This commit was manufactured by cvs2svn to create tag 'v2031_20030401'.
Sprout from R2_0_1 2003-04-01 23:04:33 UTC Sonia Dimitrov <sdimitro> 'updated versions for 2.0.3.1 patch'
Cherrypick from R2_0_1 2002-10-16 23:43:29 UTC Dejan Glozic <dejan> '*** empty log message ***':
update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/UpdateUIPlugin.java
update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/security/AuthorizationDatabase.java
update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/UpdatesView.java
Cherrypick from R2_0_3 2003-03-19 02:23:14 UTC Dejan Glozic <dejan> '*** empty log message ***':
update/org.eclipse.update.ui/plugin.xml
update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/forms/ActivityConstraints.java
update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/FeatureHierarchyElement.java
update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/InstallWizard.java
update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/NewUpdatesWizard.java
update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/OptionalFeaturesPage.java
Delete:
ant/org.eclipse.ant.core/.classpath
ant/org.eclipse.ant.core/.cvsignore
ant/org.eclipse.ant.core/.project
ant/org.eclipse.ant.core/about.html
ant/org.eclipse.ant.core/build.properties
ant/org.eclipse.ant.core/buildnotes_platform-ant.html
ant/org.eclipse.ant.core/doc/hglegal.htm
ant/org.eclipse.ant.core/doc/ngibmcpy.gif
ant/org.eclipse.ant.core/doc/org_eclipse_ant_core.html
ant/org.eclipse.ant.core/doc/org_eclipse_ant_core_antTasks.html
ant/org.eclipse.ant.core/doc/org_eclipse_ant_core_antTypes.html
ant/org.eclipse.ant.core/doc/org_eclipse_ant_core_extraClasspathEntries.html
ant/org.eclipse.ant.core/plugin.properties
ant/org.eclipse.ant.core/plugin.xml
ant/org.eclipse.ant.core/src/org/eclipse/ant/core/AntCorePlugin.java
ant/org.eclipse.ant.core/src/org/eclipse/ant/core/AntRunner.java
ant/org.eclipse.ant.core/src/org/eclipse/ant/core/TargetInfo.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/AntCorePreferences.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/Policy.java
ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/Task.java
ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/Type.java
ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/messages.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/Policy.java
ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/ProgressBuildListener.java
ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/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/os/linux/libupdate.so
update/org.eclipse.update.core.linux/src/build.xml
update/org.eclipse.update.core.linux/src/update.cpp
update/org.eclipse.update.core.linux/src/update.h
update/org.eclipse.update.core.win32/.classpath
update/org.eclipse.update.core.win32/.cvsignore
update/org.eclipse.update.core.win32/.project
update/org.eclipse.update.core.win32/about.html
update/org.eclipse.update.core.win32/build.properties
update/org.eclipse.update.core.win32/fragment.xml
update/org.eclipse.update.core.win32/os/win32/update.dll
update/org.eclipse.update.core.win32/src/build.xml
update/org.eclipse.update.core.win32/src/update.cpp
update/org.eclipse.update.core.win32/src/update.h
update/org.eclipse.update.core/.classpath
update/org.eclipse.update.core/.cvsignore
update/org.eclipse.update.core/.options
update/org.eclipse.update.core/.project
update/org.eclipse.update.core/Scrapbook.jpage
update/org.eclipse.update.core/about.html
update/org.eclipse.update.core/build.properties
update/org.eclipse.update.core/doc/featureTypes.html
update/org.eclipse.update.core/doc/hglegal.htm
update/org.eclipse.update.core/doc/installHandlers.html
update/org.eclipse.update.core/doc/ngibmcpy.gif
update/org.eclipse.update.core/doc/org_eclipse_update_core_featureTypes.html
update/org.eclipse.update.core/doc/org_eclipse_update_core_installHandlers.html
update/org.eclipse.update.core/doc/org_eclipse_update_core_siteTypes.html
update/org.eclipse.update.core/doc/siteTypes.html
update/org.eclipse.update.core/plugin.properties
update/org.eclipse.update.core/plugin.xml
update/org.eclipse.update.core/schema/featureTypes.exsd
update/org.eclipse.update.core/schema/installHandlers.exsd
update/org.eclipse.update.core/schema/siteTypes.exsd
update/org.eclipse.update.core/src/org/eclipse/update/configuration/IActivity.java
update/org.eclipse.update.core/src/org/eclipse/update/configuration/IConfiguredSite.java
update/org.eclipse.update.core/src/org/eclipse/update/configuration/IConfiguredSiteChangedListener.java
update/org.eclipse.update.core/src/org/eclipse/update/configuration/IInstallConfiguration.java
update/org.eclipse.update.core/src/org/eclipse/update/configuration/IInstallConfigurationChangedListener.java
update/org.eclipse.update.core/src/org/eclipse/update/configuration/IInstallDeltaHandler.java
update/org.eclipse.update.core/src/org/eclipse/update/configuration/ILocalSite.java
update/org.eclipse.update.core/src/org/eclipse/update/configuration/ILocalSiteChangedListener.java
update/org.eclipse.update.core/src/org/eclipse/update/configuration/ILocalSystemInfoListener.java
update/org.eclipse.update.core/src/org/eclipse/update/configuration/IProblemHandler.java
update/org.eclipse.update.core/src/org/eclipse/update/configuration/ISessionDelta.java
update/org.eclipse.update.core/src/org/eclipse/update/configuration/IVolume.java
update/org.eclipse.update.core/src/org/eclipse/update/configuration/LocalSystemInfo.java
update/org.eclipse.update.core/src/org/eclipse/update/configuration/package.html
update/org.eclipse.update.core/src/org/eclipse/update/core/ArchiveReference.java
update/org.eclipse.update.core/src/org/eclipse/update/core/BaseFeatureFactory.java
update/org.eclipse.update.core/src/org/eclipse/update/core/BaseInstallHandler.java
update/org.eclipse.update.core/src/org/eclipse/update/core/BaseSiteFactory.java
update/org.eclipse.update.core/src/org/eclipse/update/core/Category.java
update/org.eclipse.update.core/src/org/eclipse/update/core/ContentReference.java
update/org.eclipse.update.core/src/org/eclipse/update/core/Feature.java
update/org.eclipse.update.core/src/org/eclipse/update/core/FeatureContentProvider.java
update/org.eclipse.update.core/src/org/eclipse/update/core/FeatureReference.java
update/org.eclipse.update.core/src/org/eclipse/update/core/IArchiveReference.java
update/org.eclipse.update.core/src/org/eclipse/update/core/ICategory.java
update/org.eclipse.update.core/src/org/eclipse/update/core/IContentConsumer.java
update/org.eclipse.update.core/src/org/eclipse/update/core/IFeature.java
update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureContentConsumer.java
update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureContentProvider.java
update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureFactory.java
update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureReference.java
update/org.eclipse.update.core/src/org/eclipse/update/core/IImport.java
update/org.eclipse.update.core/src/org/eclipse/update/core/IIncludedFeatureReference.java
update/org.eclipse.update.core/src/org/eclipse/update/core/IInstallHandler.java
update/org.eclipse.update.core/src/org/eclipse/update/core/IInstallHandlerEntry.java
update/org.eclipse.update.core/src/org/eclipse/update/core/INonPluginEntry.java
update/org.eclipse.update.core/src/org/eclipse/update/core/IPlatformEnvironment.java
update/org.eclipse.update.core/src/org/eclipse/update/core/IPluginEntry.java
update/org.eclipse.update.core/src/org/eclipse/update/core/ISite.java
update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteContentProvider.java
update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteFactory.java
update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteFeatureReference.java
update/org.eclipse.update.core/src/org/eclipse/update/core/IURLEntry.java
update/org.eclipse.update.core/src/org/eclipse/update/core/IUpdateConstants.java
update/org.eclipse.update.core/src/org/eclipse/update/core/IVerificationListener.java
update/org.eclipse.update.core/src/org/eclipse/update/core/IVerificationResult.java
update/org.eclipse.update.core/src/org/eclipse/update/core/IVerifier.java
update/org.eclipse.update.core/src/org/eclipse/update/core/Import.java
update/org.eclipse.update.core/src/org/eclipse/update/core/IncludedFeatureReference.java
update/org.eclipse.update.core/src/org/eclipse/update/core/InstallHandlerEntry.java
update/org.eclipse.update.core/src/org/eclipse/update/core/InstallMonitor.java
update/org.eclipse.update.core/src/org/eclipse/update/core/JarContentReference.java
update/org.eclipse.update.core/src/org/eclipse/update/core/JarEntryContentReference.java
update/org.eclipse.update.core/src/org/eclipse/update/core/NonPluginEntry.java
update/org.eclipse.update.core/src/org/eclipse/update/core/PluginEntry.java
update/org.eclipse.update.core/src/org/eclipse/update/core/Site.java
update/org.eclipse.update.core/src/org/eclipse/update/core/SiteContentProvider.java
update/org.eclipse.update.core/src/org/eclipse/update/core/SiteFeatureReference.java
update/org.eclipse.update.core/src/org/eclipse/update/core/SiteFeatureReferenceModel.java
update/org.eclipse.update.core/src/org/eclipse/update/core/SiteManager.java
update/org.eclipse.update.core/src/org/eclipse/update/core/URLEntry.java
update/org.eclipse.update.core/src/org/eclipse/update/core/Utilities.java
update/org.eclipse.update.core/src/org/eclipse/update/core/Verifier.java
update/org.eclipse.update.core/src/org/eclipse/update/core/VersionedIdentifier.java
update/org.eclipse.update.core/src/org/eclipse/update/core/WebInstallHandler.java
update/org.eclipse.update.core/src/org/eclipse/update/core/model/ArchiveReferenceModel.java
update/org.eclipse.update.core/src/org/eclipse/update/core/model/CategoryModel.java
update/org.eclipse.update.core/src/org/eclipse/update/core/model/ContentEntryModel.java
update/org.eclipse.update.core/src/org/eclipse/update/core/model/DefaultFeatureParser.java
update/org.eclipse.update.core/src/org/eclipse/update/core/model/DefaultSiteParser.java
update/org.eclipse.update.core/src/org/eclipse/update/core/model/FeatureModel.java
update/org.eclipse.update.core/src/org/eclipse/update/core/model/FeatureModelFactory.java
update/org.eclipse.update.core/src/org/eclipse/update/core/model/FeatureReferenceModel.java
update/org.eclipse.update.core/src/org/eclipse/update/core/model/ImportModel.java
update/org.eclipse.update.core/src/org/eclipse/update/core/model/IncludedFeatureReferenceModel.java
update/org.eclipse.update.core/src/org/eclipse/update/core/model/InstallAbortedException.java
update/org.eclipse.update.core/src/org/eclipse/update/core/model/InstallHandlerEntryModel.java
update/org.eclipse.update.core/src/org/eclipse/update/core/model/InvalidSiteTypeException.java
update/org.eclipse.update.core/src/org/eclipse/update/core/model/ModelObject.java
update/org.eclipse.update.core/src/org/eclipse/update/core/model/NonPluginEntryModel.java
update/org.eclipse.update.core/src/org/eclipse/update/core/model/PluginEntryModel.java
update/org.eclipse.update.core/src/org/eclipse/update/core/model/SiteModel.java
update/org.eclipse.update.core/src/org/eclipse/update/core/model/SiteModelFactory.java
update/org.eclipse.update.core/src/org/eclipse/update/core/model/URLEntryModel.java
update/org.eclipse.update.core/src/org/eclipse/update/core/model/package.html
update/org.eclipse.update.core/src/org/eclipse/update/core/package.html
update/org.eclipse.update.core/src/org/eclipse/update/internal/URLKey.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Assert.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/core/BaseSiteLocalFactory.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfigurationActivity.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfigurationPolicy.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfiguredSite.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ContentConsumer.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/core/DefaultInstallHandler.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ErrorRecoveryLog.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureContentConsumer.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureExecutableContentConsumer.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureExecutableContentProvider.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureExecutableFactory.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeaturePackagedContentProvider.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeaturePackagedFactory.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureTypeFactory.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FileResponse.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/core/HttpClient.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/core/HttpResponse.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ISiteContentConsumer.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/core/IStatusCodes.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/core/IWritable.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InstallConfiguration.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InstallHandlerProxy.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InternalSiteManager.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ListenersList.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/core/NonPluginEntryContentConsumer.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/core/PluginEntryContentConsumer.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Policy.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Response.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SessionDelta.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteContentConsumer.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFile.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileContentConsumer.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileContentProvider.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileFactory.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileNonPluginContentConsumer.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFilePluginContentConsumer.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteLocal.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteReconciler.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteStatusAnalyzer.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteTypeFactory.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteURLContentProvider.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteURLFactory.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/core/TargetFeature.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/core/URLEncoder.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateManagerLogWriter.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateManagerPlugin.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateManagerReconciler.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateManagerUtils.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Volume.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Writer.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/core/messages.properties
update/org.eclipse.update.core/src/org/eclipse/update/internal/model/ConfigurationActivityModel.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/model/ConfigurationPolicyModel.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/model/ConfiguredSiteModel.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/model/DefaultPluginParser.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/model/InstallChangeParser.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/model/InstallConfigurationModel.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/model/InstallConfigurationParser.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/model/SiteLocalModel.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/model/SiteLocalParser.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/security/CertificatePair.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/security/JarVerificationResult.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/security/JarVerifier.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/security/KeyStores.java
update/org.eclipse.update.core/src/org/eclipse/update/internal/security/KeystoreHandle.java
update/org.eclipse.update.examples/.classpath
update/org.eclipse.update.examples/.cvsignore
update/org.eclipse.update.examples/.project
update/org.eclipse.update.examples/Red Dot Site Install Handler/features/com.reddot.reddot_1.0.0.jar
update/org.eclipse.update.examples/Red Dot Site Install Handler/features/com.reddot.reddot_1.0.0/data.jar
update/org.eclipse.update.examples/Red Dot Site Install Handler/features/com.reddot.reddot_1.0.0/extra.txt
update/org.eclipse.update.examples/Red Dot Site Install Handler/features/com.reddot.reddot_2.0.0.jar
update/org.eclipse.update.examples/Red Dot Site Install Handler/features/com.reddot.reddot_2.0.0/data.jar
update/org.eclipse.update.examples/Red Dot Site Install Handler/features/com.reddot.reddot_2.0.0/extra.txt
update/org.eclipse.update.examples/Red Dot Site Install Handler/info/images/redDot.jpg
update/org.eclipse.update.examples/Red Dot Site Install Handler/info/siteInfo.html
update/org.eclipse.update.examples/Red Dot Site Install Handler/plugins/com.reddot.reddot_1.0.0.jar
update/org.eclipse.update.examples/Red Dot Site Install Handler/plugins/com.reddot.reddot_2.0.0.jar
update/org.eclipse.update.examples/Scrapbook2.jpage
update/org.eclipse.update.examples/about.html
update/org.eclipse.update.examples/build.properties
update/org.eclipse.update.examples/plugin.properties
update/org.eclipse.update.examples/plugin.xml
update/org.eclipse.update.examples/site/features/com.reddot.reddot_1.0.0.jar
update/org.eclipse.update.examples/site/features/com.reddot.reddot_2.0.0.jar
update/org.eclipse.update.examples/site/info/images/redDot.jpg
update/org.eclipse.update.examples/site/info/siteInfo.html
update/org.eclipse.update.examples/site/plugins/com.reddot.reddot_1.0.0.jar
update/org.eclipse.update.examples/site/plugins/com.reddot.reddot_2.0.0.jar
update/org.eclipse.update.examples/site/site.xml
update/org.eclipse.update.examples/src/org/eclipse/update/examples/buildzip/BuildZipConverter.java
update/org.eclipse.update.examples/src/org/eclipse/update/examples/buildzip/BuildZipFeatureContentProvider.java
update/org.eclipse.update.examples/src/org/eclipse/update/examples/buildzip/BuildZipFeatureFactory.java
update/org.eclipse.update.examples/src/org/eclipse/update/examples/buildzip/BuildZipFeatureParser.java
update/org.eclipse.update.examples/src/org/eclipse/update/examples/buildzip/BuildZipPluginParser.java
update/org.eclipse.update.examples/src/org/eclipse/update/examples/buildzip/BuildZipSiteContentProvider.java
update/org.eclipse.update.examples/src/org/eclipse/update/examples/buildzip/BuildZipSiteFactory.java
update/org.eclipse.update.examples/src/org/eclipse/update/examples/buildzip/DefaultModelWriter.java
update/org.eclipse.update.examples/src/org/eclipse/update/examples/buildzip/Test.java
update/org.eclipse.update.examples/src/org/eclipse/update/examples/buildzip/java.page.jpage
update/org.eclipse.update.examples/src/org/eclipse/update/examples/freeform/FreeFormSiteContentProvider.java
update/org.eclipse.update.examples/src/org/eclipse/update/examples/freeform/FreeFormSiteFactory.java
update/org.eclipse.update.tests.core/.classpath
update/org.eclipse.update.tests.core/.cvsignore
update/org.eclipse.update.tests.core/.project
update/org.eclipse.update.tests.core/about.html
update/org.eclipse.update.tests.core/build.properties
update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data/features/feature3/feature.xml
update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data/plugins/Pde_core.jar
update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data/plugins/help.jar
update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data/plugins/junit_3.7.jar
update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data/plugins/org.eclipse.update.plugin1_1.1.1/plugin.xml
update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data/plugins/org.eclipse.update.plugin1_1.1.1/src.jar
update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/features/feature3/feature.xml
update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/features/helpFeature.jar
update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/features/org.eclipse.pde.feature_1.0.0.jar
update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/info/img/top_titlsm.gif
update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/info/img/wel_ml.jpg
update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/info/siteInfo.html
update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/plugins/Pde_core.jar
update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/plugins/help.jar
update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/plugins/junit_3.7.jar
update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/plugins/org.eclipse.update.plugin1_1.1.1/plugin.xml
update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/plugins/org.eclipse.update.plugin1_1.1.1/src.jar
update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/site.xml
update/org.eclipse.update.tests.core/data/FTPLikeSite/site.xml
update/org.eclipse.update.tests.core/data/FeatureTypeExamples/site1/features/feature3/feature.xml
update/org.eclipse.update.tests.core/data/FeatureTypeExamples/site1/site.xml
update/org.eclipse.update.tests.core/data/FeatureTypeExamples/site2/features/feature3/features2.jarfile
update/org.eclipse.update.tests.core/data/FeatureTypeExamples/site2/site.xml
update/org.eclipse.update.tests.core/data/FeatureTypeExamples/site3/features/feature3/features2.jarfile
update/org.eclipse.update.tests.core/data/FeatureTypeExamples/site3/site.xml
update/org.eclipse.update.tests.core/data/Site with space/features space/helpFeature.jar
update/org.eclipse.update.tests.core/data/Site with space/features space/space feature.jar
update/org.eclipse.update.tests.core/data/Site with space/info/img/top_titlsm.gif
update/org.eclipse.update.tests.core/data/Site with space/info/img/wel_ml.jpg
update/org.eclipse.update.tests.core/data/Site with space/info/siteInfo.html
update/org.eclipse.update.tests.core/data/Site with space/install/features space/feature3/feature.xml
update/org.eclipse.update.tests.core/data/Site with space/plugins space/Pde_core.jar
update/org.eclipse.update.tests.core/data/Site with space/plugins space/help.jar
update/org.eclipse.update.tests.core/data/Site with space/plugins space/junit_3.7.jar
update/org.eclipse.update.tests.core/data/Site with space/plugins space/org.eclipse.update.plugin1_1.1.1/plugin.xml
update/org.eclipse.update.tests.core/data/Site with space/plugins space/org.eclipse.update.plugin1_1.1.1/src.jar
update/org.eclipse.update.tests.core/data/Site with space/site.xml
update/org.eclipse.update.tests.core/data/SiteTypeExamples/site1/features/feature3/features2.jarfile
update/org.eclipse.update.tests.core/data/SiteTypeExamples/site1/site.xml
update/org.eclipse.update.tests.core/data/SiteURLTest/data/artifacts/features/helpFeature.jar
update/org.eclipse.update.tests.core/data/SiteURLTest/data/artifacts/features/org.eclipse.pde.feature_1.0.0.jar
update/org.eclipse.update.tests.core/data/SiteURLTest/data/artifacts/plugins/Pde_core.jar
update/org.eclipse.update.tests.core/data/SiteURLTest/data/artifacts/plugins/help.jar
update/org.eclipse.update.tests.core/data/SiteURLTest/data/artifacts/plugins/junit_3.7.jar
update/org.eclipse.update.tests.core/data/SiteURLTest/data/info/img/top_titlsm.gif
update/org.eclipse.update.tests.core/data/SiteURLTest/data/info/img/wel_ml.jpg
update/org.eclipse.update.tests.core/data/SiteURLTest/data/info/siteInfo.html
update/org.eclipse.update.tests.core/data/SiteURLTest/data/site.xml
update/org.eclipse.update.tests.core/data/dataEntrySiteTest/site1/file1.zip
update/org.eclipse.update.tests.core/data/dataEntrySiteTest/site1/install/features/feature3/feature.xml
update/org.eclipse.update.tests.core/data/dataEntrySiteTest/site1/site.xml
update/org.eclipse.update.tests.core/data/dataEntrySiteTest/site2/features/features3.jar
update/org.eclipse.update.tests.core/data/dataEntrySiteTest/site2/non data/another file.zip
update/org.eclipse.update.tests.core/data/dataEntrySiteTest/site2/site.xml
update/org.eclipse.update.tests.core/data/features/features2.jar
update/org.eclipse.update.tests.core/data/features/org.eclipse.test.feature_1.0.0.jar
update/org.eclipse.update.tests.core/data/features/org.eclipse.update.core.tests.feature1_1.0.4.jar
update/org.eclipse.update.tests.core/data/features/org.eclipse_test_feature.jar
update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest/features/org.eclipse.update.core.tests.childrenfeature_2.0.0.jar
update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest/features/rootfeature.jar
update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest/plugins/org.eclipse.update.core.tests.feature1.plugin1_3.5.6.jar
update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest/plugins/org.eclipse.update.core.tests.feature1.plugin2_5.0.0.jar
update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest/plugins/org.eclipse.update.core.tests.feature1.plugin2_5.0.1.jar
update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest/site.xml
update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest2/features/childrenfeature.jar
update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest2/features/rootfeature.jar
update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest2/plugins/org.eclipse.update.core.tests.feature1.plugin1_3.5.6.jar
update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest2/plugins/org.eclipse.update.core.tests.feature1.plugin2_5.0.0.jar
update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest2/plugins/org.eclipse.update.core.tests.feature1.plugin2_5.0.1.jar
update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest2/site.xml
update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest3/features/childrenfeature.jar
update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest3/features/rootfeature.jar
update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest3/plugins/org.eclipse.update.core.tests.feature1.plugin1_3.5.6.jar
update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest3/plugins/org.eclipse.update.core.tests.feature1.plugin2_5.0.0.jar
update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest3/plugins/org.eclipse.update.core.tests.feature1.plugin2_5.0.1.jar
update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest3/site.xml
update/org.eclipse.update.tests.core/data/parsertests/feature1.xml
update/org.eclipse.update.tests.core/data/parsertests/feature1bis.xml
update/org.eclipse.update.tests.core/data/parsertests/feature2.xml
update/org.eclipse.update.tests.core/data/parsertests/reddot.xml
update/org.eclipse.update.tests.core/data/parsertests/reddot1.xml
update/org.eclipse.update.tests.core/data/parsertests/site.properties
update/org.eclipse.update.tests.core/data/parsertests/site.xml
update/org.eclipse.update.tests.core/data/parsertests/site10.xml
update/org.eclipse.update.tests.core/data/parsertests/site2.xml
update/org.eclipse.update.tests.core/data/parsertests/site3.xml
update/org.eclipse.update.tests.core/data/parsertests/site4.xml
update/org.eclipse.update.tests.core/data/parsertests/site7.xml
update/org.eclipse.update.tests.core/data/parsertests/site8.xml
update/org.eclipse.update.tests.core/data/parsertests/site9.xml
update/org.eclipse.update.tests.core/data/parsertests/siteftp.xml
update/org.eclipse.update.tests.core/data/plugins/org.eclipse.update.core.feature1.plugin1_1.1.1.jar
update/org.eclipse.update.tests.core/data/plugins/org.eclipse.update.core.feature2.plugin2_2.2.2.jar
update/org.eclipse.update.tests.core/data/plugins/org.eclipse.update.core.tests.dummy_7.9.8.jar
update/org.eclipse.update.tests.core/data/plugins/org.eclipse.update.core.tests.feature1.plugin1_3.5.6.jar
update/org.eclipse.update.tests.core/data/plugins/org.eclipse.update.core.tests.feature1.plugin2_5.0.0.jar
update/org.eclipse.update.tests.core/data/plugins/org.eclipse.update.plugin1_1.1.1/plugin.xml
update/org.eclipse.update.tests.core/data/plugins/org.eclipse.update.plugin1_1.1.1/src.jar
update/org.eclipse.update.tests.core/data/reconciliationSites/site1/install/features/feature3/feature.xml
update/org.eclipse.update.tests.core/data/reconciliationSites/site1/plugins/org.eclipse.update.plugin1_1.1.1/plugin.xml
update/org.eclipse.update.tests.core/data/reconciliationSites/site1/plugins/org.eclipse.update.plugin1_1.1.1/src.jar
update/org.eclipse.update.tests.core/data/reconciliationSites/site2/install/features/feature3/feature.xml
update/org.eclipse.update.tests.core/data/reconciliationSites/site2/plugins/org.eclipse.update.core_2.0.0/plugin.xml
update/org.eclipse.update.tests.core/data/reconciliationSites/site2/plugins/org.eclipse.update.core_2.0.0/src.jar
update/org.eclipse.update.tests.core/data/resources.properties
update/org.eclipse.update.tests.core/data/site.xml
update/org.eclipse.update.tests.core/data/site2/site.xml
update/org.eclipse.update.tests.core/data/siteTestLocalSite/plugins/feature1_plugin2_5.0.0/plugin.xml
update/org.eclipse.update.tests.core/data/siteTestLocalSite/plugins/feature1_plugin2_5.0.0/src.jar
update/org.eclipse.update.tests.core/data/siteTestLocalSite/plugins/feature1_plugin2_5.0.1/plugin.xml
update/org.eclipse.update.tests.core/data/siteTestLocalSite/plugins/feature1_plugin2_5.0.1/src.jar
update/org.eclipse.update.tests.core/data/testAPI/features/feature3/feature.xml
update/org.eclipse.update.tests.core/data/testAPI/plugins/org.eclipse.update.plugin1_1.1.1/plugin.xml
update/org.eclipse.update.tests.core/data/testAPI/plugins/org.eclipse.update.plugin1_1.1.1/src.jar
update/org.eclipse.update.tests.core/data/testAPI/site.xml
update/org.eclipse.update.tests.core/data/validation/site2/.eclipseproduct
update/org.eclipse.update.tests.core/data/validation/site3/.eclipseextension
update/org.eclipse.update.tests.core/data/validation/site4/.eclipseUM
update/org.eclipse.update.tests.core/data/validation/site5/.eclipseUM
update/org.eclipse.update.tests.core/data/validation/site6/.eclipseUM
update/org.eclipse.update.tests.core/data/xmls/apitests/org.eclipse.test.feature_1.0.0/feature.xml
update/org.eclipse.update.tests.core/data/xmls/apitests/org.eclipse_test_feature/feature.xml
update/org.eclipse.update.tests.core/data/xmls/feature_1.0.0/feature.xml
update/org.eclipse.update.tests.core/data/xmls/feature_1.0.0/feature1.gif
update/org.eclipse.update.tests.core/data/xmls/site1/site.xml
update/org.eclipse.update.tests.core/plugin.properties
update/org.eclipse.update.tests.core/plugin.xml
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/AllTests.java
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/UpdateManagerTestCase.java
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/UpdateTestsPlugin.java
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/AllAPITests.java
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/DefaultFeature.java
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/MyURLEntry.java
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestDefaultExecutableFeatureAPI.java
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestDefaultPackageFeatureAPI.java
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestFeatureContentProvider_FileFilterAPI.java
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestLocalSiteAPI.java
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestNestedFeatureAPI.java
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestPluginContainerAPI.java
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestSiteAPI.java
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestSiteManagerAPI.java
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestUpdateManagerUtilsAPI.java
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/configurations/AllConfigurationsTests.java
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/configurations/TestBackward.java
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/configurations/TestRevert.java
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/core/boot/AllPlatformConfigurationTests.java
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/core/boot/PlatformConfigurationTestCase.java
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/core/boot/TestPlatCfgAPI.java
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/core/boot/TestPlatCfgDefault.java
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/implementation/SiteFTP.java
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/implementation/SiteFTPFactory.java
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/AllModelTests.java
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/FeatureMain.java
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/SiteMain.java
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/feature.xml
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/site.xml
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/site_old_format.xml
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/site_with_type.xml
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/test.properties
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/nativeTests/TestLocalSystemInfo.java
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/nestedfeatures/AllNestedTests.java
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/nestedfeatures/TestInstall.java
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/parser/AllParserTests.java
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/parser/TestCategories.java
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/parser/TestFeatureParse.java
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/parser/TestSiteParse.java
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/reconciliation/AllReconciliationTests.java
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/reconciliation/TestSiteReconciliation.java
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/AllRegularInstallTests.java
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/MultipleTestLocalSite.java
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestDataEntryInstall.java
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestExecutableInstall.java
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestExecutablePackagedInstall.java
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestGetFeature.java
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestInstall.java
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestInstallURLSIteXML.java
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestLocalSite.java
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestSpaceInInstall.java
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularRemove/AllRegularRemoveTests.java
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularRemove/TestRemove.java
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/sitevalidation/AllSiteValidationTests.java
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/sitevalidation/TestSiteValidation.java
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/types/AllTypesTests.java
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/types/TestFeatureType.java
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/types/TestSiteType.java
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/uivalues/AllCoreUITests.java
update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/uivalues/TestUILabel.java
update/org.eclipse.update.tests.core/test.xml
update/org.eclipse.update.tests.core/test_with_mail.xml
update/org.eclipse.update.tests.core/webserver/Site with space/features space/helpFeature.jar
update/org.eclipse.update.tests.core/webserver/Site with space/features space/space feature.jar
update/org.eclipse.update.tests.core/webserver/Site with space/info/img/top_titlsm.gif
update/org.eclipse.update.tests.core/webserver/Site with space/info/img/wel_ml.jpg
update/org.eclipse.update.tests.core/webserver/Site with space/info/siteInfo.html
update/org.eclipse.update.tests.core/webserver/Site with space/install/features space/feature3/feature.xml
update/org.eclipse.update.tests.core/webserver/Site with space/plugins space/Pde_core.jar
update/org.eclipse.update.tests.core/webserver/Site with space/plugins space/help.jar
update/org.eclipse.update.tests.core/webserver/Site with space/plugins space/junit_3.7.jar
update/org.eclipse.update.tests.core/webserver/Site with space/site.xml
update/org.eclipse.update.tests.core/webserver/UpdateManager/features/helpFeature.jar
update/org.eclipse.update.tests.core/webserver/UpdateManager/features/org.eclipse.pde.feature_1.0.0.jar
update/org.eclipse.update.tests.core/webserver/UpdateManager/info/img/top_titlsm.gif
update/org.eclipse.update.tests.core/webserver/UpdateManager/info/img/wel_ml.jpg
update/org.eclipse.update.tests.core/webserver/UpdateManager/info/siteInfo.html
update/org.eclipse.update.tests.core/webserver/UpdateManager/plugins/Pde_core.jar
update/org.eclipse.update.tests.core/webserver/UpdateManager/plugins/help.jar
update/org.eclipse.update.tests.core/webserver/UpdateManager/plugins/junit_3.7.jar
update/org.eclipse.update.tests.core/webserver/UpdateManager/site.xml
update/org.eclipse.update.tests.core/webserver/UpdateManager2/features/features2.jar
update/org.eclipse.update.tests.core/webserver/UpdateManager2/features/org.eclipse.test.feature_1.0.0.jar
update/org.eclipse.update.tests.core/webserver/UpdateManager2/features/org.eclipse.update.core.tests.feature1_1.0.4.jar
update/org.eclipse.update.tests.core/webserver/UpdateManager2/features/org.eclipse_test_feature.jar
update/org.eclipse.update.tests.core/webserver/UpdateManager2/nestedFeatureSiteTest/features/org.eclipse.update.core.tests.childrenfeature_2.0.0.jar
update/org.eclipse.update.tests.core/webserver/UpdateManager2/nestedFeatureSiteTest/features/rootfeature.jar
update/org.eclipse.update.tests.core/webserver/UpdateManager2/nestedFeatureSiteTest/plugins/org.eclipse.update.core.tests.feature1.plugin1_3.5.6.jar
update/org.eclipse.update.tests.core/webserver/UpdateManager2/nestedFeatureSiteTest/plugins/org.eclipse.update.core.tests.feature1.plugin2_5.0.0.jar
update/org.eclipse.update.tests.core/webserver/UpdateManager2/nestedFeatureSiteTest/plugins/org.eclipse.update.core.tests.feature1.plugin2_5.0.1.jar
update/org.eclipse.update.tests.core/webserver/UpdateManager2/nestedFeatureSiteTest/site.xml
update/org.eclipse.update.tests.core/webserver/UpdateManager2/org.eclipse.update.core.feature2_1.0.0/org.eclipse.update.core.feature2_2.2.2.jar
update/org.eclipse.update.tests.core/webserver/UpdateManager2/plugins/org.eclipse.update.core.feature1.plugin1_1.1.1.jar
update/org.eclipse.update.tests.core/webserver/UpdateManager2/plugins/org.eclipse.update.core.feature2.plugin2_2.2.2.jar
update/org.eclipse.update.tests.core/webserver/UpdateManager2/plugins/org.eclipse.update.core.tests.dummy_7.9.8.jar
update/org.eclipse.update.tests.core/webserver/UpdateManager2/plugins/org.eclipse.update.core.tests.feature1.plugin1_3.5.6.jar
update/org.eclipse.update.tests.core/webserver/UpdateManager2/plugins/org.eclipse.update.core.tests.feature1.plugin2_5.0.0.jar
update/org.eclipse.update.tests.core/webserver/UpdateManager2/site.properties
update/org.eclipse.update.tests.core/webserver/UpdateManager2/site.xml
update/org.eclipse.update.tests.core/webserver/WEB-INF/web.xml
update/org.eclipse.update.ui.forms/.classpath
update/org.eclipse.update.ui.forms/.cvsignore
update/org.eclipse.update.ui.forms/.project
update/org.eclipse.update.ui.forms/about.html
update/org.eclipse.update.ui.forms/build.properties
update/org.eclipse.update.ui.forms/plugin.properties
update/org.eclipse.update.ui.forms/plugin.xml
update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/AbstractForm.java
update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/AbstractSectionForm.java
update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/CustomWorkbook.java
update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/ExpandableGroup.java
update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/FormButton.java
update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/FormEntry.java
update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/FormLabel.java
update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/FormSection.java
update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/FormWidgetFactory.java
update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/FormsPlugin.java
update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/FormsPluginResources.properties
update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/HTMLTableLayout.java
update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/HyperlinkAdapter.java
update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/HyperlinkHandler.java
update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/HyperlinkSettings.java
update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/IForm.java
update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/IFormPage.java
update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/IFormSelectionListener.java
update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/IFormTextListener.java
update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/IFormWorkbook.java
update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/IHyperlinkListener.java
update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/NoTabsWorkbook.java
update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/ScrollableSectionForm.java
update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/SectionChangeManager.java
update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/SectionForm.java
update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/SelectableControl.java
update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/SelectableFormLabel.java
update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/TableData.java
update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/TableLayoutTest.java
update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/ToggleControl.java
update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/WebForm.java
update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/BulletParagraph.java
update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/FormEngine.java
update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/FormEngineLayout.java
update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/HTTPAction.java
update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/HyperlinkAction.java
update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/HyperlinkSegment.java
update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/IBulletParagraph.java
update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/IHyperlinkSegment.java
update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/IImageSegment.java
update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/IObjectReference.java
update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/IParagraph.java
update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/IParagraphSegment.java
update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/ITextModel.java
update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/ITextSegment.java
update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/ImageSegment.java
update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/Locator.java
update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/Paragraph.java
update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/ParagraphSegment.java
update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/TextModel.java
update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/TextSegment.java
update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/index.xml
update/org.eclipse.update.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/fragment.xml
update/org.eclipse.update.ui.win32/icons/full/cview16/browser.gif
update/org.eclipse.update.ui.win32/icons/full/eview16/browser.gif
update/org.eclipse.update.ui.win32/src/org/eclipse/update/internal/ui/win32/views/BrowserControlSite.java
update/org.eclipse.update.ui.win32/src/org/eclipse/update/internal/ui/win32/views/WebBrowser.java
update/org.eclipse.update.ui.win32/src/org/eclipse/update/internal/ui/win32/views/WebBrowserView.java
update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/security/UpdateManagerAuthenticator.javadiff --git a/ant/org.eclipse.ant.core/.classpath b/ant/org.eclipse.ant.core/.classpath
deleted file mode 100644
index 520e05a..0000000
--- a/ant/org.eclipse.ant.core/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="/org.apache.xerces"/>
- <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
- <classpathentry kind="src" path="/org.eclipse.core.boot"/>
- <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
- <classpathentry kind="lib" path="/org.apache.ant/ant.jar" sourcepath="/org.apache.ant/antsrc.zip"/>
- <classpathentry kind="src" path="src_ant"/>
- <classpathentry kind="src" path="src"/>
- <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 57b480f..0000000
--- a/ant/org.eclipse.ant.core/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-lib
diff --git a/ant/org.eclipse.ant.core/.project b/ant/org.eclipse.ant.core/.project
deleted file mode 100644
index 4f65961..0000000
--- a/ant/org.eclipse.ant.core/.project
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.ant.core</name>
- <comment></comment>
- <projects>
- <project>org.apache.xerces</project>
- <project>org.eclipse.core.boot</project>
- <project>org.eclipse.core.runtime</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/ant/org.eclipse.ant.core/about.html b/ant/org.eclipse.ant.core/about.html
deleted file mode 100644
index 328a8cd..0000000
--- a/ant/org.eclipse.ant.core/about.html
+++ /dev/null
@@ -1,89 +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>Third Party Content</h3>
-
-<p>The Content includes items that have been sourced from third parties as follows:</p>
-
-<p><b>Ant 1.4.1</b></p>
-<p>The plug-in is based on software developed by The Apache Software Foundation as part of the Jakarta project. Therefore:</p>
-
-<blockquote>
-This product includes software developed by the Apache Software Foundation (<a href="http://www.apache.org/">http://www.apache.org/</a>).
-</blockquote>
-
-<p>The following classes "Ant Derivative Work" are based on Ant code:</p>
-
-<ul>
- <li>InternalAntRunner contained in antsupportlib.jar and antsupportlibsrc.zip</li>
-</ul>
-
-<p>The Ant Derivative Work is:</p>
-
-<blockquote>Copyright (c) 1999 The Apache Software Foundation. All rights reserved.</blockquote>
-
-<p>Your use of the Ant Derivative Work is subject to the terms and conditions of the Apache Software License 1.1 which
-is available at <a href="http://jakarta.apache.org/ant/manual/LICENSE">http://jakarta.apache.org/ant/manual/LICENSE</a>.
-More specifically:</p>
-<blockquote>
- 1. Redistributions of source code must retain the above copyright notice, this list of<br />
- conditions and the following disclaimer.<br />
-<br />
- 2. Redistributions in binary form must reproduce the above copyright notice, this list of<br />
- conditions and the following disclaimer in the documentation and/or other materials<br />
- provided with the distribution.<br />
-<br />
- 3. The end-user documentation included with the redistribution, if any, must include the<br />
- following acknowledgment:<br />
- <blockquote>
- "This product includes software developed by the Apache Software Foundation<br />
- (<a href="http://www.apache.org/">http://www.apache.org/</a>)."
- </blockquote>
- Alternately, this acknowledgment may appear in the software itself, if and wherever such<br />
- third-party acknowledgments normally appear.<br />
-<br />
- 4. The names "Ant" and "Apache Software Foundation" must not be used to endorse or<br />
- promote products derived from this software without prior written permission. For written<br />
- permission, please contact <a href="mailto:apache@apache.org">apache@apache.org</a>.<br />
-<br />
- 5. Products derived from this software may not be called "Apache", nor may "Apache" appear<br />
- in their name, without prior written permission of the Apache Software Foundation.<br />
-<br />
- THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT<br />
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR<br />
- PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR ITS<br />
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR<br />
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR<br />
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON<br />
- ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING<br />
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF<br />
- ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-</blockquote>
-
-<h3>Contributions</h3>
-
-<p>If this Content is licensed to you under the terms and conditions of the CPL, any Contributions, as defined in the CPL, uploaded, submitted, or otherwise
-made available to Eclipse.org, members of Eclipse.org and/or the host of Eclipse.org web site, by you that relate to such
-Content are provided under the terms and conditions of the CPL and can be made available to others under the terms of the CPL.</p>
-
-<p>If this Content is licensed to you under license terms and conditions other than the CPL ("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/build.properties b/ant/org.eclipse.ant.core/build.properties
deleted file mode 100644
index 3c67aa5..0000000
--- a/ant/org.eclipse.ant.core/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.antsupport.jar=src/
-source.lib/antsupportlib.jar=src_ant/
-src.includes=about.html
-bin.includes=plugin.xml,plugin.properties,about.html,*.jar,lib/*,jar
-jars.compile.order=antsupport.jar,lib/antsupportlib.jar
-jars.extra.classpath=../org.apache.ant/ant.jar
-javadoc.packages=org.eclipse.*
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.core/buildnotes_platform-ant.html b/ant/org.eclipse.ant.core/buildnotes_platform-ant.html
deleted file mode 100644
index 238d69a..0000000
--- a/ant/org.eclipse.ant.core/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/doc/hglegal.htm b/ant/org.eclipse.ant.core/doc/hglegal.htm
deleted file mode 100644
index b071dbd..0000000
--- a/ant/org.eclipse.ant.core/doc/hglegal.htm
+++ /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">
- <meta name="GENERATOR" content="Mozilla/4.73 [en] (Win98; U) [Netscape]">
- <title>Legal Notices</title>
-</head>
-<body>
-
-<h3>
-<a NAME="Notices"></a>Notices</h3>
-(c) Copyright IBM Corp. 2000, 2001. All Rights Reserved.
-</body>
-</html>
diff --git a/ant/org.eclipse.ant.core/doc/ngibmcpy.gif b/ant/org.eclipse.ant.core/doc/ngibmcpy.gif
deleted file mode 100644
index 360f8e9..0000000
--- a/ant/org.eclipse.ant.core/doc/ngibmcpy.gif
+++ /dev/null
Binary files differ
diff --git a/ant/org.eclipse.ant.core/doc/org_eclipse_ant_core.html b/ant/org.eclipse.ant.core/doc/org_eclipse_ant_core.html
deleted file mode 100644
index a8c550f..0000000
--- a/ant/org.eclipse.ant.core/doc/org_eclipse_ant_core.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>Ant Build Tool Core extension-points</title>
-</head>
-<body link="#0000FF" vlink="#800080">
-
-<center>
-<h1>
-Ant Build Tool Core Plug-in</h1></center>
-This document lists all of the extension points that the Ant Build Tool Core
-plug-in makes available to tool developers.
-<p>
-<hr WIDTH="100%">
-<h1>
-General Extension Points</h1>
-The following extension points can be used to extend the fundamental capabilities
-of the Ant core plug-in:
-<ul>
-<li>
-<a href="org_eclipse_ant_core_antObjects.html">org.eclipse.ant.core.antObjects</a></li>
-
-<li>
-<a href="org_eclipse_ant_core_antTasks.html">org.eclipse.ant.core.antTasks</a></li>
-
-<li>
-<a href="org_eclipse_ant_core_antTypes.html">org.eclipse.ant.core.antTypes</a></li>
-</ul>
-<a href="hglegal.htm"><img SRC="ngibmcpy.gif" ALT="Copyright IBM Corp. 2000, 2001. All Rights Reserved." BORDER=0 height=12 width=195></a>
-</body>
-</html>
diff --git a/ant/org.eclipse.ant.core/doc/org_eclipse_ant_core_antTasks.html b/ant/org.eclipse.ant.core/doc/org_eclipse_ant_core_antTasks.html
deleted file mode 100644
index a6da96c..0000000
--- a/ant/org.eclipse.ant.core/doc/org_eclipse_ant_core_antTasks.html
+++ /dev/null
@@ -1,55 +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>AntTasks</title>
-</head>
-<body link="#0000FF" vlink="#800080">
-
-<center>
-<h1>
-AntTasks</h1></center>
-<b><i>Identifier: </i></b>org.eclipse.ant.core.antTasks
-<p><b><i>Description: </i></b>Allows plug-ins to define arbitrary Ant tasks
-for use by the Ant infrastructure. The standard Ant infrastructure
-allows for the addition of arbitrary tasks. Unfortunately, it is
-unlikely that the Ant Core plug-in would have the classes required by these
-tasks on its classpath (or that of any of its prerequisites). To
-address this, clients should define an extension which plugs into this
-extension-point and maps a task name onto a class. The Ant plug-in
-can then request that the declaring plug-in load the specified class.
-<p><b><i>Configuration Markup:</i></b>
-<p><tt> <!ELEMENT antTask EMPTY></tt>
-<br><tt> <!ATTLIST antTask</tt>
-<br><tt> name
-CDATA #REQUIRED</tt>
-<br><tt> class
-CDATA #REQUIRED</tt>
-<br><tt> library
-CDATA #REQUIRED</tt>
-<br><tt> ></tt>
-<ul>
-<li>
-<b>name -</b> name of the task to be defined</li>
-
-<li>
-<b>class</b> - the fully qualified name of a Java class implementing the
-task. Generally this class must be a subclass of <tt>org.apache.tools.ant.Task</tt>.</li>
-
-<li>
-<b>library</b> - a path relative to the plug-in install location for the
-library containing the task</li>
-</ul>
-<b><i>Examples: </i></b>The following is an example of an object declaration:
-<p><tt> <extension point="org.eclipse.ant.core.antTask"></tt>
-<br><tt> <antTask name="coolTask" class="com.example.CoolTask"/></tt>
-<br><tt> </extension></tt>
-<p><b><i>API Information</i>:</b><i> </i>The objects declared via this
-extension-point are accessible though the following API:
-<p><tt> org.eclipse.core.ant.AntPlugin.getTaskExtensions</tt>
-<p><b><i>Supplied Implementation:</i></b> The platform itself supplies
-a number of tasks including <tt>incremental, javac and refreshLocal</tt>.
-<p><a href="hglegal.htm"><img SRC="ngibmcpy.gif" ALT="Copyright IBM Corp. 2000, 2001. All Rights Reserved." BORDER=0 height=12 width=195></a>
-</body>
-</html>
diff --git a/ant/org.eclipse.ant.core/doc/org_eclipse_ant_core_antTypes.html b/ant/org.eclipse.ant.core/doc/org_eclipse_ant_core_antTypes.html
deleted file mode 100644
index eadff6d..0000000
--- a/ant/org.eclipse.ant.core/doc/org_eclipse_ant_core_antTypes.html
+++ /dev/null
@@ -1,55 +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>AntObjects</title>
-</head>
-<body link="#0000FF" vlink="#800080">
-
-<center>
-<h1>
-AntTypes</h1></center>
-<b><i>Identifier: </i></b>org.eclipse.ant.core.antTypes
-<p><b><i>Description: </i></b>Allows plug-ins to define arbitrary Ant datatypes
-for use by the Ant infrastructure. The standard Ant infrastructure
-allows for the addition of arbitrary datatypes. Unfortunately, it
-is unlikely that the Ant Core plug-in would have the classes required by
-these datatypes on its classpath (or that of any of its prerequisites).
-To address this, clients should define an extension which plugs into this
-extension-point and maps a datatype name onto a class. The Ant plug-in
-can then request that the declaring plug-in load the specified class.
-<p><b><i>Configuration Markup:</i></b>
-<p><tt> <!ELEMENT antType EMPTY></tt>
-<br><tt> <!ATTLIST antType</tt>
-<br><tt> name
-CDATA #REQUIRED</tt>
-<br><tt> class
-CDATA #REQUIRED</tt>
-<br><tt> library
-CDATA #REQUIRED</tt>
-<br><tt> ></tt>
-<ul>
-<li>
-<b>name -</b> name of the task to be defined</li>
-
-<li>
-<b>class</b> - the fully qualified name of a Java class implementing the
-datatype. Generally this class must be a subclass of <tt>org.apache.tools.ant.types.DataType</tt>.</li>
-
-<li>
-<b>library</b> - a path relative to the plug-in install location for the
-library containing the type</li>
-</ul>
-<b><i>Examples: </i></b>The following is an example of an object declaration:
-<p><tt> <extension point="org.eclipse.ant.core.antType"></tt>
-<br><tt> <antTask name="coolType" class="com.example.CoolType"/></tt>
-<br><tt> </extension></tt>
-<p><b><i>API Information</i>:</b><i> </i>The objects declared via this
-extension-point are accessible though the following API:
-<p><tt> org.eclipse.core.ant.AntPlugin.getTypeExtensions</tt>
-<p><b><i>Supplied Implementation:</i></b> The platform itself supplies
-a number of datatypes including <tt>commaPatternSet</tt>.
-<p><a href="hglegal.htm"><img SRC="ngibmcpy.gif" ALT="Copyright IBM Corp. 2000, 2001. All Rights Reserved." BORDER=0 height=12 width=195></a>
-</body>
-</html>
diff --git a/ant/org.eclipse.ant.core/doc/org_eclipse_ant_core_extraClasspathEntries.html b/ant/org.eclipse.ant.core/doc/org_eclipse_ant_core_extraClasspathEntries.html
deleted file mode 100644
index 0ad32d1..0000000
--- a/ant/org.eclipse.ant.core/doc/org_eclipse_ant_core_extraClasspathEntries.html
+++ /dev/null
@@ -1,38 +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]">
- <meta name="Author" content="Rodrigo Peretti">
- <title>Extra Ant Classpath Entries</title>
-</head>
-<body link="#0000FF" vlink="#800080">
-
-<center>
-<h1>
-Extra Ant Classpath Entries</h1></center>
-<b><i>Identifier: </i></b>org.eclipse.ant.core.extraClasspathEntries
-<p><b><i>Description: </i></b>Allows plug-ins to define arbitrary JARs
-for use by the Ant infrastructure. These JARs are put into the Ant classpath
-at runtime. Besides the JAR, the plug-in classloader of the plug-in providing
-the JAR is also added to the classpath.
-<p><b><i>Configuration Markup:</i></b>
-<p><tt> <!ELEMENT extraClasspathEntry EMPTY></tt>
-<br><tt> <!ATTLIST extraClasspathEntry</tt>
-<br><tt> library
-CDATA #REQUIRED</tt>
-<br><tt> ></tt>
-<ul>
-<li>
-<b>library</b> - a path relative to the plug-in install location for the
-library</li>
-</ul>
-<b><i>Examples: </i></b>The following is an example of an object declaration:
-<p><tt> <extension point="org.eclipse.ant.core.extraClasspathEntries"></tt>
-<br><tt> <extraClasspathEntry library="myExtraLibrary.jar"/></tt>
-<br><tt> </extension></tt>
-<p><b><i>Supplied Implementation:</i></b> The platform itself does not
-supply any extension.
-<p><a href="hglegal.htm"><img SRC="ngibmcpy.gif" ALT="Copyright IBM Corp. 2000, 2001. All Rights Reserved." BORDER=0 height=12 width=195></a>
-</body>
-</html>
diff --git a/ant/org.eclipse.ant.core/plugin.properties b/ant/org.eclipse.ant.core/plugin.properties
deleted file mode 100644
index 0efa59e..0000000
--- a/ant/org.eclipse.ant.core/plugin.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-pluginName = Ant Build Tool Core
-providerName = Eclipse.org
-classpathName = Extra Ant Classpath Entry Definitions
-tasksName = Ant Task Definitions
-typesName = Ant Type Definitions
diff --git a/ant/org.eclipse.ant.core/plugin.xml b/ant/org.eclipse.ant.core/plugin.xml
deleted file mode 100644
index ad09079..0000000
--- a/ant/org.eclipse.ant.core/plugin.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
- id="org.eclipse.ant.core"
- name="%pluginName"
- version="2.0.1"
- provider-name="%providerName"
- class="org.eclipse.ant.core.AntCorePlugin">
-
- <requires>
- <import plugin="org.apache.xerces"/>
- </requires>
-
- <runtime>
- <library name="antsupport.jar">
- <export name="*"/>
- </library>
- </runtime>
-
- <extension-point id="extraClasspathEntries" name="%classpathName"/>
- <extension-point id="antTasks" name="%tasksName"/>
- <extension-point id="antTypes" name="%typesName"/>
-
- <!-- Applications -->
- <extension
- id="antRunner"
- point="org.eclipse.core.runtime.applications">
- <application>
- <run
- class="org.eclipse.ant.core.AntRunner">
- </run>
- </application>
- </extension>
-
- <!-- Extra Classpath -->
- <extension point="org.eclipse.ant.core.extraClasspathEntries">
- <extraClasspathEntry
- library="lib/antsupportlib.jar">
- </extraClasspathEntry>
- </extension>
-
-</plugin>
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.core/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 2368349..0000000
--- a/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/AntCorePlugin.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/**********************************************************************
- * Copyright (c) 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 v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.ant.core;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.ant.internal.core.AntCorePreferences;
-import org.eclipse.ant.internal.core.IAntCoreConstants;
-import org.eclipse.core.runtime.*;
-/**
- * The plug-in runtime class for the Ant Core plug-in.
- */
-public class AntCorePlugin extends Plugin implements IAntCoreConstants {
-
- /**
- * The single instance of this plug-in runtime class.
- */
- private static AntCorePlugin plugin;
-
- /**
- * Table of Ant tasks (IConfigurationElement) added through the tasks extension point
- */
- private Map taskExtensions;
-
- /**
- * Table of libraries (IConfigurationElement) added through the extraClasspathEntries extension point
- */
- private Map extraClasspathExtensions;
-
- /**
- * Table of Ant ypes (IConfigurationElement) added through the types extension point
- */
- private Map typeExtensions;
-
- /**
- *
- */
- private AntCorePreferences preferences;
-
- /**
- * Unique identifier constant (value <code>"org.eclipse.ant.core"</code>)
- * for the Ant Core plug-in.
- */
- public static final String PI_ANTCORE= "org.eclipse.ant.core"; //$NON-NLS-1$
-
- /**
- * Simple identifier constant (value <code>"antTasks"</code>)
- * for the Ant tasks extension point.
- */
- public static final String PT_TASKS = "antTasks"; //$NON-NLS-1$
-
- /**
- * Simple identifier constant (value <code>"extraClasspathEntries"</code>)
- * for the extra classpath entries extension point.
- */
- public static final String PT_EXTRA_CLASSPATH = "extraClasspathEntries"; //$NON-NLS-1$
-
- /**
- * Simple identifier constant (value <code>"antTypes"</code>)
- * for the Ant types extension point.
- */
- public static final String PT_TYPES = "antTypes"; //$NON-NLS-1$
-
- /**
- * Simple identifier constant (value <code>"class"</code>)
- * of a tag that appears in Ant extensions.
- */
- public static final String CLASS = "class"; //$NON-NLS-1$
-
- /**
- * Simple identifier constant (value <code>"name"</code>)
- * of a tag that appears in Ant extensions.
- */
- public static final String NAME = "name"; //$NON-NLS-1$
-
- /**
- * Simple identifier constant (value <code>"library"</code>)
- * of a tag that appears in Ant extensions.
- */
- public static final String LIBRARY = "library"; //$NON-NLS-1$
-
- /**
- * 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$
-
-/**
- * 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>Cliens must never explicitly instantiate a plug-in runtime class.</b>
- * </p>
- *
- * @param pluginDescriptor the plug-in descriptor for the
- * Ant Core plug-in
- */
-public AntCorePlugin(IPluginDescriptor descriptor) {
- super(descriptor);
- plugin = this;
-}
-
-/**
- * @see Plugin#startup
- */
-public void startup() throws CoreException {
- taskExtensions = extractExtensions(PT_TASKS, NAME);
- typeExtensions = extractExtensions(PT_TYPES, NAME);
- extraClasspathExtensions = extractExtensions(PT_EXTRA_CLASSPATH, LIBRARY);
-}
-
-/**
- * @see Plugin#shutdown
- */
-public void shutdown() throws CoreException {
- if (preferences == null)
- return;
- preferences.updatePluginPreferences();
- savePluginPreferences();
-}
-
-/**
- * Given an extension point name, extract its extensions and return them
- * as a Map. It uses as keys the attribute specified by the key parameter.
- */
-private Map extractExtensions(String point, String key) {
- IExtensionPoint extensionPoint = getDescriptor().getExtensionPoint(point);
- if (extensionPoint == null)
- return null;
- IConfigurationElement[] extensions = extensionPoint.getConfigurationElements();
- Map result = new HashMap(extensions.length);
- for (int i = 0; i < extensions.length; i++) {
- String name = extensions[i].getAttribute(key);
- result.put(name, extensions[i]);
- }
- return result;
-}
-
-/**
- * Returns an object representing this plug-in's preferences.
- * <p>
- * This method is for internal use by the platform-related plug-ins.
- * Clients should not call this method.
- * </p>
- */
-public AntCorePreferences getPreferences() {
- if (preferences == null)
- preferences = new AntCorePreferences(taskExtensions, extraClasspathExtensions, typeExtensions);
- return preferences;
-}
-
-/**
- * Returns this plug-in instance.
- *
- * @return the single instance of this plug-in runtime class
- */
-public static AntCorePlugin getPlugin() {
- return plugin;
-}
-
-}
\ 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 ec8edbe..0000000
--- a/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/AntRunner.java
+++ /dev/null
@@ -1,331 +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 v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- *
- * Contributors:
- * IBM - 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.util.*;
-
-import org.eclipse.ant.internal.core.*;
-import org.eclipse.ant.internal.core.AntClassLoader;
-import org.eclipse.ant.internal.core.AntCorePreferences;
-import org.eclipse.core.boot.BootLoader;
-import org.eclipse.core.boot.IPlatformRunnable;
-import org.eclipse.core.runtime.*;
-/**
- * Entry point for running Ant scripts inside Eclipse.
- */
-public class AntRunner implements IPlatformRunnable, IAntCoreConstants {
-
- protected String buildFileLocation = DEFAULT_BUILD_FILENAME;
- protected List buildListeners;
- protected Vector targets;
- protected Map userProperties;
- protected int messageOutputLevel = 2; // Project.MSG_INFO
- protected String buildLoggerClassName;
- protected String[] arguments;
-
-/**
- * Constructs an instance of this class.
- */
-public AntRunner() {
- buildListeners = new ArrayList(5);
-}
-
-protected ClassLoader getClassLoader() {
- AntCorePreferences preferences = AntCorePlugin.getPlugin().getPreferences();
- URL[] urls = preferences.getURLs();
- ClassLoader[] pluginLoaders = preferences.getPluginClassLoaders();
- return new AntClassLoader(urls, pluginLoaders, null);
-}
-
-/**
- * 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 = 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) {
- this.messageOutputLevel = level;
-}
-
-/**
- * Sets the arguments to be passed to the script (e.g. -Dos=win32 -Dws=win32 -verbose).
- *
- * @param arguments the arguments to be passed to the script
- */
-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 script (e.g. -Dos=win32 -Dws=win32 -verbose).
- *
- * @param arguments the arguments to be passed to the script
- * @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) {
- targets = new Vector(10);
- for (int i = 0; i < executionTargets.length; i++)
- targets.add(executionTargets[i]);
-}
-
-/**
- * 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;
- buildListeners.add(className);
-}
-
-/**
- * Adds a 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>).
- *
- * @param className a build logger class name
- */
-public void addBuildLogger(String className) {
- this.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) {
- this.userProperties = properties;
-}
-
-/**
- * Runs the build script. 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>.
- *
- * @param monitor a progress monitor, or <code>null</code> if progress
- * reporting and cancellation are not desired
- */
-public void run(IProgressMonitor monitor) throws CoreException {
- try {
- ClassLoader loader = getClassLoader();
- Class classInternalAntRunner = loader.loadClass("org.eclipse.ant.internal.core.ant.InternalAntRunner"); //$NON-NLS-1$
- Object runner = classInternalAntRunner.newInstance();
- // set build file
- Method setBuildFileLocation = classInternalAntRunner.getMethod("setBuildFileLocation", new Class[] {String.class}); //$NON-NLS-1$
- setBuildFileLocation.invoke(runner, new Object[] {buildFileLocation});
- // add listeners
- Method addBuildListeners = classInternalAntRunner.getMethod("addBuildListeners", new Class[] {List.class}); //$NON-NLS-1$
- addBuildListeners.invoke(runner, new Object[] {buildListeners});
- // add build logger
- if (buildLoggerClassName != null) {
- Method addBuildLogger = classInternalAntRunner.getMethod("addBuildLogger", new Class[] {String.class}); //$NON-NLS-1$
- addBuildLogger.invoke(runner, new Object[] {buildLoggerClassName});
- }
- // add progress monitor
- if (monitor != null) {
- Method setProgressMonitor = classInternalAntRunner.getMethod("setProgressMonitor", new Class[] {IProgressMonitor.class}); //$NON-NLS-1$
- setProgressMonitor.invoke(runner, new Object[] {monitor});
- }
- // add properties
- Method addUserProperties = classInternalAntRunner.getMethod("addUserProperties", new Class[] {Map.class}); //$NON-NLS-1$
- addUserProperties.invoke(runner, new Object[] {userProperties});
- // set message output level
- Method setMessageOutputLevel = classInternalAntRunner.getMethod("setMessageOutputLevel", new Class[] {int.class}); //$NON-NLS-1$
- setMessageOutputLevel.invoke(runner, new Object[] {new Integer(messageOutputLevel)});
- // set execution targets
- if (targets != null) {
- Method setExecutionTargets = classInternalAntRunner.getMethod("setExecutionTargets", new Class[] {Vector.class}); //$NON-NLS-1$
- setExecutionTargets.invoke(runner, new Object[] {targets});
- }
- // set extra arguments
- if (arguments != null) {
- Method setArguments = classInternalAntRunner.getMethod("setArguments", new Class[] {String[].class}); //$NON-NLS-1$
- setArguments.invoke(runner, new Object[] {arguments});
- }
- // run
- Method run = classInternalAntRunner.getMethod("run", null); //$NON-NLS-1$
- run.invoke(runner, null);
- } catch (NoClassDefFoundError e) {
- throw new CoreException(new Status(IStatus.ERROR, PI_ANTCORE, ERROR_RUNNING_SCRIPT, Policy.bind("error.incorrectClasspath"), e)); //$NON-NLS-1$
- } catch (ClassNotFoundException e) {
- throw new CoreException(new Status(IStatus.ERROR, PI_ANTCORE, ERROR_RUNNING_SCRIPT, Policy.bind("error.incorrectClasspath"), e)); //$NON-NLS-1$
- } catch (InvocationTargetException e) {
- Throwable realException = e.getTargetException();
- throw new CoreException(new Status(IStatus.ERROR, PI_ANTCORE, ERROR_RUNNING_SCRIPT, Policy.bind("error.buildFailed"), realException)); //$NON-NLS-1$
- } catch (Exception e) {
- throw new CoreException(new Status(IStatus.ERROR, PI_ANTCORE, ERROR_RUNNING_SCRIPT, Policy.bind("error.buildFailed"), e)); //$NON-NLS-1$
- }
-}
-
-/**
- * Runs the build script.
- */
-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.
- *
- * @param argArray the command line arguments
- * @exception Exception if a problem occurred during the script execution
- */
-public Object run(Object argArray) throws Exception {
- // 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();
- 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});
- return null;
-}
-
-/**
- * Returns the build file target information.
- *
- * @return an array containing the target information
- *
- * @see TargetInfo
- * @since 2.1
- */
-public TargetInfo[] getAvailableTargets() throws CoreException {
- try {
- ClassLoader loader = getClassLoader();
- Class classInternalAntRunner = loader.loadClass("org.eclipse.ant.internal.core.ant.InternalAntRunner"); //$NON-NLS-1$
- Object runner = classInternalAntRunner.newInstance();
- // set build file
- Method setBuildFileLocation = classInternalAntRunner.getMethod("setBuildFileLocation", new Class[] {String.class}); //$NON-NLS-1$
- setBuildFileLocation.invoke(runner, new Object[] {buildFileLocation});
- // get the info for each targets
- Method getTargets = classInternalAntRunner.getMethod("getTargets", null); //$NON-NLS-1$
- Object results = getTargets.invoke(runner, null);
- // collect the info into target objects
- String[][] infos = (String[][]) results;
- if (infos.length < 2)
- return new TargetInfo[0];
- // The last info is the name of the default target or null if none
- int count = infos.length - 1;
- String defaultName = infos[count][0];
- TargetInfo[] targets = new TargetInfo[count];
- for (int i = 0; i < count; i++) {
- String[] info = infos[i];
- boolean isDefault = info[0].equals(defaultName);
- targets[i] = new TargetInfo(info[0], info[1], isDefault);
- }
- return targets;
- } catch (NoClassDefFoundError e) {
- throw new CoreException(new Status(IStatus.ERROR, PI_ANTCORE, ERROR_RUNNING_SCRIPT, Policy.bind("error.incorrectClasspath"), e)); //$NON-NLS-1$
- } catch (ClassNotFoundException e) {
- throw new CoreException(new Status(IStatus.ERROR, PI_ANTCORE, ERROR_RUNNING_SCRIPT, Policy.bind("error.incorrectClasspath"), e)); //$NON-NLS-1$
- } catch (InvocationTargetException e) {
- Throwable realException = e.getTargetException();
- String message = (realException.getMessage() == null) ? Policy.bind("error.buildFailed") : realException.getMessage(); //$NON-NLS-1$
- throw new CoreException(new Status(IStatus.ERROR, PI_ANTCORE, ERROR_RUNNING_SCRIPT, message, realException));
- } catch (Exception e) {
- String message = (e.getMessage() == null) ? Policy.bind("error.buildFailed") : e.getMessage(); //$NON-NLS-1$
- throw new CoreException(new Status(IStatus.ERROR, PI_ANTCORE, ERROR_RUNNING_SCRIPT, message, e));
- }
-}
-
-}
\ No newline at end of file
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 c458c71..0000000
--- a/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/TargetInfo.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/**********************************************************************
- * Copyright (c) 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 v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- *
- * Contributors:
- * IBM - 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 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 isDefault whether this is the build file default target
- */
-/*package*/ TargetInfo(String name, String description, boolean isDefault) {
- this.name = name == null ? "" : name; //$NON-NLS-1$
- this.description = description;
- 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 whether this is the build file default target.
- *
- * @return whether this is the build file default target
- */
-public boolean isDefault() {
- return isDefault;
-}
-}
\ No newline at end of file
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 e84a409..0000000
--- a/ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/AntClassLoader.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/**********************************************************************
- * Copyright (c) 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 v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.ant.internal.core;
-
-import java.net.URL;
-import java.net.URLClassLoader;
-
-public class AntClassLoader extends URLClassLoader {
-
- protected ClassLoader[] pluginLoaders;
-
-public AntClassLoader(URL[] urls, ClassLoader[] pluginLoaders, ClassLoader parent) {
- super(urls, parent);
- this.pluginLoaders = pluginLoaders;
-}
-
-public Class loadClass(String name) throws ClassNotFoundException {
- Class result = loadClassParent(name);
- if (result == null)
- result = loadClassURLs(name);
- if (result == null)
- result = loadClassPlugins(name);
- if (result == null)
- throw new ClassNotFoundException(name);
- return result;
-}
-
-protected Class loadClassParent(String name) {
- try {
- ClassLoader parent = getParent();
- if (parent != null)
- return parent.loadClass(name);
- } catch (ClassNotFoundException e) {
- // Ignore exception now. If necessary we'll throw
- // a ClassNotFoundException in loadClass(String)
- }
- return null;
-}
-
-protected Class loadClassURLs(String name) {
- try {
- return super.loadClass(name);
- } catch (ClassNotFoundException e) {
- // Ignore exception now. If necessary we'll throw
- // a ClassNotFoundException in loadClass(String)
- }
- return null;
-}
-
-protected Class loadClassPlugins(String name) {
- Class result = null;
- if (pluginLoaders != null) {
- for (int i = 0; (i < pluginLoaders.length) && (result == null); i++) {
- try {
- result = pluginLoaders[i].loadClass(name);
- } catch (ClassNotFoundException e) {
- // Ignore exception now. If necessary we'll throw
- // a ClassNotFoundException in loadClass(String)
- }
- }
- }
- return result;
-}
-}
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/AntCorePreferences.java b/ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/AntCorePreferences.java
deleted file mode 100644
index 81aee37..0000000
--- a/ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/AntCorePreferences.java
+++ /dev/null
@@ -1,395 +0,0 @@
-/**********************************************************************
- * Copyright (c) 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 v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.ant.internal.core;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.*;
-
-import org.eclipse.ant.core.AntCorePlugin;
-import org.eclipse.core.runtime.*;
-/**
- *
- */
-public class AntCorePreferences implements IAntCoreConstants {
-
- protected List defaultTasks;
- protected List defaultTypes;
- protected List defaultURLs;
- protected Task[] customTasks;
- protected Type[] customTypes;
- protected URL[] customURLs;
- protected Map defaultObjects;
- protected List pluginClassLoaders;
-
-public AntCorePreferences(Map defaultTasks, Map defaultExtraClasspath, Map defaultTypes) {
- initializePluginClassLoaders();
- defaultURLs = new ArrayList(20);
- this.defaultTasks = computeDefaultTasks(defaultTasks);
- this.defaultTypes = computeDefaultTypes(defaultTypes);
- computeDefaultExtraClasspathEntries(defaultExtraClasspath);
- restoreCustomObjects();
-}
-
-protected void restoreCustomObjects() {
- Preferences prefs = AntCorePlugin.getPlugin().getPluginPreferences();
- // tasks
- String tasks = prefs.getString(PREFERENCE_TASKS);
- if (tasks.equals("")) //$NON-NLS-1$
- customTasks = new Task[0];
- else
- customTasks = extractTasks(prefs, getArrayFromString(tasks));
- // types
- String types = prefs.getString(PREFERENCE_TYPES);
- if (types.equals("")) //$NON-NLS-1$
- customTypes = new Type[0];
- else
- customTypes = extractTypes(prefs, getArrayFromString(types));
- // urls
- String urls = prefs.getString(PREFERENCE_URLS);
- if (urls.equals("")) //$NON-NLS-1$
- customURLs = getDefaultCustomURLs();
- else
- customURLs = extractURLs(prefs, getArrayFromString(urls));
-}
-
-protected Task[] extractTasks(Preferences prefs, String[] tasks) {
- List result = new ArrayList(10);
- for (int i = 0; i < tasks.length; i++) {
- try {
- String taskName = tasks[i];
- String[] values = getArrayFromString(prefs.getString(PREFIX_TASK + taskName));
- Task task = new Task();
- task.setTaskName(taskName);
- task.setClassName(values[0]);
- task.setLibrary(new URL(values[1]));
- result.add(task);
- } catch (MalformedURLException e) {
- // if the URL does not have a valid format, just log and ignore the exception
- IStatus status = new Status(IStatus.ERROR, AntCorePlugin.PI_ANTCORE, ERROR_MALFORMED_URL, Policy.bind("exception.malformedURL"), e); //$NON-NLS-1$
- AntCorePlugin.getPlugin().getLog().log(status);
- }
- }
- return (Task[]) result.toArray(new Task[result.size()]);
-}
-
-protected Type[] extractTypes(Preferences prefs, String[] types) {
- List result = new ArrayList(10);
- for (int i = 0; i < types.length; i++) {
- try {
- String typeName = types[i];
- String[] values = getArrayFromString(prefs.getString(PREFIX_TYPE + typeName));
- Type type = new Type();
- type.setTypeName(typeName);
- type.setClassName(values[0]);
- type.setLibrary(new URL(values[1]));
- result.add(type);
- } catch (MalformedURLException e) {
- // if the URL does not have a valid format, just log and ignore the exception
- IStatus status = new Status(IStatus.ERROR, AntCorePlugin.PI_ANTCORE, ERROR_MALFORMED_URL, Policy.bind("exception.malformedURL"), e); //$NON-NLS-1$
- AntCorePlugin.getPlugin().getLog().log(status);
- }
- }
- return (Type[]) result.toArray(new Type[result.size()]);
-}
-
-protected URL[] extractURLs(Preferences prefs, String[] urls) {
- List result = new ArrayList(10);
- for (int i = 0; i < urls.length; i++) {
- try {
- result.add(new URL(urls[i]));
- } catch (MalformedURLException e) {
- // if the URL does not have a valid format, just log and ignore the exception
- IStatus status = new Status(IStatus.ERROR, AntCorePlugin.PI_ANTCORE, ERROR_MALFORMED_URL, Policy.bind("exception.malformedURL"), e); //$NON-NLS-1$
- AntCorePlugin.getPlugin().getLog().log(status);
- }
- }
- return (URL[]) result.toArray(new URL[result.size()]);
-}
-
-
-
-
-public URL[] getDefaultCustomURLs() {
- List result = new ArrayList(10);
- IPluginDescriptor descriptor = Platform.getPlugin("org.apache.ant").getDescriptor(); //$NON-NLS-1$
- addLibraries(descriptor, result);
- descriptor = Platform.getPlugin("org.apache.xerces").getDescriptor(); //$NON-NLS-1$
- addLibraries(descriptor, result);
- addToolsJar(result);
- return (URL[]) result.toArray(new URL[result.size()]);
-}
-
-protected List computeDefaultTasks(Map tasks) {
- List result = new ArrayList(10);
- for (Iterator iterator = tasks.entrySet().iterator(); iterator.hasNext();) {
- Map.Entry entry = (Map.Entry) iterator.next();
- Task task = new Task();
- task.setTaskName((String) entry.getKey());
- IConfigurationElement element = (IConfigurationElement) entry.getValue();
- task.setClassName(element.getAttribute(AntCorePlugin.CLASS));
- String library = element.getAttribute(AntCorePlugin.LIBRARY);
- if (library == null) {
- IStatus status = new Status(IStatus.ERROR, AntCorePlugin.PI_ANTCORE, ERROR_LIBRARY_NOT_SPECIFIED, Policy.bind("error.libraryNotSpecified", task.getTaskName()), null); //$NON-NLS-1$
- AntCorePlugin.getPlugin().getLog().log(status);
- continue;
- }
- IPluginDescriptor descriptor = element.getDeclaringExtension().getDeclaringPluginDescriptor();
- try {
- URL url = Platform.asLocalURL(new URL(descriptor.getInstallURL(), library));
- task.setLibrary(url);
- defaultURLs.add(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, ERROR_MALFORMED_URL, Policy.bind("exception.malformedURL"), e); //$NON-NLS-1$
- AntCorePlugin.getPlugin().getLog().log(status);
- continue;
- }
- result.add(task);
- addPluginClassLoader(descriptor.getPluginClassLoader());
- }
- return result;
-}
-
-protected List computeDefaultTypes(Map types) {
- List result = new ArrayList(10);
- for (Iterator iterator = types.entrySet().iterator(); iterator.hasNext();) {
- Map.Entry entry = (Map.Entry) iterator.next();
- Type type = new Type();
- type.setTypeName((String) entry.getKey());
- IConfigurationElement element = (IConfigurationElement) entry.getValue();
- type.setClassName(element.getAttribute(AntCorePlugin.CLASS));
- String library = element.getAttribute(AntCorePlugin.LIBRARY);
- if (library == null) {
- IStatus status = new Status(IStatus.ERROR, AntCorePlugin.PI_ANTCORE, ERROR_LIBRARY_NOT_SPECIFIED, Policy.bind("error.libraryNotSpecified", type.getTypeName()), null); //$NON-NLS-1$
- AntCorePlugin.getPlugin().getLog().log(status);
- continue;
- }
- IPluginDescriptor descriptor = element.getDeclaringExtension().getDeclaringPluginDescriptor();
- try {
- URL url = Platform.asLocalURL(new URL(descriptor.getInstallURL(), library));
- type.setLibrary(url);
- defaultURLs.add(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, ERROR_MALFORMED_URL, Policy.bind("exception.malformedURL"), e); //$NON-NLS-1$
- AntCorePlugin.getPlugin().getLog().log(status);
- continue;
- }
- result.add(type);
- addPluginClassLoader(descriptor.getPluginClassLoader());
- }
- return result;
-}
-
-/**
- * Computes the extra classpath entries defined plugins and fragments.
- */
-protected void computeDefaultExtraClasspathEntries(Map entries) {
- for (Iterator iterator = entries.entrySet().iterator(); iterator.hasNext();) {
- Map.Entry entry = (Map.Entry) iterator.next();
- String library = (String) entry.getKey();
- IConfigurationElement element = (IConfigurationElement) entry.getValue();
- IPluginDescriptor descriptor = element.getDeclaringExtension().getDeclaringPluginDescriptor();
- try {
- URL url = Platform.asLocalURL(new URL(descriptor.getInstallURL(), library));
- defaultURLs.add(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, ERROR_MALFORMED_URL, Policy.bind("exception.malformedURL"), e); //$NON-NLS-1$
- AntCorePlugin.getPlugin().getLog().log(status);
- continue;
- }
- addPluginClassLoader(descriptor.getPluginClassLoader());
- }
-}
-
-/**
- * Ant running through the command line tries to find tools.jar to help the user. Try
- * emulating the same behaviour here.
- */
-protected void addToolsJar(List destination) {
- IPath path = new Path(System.getProperty("java.home")); //$NON-NLS-1$
- if (path.lastSegment().equalsIgnoreCase("jre")) //$NON-NLS-1$
- path = path.removeLastSegments(1);
- path = path.append("lib").append("tools.jar"); //$NON-NLS-1$ //$NON-NLS-2$
- File tools = path.toFile();
- if (!tools.exists())
- return;
- try {
- destination.add(new URL("file:" + tools.getAbsolutePath())); //$NON-NLS-1$
- } catch (MalformedURLException e) {
- // if the URL does not have a valid format, just log and ignore the exception
- IStatus status = new Status(IStatus.ERROR, AntCorePlugin.PI_ANTCORE, ERROR_MALFORMED_URL, Policy.bind("exception.malformedURL"), e); //$NON-NLS-1$
- AntCorePlugin.getPlugin().getLog().log(status);
- }
-}
-
-protected void addLibraries(IPluginDescriptor source, List destination) {
- URL root = source.getInstallURL();
- ILibrary[] libraries = source.getRuntimeLibraries();
- for (int i = 0; i < libraries.length; i++) {
- try {
- URL url = new URL(root, libraries[i].getPath().toString());
- destination.add(Platform.asLocalURL(url));
- } catch (Exception e) {
- // if the URL does not have a valid format, just log and ignore the exception
- IStatus status = new Status(IStatus.ERROR, AntCorePlugin.PI_ANTCORE, ERROR_MALFORMED_URL, Policy.bind("exception.malformedURL"), e); //$NON-NLS-1$
- AntCorePlugin.getPlugin().getLog().log(status);
- continue;
- }
- }
-}
-
-
-
-protected void addPluginClassLoader(ClassLoader loader) {
- if (!pluginClassLoaders.contains(loader))
- pluginClassLoaders.add(loader);
-}
-
-
-
-public URL[] getURLs() {
- List result = new ArrayList(10);
- if (defaultURLs != null)
- result.addAll(defaultURLs);
- if (customURLs != null)
- result.addAll(Arrays.asList(customURLs));
- return (URL[]) result.toArray(new URL[result.size()]);
-}
-
-public ClassLoader[] getPluginClassLoaders() {
- return (ClassLoader[]) pluginClassLoaders.toArray(new ClassLoader[pluginClassLoaders.size()]);
-}
-
-protected void initializePluginClassLoaders() {
- pluginClassLoaders = new ArrayList(20);
- // ant.core should always be present
- pluginClassLoaders.add(Platform.getPlugin(AntCorePlugin.PI_ANTCORE).getDescriptor().getPluginClassLoader());
-}
-
-
-/**
- * Returns default + custom tasks.
- */
-public List getTasks() {
- List result = new ArrayList(10);
- if (defaultTasks != null)
- result.addAll(defaultTasks);
- if (customTasks != null)
- result.addAll(Arrays.asList(customTasks));
- return result;
-}
-
-public Task[] getCustomTasks() {
- return customTasks;
-}
-
-public Type[] getCustomTypes() {
- return customTypes;
-}
-
-public URL[] getCustomURLs() {
- return customURLs;
-}
-
-public void setCustomTasks(Task[] tasks) {
- this.customTasks = tasks;
-}
-
-public void setCustomTypes(Type[] types) {
- this.customTypes = types;
-}
-
-public void setCustomURLs(URL[] urls) {
- this.customURLs = urls;
-}
-
-/**
- * Returns default + custom types.
- */
-public List getTypes() {
- List result = new ArrayList(10);
- if (defaultTypes != null)
- result.addAll(defaultTypes);
- if (customTypes != null)
- result.addAll(Arrays.asList(customTypes));
- return result;
-}
-
-/**
- * Convert a list of tokens into an array. The list separator has to be specified.
- */
-public static String[] getArrayFromString(String list, String separator) {
- 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()]);
-}
-
-/**
- * convert a list of comma-separated tokens into an array
- */
-public static String[] getArrayFromString(String list) {
- return getArrayFromString(list, ","); //$NON-NLS-1$
-}
-
-public void updatePluginPreferences() {
- Preferences prefs = AntCorePlugin.getPlugin().getPluginPreferences();
- updateTasks(prefs);
- updateTypes(prefs);
- updateURLs(prefs);
-}
-
-protected void updateTasks(Preferences prefs) {
- if (customTasks.length == 0) {
- prefs.setValue(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(","); //$NON-NLS-1$
- prefs.setValue(PREFIX_TASK + customTasks[i].getTaskName(), customTasks[i].getClassName() + "," + customTasks[i].getLibrary().toExternalForm()); //$NON-NLS-1$
- }
- prefs.setValue(PREFERENCE_TASKS, tasks.toString());
-}
-
-protected void updateTypes(Preferences prefs) {
- if (customTypes.length == 0) {
- prefs.setValue(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(","); //$NON-NLS-1$
- prefs.setValue(PREFIX_TYPE + customTypes[i].getTypeName(), customTypes[i].getClassName() + "," + customTypes[i].getLibrary().toExternalForm()); //$NON-NLS-1$
- }
- prefs.setValue(PREFERENCE_TYPES, types.toString());
-}
-
-protected void updateURLs(Preferences prefs) {
- StringBuffer urls = new StringBuffer();
- for (int i = 0; i < customURLs.length; i++) {
- urls.append(customURLs[i].toExternalForm());
- urls.append(","); //$NON-NLS-1$
- }
- prefs.setValue(PREFERENCE_URLS, urls.toString());
-}
-}
\ No newline at end of file
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 9c66f74..0000000
--- a/ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/IAntCoreConstants.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/**********************************************************************
- * Copyright (c) 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 v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.ant.internal.core;
-
-/**
- * Common constants.
- */
-public interface IAntCoreConstants {
-
- // default values
- public static final String PI_ANTCORE = "org.eclipse.ant.core"; //$NON-NLS-1$
- public static final String DEFAULT_BUILD_FILENAME = "build.xml"; //$NON-NLS-1$
-
- // error codes
- public static final int ERROR_RUNNING_SCRIPT = 1;
- public static final int ERROR_MALFORMED_URL = 2;
- public static final int ERROR_LIBRARY_NOT_SPECIFIED = 3;
-
- // preferences
- public static final String PREFERENCE_TASKS = "tasks"; //$NON-NLS-1$
- public static final String PREFERENCE_TYPES = "types"; //$NON-NLS-1$
- public static final String PREFERENCE_URLS = "urls"; //$NON-NLS-1$
- public static final String PREFIX_TASK = "task."; //$NON-NLS-1$
- public static final String PREFIX_TYPE = "type."; //$NON-NLS-1$
- public static final String PREFIX_URL = "url."; //$NON-NLS-1$
-}
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/Policy.java b/ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/Policy.java
deleted file mode 100644
index 860151d..0000000
--- a/ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/Policy.java
+++ /dev/null
@@ -1,68 +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 v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.ant.internal.core;
-
-import java.text.MessageFormat;
-import java.util.*;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-public class Policy {
- private static final String bundleName = "org.eclipse.ant.internal.core.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 bind(String id) {
- return bind(id, (String[])null);
-}
-public static IProgressMonitor monitorFor(IProgressMonitor monitor) {
- if (monitor == null)
- return new NullProgressMonitor();
- return monitor;
-}
-/**
- * Lookup the message with the given ID in this catalog and bind its
- * substitution locations with the given string.
- */
-public static String bind(String id, String binding) {
- return bind(id, new String[] {binding});
-}
-/**
- * Lookup the message with the given ID in this catalog and bind its
- * substitution locations with the given strings.
- */
-public static String bind(String id, String binding1, String binding2) {
- return bind(id, new String[] {binding1, binding2});
-}
-
-/**
- * Lookup the message with the given ID in this catalog and bind its
- * substitution locations with the given string values.
- */
-public static String bind(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);
-}
-}
diff --git a/ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/Task.java b/ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/Task.java
deleted file mode 100644
index 9d09cda..0000000
--- a/ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/Task.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/**********************************************************************
- * Copyright (c) 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 v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.ant.internal.core;
-
-import java.net.URL;
-
-public class Task {
-
- protected String taskName;
- protected String className;
- protected URL library;
-
-/**
- * Gets the className.
- * @return Returns a String
- */
-public String getClassName() {
- return className;
-}
-
-/**
- * Sets the className.
- * @param className The className to set
- */
-public void setClassName(String className) {
- this.className = className;
-}
-
-/**
- * Gets the library.
- * @return Returns a URL
- */
-public URL getLibrary() {
- return library;
-}
-
-/**
- * Sets the library.
- * @param library The library to set
- */
-public void setLibrary(URL library) {
- this.library = library;
-}
-
-/**
- * Gets the taskName.
- * @return Returns a String
- */
-public String getTaskName() {
- return taskName;
-}
-
-/**
- * Sets the taskName.
- * @param taskName The taskName to set
- */
-public void setTaskName(String taskName) {
- this.taskName = taskName;
-}
-}
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/Type.java b/ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/Type.java
deleted file mode 100644
index 3ba3664..0000000
--- a/ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/Type.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/**********************************************************************
- * Copyright (c) 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 v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.ant.internal.core;
-
-import java.net.URL;
-
-public class Type {
-
- protected String typeName;
- protected String className;
- protected URL library;
-
-/**
- * Gets the className.
- * @return Returns a String
- */
-public String getClassName() {
- return className;
-}
-
-/**
- * Sets the className.
- * @param className The className to set
- */
-public void setClassName(String className) {
- this.className = className;
-}
-
-/**
- * Gets the library.
- * @return Returns a URL
- */
-public URL getLibrary() {
- return library;
-}
-
-/**
- * Sets the library.
- * @param library The library to set
- */
-public void setLibrary(URL library) {
- this.library = library;
-}
-
-/**
- * Gets the taskName.
- * @return Returns a String
- */
-public String getTypeName() {
- return typeName;
-}
-
-/**
- * Sets the taskName.
- * @param taskName The taskName to set
- */
-public void setTypeName(String taskName) {
- this.typeName = taskName;
-}
-}
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/messages.properties b/ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/messages.properties
deleted file mode 100644
index 70ded61..0000000
--- a/ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/messages.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-### Ant Core plugin message catalog
-
-### errors
-error.buildFailed = Build Failed.
-error.libraryNotSpecified = Library not specified for: {0}
-error.incorrectClasspath = Could not find one or more classes. Please check the Ant classpath.
-
-### exceptions
-exception.malformedURL = Malformed URL.
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/InternalAntRunner.java b/ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/InternalAntRunner.java
deleted file mode 100644
index 20b5f9f..0000000
--- a/ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/InternalAntRunner.java
+++ /dev/null
@@ -1,774 +0,0 @@
-/**********************************************************************
- * Copyright (c) 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 v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.ant.internal.core.ant;
-
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999, 2000 The Apache Software Foundation. All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution, if
- * any, must include the following acknowlegement:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowlegement may appear in the software itself,
- * if and wherever such third-party acknowlegements normally appear.
- *
- * 4. The names "The Jakarta Project", "Ant", and "Apache Software
- * Foundation" must not be used to endorse or promote products derived
- * from this software without prior written permission. For written
- * permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache"
- * nor may "Apache" appear in their names without prior written
- * permission of the Apache Group.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- */
-import java.io.*;
-import java.util.*;
-
-import org.apache.tools.ant.*;
-import org.eclipse.ant.core.AntCorePlugin;
-import org.eclipse.ant.internal.core.Task;
-import org.eclipse.ant.internal.core.Type;
-import org.eclipse.core.runtime.IProgressMonitor;
-/**
- * Eclipse application entry point into Ant. Derived from the original Ant Main class
- * to ensure that the functionality is equivalent when running in the platform.
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under
- * development and expected to change significantly before reaching stability.
- * It is being made available at this early stage to solicit feedback from pioneering
- * adopters on the understanding that any code that uses this API will almost
- * certainly be broken (repeatedly) as the API evolves.
- * </p>
- */
-public class InternalAntRunner {
-
- /**
- *
- */
- protected IProgressMonitor monitor;
-
- /**
- *
- */
- protected List buildListeners;
-
- /**
- *
- */
- protected String buildFileLocation;
-
- /** Targets we want to run. */
- protected Vector targets;
-
- /**
- *
- */
- protected Map userProperties;
-
- /** Our current message output status. Follows Project.MSG_XXX */
- protected int messageOutputLevel = Project.MSG_INFO;
-
- /** Indicates whether output to the log is to be unadorned. */
- protected boolean emacsMode = false;
-
- /** Indicates we should only parse and display the project help information */
- protected boolean projectHelp = false;
-
- /** Stream that we are using for logging */
- private PrintStream out = System.out;
-
- /** Stream that we are using for logging error messages */
- private PrintStream err = System.err;
-
- /**
- * The Ant logger class. There may be only one logger. It will have the
- * right to use the 'out' PrintStream. The class must implements the BuildLogger
- * interface.
- */
- protected String loggerClassname = null;
-
- /** Extra arguments to be parsed as command line arguments. */
- protected String[] extraArguments = null;
-
- // properties
- private static final String PROPERTY_ECLIPSE_RUNNING = "eclipse.running"; //$NON-NLS-1$
-
-public InternalAntRunner() {
- buildListeners = new ArrayList(5);
-}
-
-/**
- * Adds a build listener.
- *
- * @param buildListener a build listener
- */
-public void addBuildListeners(List classNames) {
- this.buildListeners = classNames;
-}
-
-/**
- * Adds a build logger .
- *
- * @param
- */
-public void addBuildLogger(String className) {
- this.loggerClassname = className;
-}
-
-/**
- * Adds user properties.
- */
-public void addUserProperties(Map properties) {
- this.userProperties = properties;
-}
-
-protected void addBuildListeners(Project project) {
- try {
- project.addBuildListener(createLogger());
- for (Iterator iterator = buildListeners.iterator(); iterator.hasNext();) {
- String className = (String) iterator.next();
- Class listener = Class.forName(className);
- project.addBuildListener((BuildListener) listener.newInstance());
- }
- } catch (Exception e) {
- throw new BuildException(e);
- }
-}
-
-
-protected void setProperties(Project project) {
- project.setUserProperty(PROPERTY_ECLIPSE_RUNNING, "true"); //$NON-NLS-1$
- project.setUserProperty("ant.file" , getBuildFileLocation()); //$NON-NLS-1$
- project.setUserProperty("ant.version", getAntVersion()); //$NON-NLS-1$
- if (userProperties == null)
- return;
- for (Iterator iterator = userProperties.entrySet().iterator(); iterator.hasNext();) {
- Map.Entry entry = (Map.Entry) iterator.next();
- project.setUserProperty((String) entry.getKey(), (String) entry.getValue());
- }
-}
-
-protected void setTasks(Project project) {
- List tasks = AntCorePlugin.getPlugin().getPreferences().getTasks();
- if (tasks == null)
- return;
- try {
- for (Iterator iterator = tasks.iterator(); iterator.hasNext();) {
- Task task = (Task) iterator.next();
- Class taskClass = Class.forName(task.getClassName());
- project.addTaskDefinition(task.getTaskName(), taskClass);
- }
- } catch (ClassNotFoundException e) {
- throw new BuildException(e);
- }
-}
-
-protected void setTypes(Project project) {
- List types = AntCorePlugin.getPlugin().getPreferences().getTypes();
- if (types == null)
- return;
- try {
- for (Iterator iterator = types.iterator(); iterator.hasNext();) {
- Type type = (Type) iterator.next();
- Class typeClass = Class.forName(type.getClassName());
- project.addDataTypeDefinition(type.getTypeName(), typeClass);
- }
- } catch (Exception e) {
- throw new BuildException(e);
- }
-}
-
-
-/**
- * Parses the build script and adds necessary information into
- * the given project.
- */
-protected void parseScript(Project project) {
- File buildFile = new File(getBuildFileLocation());
- ProjectHelper.configureProject(project, buildFile);
-}
-
-/**
- * Runs the build script.
- */
-public void run() {
- if (extraArguments != null)
- processCommandLine(getArrayList(extraArguments));
- Project project = new Project();
- Throwable error = null;
- PrintStream originalErr = System.err;
- PrintStream originalOut = System.out;
- try {
- System.setOut(new PrintStream(new DemuxOutputStream(project, false)));
- System.setErr(new PrintStream(new DemuxOutputStream(project, true)));
- project.log(Policy.bind("label.buildFile", getBuildFileLocation())); //$NON-NLS-1$
- project.init();
- addBuildListeners(project);
- setProperties(project);
- setTasks(project);
- setTypes(project);
- parseScript(project);
- if (projectHelp) {
- printHelp(project);
- return;
- }
- createMonitorBuildListener(project);
- fireBuildStarted(project);
- if (extraArguments != null)
- printArguments(project);
- if (targets != null && !targets.isEmpty())
- project.executeTargets(targets);
- else
- project.executeTarget(project.getDefaultTarget());
- } catch(RuntimeException e) {
- error = e;
- throw e;
- } catch(Error e) {
- error = e;
- throw e;
- } finally {
- if (error != null)
- error.printStackTrace();
- System.setErr(originalErr);
- System.setOut(originalOut);
- fireBuildFinished(project, error);
- }
-}
-
-protected void printArguments(Project project) {
- StringBuffer sb = new StringBuffer();
- for (int i = 0; i < extraArguments.length; i++)
- sb.append(extraArguments[i]);
- project.log(Policy.bind("label.arguments", sb.toString())); //$NON-NLS-1$
-}protected void createMonitorBuildListener(Project project) {
- if (monitor == null)
- return;
- Vector chosenTargets = targets;
- if (chosenTargets == null || chosenTargets.isEmpty()) {
- chosenTargets = new Vector();
- chosenTargets.add(project.getDefaultTarget());
- }
- project.addBuildListener(new ProgressBuildListener(project, chosenTargets, monitor));
-}
-
-/**
- * Logs a message with the client that lists the targets
- * in a project
- *
- * @param project the project to list targets from
- */
-private void printTargets(Project project) {
- // find the target with the longest name
- int maxLength = 0;
- Enumeration ptargets = project.getTargets().elements();
- String targetName;
- String targetDescription;
- Target currentTarget;
- // split the targets in top-level and sub-targets depending
- // on the presence of a description
- Vector topNames = new Vector();
- Vector topDescriptions = new Vector();
- Vector subNames = new Vector();
-
- while (ptargets.hasMoreElements()) {
- currentTarget = (Target)ptargets.nextElement();
- targetName = currentTarget.getName();
- targetDescription = currentTarget.getDescription();
- // maintain a sorted list of targets
- if (targetDescription == null) {
- int pos = findTargetPosition(subNames, targetName);
- subNames.insertElementAt(targetName, pos);
- } else {
- int pos = findTargetPosition(topNames, targetName);
- topNames.insertElementAt(targetName, pos);
- topDescriptions.insertElementAt(targetDescription, pos);
- if (targetName.length() > maxLength) {
- maxLength = targetName.length();
- }
- }
- }
-
- String defaultTarget = project.getDefaultTarget();
- if (defaultTarget != null && !"".equals(defaultTarget)) { // shouldn't need to check but... //$NON-NLS-1$
- Vector defaultName = new Vector();
- Vector defaultDesc = null;
- defaultName.addElement(defaultTarget);
-
- int indexOfDefDesc = topNames.indexOf(defaultTarget);
- if (indexOfDefDesc >= 0) {
- defaultDesc = new Vector();
- defaultDesc.addElement(topDescriptions.elementAt(indexOfDefDesc));
- }
- printTargets(project, defaultName, defaultDesc, Policy.bind("label.defaultTarget"), maxLength); //$NON-NLS-1$
-
- }
-
- printTargets(project, topNames, topDescriptions, Policy.bind("label.mainTargets"), maxLength); //$NON-NLS-1$
- printTargets(project, subNames, null, Policy.bind("label.subTargets"), 0); //$NON-NLS-1$
-}
-
-/**
- * Returns the appropriate insertion index for a given string into a sorted collection.
- *
- * @return the insertion index
- * @param names the initial collection of sorted strings
- * @param name the string whose insertion index into <code>names</code> is to be determined
- */
-private int findTargetPosition(Vector names, String name) {
- int result = names.size();
- for (int i = 0; i < names.size() && result == names.size(); i++) {
- if (name.compareTo((String) names.elementAt(i)) < 0)
- result = i;
- }
- return result;
-}
-
-/**
- * Logs a message with the client that lists the target names and optional descriptions
- *
- * @param names the targets names
- * @param descriptions the corresponding descriptions
- * @param heading the message heading
- * @param maxlen maximum length that can be allocated for a name
- */
-private void printTargets(Project project, Vector names, Vector descriptions, String heading, int maxlen) {
- // now, start printing the targets and their descriptions
- String lSep = System.getProperty("line.separator"); //$NON-NLS-1$
- // got a bit annoyed that I couldn't find a pad function
- String spaces = " "; //$NON-NLS-1$
- while (spaces.length() < maxlen) {
- spaces += spaces;
- }
- StringBuffer msg = new StringBuffer();
- msg.append(heading + lSep + lSep);
- for (int i= 0; i < names.size(); i++) {
- msg.append(" "); //$NON-NLS-1$
- msg.append(names.elementAt(i));
- if (descriptions != null) {
- msg.append(spaces.substring(0, maxlen - ((String) names.elementAt(i)).length() + 2));
- msg.append(descriptions.elementAt(i));
- }
- msg.append(lSep);
- }
- logMessage(project, msg.toString(), Project.MSG_INFO);
-}
-
-/**
- * Invokes the building of a project object and executes a build using either a given
- * target or the default target.
- *
- * @param argArray the command line arguments
- * @exception execution exceptions
- */
-public void run(Object argArray) throws Exception {
- boolean success = processCommandLine(getArrayList((String[]) argArray));
- if (!success)
- return;
- try {
- run();
- } catch (Exception e) {
- printMessage(e);
- throw e;
- }
-}
-
-/**
- * Prints the message of the Throwable if it is not null.
- *
- * @param t the throwable whose message is to be displayed
- */
-protected void printMessage(Throwable t) {
- String message= t.getMessage();
- if (message != null)
- logMessage(null, message, Project.MSG_ERR);
-}
-
-/**
- * Creates and returns the default build logger for logging build events to the ant log.
- *
- * @return the default build logger for logging build events to the ant log
- */
-protected BuildLogger createLogger() {
- BuildLogger logger = null;
- if (loggerClassname != null) {
- try {
- logger = (BuildLogger) (Class.forName(loggerClassname).newInstance());
- } catch (Exception e) {
- String message = Policy.bind("exception.cannotCreateLogger", loggerClassname); //$NON-NLS-1$
- logMessage(null, message, Project.MSG_ERR);
- throw new BuildException(e);
- }
- } else {
- logger = new DefaultLogger();
- }
- logger.setMessageOutputLevel(messageOutputLevel);
- logger.setOutputPrintStream(out);
- logger.setErrorPrintStream(err);
- logger.setEmacsMode(emacsMode);
- return logger;
-}
-
-/**
- * We only have to do this because Project.fireBuildStarted is protected. If it becomes
- * public we should remove this method and call the appropriate one.
- */
-private void fireBuildStarted(Project project) {
- BuildEvent event = new BuildEvent(project);
- for (Iterator iterator = project.getBuildListeners().iterator(); iterator.hasNext();) {
- BuildListener listener = (BuildListener) iterator.next();
- listener.buildStarted(event);
- }
-}
-
-/**
- * We only have to do this because Project.fireBuildFinished is protected. If it becomes
- * public we should remove this method and call the appropriate one.
- */
-private void fireBuildFinished(Project project, Throwable error) {
- BuildEvent event = new BuildEvent(project);
- event.setException(error);
- for (Iterator iterator = project.getBuildListeners().iterator(); iterator.hasNext();) {
- BuildListener listener = (BuildListener) iterator.next();
- listener.buildFinished(event);
- }
-}
-
-protected void logMessage(Project project, String message, int priority) {
- if (project == null)
- project = new Project();
- BuildEvent event = new BuildEvent(project);
- event.setMessage(message, priority);
- for (Iterator iterator = buildListeners.iterator(); iterator.hasNext();) {
- BuildListener listener = (BuildListener) iterator.next();
- listener.messageLogged(event);
- }
-}
-
-/**
- * Sets the buildFileLocation.
- *
- * @param buildFileLocation the file system location of the build file
- */
-public void setBuildFileLocation(String buildFileLocation) {
- this.buildFileLocation = buildFileLocation;
-}
-
-protected String getBuildFileLocation() {
- if (buildFileLocation == null)
- buildFileLocation = new File("build.xml").getAbsolutePath(); //$NON-NLS-1$
- return buildFileLocation;
-}
-
-/**
- * Sets the message output level. Use -1 for none.
- *
- * @param
- */
-public void setMessageOutputLevel(int level) {
- this.messageOutputLevel = level;
-}
-
-/**
- *
- */
-public void setArguments(String[] args) {
- this.extraArguments = args;
-}
-
-/**
- * Sets the execution targets.
- *
- */
-public void setExecutionTargets(Vector executiongTargets) {
- targets = executiongTargets;
-}
-
-protected static String getAntVersion() throws BuildException {
- try {
- Properties props = new Properties();
- InputStream in = Main.class.getResourceAsStream("/org/apache/tools/ant/version.txt"); //$NON-NLS-1$
- props.load(in);
- in.close();
-
- StringBuffer msg = new StringBuffer();
- msg.append(Policy.bind("usage.antVersion")); //$NON-NLS-1$
- msg.append(props.getProperty("VERSION") + " "); //$NON-NLS-1$ //$NON-NLS-2$
- msg.append(Policy.bind("usage.compiledOn")); //$NON-NLS-1$
- msg.append(props.getProperty("DATE")); //$NON-NLS-1$
- return msg.toString();
- } catch (IOException ioe) {
- throw new BuildException(Policy.bind("exception.cannotLoadVersionInfo", ioe.getMessage())); //$NON-NLS-1$
- } catch (NullPointerException npe) {
- throw new BuildException(Policy.bind("exception.cannotLoadVersionInfo", "")); //$NON-NLS-1$ //$NON-NLS-2$
- }
-}
-
-/**
- * Looks for interesting command line arguments. Returns true is it is OK to run
- * the script.
- */
-protected boolean processCommandLine(List commands) {
- // looks for flag-like commands
- if (commands.remove("-help")) { //$NON-NLS-1$
- printUsage();
- return false;
- }
- if (commands.remove("-version")) { //$NON-NLS-1$
- printVersion();
- return false;
- }
- if (commands.remove("-quiet") || commands.remove("-q")) { //$NON-NLS-1$ //$NON-NLS-2$
- messageOutputLevel = Project.MSG_WARN;
- }
- if (commands.remove("-verbose") || commands.remove("-v")) { //$NON-NLS-1$ //$NON-NLS-2$
- messageOutputLevel = Project.MSG_VERBOSE;
- }
- if (commands.remove("-debug")) { //$NON-NLS-1$
- messageOutputLevel = Project.MSG_DEBUG;
- }
- if (commands.remove("-emacs")) { //$NON-NLS-1$
- emacsMode = true;
- }
- if (commands.remove("-projecthelp")) { //$NON-NLS-1$
- projectHelp = true;
- }
-
- // look for argumments
- String[] args = getArguments(commands, "-logfile"); //$NON-NLS-1$
- if (args == null) {
- args = getArguments(commands, "-l"); //$NON-NLS-1$
- }
- if (args != null) {
- try {
- File logFile = new File(args[0]);
- out = new PrintStream(new FileOutputStream(logFile));
- err = out;
- } catch (IOException e) {
- // just log message and ignore exception
- logMessage(null, Policy.bind("exception.cannotWriteToLog"), Project.MSG_INFO); //$NON-NLS-1$
- return false;
- }
- }
-
- args = getArguments(commands, "-buildfile"); //$NON-NLS-1$
- if (args == null) {
- args = getArguments(commands, "-file"); //$NON-NLS-1$
- if (args == null)
- args = getArguments(commands, "-f"); //$NON-NLS-1$
- }
- if (args != null) {
- buildFileLocation = args[0];
- targets = new Vector();
- for (int i = 1; i < args.length; i++)
- targets.add(args[i]);
- }
-
- args = getArguments(commands, "-listener"); //$NON-NLS-1$
- if (args != null)
- buildListeners.add(args[0]);
-
- args = getArguments(commands, "-logger"); //$NON-NLS-1$
- if (args != null)
- loggerClassname = args[0];
-
- processProperties(commands);
-
- return true;
-}
-
-protected void processProperties(List commands) {
- userProperties = new HashMap(10);
- String[] args = (String[]) commands.toArray(new String[commands.size()]);
- for (int i = 0; i < args.length; i++) {
- String arg = args[i];
- if (arg.startsWith("-D")) { //$NON-NLS-1$
-
- /* Interestingly enough, we get to here when a user
- * uses -Dname=value. However, in some cases, the JDK
- * goes ahead * and parses this out to args
- * {"-Dname", "value"}
- * so instead of parsing on "=", we just make the "-D"
- * characters go away and skip one argument forward.
- *
- * I don't know how to predict when the JDK is going
- * to help or not, so we simply look for the equals sign.
- */
-
- String name = arg.substring(2, arg.length());
- String value = null;
- int posEq = name.indexOf("="); //$NON-NLS-1$
- if (posEq > 0) {
- value = name.substring(posEq + 1);
- name = name.substring(0, posEq);
- } else if (i < args.length - 1)
- value = args[++i];
-
- userProperties.put(name, value);
- commands.remove(args[i]);
- }
- }
-}
-
-/**
- * Print the project description, if any
- */
-protected void printHelp(Project project) {
- if (project.getDescription() != null)
- logMessage(project, project.getDescription(), Project.MSG_INFO);
- printTargets(project);
-}
-
-/**
- * Logs a message with the client indicating the version of <b>Ant</b> that this class
- * fronts.
- */
-protected void printVersion() {
- logMessage(null, getAntVersion(), Project.MSG_INFO);
-}
-
-/**
- * Logs a message with the client outlining the usage of <b>Ant</b>.
- */
-protected void printUsage() {
- String lSep = System.getProperty("line.separator"); //$NON-NLS-1$
- StringBuffer msg = new StringBuffer();
- msg.append("ant [" + Policy.bind("usage.options") + "] [" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- + Policy.bind("usage.target") + " [" //$NON-NLS-1$ //$NON-NLS-2$
- + Policy.bind("usage.target") + "2 [" //$NON-NLS-1$ //$NON-NLS-2$
- + Policy.bind("usage.target") + "3] ...]]" + lSep); //$NON-NLS-1$ //$NON-NLS-2$
- msg.append(Policy.bind("usage.Options") + ": " + lSep); //$NON-NLS-1$ //$NON-NLS-2$
- msg.append(" -help " + Policy.bind("usage.printMessage") + lSep); //$NON-NLS-1$ //$NON-NLS-2$
- msg.append(" -projecthelp " + Policy.bind("usage.projectHelp") + lSep); //$NON-NLS-1$ //$NON-NLS-2$
- msg.append(" -version " + Policy.bind("usage.versionInfo") + lSep); //$NON-NLS-1$ //$NON-NLS-2$
- msg.append(" -quiet " + Policy.bind("usage.beQuiet") + lSep); //$NON-NLS-1$ //$NON-NLS-2$
- msg.append(" -verbose " + Policy.bind("usage.beVerbose") + lSep); //$NON-NLS-1$ //$NON-NLS-2$
- msg.append(" -debug " + Policy.bind("usage.printDebugInfo") + lSep); //$NON-NLS-1$ //$NON-NLS-2$
- msg.append(" -emacs " + Policy.bind("usage.emacsLog") + lSep); //$NON-NLS-1$ //$NON-NLS-2$
- msg.append(" -logfile <file> " + Policy.bind("usage.useFile") + lSep); //$NON-NLS-1$ //$NON-NLS-2$
- msg.append(" -logger <classname> " + Policy.bind("usage.logClass") + lSep); //$NON-NLS-1$ //$NON-NLS-2$
- msg.append(" -listener <classname> " + Policy.bind("usage.listenerClass") + lSep); //$NON-NLS-1$ //$NON-NLS-2$
- msg.append(" -buildfile <file> " + Policy.bind("usage.fileToBuild") + lSep); //$NON-NLS-1$ //$NON-NLS-2$
- msg.append(" -D<property>=<value> " + Policy.bind("usage.propertiesValues") + lSep); //$NON-NLS-1$ //$NON-NLS-2$
-// msg.append(" -find <file> " + Policy.bind("usage.findFileToBuild") + lSep);
-
- logMessage(null, msg.toString(), Project.MSG_INFO);
-}
-
-/**
- * From a command line list, get the array of arguments of a given parameter.
- * The parameter and its arguments are removed from the list.
- * @return null if the parameter is not found or has no arguments
- */
-protected String[] getArguments(List commands, String param) {
- int index = commands.indexOf(param);
- if (index == -1)
- return null;
- commands.remove(index);
- if (index == commands.size()) // if this is the last command
- return null;
- List args = new ArrayList(commands.size());
- while (index < commands.size()) { // while not the last command
- String command = (String) commands.get(index);
- if (command.startsWith("-")) // is it a new parameter? //$NON-NLS-1$
- break;
- args.add(command);
- commands.remove(index);
- }
- if (args.isEmpty())
- return null;
- return (String[]) args.toArray(new String[args.size()]);
-}
-
-/**
- * Helper method to ensure an array is converted into an ArrayList.
- */
-private ArrayList getArrayList(String[] args) {
- // We could be using Arrays.asList() here, but it does not specify
- // what kind of list it will return. We do need a list that
- // implements the method List.remove(int) and ArrayList does.
- ArrayList result = new ArrayList(args.length);
- for (int i = 0; i < args.length; i++)
- result.add(args[i]);
- return result;
-}
-
-
-
-/**
- * Sets the build progress monitor.
- */
-public void setProgressMonitor(IProgressMonitor monitor) {
- this.monitor = monitor;
-}
-/**
- * Gets all the target information from the build script.
- * Returns a two dimension array. Each row represents a
- * target, where the first column is the name and the
- * second column is the description. The last row is
- * special and represents the name of the default target.
- * This default target name is in the first column, the
- * second column is null. Note, the default name can be
- * null.
- */
-public String[][] getTargets() {
- // create a project and initialize it
- Project antProject = new Project();
- antProject.init();
- antProject.setProperty("ant.file", getBuildFileLocation()); //$NON-NLS-1$
- parseScript(antProject);
- String defaultName = antProject.getDefaultTarget();
- Collection targets = antProject.getTargets().values();
- String[][] infos = new String[targets.size() + 1][2];
- Iterator enum = targets.iterator();
- int i = 0;
- while (enum.hasNext()) {
- Target target = (Target) enum.next();
- infos[i][0] = target.getName();
- infos[i][1] = target.getDescription();
- i++;
- }
- infos[i][0] = defaultName;
- return infos;
-}}
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/Policy.java b/ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/Policy.java
deleted file mode 100644
index 7f1e5e5..0000000
--- a/ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/Policy.java
+++ /dev/null
Binary files differ
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 076573c..0000000
--- a/ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/ProgressBuildListener.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/**********************************************************************
- * Copyright (c) 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 v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.ant.internal.core.ant;
-
-import java.util.*;
-import java.util.Hashtable;
-import java.util.Iterator;
-
-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.IProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-/**
- * Reports progress and checks for cancelation of a script execution.
- */
-public class ProgressBuildListener implements BuildListener {
-
- protected Hashtable projects;
- protected Project mainProject;
- protected Project parentProject;
-
- // cointains the progress monitor instances for the various
- // projects in a chain
- protected class ProjectMonitors {
- // this field is null for the main project
- Target mainTarget;
- IProgressMonitor mainMonitor;
- IProgressMonitor targetMonitor;
- IProgressMonitor taskMonitor;
- }
-
-public ProgressBuildListener(Project project, Vector targetNames, IProgressMonitor monitor) {
- projects = new Hashtable();
- this.mainProject = project;
- ProjectMonitors monitors = new ProjectMonitors();
- monitors.mainMonitor = Policy.monitorFor(monitor);
- projects.put(this.mainProject, monitors);
- Target[] targets = new Target[targetNames.size()];
- for (int i = 0; i < targetNames.size(); i++) {
- String targetName = (String) targetNames.get(i);
- targets[i] = (Target) this.mainProject.getTargets().get(targetName);
- }
- int work = computeWork(this.mainProject, targets);
- monitors.mainMonitor.beginTask("", work); //$NON-NLS-1$
-}
-
-public void buildStarted(BuildEvent event) {
- checkCanceled();
-}
-
-protected int computeWork(Project project, Target[] targets) {
- int result = 0;
- for (int i = 0; i < targets.length; i++)
- result = result + countTarget(targets[i]);
- return result;
-}
-
-protected int countTarget(Target target) {
- int result = 1;
- Project project = target.getProject();
- for(Enumeration dependencies = target.getDependencies(); dependencies.hasMoreElements();) {
- String targetName = (String) dependencies.nextElement();
- Target dependency = (Target) project.getTargets().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 + (project.getTargets().size()-1);
- }
- }
- return result;
-}
-
-public void buildFinished(BuildEvent event) {
- ProjectMonitors monitors = (ProjectMonitors) projects.get(mainProject);
- monitors.mainMonitor.done();
-}
-
-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.targetMonitor = Policy.subMonitorFor(monitors.mainMonitor, 1);
- int work = (target != null) ? target.getTasks().length : 100;
- monitors.targetMonitor.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.mainTarget = target;
- int work = computeWork(currentProject, new Target[]{ target });
- ProjectMonitors parentMonitors = null;
- if (parentProject == null) {
- parentMonitors = (ProjectMonitors) projects.get(mainProject);
- monitors.mainMonitor = Policy.subMonitorFor(parentMonitors.mainMonitor, 1);
- } else {
- parentMonitors = (ProjectMonitors) projects.get(parentProject);
- parentProject = null;
- monitors.mainMonitor = Policy.subMonitorFor(parentMonitors.taskMonitor, 1);
- }
- monitors.mainMonitor.beginTask("", work); //$NON-NLS-1$
- projects.put(currentProject, monitors);
- return monitors;
-}
-
-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.targetMonitor.done();
- // if this is not the main project test if we are done with this project
- if ((currentProject != mainProject) && (monitors.mainTarget == event.getTarget())) {
- monitors.mainMonitor.done();
- projects.remove(currentProject);
- }
-}
-
-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;
- monitors.taskMonitor = Policy.subMonitorFor(monitors.targetMonitor, 1);
- monitors.taskMonitor.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.taskMonitor);
-}
-
-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.taskMonitor.done();
-}
-
-public void messageLogged(BuildEvent event) {
-}
-
-protected void checkCanceled() {
- ProjectMonitors monitors = (ProjectMonitors) projects.get(mainProject);
- if (monitors.mainMonitor.isCanceled())
- throw new OperationCanceledException(Policy.bind("exception.canceled")); //$NON-NLS-1$
-}
-}
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/messages.properties b/ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/messages.properties
deleted file mode 100644
index c72481f..0000000
--- a/ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/messages.properties
+++ /dev/null
@@ -1,39 +0,0 @@
-### Ant Core Library message catalog
-
-### exception
-exception.canceled = Build canceled.
-exception.cannotAppendToReference = Cannot append to a reference.
-exception.cannotCreateLogger = Unable to instantiate logger: {0}
-exception.cannotLoadVersionInfo = Could not load the version information. {0}
-exception.cannotWriteToLog = Cannot write on the specified log file. Make sure the path exists and you have write permissions.
-exception.missingExcludesFile = Excludes file not found: {0}
-exception.missingIncludesFile = Includes file not found: {0}
-exception.notAPatternSet = Not a patternset: {0}
-exception.patternFile = An error occured while reading pattern file: {0}
-
-### labels
-label.buildFile = Build file: {0}
-label.defaultTarget = Default target:
-label.mainTargets = Main targets:
-label.subTargets = Subtargets:
-label.arguments = Arguments: {0}
-
-### usage
-usage.antVersion = Ant version
-usage.beQuiet = be extra quiet
-usage.beVerbose = be extra verbose
-usage.compiledOn = compiled on
-usage.emacsLog = produce logging information without adornments
-usage.fileToBuild = use given buildfile
-usage.findFileToBuild = search for buildfile towards the root of the filesystem and use it
-usage.listenerClass = add an instance of class as a project listener
-usage.logClass = the class which is to perform logging
-usage.options = options
-usage.Options = Options
-usage.printDebugInfo = print debugging information
-usage.printMessage = print this message
-usage.projectHelp = print project help information
-usage.propertiesValues = use value for given property
-usage.target = target
-usage.useFile = use given file for log
-usage.versionInfo = print the version information and exit
diff --git a/update/org.eclipse.update.core.linux/.classpath b/update/org.eclipse.update.core.linux/.classpath
deleted file mode 100644
index 5921923..0000000
--- a/update/org.eclipse.update.core.linux/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="/org.eclipse.update.core"/>
- <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
- <classpathentry kind="src" path="/org.eclipse.help"/>
- <classpathentry kind="src" path="/org.apache.xerces"/>
- <classpathentry kind="src" path="/org.eclipse.core.boot"/>
- <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/update/org.eclipse.update.core.linux/.cvsignore b/update/org.eclipse.update.core.linux/.cvsignore
deleted file mode 100644
index c5e82d7..0000000
--- a/update/org.eclipse.update.core.linux/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
\ No newline at end of file
diff --git a/update/org.eclipse.update.core.linux/.project b/update/org.eclipse.update.core.linux/.project
deleted file mode 100644
index d41874c..0000000
--- a/update/org.eclipse.update.core.linux/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.update.core.linux</name>
- <comment></comment>
- <projects>
- <project>org.apache.xerces</project>
- <project>org.eclipse.core.boot</project>
- <project>org.eclipse.core.runtime</project>
- <project>org.eclipse.help</project>
- <project>org.eclipse.update.core</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/update/org.eclipse.update.core.linux/about.html b/update/org.eclipse.update.core.linux/about.html
deleted file mode 100644
index 9db411a..0000000
--- a/update/org.eclipse.update.core.linux/about.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>20th June, 2002</p>
-<h3>License</h3>
-<p>Eclipse.org makes available all content in this plug-in ("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 40d668e..0000000
--- a/update/org.eclipse.update.core.linux/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = fragment.xml,\
- os/,\
- fragment.properties,\
- about.html
-source.updatecorelinux.zip = src/
diff --git a/update/org.eclipse.update.core.linux/fragment.xml b/update/org.eclipse.update.core.linux/fragment.xml
deleted file mode 100644
index 3211d65..0000000
--- a/update/org.eclipse.update.core.linux/fragment.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
- id="org.eclipse.update.core.linux"
- name="%fragmentNameLinux"
- version="2.0.0"
- provider-name="%providerName"
- plugin-id="org.eclipse.update.core"
- plugin-version="2.0.0"
- match="compatible">
-
- <runtime>
- </runtime>
-
-
-</fragment>
diff --git a/update/org.eclipse.update.core.linux/os/linux/libupdate.so b/update/org.eclipse.update.core.linux/os/linux/libupdate.so
deleted file mode 100644
index 5533317..0000000
--- a/update/org.eclipse.update.core.linux/os/linux/libupdate.so
+++ /dev/null
Binary files differ
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 2fa29aa..0000000
--- a/update/org.eclipse.update.core.linux/src/build.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0"?>
-<project name="buildlibrary" default="run" basedir=".">
-
- <!-- The properties ${eclipse-home} ${jdk-path} should be passed into this script -->
- <!-- Set a meaningful default value for when it is not. -->
- <property name="eclipse-home" value="${basedir}/../.."/>
- <property name="jdk-path" value="${java.home}"/>
- <property name="destination" value="${eclipse-home}/org.eclipse.update.core.linux/os/linux/"/>
- <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-windows-path} ${library-file} -static -lc"/>
-
- <apply executable="gcc" dest="${eclipse-home}/" parallel="false">
- <arg value="-o"/>
- <arg value="${library-file}"/>
- <arg value="-shared"/>
- <arg value="-I${src-path}"/>
- <arg value="-I${header-path}"/>
- <arg value="-I${header-linux-path}"/>
- <srcfile/>
- <arg value="-static"/>
- <arg value="-lc"/>
- <fileset dir="${src-path}" includes="*.cpp"/>
- <mapper type="glob" from="*.cpp" to="*.o"/>
- </apply>
-
- <move file="${library-file}" todir="${destination}"/>
- </target>
-
-
-</project>
\ No newline at end of file
diff --git a/update/org.eclipse.update.core.linux/src/update.cpp b/update/org.eclipse.update.core.linux/src/update.cpp
deleted file mode 100644
index fffaff9..0000000
--- a/update/org.eclipse.update.core.linux/src/update.cpp
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-# include <sys/types.h>
-# include <sys/statfs.h>
-# include <update.h>
-
-/*
- * Class: org_eclipse_update_configuration_LocalSystemInfo
- * Method: nativeGetFreeSpace
- * Signature: (Ljava/io/File;)J
- */
-JNIEXPORT jlong JNICALL Java_org_eclipse_update_configuration_LocalSystemInfo_nativeGetFreeSpace(
- JNIEnv * jnienv,
- jclass javaClass,
- jobject file) {
-
- // to retrive the String
- jclass cls;
- jmethodID id;
- jobject obj;
-
- // java.io.File.getAbsolutePath()
- const char * lpDirectoryName;
-
- // Linux Parameters
- struct statfs buffer;
-
- // the result
- jlong result = org_eclipse_update_configuration_LocalSystemInfo_SIZE_UNKNOWN;
-
- // first, obtain the Path from the java.io.File parameter
- cls = jnienv -> GetObjectClass(file);
- id = jnienv -> GetMethodID(cls, "getAbsolutePath", "()Ljava/lang/String;");
- obj = jnienv -> CallObjectMethod(file, id);
- lpDirectoryName = jnienv -> GetStringUTFChars((jstring) obj, 0);
-
- // cast one argument as jlong to have a jlong result
- int err = statfs(lpDirectoryName,&buffer);
- if (err==0){
- long size = buffer.f_bsize;
- jlong free = buffer.f_bfree;
- result = size*free;
- }
-
- return result;
-}
-
-/*
- * Class: org_eclipse_update_configuration_LocalSystemInfo
- * Method: nativeGetLabel
- * Signature: (Ljava/io/File;)Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_org_eclipse_update_configuration_LocalSystemInfo_nativeGetLabel(
- JNIEnv * jnienv,
- jclass javaClass,
- jobject file) {
-
- // to retrive the String
- jclass cls;
- jmethodID id;
- jobject obj;
-
- // java.io.File.getAbsolutePath()
- const char * lpDirectoryName;
-
- // obtain the String from the parameter
- cls = jnienv -> GetObjectClass(file);
- id = jnienv -> GetMethodID(cls, "getAbsolutePath", "()Ljava/lang/String;");
- obj = jnienv -> CallObjectMethod(file, id);
- lpDirectoryName = jnienv -> GetStringUTFChars((jstring) obj, 0);
-
- jstring result = NULL;
-
- // Linux implementation following
-
- return result;
-}
-
-/*
- * Class: org_eclipse_update_configuration_LocalSystemInfo
- * Method: nativeGetType
- * Signature: (Ljava/io/File;)I
- */
-JNIEXPORT jint JNICALL Java_org_eclipse_update_configuration_LocalSystemInfo_nativeGetType(
- JNIEnv * jnienv,
- jclass javaClass,
- jobject file) {
-
- // to retrive the String
- jclass cls;
- jmethodID id;
- jobject obj;
-
- // java.io.File.getAbsolutePath()
- const char * lpDirectoryName;
-
- // obtain the String from the parameter
- cls = jnienv -> GetObjectClass(file);
- id = jnienv -> GetMethodID(cls, "getAbsolutePath", "()Ljava/lang/String;");
- obj = jnienv -> CallObjectMethod(file, id);
- lpDirectoryName = jnienv -> GetStringUTFChars((jstring) obj, 0);
-
- int result;
-
- // Linux implemantation
-
- result = org_eclipse_update_configuration_LocalSystemInfo_VOLUME_INVALID_PATH;
- return result;
-}
-
-/*
- * Class: org_eclipse_update_configuration_LocalSystemInfo
- * Method: nativeListMountPoints
- * Signature: ()[Ljava/lang/String;
- */
-JNIEXPORT jobjectArray JNICALL Java_org_eclipse_update_configuration_LocalSystemInfo_nativeListMountPoints(
- JNIEnv * jnienv,
- jclass javaClass) {
-
- //
- int drive;
- char driveName[100];
- jobjectArray returnArray;
- int nDrive = 0;
-
- //
- jclass stringClass;
- jobject empty;
- int index = 0;
- jobject str;
-
- // Linux implementation
- // find mount points
-
- drive = 0;
- stringClass = jnienv -> FindClass("java/lang/String");
- empty = jnienv -> NewStringUTF("");
- //returnArray = jnienv -> NewObjectArray(nDrive, stringClass, empty);
- // for now return null as method is not implemented
- returnArray = NULL;
-
- for (int i = 0; i < drive; i++) {
- // Linux implementation, create String for each mount point
-
- str = jnienv -> NewStringUTF(driveName);
- jnienv -> SetObjectArrayElement(returnArray, index, str);
- index++;
- }
-
- return returnArray;
-}
diff --git a/update/org.eclipse.update.core.linux/src/update.h b/update/org.eclipse.update.core.linux/src/update.h
deleted file mode 100644
index f88aa29..0000000
--- a/update/org.eclipse.update.core.linux/src/update.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-#include <jni.h>
-/* Header for class org_eclipse_update_configuration_LocalSystemInfo */
-
-#ifndef _Included_org_eclipse_update_configuration_LocalSystemInfo
-#define _Included_org_eclipse_update_configuration_LocalSystemInfo
-#ifdef __cplusplus
-extern "C" {
-#endif
-#undef org_eclipse_update_configuration_LocalSystemInfo_SIZE_UNKNOWN
-#define org_eclipse_update_configuration_LocalSystemInfo_SIZE_UNKNOWN -1L
-#undef org_eclipse_update_configuration_LocalSystemInfo_VOLUME_UNKNOWN
-#define org_eclipse_update_configuration_LocalSystemInfo_VOLUME_UNKNOWN -1L
-#undef org_eclipse_update_configuration_LocalSystemInfo_VOLUME_INVALID_PATH
-#define org_eclipse_update_configuration_LocalSystemInfo_VOLUME_INVALID_PATH -2L
-#undef org_eclipse_update_configuration_LocalSystemInfo_VOLUME_REMOVABLE
-#define org_eclipse_update_configuration_LocalSystemInfo_VOLUME_REMOVABLE 1L
-#undef org_eclipse_update_configuration_LocalSystemInfo_VOLUME_FIXED
-#define org_eclipse_update_configuration_LocalSystemInfo_VOLUME_FIXED 2L
-#undef org_eclipse_update_configuration_LocalSystemInfo_VOLUME_REMOTE
-#define org_eclipse_update_configuration_LocalSystemInfo_VOLUME_REMOTE 3L
-#undef org_eclipse_update_configuration_LocalSystemInfo_VOLUME_CDROM
-#define org_eclipse_update_configuration_LocalSystemInfo_VOLUME_CDROM 4L
-#undef org_eclipse_update_configuration_LocalSystemInfo_VOLUME_RAMDISK
-#define org_eclipse_update_configuration_LocalSystemInfo_VOLUME_RAMDISK 5L
-/* Inaccessible static: listeners */
-/* Inaccessible static: hasNatives */
-/*
- * Class: org_eclipse_update_configuration_LocalSystemInfo
- * Method: nativeGetFreeSpace
- * Signature: (Ljava/io/File;)J
- */
-JNIEXPORT jlong JNICALL Java_org_eclipse_update_configuration_LocalSystemInfo_nativeGetFreeSpace
- (JNIEnv *, jclass, jobject);
-
-/*
- * Class: org_eclipse_update_configuration_LocalSystemInfo
- * Method: nativeGetLabel
- * Signature: (Ljava/io/File;)Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_org_eclipse_update_configuration_LocalSystemInfo_nativeGetLabel
- (JNIEnv *, jclass, jobject);
-
-/*
- * Class: org_eclipse_update_configuration_LocalSystemInfo
- * Method: nativeGetType
- * Signature: (Ljava/io/File;)I
- */
-JNIEXPORT jint JNICALL Java_org_eclipse_update_configuration_LocalSystemInfo_nativeGetType
- (JNIEnv *, jclass, jobject);
-
-/*
- * Class: org_eclipse_update_configuration_LocalSystemInfo
- * Method: nativeListMountPoints
- * Signature: ()[Ljava/lang/String;
- */
-JNIEXPORT jobjectArray JNICALL Java_org_eclipse_update_configuration_LocalSystemInfo_nativeListMountPoints
- (JNIEnv *, jclass);
-
-#ifdef __cplusplus
-}
-
-#endif
-#endif
diff --git a/update/org.eclipse.update.core.win32/.classpath b/update/org.eclipse.update.core.win32/.classpath
deleted file mode 100644
index 5921923..0000000
--- a/update/org.eclipse.update.core.win32/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="/org.eclipse.update.core"/>
- <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
- <classpathentry kind="src" path="/org.eclipse.help"/>
- <classpathentry kind="src" path="/org.apache.xerces"/>
- <classpathentry kind="src" path="/org.eclipse.core.boot"/>
- <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/update/org.eclipse.update.core.win32/.cvsignore b/update/org.eclipse.update.core.win32/.cvsignore
deleted file mode 100644
index c5e82d7..0000000
--- a/update/org.eclipse.update.core.win32/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
\ No newline at end of file
diff --git a/update/org.eclipse.update.core.win32/.project b/update/org.eclipse.update.core.win32/.project
deleted file mode 100644
index 7446979..0000000
--- a/update/org.eclipse.update.core.win32/.project
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.update.core.win32</name>
- <comment></comment>
- <projects>
- <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.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/update/org.eclipse.update.core.win32/about.html b/update/org.eclipse.update.core.win32/about.html
deleted file mode 100644
index 9db411a..0000000
--- a/update/org.eclipse.update.core.win32/about.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>20th June, 2002</p>
-<h3>License</h3>
-<p>Eclipse.org makes available all content in this plug-in ("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 e5de40b..0000000
--- a/update/org.eclipse.update.core.win32/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-source.updatecorewin32.zip = src/
-bin.includes = fragment.xml,\
- os/,\
- fragment.properties,\
- about.html
diff --git a/update/org.eclipse.update.core.win32/fragment.xml b/update/org.eclipse.update.core.win32/fragment.xml
deleted file mode 100644
index 8d13d40..0000000
--- a/update/org.eclipse.update.core.win32/fragment.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
- id="org.eclipse.update.core.win32"
- name="%fragmentNameWin"
- version="2.0.0"
- provider-name="%providerName"
- plugin-id="org.eclipse.update.core"
- plugin-version="2.0.0"
- match="compatible">
-
- <runtime>
- </runtime>
-
-
-</fragment>
diff --git a/update/org.eclipse.update.core.win32/os/win32/update.dll b/update/org.eclipse.update.core.win32/os/win32/update.dll
deleted file mode 100644
index 9bf92d6..0000000
--- a/update/org.eclipse.update.core.win32/os/win32/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 c2d7d17..0000000
--- a/update/org.eclipse.update.core.win32/src/build.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0"?>
-<project name="buildlibrary" default="run" basedir=".">
-
- <!-- The properties ${eclipse-home} ${jdk-path} should be passed into this script -->
- <!-- Set a meaningful default value for when it is not. -->
- <property name="eclipse-home" value="${basedir}/../.."/>
- <property name="jdk-path" value="${java.home}"/>
- <property name="destination" value="${eclipse-home}/org.eclipse.update.core.win32/os/win32/"/>
- <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 90645bc..0000000
--- a/update/org.eclipse.update.core.win32/src/update.cpp
+++ /dev/null
@@ -1,479 +0,0 @@
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-
-# 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
- 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);
- handle=CreateFile(floppyPath,
- 0,FILE_SHARE_WRITE,0,OPEN_EXISTING,0,0);
- 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
- 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 0bedfe0..0000000
--- a/update/org.eclipse.update.core.win32/src/update.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-#include <jni.h>
-/* Header for class org_eclipse_update_configuration_LocalSystemInfo */
-
-#ifndef _Included_org_eclipse_update_configuration_LocalSystemInfo
-#define _Included_org_eclipse_update_configuration_LocalSystemInfo
-#ifdef __cplusplus
-extern "C" {
-#endif
-#undef org_eclipse_update_configuration_LocalSystemInfo_SIZE_UNKNOWN
-#define org_eclipse_update_configuration_LocalSystemInfo_SIZE_UNKNOWN -1L
-#undef org_eclipse_update_configuration_LocalSystemInfo_VOLUME_UNKNOWN
-#define org_eclipse_update_configuration_LocalSystemInfo_VOLUME_UNKNOWN -1L
-#undef org_eclipse_update_configuration_LocalSystemInfo_VOLUME_INVALID_PATH
-#define org_eclipse_update_configuration_LocalSystemInfo_VOLUME_INVALID_PATH -2L
-#undef org_eclipse_update_configuration_LocalSystemInfo_VOLUME_REMOVABLE
-#define org_eclipse_update_configuration_LocalSystemInfo_VOLUME_REMOVABLE 1L
-#undef org_eclipse_update_configuration_LocalSystemInfo_VOLUME_FIXED
-#define org_eclipse_update_configuration_LocalSystemInfo_VOLUME_FIXED 2L
-#undef org_eclipse_update_configuration_LocalSystemInfo_VOLUME_REMOTE
-#define org_eclipse_update_configuration_LocalSystemInfo_VOLUME_REMOTE 3L
-#undef org_eclipse_update_configuration_LocalSystemInfo_VOLUME_CDROM
-#define org_eclipse_update_configuration_LocalSystemInfo_VOLUME_CDROM 4L
-#undef org_eclipse_update_configuration_LocalSystemInfo_VOLUME_RAMDISK
-#define org_eclipse_update_configuration_LocalSystemInfo_VOLUME_RAMDISK 5L
-#undef org_eclipse_update_configuration_LocalSystemInfo_VOLUME_FLOPPY_5
-#define org_eclipse_update_configuration_LocalSystemInfo_VOLUME_FLOPPY_5 6L
-#undef org_eclipse_update_configuration_LocalSystemInfo_VOLUME_FLOPPY_3
-#define org_eclipse_update_configuration_LocalSystemInfo_VOLUME_FLOPPY_3 7L
-/* Inaccessible static: listeners */
-/* Inaccessible static: hasNatives */
-/*
- * Class: org_eclipse_update_configuration_LocalSystemInfo
- * Method: nativeGetFreeSpace
- * Signature: (Ljava/io/File;)J
- */
-JNIEXPORT jlong JNICALL Java_org_eclipse_update_configuration_LocalSystemInfo_nativeGetFreeSpace
- (JNIEnv *, jclass, jobject);
-
-/*
- * Class: org_eclipse_update_configuration_LocalSystemInfo
- * Method: nativeGetLabel
- * Signature: (Ljava/io/File;)Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_org_eclipse_update_configuration_LocalSystemInfo_nativeGetLabel
- (JNIEnv *, jclass, jobject);
-
-/*
- * Class: org_eclipse_update_configuration_LocalSystemInfo
- * Method: nativeGetType
- * Signature: (Ljava/io/File;)I
- */
-JNIEXPORT jint JNICALL Java_org_eclipse_update_configuration_LocalSystemInfo_nativeGetType
- (JNIEnv *, jclass, jobject);
-
-/*
- * Class: org_eclipse_update_configuration_LocalSystemInfo
- * Method: nativeListMountPoints
- * Signature: ()[Ljava/lang/String;
- */
-JNIEXPORT jobjectArray JNICALL Java_org_eclipse_update_configuration_LocalSystemInfo_nativeListMountPoints
- (JNIEnv *, jclass);
-
-#ifdef __cplusplus
-}
-
-#endif
-#endif
diff --git a/update/org.eclipse.update.core/.classpath b/update/org.eclipse.update.core/.classpath
deleted file mode 100644
index f10cf27..0000000
--- a/update/org.eclipse.update.core/.classpath
+++ /dev/null
@@ -1,9 +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="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/update/org.eclipse.update.core/.cvsignore b/update/org.eclipse.update.core/.cvsignore
deleted file mode 100644
index c5e82d7..0000000
--- a/update/org.eclipse.update.core/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/.options b/update/org.eclipse.update.core/.options
deleted file mode 100644
index 7bf6197..0000000
--- a/update/org.eclipse.update.core/.options
+++ /dev/null
@@ -1,9 +0,0 @@
-org.eclipse.update.core/debug=true
-org.eclipse.update.core/debug/warning=false
-org.eclipse.update.core/debug/parsing=false
-org.eclipse.update.core/debug/install=false
-org.eclipse.update.core/debug/configuration=false
-org.eclipse.update.core/debug/type=false
-org.eclipse.update.core/debug/web=false
-org.eclipse.update.core/debug/installhandler=false
-org.eclipse.update.core/debug/reconciler=false
diff --git a/update/org.eclipse.update.core/.project b/update/org.eclipse.update.core/.project
deleted file mode 100644
index 5248656..0000000
--- a/update/org.eclipse.update.core/.project
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.update.core</name>
- <comment></comment>
- <projects>
- <project>org.apache.xerces</project>
- <project>org.eclipse.core.boot</project>
- <project>org.eclipse.core.runtime</project>
- <project>org.eclipse.help</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/update/org.eclipse.update.core/Scrapbook.jpage b/update/org.eclipse.update.core/Scrapbook.jpage
deleted file mode 100644
index 459742a..0000000
--- a/update/org.eclipse.update.core/Scrapbook.jpage
+++ /dev/null
@@ -1,424 +0,0 @@
- java.util.Enumeration enum = System.getProperties().keys();
- String key = null;
- while (enum.hasMoreElements()){
- key = (String)enum.nextElement();
- System.out.print(key);
- for (int i =0;i<(30-key.length());i++)System.out.print(" ");
- System.out.println("->"+System.getProperty(key));
- }
-
-
-new java.net.URL("file://C:/temp/org.eclipse.update.core.feature1_1.0.0/org.eclipse.update.core.feature1.plugin1_1.1.1.jar").openStream()
-
-(new java.io.File("C:\\chris chris\hello\\")).mkdirs();
-
-java.net.URL a = new java.net.URL("http","www.oti.com","/feature/blah.jar");
-java.net.URL b = new java.net.URL("jar",null,a.toExternalForm()+"!/hello.txt");
-b
-
-new java.net.URL("file",null,System.getProperty("java.io.tmpdir"));
-new java.net.URL("file",null,System.getProperty("user.home"));
-
-String tempDir = "c:\\TEMP\\features2.jar";
-java.net.URL TEMP_SITE = new java.net.URL("file",null,tempDir);
-java.net.URL file = new java.net.URL("jar",null,TEMP_SITE.toExternalForm()+"!/feature.xml");
-file.openStream();
-file
-
-java.io.File f = new java.io.File("c:\\temp\\xtf\\file.jar");
-f.mkdirs()
-
-java.util.Locale.getDefault()
-java.util.ResourceBundle
-
-java.net.URL url = new java.net.URL("file",null,"C:\\path"+java.io.File.separator);
-url.getPath().endsWith("/");
-url
-
-java.net.URL url = new java.net.URL("http://machine:8080/path space/file.abc#hello");
-java.net.URL url2 = new java.net.URL(url,"/ ");
-url2.getPath()
-
-java.lang.ClassLoader l = new java.net.URLClassLoader(new java.net.URL[] {new java.net.URL("file",null,"c:\\oti\\wsw205\\eclipse\\install\\features\\org.eclipse.help.feature_1.0.4/") }, null);
-java.util.ResourceBundle bundle = java.util.ResourceBundle.getBundle("feature", java.util.Locale.getDefault(), l);
-bundle
-
-String[] ss = {"a", "b"};
-java.util.List list = new java.util.ArrayList(0);
-list.addAll(java.util.Arrays.asList(ss));
-list.add("c");
-list.size();
-
-java.util.List list = new java.util.ArrayList(0);
-list.add("1");
-list.add("2");
-list.add("3");
-list.add("4");
-list.add("5");
-list.add("6");
-list.add("7");
-while (list.size()>5){
- list.remove(0);
-}
-list.get(0)
-
-
-org.eclipse.update.internal.security.KeyStores k = new org.eclipse.update.internal.security.KeyStores();
-while (k.hasNext()){
- org.eclipse.update.internal.security.KeystoreHandle handle = (org.eclipse.update.internal.security.KeystoreHandle) k.next();
- System.out.println("KeyStore:"+handle.getLocation()+":"+handle.getType());
-}
-
-*****************************************
-OLD Feature Code
-
-
- /**
- */
- private void downloadArchivesLocally(ISite tempSite, String[] archiveIDToInstall, IProgressMonitor monitor) throws CoreException, IOException {
-
- URL sourceURL;
- String newFile;
- URL newURL;
-
- if (monitor != null) {
- monitor.beginTask("Download archives bundles to Temporary Space", archiveIDToInstall.length);
- }
- for (int i = 0; i < archiveIDToInstall.length; i++) {
-
- // transform the id by asking the site to map them to real URL inside the SITE
- if (getSite() != null) {
- sourceURL = getSite().getSiteContentProvider().getArchivesReferences(archiveIDToInstall[i]);
- if (monitor != null) {
- monitor.subTask("..." + archiveIDToInstall[i]);
- }
- // the name of the file in the temp directory
- // should be the regular plugins/pluginID_ver as the Temp site is OUR site
- newFile = Site.DEFAULT_PLUGIN_PATH + archiveIDToInstall[i];
- newURL = UpdateManagerUtils.resolveAsLocal(sourceURL, newFile, monitor);
-
- // transfer the possible mapping to the temp site
- ((Site) tempSite).addArchive(new URLEntry(archiveIDToInstall[i], newURL));
- if (monitor != null) {
- monitor.worked(1);
- if (monitor.isCanceled()) {
- throw CANCEL_EXCEPTION;
- }
- }
- }
- }
-
- // the site of this feature now becomes the TEMP directory
- // FIXME: make sure there is no other issue
- // like asking for stuff that hasn't been copied
- // or reusing this feature
- // of having an un-manageable temp site
-
- this.setSite(tempSite);
-
- }
-
- /**
- */
- private void downloadDataLocally(IFeature targetFeature, INonPluginEntry[] dataToInstall, IProgressMonitor monitor) throws CoreException, IOException {
-
- URL sourceURL;
- // any other data
- INonPluginEntry[] entries = getNonPluginEntries();
- if (entries != null) {
- if (monitor != null) {
- monitor.beginTask("Installing Other Data information", dataToInstall.length);
- if (monitor.isCanceled()) {
- throw CANCEL_EXCEPTION;
- }
- }
-
- for (int j = 0; j < entries.length; j++) {
- String name = dataToInstall[j].getIdentifier();
- if (monitor != null) {
- monitor.subTask("..." + name);
- }
-
- // the id is URL format with "/"
- String dataEntryId = Site.DEFAULT_FEATURE_PATH + getIdentifier().toString() + "/" + name;
- // transform the id by asking the site to map them to real URL inside the SITE
- if (getSite() != null) {
- sourceURL = getSite().getSiteContentProvider().getArchivesReferences(dataEntryId);
- ((Site) targetFeature.getSite()).storeFeatureInfo(getIdentifier(), name, sourceURL.openStream());
- if (monitor != null) {
- monitor.worked(1);
- if (monitor.isCanceled()) {
- throw CANCEL_EXCEPTION;
- }
- }
- }// getSite==null
- }
- }
- }
-
-
- /**
- * Method install.
- * @param targetFeature
- * @param monitor
- * @throws CoreException
- */
- public void old_install(IFeature targetFeature, IProgressMonitor monitor) throws CoreException {
-
- IPluginEntry[] sourceFeaturePluginEntries = getPluginEntries();
- IPluginEntry[] targetSitePluginEntries = targetFeature.getSite().getPluginEntries();
- Site tempSite = (Site) SiteManager.getTempSite();
-
- // determine list of plugins to install
- // find the intersection between the two arrays of IPluginEntry...
- // The one teh site contains and teh one the feature contains
- IPluginEntry[] pluginsToInstall = intersection(sourceFeaturePluginEntries, targetSitePluginEntries);
-
- // private abstract - Determine list of content references id /archives id /bundles id that
- // map the list of plugins to install
- String[] archiveIDToInstall = getContentReferenceToInstall(pluginsToInstall);
-
- try {
- // download and install data bundles
- // before we set the site of teh feature to the TEMP site
- INonPluginEntry[] dataEntries = getNonPluginEntries();
- if (dataEntries.length > 0) {
- downloadDataLocally(targetFeature, dataEntries, monitor);
- }
-
- // optmization, may be private to implementation
- // copy *blobs/content references/archives/bundles* in TEMP space
- if (((Site) getSite()).optimize()) {
- if (archiveIDToInstall != null) {
- downloadArchivesLocally(tempSite, archiveIDToInstall, monitor);
- }
- }
-
- // obtain the list of *Streamable Storage Unit*
- // from the archive
- if (monitor != null) {
- int total = pluginsToInstall == null ? 1 : pluginsToInstall.length + 1;
- monitor.beginTask("Install feature " + getLabel(), total);
- }
- if (pluginsToInstall != null) {
- InputStream inStream = null;
- for (int i = 0; i < pluginsToInstall.length; i++) {
- if (monitor != null) {
- monitor.subTask("Installing plug-in: " + pluginsToInstall[i]);
- if (monitor.isCanceled()) {
- throw CANCEL_EXCEPTION;
- }
- }
-
- open(pluginsToInstall[i]);
- String[] names = getStorageUnitNames(pluginsToInstall[i]);
- if (names != null) {
- for (int j = 0; j < names.length; j++) {
- if ((inStream = getInputStreamFor(pluginsToInstall[i], names[j])) != null)
- targetFeature.store(pluginsToInstall[i], names[j], inStream);
- }
- }
- close(pluginsToInstall[i]);
- if (monitor != null) {
- monitor.worked(1);
- if (monitor.isCanceled()) {
- throw CANCEL_EXCEPTION;
- }
- }
-
- }
- }
-
- // install the Feature info
- InputStream inStream = null;
- String[] names = getStorageUnitNames(this);
- if (names != null) {
- openFeature();
- if (monitor != null) {
- monitor.subTask("Installing Feature information");
- if (monitor.isCanceled()) {
- throw CANCEL_EXCEPTION;
- }
- }
-
- for (int j = 0; j < names.length; j++) {
- if ((inStream = getInputStreamFor(this, names[j])) != null)
- ((Site) targetFeature.getSite()).storeFeatureInfo(getIdentifier(), names[j], inStream);
- }
- closeFeature();
- if (monitor != null) {
- monitor.worked(1);
- if (monitor.isCanceled()) {
- throw CANCEL_EXCEPTION;
- }
- }
-
- }
-
- } catch (IOException e) {
- String id = UpdateManagerPlugin.getPlugin().getDescriptor().getUniqueIdentifier();
- IStatus status = new Status(IStatus.ERROR, id, IStatus.OK, "Error during Install", e);
- throw new CoreException(status);
- } finally {
- //do not clean up TEMP drive
- // as other feature may be there... clean up when exiting the plugin
- }
- }
-
-
- /**
- * @see IPluginContainer#store(IPluginEntry, String, InputStream)
- */
- public void store(IPluginEntry pluginEntry, String contentKey, InputStream inStream) throws CoreException {
- // check if pluginEntry already exists before passing to the site
- // anything else ?
- boolean found = false;
- int i = 0;
- IPluginEntry[] entries = getPluginEntries();
- while (i < entries.length && !found) {
- if (entries[i].equals(pluginEntry)) {
- found = true;
- }
- i++;
- }
- if (!found) {
- String id = UpdateManagerPlugin.getPlugin().getDescriptor().getUniqueIdentifier();
- IStatus status = new Status(IStatus.ERROR, id, IStatus.OK, "The plugin:" + pluginEntry.getIdentifier().toString() + " is not part of the plugins of the feature:" + this.getIdentifier().toString(), null);
- throw new CoreException(status);
- }
- getSite().store(pluginEntry, contentKey, inStream);
- }
-
- /**
- * perform pre processing before opening a plugin archive
- * @param entry the plugin about to be opened
- */
- protected void open(IPluginEntry entry) {
- };
-
- /**
- * perform post processing to close a plugin archive
- * @param entry the plugin about to be closed
- */
- protected void close(IPluginEntry entry) throws IOException {
- };
-
- /**
- * perform pre processing before opening the feature archive
- */
- protected void openFeature() {
- };
-
- /**
- * perform post processing to close a feature archive
- */
- public void closeFeature() throws IOException {
- };
-
-
- /**
- * return the list of FILE to be transfered for a Plugin
- */
- protected abstract String[] getStorageUnitNames(IPluginEntry pluginEntry) throws CoreException;
-
- /**
- * return the list of FILE to be transfered from within the Feature
- */
- protected abstract String[] getStorageUnitNames(IFeature feature) throws CoreException;
-
- /**
- * return the Stream of the FILE to be transfered for a Plugin
- */
- protected abstract InputStream getInputStreamFor(IPluginEntry pluginEntry, String name) throws CoreException;
-
- /**
- * return the Stream of FILE to be transfered from within the Feature
- */
- protected abstract InputStream getInputStreamFor(IFeature feature, String name) throws IOException, CoreException;
-
- /**
- * returns the list of archive to transfer/install
- * in order to install the list of plugins
- *
- * @param pluginsToInstall list of plugin to install
- */
- protected abstract String[] getContentReferenceToInstall(IPluginEntry[] pluginsToInstall);
-
-
- /**
- * remove myself...
- */
- public void old_remove(IProgressMonitor monitor) throws CoreException {
-
- // remove the feature and the plugins if they are not used and not activated
-
- // get the plugins from the feature
- IPluginEntry[] pluginsToRemove = ((SiteLocal) SiteManager.getLocalSite()).getDeltaPluginEntries(this);
-
- try {
-
- // obtain the list of *Streamable Storage Unit*
- // from the archive
- if (monitor != null) {
- int total = pluginsToRemove == null ? 1 : pluginsToRemove.length + 1;
- monitor.beginTask("Uninstall feature " + getLabel(), total);
- }
- if (pluginsToRemove != null) {
- for (int i = 0; i < pluginsToRemove.length; i++) {
- if (monitor != null) {
- monitor.subTask("Removing plug-in: " + pluginsToRemove[i]);
- if (monitor.isCanceled()) {
- throw CANCEL_EXCEPTION;
- }
- }
-
- remove(pluginsToRemove[i]);
-
- if (monitor != null) {
- monitor.worked(1);
- if (monitor.isCanceled()) {
- throw CANCEL_EXCEPTION;
- }
- }
-
- }
- }
-
- // remove the Feature info
- String[] names = getStorageUnitNames(this);
- if (names != null) {
- if (monitor != null) {
- monitor.subTask("Removing Feature information");
- if (monitor.isCanceled()) {
- throw CANCEL_EXCEPTION;
- }
- }
-
- ((Site) this.getSite()).removeFeatureInfo(getIdentifier());
-
- closeFeature();
- if (monitor != null) {
- monitor.worked(1);
- if (monitor.isCanceled()) {
- throw CANCEL_EXCEPTION;
- }
- }
-
- }
-
- } catch (IOException e) {
- String id = UpdateManagerPlugin.getPlugin().getDescriptor().getUniqueIdentifier();
- IStatus status = new Status(IStatus.ERROR, id, IStatus.OK, "Error during Uninstall", e);
- throw new CoreException(status);
- }
- }
-
- System.getProperty("java.io.tmpdir")(java.lang.String) /tmp
-
- true^false
- true^true
-
-
-org.eclipse.core.runtime.IPath p1= (new org.eclipse.core.runtime.Path("/path1/path2/*.txt"));
-org.eclipse.core.runtime.IPath p2= (new org.eclipse.core.runtime.Path("/path1/path2/a.txt"));
-p1.equals(p2);
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/about.html b/update/org.eclipse.update.core/about.html
deleted file mode 100644
index 9db411a..0000000
--- a/update/org.eclipse.update.core/about.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>20th June, 2002</p>
-<h3>License</h3>
-<p>Eclipse.org makes available all content in this plug-in ("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/build.properties b/update/org.eclipse.update.core/build.properties
deleted file mode 100644
index d8293a5..0000000
--- a/update/org.eclipse.update.core/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-source.updatecore.jar = src/
-src.includes=about.html
-bin.includes=plugin.xml,plugin.properties,*.jar,about.html,.options,os/,schema/
diff --git a/update/org.eclipse.update.core/doc/featureTypes.html b/update/org.eclipse.update.core/doc/featureTypes.html
deleted file mode 100644
index 9fa36d1..0000000
--- a/update/org.eclipse.update.core/doc/featureTypes.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HEAD>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</HEAD>
-<HTML>
-<BODY>
-<H1><CENTER>Feature Type Factory</CENTER></H1>
-<H2>Identifier</H2>
-org.eclipse.update.core.featureTypes<H2>Description</H2>
-<p>The platform update mechanism supports pluggable feature type
-implementations. A new feature type can be registered in order
-to support
-alternate packaging and verification schemes.
-</p>
-<p>
-The <code>featureTypes</code>
-extension point allows alternate feature implementations to be
-registered using a symbolic type identifier. Whenever the
-type is referenced using this identifier, the supplied factory
-is used to create the correct concrete feature implementation.
-</p><H2>Markup</H2>
-<p><samp> <!ELEMENT extension (feature-factory+)></samp>
-<br><samp> <!ATTLIST extension</samp>
-<br><samp> point CDATA #REQUIRED</samp>
-<br><samp> id CDATA #IMPLIED</samp>
-<br><samp> name CDATA #IMPLIED</samp>
-<br><samp> ></samp>
-<ul>
-<li><b>point</b> - must be specified as <b>org.eclipse.update.core.featureTypes</b></li><li><b>id</b> - must be specified. Identifies the new feature type</li><li><b>name</b> - optional displayable label for the new feature type</li></ul>
-<p><samp> <!ELEMENT feature-factory EMPTY></samp>
-<br><samp> <!ATTLIST feature-factory</samp>
-<br><samp> class CDATA #REQUIRED</samp>
-<br><samp> ></samp>
-<ul>
-<li><b>class</b> - fully qualified name of the factory class for the identified feature type</li></ul>
-<H2>Example</H2>
-The following is an example of new feature type registration.
-<br><br>
-<code>
-<extension<br>
- id="custom"<br>
- point="org.eclipse.update.core.featureTypes"<br>
- name="Custom packaged feature"><br>
-<br>
- <feature-factory<br>
- class="com.xyz.update.CustomFeatureFactory"><br>
- </feature-factory><br>
-</extension><br>
-</code><H2>API Information</H2>
-Registered factory classes must implement
-<code><b>org.eclipse.update.core.IFeatureFactory</b></code><H2>Supplied Implementation</H2>
-The platform supplies two standard implementations of feature
-types. One representing the default packaged feature type, and
-the other representing an installed feature type.<br>
-<br><a href="hglegal.htm"><img SRC="ngibmcpy.gif"
-ALT="Copyright IBM Corp. and others 2000, 2002. All Rights Reserved."
-BORDER=0></a></BODY>
-</HTML>
diff --git a/update/org.eclipse.update.core/doc/hglegal.htm b/update/org.eclipse.update.core/doc/hglegal.htm
deleted file mode 100644
index 919e18b..0000000
--- a/update/org.eclipse.update.core/doc/hglegal.htm
+++ /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">
- <meta name="GENERATOR" content="Microsoft FrontPage 4.0">
- <title>Legal Notices</title>
-</head>
-<body>
-
-<h3>
-<a NAME="Notices"></a>Notices</h3>
-(c) Copyright IBM Corp. and others 2000, 2002. All Rights Reserved.
-</body>
-</html>
diff --git a/update/org.eclipse.update.core/doc/installHandlers.html b/update/org.eclipse.update.core/doc/installHandlers.html
deleted file mode 100644
index bbd2a65..0000000
--- a/update/org.eclipse.update.core/doc/installHandlers.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HEAD>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</HEAD>
-<HTML>
-<BODY>
-<H1><CENTER>Global Install Handlers</CENTER></H1>
-<H2>Identifier</H2>
-org.eclipse.update.core.installHandlers<H2>Description</H2>
-Extension point for registering global install handlers. Global
-install handlers can be referenced by features
-(using the <code><feature> <install-handler></code>
-tags) without having to include a copy of the handler code as
-part of the downloadable feature.<H2>Markup</H2>
-<p><samp> <!ELEMENT extension (install-handler+)></samp>
-<br><samp> <!ATTLIST extension</samp>
-<br><samp> point CDATA #REQUIRED</samp>
-<br><samp> id CDATA #IMPLIED</samp>
-<br><samp> name CDATA #IMPLIED</samp>
-<br><samp> ></samp>
-<ul>
-<li><b>point</b> - must be specified as <b>org.eclipse.update.core.installHandlers</b></li><li><b>id</b> - must be specified. Identifies the new install handler</li><li><b>name</b> - optional displayable label for the new install handler</li></ul>
-<p><samp> <!ELEMENT install-handler EMPTY></samp>
-<br><samp> <!ATTLIST install-handler</samp>
-<br><samp> class CDATA #REQUIRED</samp>
-<br><samp> ></samp>
-<ul>
-<li><b>class</b> - fully qualified name of the handler implementation class for the identified
-install handler</li></ul>
-<H2>Example</H2>
-The following is an example of new global install handler registration.
-<br><br>
-<code>
-<extension<br>
- id="custom"<br>
- point="org.eclipse.update.core.installHandlers"<br>
- name="Custom install handler"><br>
-<br>
- <install-handler<br>
- class="com.xyz.update.CustomInstallHandler"><br>
- </install-handler><br>
-</extension><br>
-</code><H2>API Information</H2>
-Registered install handler classes must implement
-<code><b>org.eclipse.update.core.IInstallHandler</b></code> interface.
-Implementers should extend base class <code><b>org.eclipse.update.core.BaseInstallHandler</b></code>.<H2>Supplied Implementation</H2>
-The platform supplies a simple install handler that is registered as <code><b>org.eclipse.update.core.DefaultInstallHandler</b></code>. If used, it will copy any non-plug-in data entries provided with the feature into the feature installation directory.<br>
-<br><a href="hglegal.htm"><img SRC="ngibmcpy.gif"
-ALT="Copyright IBM Corp. and others 2000, 2002. All Rights Reserved."
-BORDER=0></a></BODY>
-</HTML>
diff --git a/update/org.eclipse.update.core/doc/ngibmcpy.gif b/update/org.eclipse.update.core/doc/ngibmcpy.gif
deleted file mode 100644
index 3fda87a..0000000
--- a/update/org.eclipse.update.core/doc/ngibmcpy.gif
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.core/doc/org_eclipse_update_core_featureTypes.html b/update/org.eclipse.update.core/doc/org_eclipse_update_core_featureTypes.html
deleted file mode 100644
index 9fa36d1..0000000
--- a/update/org.eclipse.update.core/doc/org_eclipse_update_core_featureTypes.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HEAD>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</HEAD>
-<HTML>
-<BODY>
-<H1><CENTER>Feature Type Factory</CENTER></H1>
-<H2>Identifier</H2>
-org.eclipse.update.core.featureTypes<H2>Description</H2>
-<p>The platform update mechanism supports pluggable feature type
-implementations. A new feature type can be registered in order
-to support
-alternate packaging and verification schemes.
-</p>
-<p>
-The <code>featureTypes</code>
-extension point allows alternate feature implementations to be
-registered using a symbolic type identifier. Whenever the
-type is referenced using this identifier, the supplied factory
-is used to create the correct concrete feature implementation.
-</p><H2>Markup</H2>
-<p><samp> <!ELEMENT extension (feature-factory+)></samp>
-<br><samp> <!ATTLIST extension</samp>
-<br><samp> point CDATA #REQUIRED</samp>
-<br><samp> id CDATA #IMPLIED</samp>
-<br><samp> name CDATA #IMPLIED</samp>
-<br><samp> ></samp>
-<ul>
-<li><b>point</b> - must be specified as <b>org.eclipse.update.core.featureTypes</b></li><li><b>id</b> - must be specified. Identifies the new feature type</li><li><b>name</b> - optional displayable label for the new feature type</li></ul>
-<p><samp> <!ELEMENT feature-factory EMPTY></samp>
-<br><samp> <!ATTLIST feature-factory</samp>
-<br><samp> class CDATA #REQUIRED</samp>
-<br><samp> ></samp>
-<ul>
-<li><b>class</b> - fully qualified name of the factory class for the identified feature type</li></ul>
-<H2>Example</H2>
-The following is an example of new feature type registration.
-<br><br>
-<code>
-<extension<br>
- id="custom"<br>
- point="org.eclipse.update.core.featureTypes"<br>
- name="Custom packaged feature"><br>
-<br>
- <feature-factory<br>
- class="com.xyz.update.CustomFeatureFactory"><br>
- </feature-factory><br>
-</extension><br>
-</code><H2>API Information</H2>
-Registered factory classes must implement
-<code><b>org.eclipse.update.core.IFeatureFactory</b></code><H2>Supplied Implementation</H2>
-The platform supplies two standard implementations of feature
-types. One representing the default packaged feature type, and
-the other representing an installed feature type.<br>
-<br><a href="hglegal.htm"><img SRC="ngibmcpy.gif"
-ALT="Copyright IBM Corp. and others 2000, 2002. All Rights Reserved."
-BORDER=0></a></BODY>
-</HTML>
diff --git a/update/org.eclipse.update.core/doc/org_eclipse_update_core_installHandlers.html b/update/org.eclipse.update.core/doc/org_eclipse_update_core_installHandlers.html
deleted file mode 100644
index bbd2a65..0000000
--- a/update/org.eclipse.update.core/doc/org_eclipse_update_core_installHandlers.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HEAD>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</HEAD>
-<HTML>
-<BODY>
-<H1><CENTER>Global Install Handlers</CENTER></H1>
-<H2>Identifier</H2>
-org.eclipse.update.core.installHandlers<H2>Description</H2>
-Extension point for registering global install handlers. Global
-install handlers can be referenced by features
-(using the <code><feature> <install-handler></code>
-tags) without having to include a copy of the handler code as
-part of the downloadable feature.<H2>Markup</H2>
-<p><samp> <!ELEMENT extension (install-handler+)></samp>
-<br><samp> <!ATTLIST extension</samp>
-<br><samp> point CDATA #REQUIRED</samp>
-<br><samp> id CDATA #IMPLIED</samp>
-<br><samp> name CDATA #IMPLIED</samp>
-<br><samp> ></samp>
-<ul>
-<li><b>point</b> - must be specified as <b>org.eclipse.update.core.installHandlers</b></li><li><b>id</b> - must be specified. Identifies the new install handler</li><li><b>name</b> - optional displayable label for the new install handler</li></ul>
-<p><samp> <!ELEMENT install-handler EMPTY></samp>
-<br><samp> <!ATTLIST install-handler</samp>
-<br><samp> class CDATA #REQUIRED</samp>
-<br><samp> ></samp>
-<ul>
-<li><b>class</b> - fully qualified name of the handler implementation class for the identified
-install handler</li></ul>
-<H2>Example</H2>
-The following is an example of new global install handler registration.
-<br><br>
-<code>
-<extension<br>
- id="custom"<br>
- point="org.eclipse.update.core.installHandlers"<br>
- name="Custom install handler"><br>
-<br>
- <install-handler<br>
- class="com.xyz.update.CustomInstallHandler"><br>
- </install-handler><br>
-</extension><br>
-</code><H2>API Information</H2>
-Registered install handler classes must implement
-<code><b>org.eclipse.update.core.IInstallHandler</b></code> interface.
-Implementers should extend base class <code><b>org.eclipse.update.core.BaseInstallHandler</b></code>.<H2>Supplied Implementation</H2>
-The platform supplies a simple install handler that is registered as <code><b>org.eclipse.update.core.DefaultInstallHandler</b></code>. If used, it will copy any non-plug-in data entries provided with the feature into the feature installation directory.<br>
-<br><a href="hglegal.htm"><img SRC="ngibmcpy.gif"
-ALT="Copyright IBM Corp. and others 2000, 2002. All Rights Reserved."
-BORDER=0></a></BODY>
-</HTML>
diff --git a/update/org.eclipse.update.core/doc/org_eclipse_update_core_siteTypes.html b/update/org.eclipse.update.core/doc/org_eclipse_update_core_siteTypes.html
deleted file mode 100644
index b1f0cb5..0000000
--- a/update/org.eclipse.update.core/doc/org_eclipse_update_core_siteTypes.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HEAD>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</HEAD>
-<HTML>
-<BODY>
-<H1><CENTER>Site Type Factory</CENTER></H1>
-<H2>Identifier</H2>
-org.eclipse.update.core.siteTypes<H2>Description</H2>
-<p>
-The platform update mechanism supports pluggable site type
-implementations. A new site type can be registered in order
-to support
-alternate site layout schemes.
-</p>
-
-<p>
-The <code>siteTypes</code>
-extension point allows alternate site implementations to be
-registered using a symbolic type identifier. Whenever the
-type is referenced using this identifier, the supplied factory
-is used to create the correct concrete site implementation.
-</p><H2>Markup</H2>
-<p><samp> <!ELEMENT extension (site-factory+)></samp>
-<br><samp> <!ATTLIST extension</samp>
-<br><samp> point CDATA #REQUIRED</samp>
-<br><samp> id CDATA #IMPLIED</samp>
-<br><samp> name CDATA #IMPLIED</samp>
-<br><samp> ></samp>
-<ul>
-<li><b>point</b> - must be specified as <b>org.eclipse.update.core.siteTypes</b></li><li><b>id</b> - must be specified. Identifies the new site type</li><li><b>name</b> - optional displayable label for the new site type</li></ul>
-<p><samp> <!ELEMENT site-factory EMPTY></samp>
-<br><samp> <!ATTLIST site-factory</samp>
-<br><samp> class CDATA #REQUIRED</samp>
-<br><samp> ></samp>
-<ul>
-<li><b>class</b> - fully qualified name of the factory class for the identified
-site type</li></ul>
-<H2>Example</H2>
-The following is an example of new site type registration.
-<br><br>
-<code>
-<extension<br>
- id="custom"<br>
- point="org.eclipse.update.core.siteTypes"<br>
- name="Custom site"><br>
-<br>
- <site-factory<br>
- class="com.xyz.update.CustomSiteFactory"><br>
- </site-factory><br>
-</extension><br>
-</code><H2>API Information</H2>
-Registered factory classes must implement
-<code><b>org.eclipse.update.core.ISiteFactory</b></code><H2>Supplied Implementation</H2>
-The platform supplies two standard implementations of site
-types. One representing the default update server type, and
-the other representing the local file system site.<br>
-<br><a href="hglegal.htm"><img SRC="ngibmcpy.gif"
-ALT="Copyright IBM Corp. and others 2000, 2002. All Rights Reserved."
-BORDER=0></a></BODY>
-</HTML>
diff --git a/update/org.eclipse.update.core/doc/siteTypes.html b/update/org.eclipse.update.core/doc/siteTypes.html
deleted file mode 100644
index b1f0cb5..0000000
--- a/update/org.eclipse.update.core/doc/siteTypes.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HEAD>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</HEAD>
-<HTML>
-<BODY>
-<H1><CENTER>Site Type Factory</CENTER></H1>
-<H2>Identifier</H2>
-org.eclipse.update.core.siteTypes<H2>Description</H2>
-<p>
-The platform update mechanism supports pluggable site type
-implementations. A new site type can be registered in order
-to support
-alternate site layout schemes.
-</p>
-
-<p>
-The <code>siteTypes</code>
-extension point allows alternate site implementations to be
-registered using a symbolic type identifier. Whenever the
-type is referenced using this identifier, the supplied factory
-is used to create the correct concrete site implementation.
-</p><H2>Markup</H2>
-<p><samp> <!ELEMENT extension (site-factory+)></samp>
-<br><samp> <!ATTLIST extension</samp>
-<br><samp> point CDATA #REQUIRED</samp>
-<br><samp> id CDATA #IMPLIED</samp>
-<br><samp> name CDATA #IMPLIED</samp>
-<br><samp> ></samp>
-<ul>
-<li><b>point</b> - must be specified as <b>org.eclipse.update.core.siteTypes</b></li><li><b>id</b> - must be specified. Identifies the new site type</li><li><b>name</b> - optional displayable label for the new site type</li></ul>
-<p><samp> <!ELEMENT site-factory EMPTY></samp>
-<br><samp> <!ATTLIST site-factory</samp>
-<br><samp> class CDATA #REQUIRED</samp>
-<br><samp> ></samp>
-<ul>
-<li><b>class</b> - fully qualified name of the factory class for the identified
-site type</li></ul>
-<H2>Example</H2>
-The following is an example of new site type registration.
-<br><br>
-<code>
-<extension<br>
- id="custom"<br>
- point="org.eclipse.update.core.siteTypes"<br>
- name="Custom site"><br>
-<br>
- <site-factory<br>
- class="com.xyz.update.CustomSiteFactory"><br>
- </site-factory><br>
-</extension><br>
-</code><H2>API Information</H2>
-Registered factory classes must implement
-<code><b>org.eclipse.update.core.ISiteFactory</b></code><H2>Supplied Implementation</H2>
-The platform supplies two standard implementations of site
-types. One representing the default update server type, and
-the other representing the local file system site.<br>
-<br><a href="hglegal.htm"><img SRC="ngibmcpy.gif"
-ALT="Copyright IBM Corp. and others 2000, 2002. All Rights Reserved."
-BORDER=0></a></BODY>
-</HTML>
diff --git a/update/org.eclipse.update.core/plugin.properties b/update/org.eclipse.update.core/plugin.properties
deleted file mode 100644
index f35de76..0000000
--- a/update/org.eclipse.update.core/plugin.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-pluginName= Install/Update Core
-providerName= Eclipse.org
-fragmentNameWin= Install/Update Core for Windows
-fragmentNameLinux= Install/Update Core for Linux
-
-
diff --git a/update/org.eclipse.update.core/plugin.xml b/update/org.eclipse.update.core/plugin.xml
deleted file mode 100644
index c422824..0000000
--- a/update/org.eclipse.update.core/plugin.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
- id="org.eclipse.update.core"
- name="%pluginName"
- version="2.0.2"
- provider-name="%providerName"
- class="org.eclipse.update.internal.core.UpdateManagerPlugin">
-
- <runtime>
- <library name="updatecore.jar">
- <export name="*"/>
- </library>
- </runtime>
- <requires>
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.apache.xerces"/>
- </requires>
-
-
- <extension-point id="featureTypes" name="Install/Update Concrete Feature Type Implementation Factory" schema="schema/featureTypes.exsd"/>
- <extension-point id="siteTypes" name="Install/Update Concrete Site Type Implementation Factory" schema="schema/siteTypes.exsd"/>
- <extension-point id="installHandlers" name="Install/Update Global Install Handlers" schema="schema/installHandlers.exsd"/>
- <extension-point id="deltaHandler" name="Install/Update Delta Handler"/>
-
- <extension
- id="reconciler"
- point="org.eclipse.core.runtime.applications">
- <application
- run="org.eclipse.update.internal.core.UpdateManagerReconciler">
- </application>
- </extension>
- <extension
- id="packaged"
- point="org.eclipse.update.core.featureTypes">
- <feature-factory
- class="org.eclipse.update.internal.core.FeaturePackagedFactory">
- </feature-factory>
- </extension>
- <extension
- id="installed"
- point="org.eclipse.update.core.featureTypes">
- <feature-factory
- class="org.eclipse.update.internal.core.FeatureExecutableFactory">
- </feature-factory>
- </extension>
- <extension
- id="http"
- point="org.eclipse.update.core.siteTypes">
- <site-factory
- class="org.eclipse.update.internal.core.SiteURLFactory">
- </site-factory>
- </extension>
- <extension
- id="file"
- point="org.eclipse.update.core.siteTypes">
- <site-factory
- class="org.eclipse.update.internal.core.SiteFileFactory">
- </site-factory>
- </extension>
- <extension
- id="DefaultInstallHandler"
- point="org.eclipse.update.core.installHandlers">
- <install-handler
- class="org.eclipse.update.internal.core.DefaultInstallHandler">
- </install-handler>
- </extension>
-
-</plugin>
diff --git a/update/org.eclipse.update.core/schema/featureTypes.exsd b/update/org.eclipse.update.core/schema/featureTypes.exsd
deleted file mode 100644
index 85981fb..0000000
--- a/update/org.eclipse.update.core/schema/featureTypes.exsd
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.update.core">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.update.core" id="featureTypes" name="Feature Type Factory"/>
- </appInfo>
- <documentation>
- <p>The platform update mechanism supports pluggable feature type
-implementations. A new feature type can be registered in order
-to support
-alternate packaging and verification schemes.
-</p>
-<p>
-The <code>featureTypes</code>
-extension point allows alternate feature implementations to be
-registered using a symbolic type identifier. Whenever the
-type is referenced using this identifier, the supplied factory
-is used to create the correct concrete feature implementation.
-</p>
- </documentation>
-</annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="feature-factory" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- must be specified as <b>org.eclipse.update.core.featureTypes</b>
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- must be specified. Identifies the new feature type
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- optional displayable label for the new feature type
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="feature-factory">
- <complexType>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
- fully qualified name of the factory class for the identified feature type
- </documentation>
- <appInfo>
- <meta.attribute kind="java" basedOn="org.eclipse.update.configuration.IInstallDeltaHandler"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- The following is an example of new feature type registration.
-<br><br>
-<code>
-&lt;extension<br>
-&nbsp;&nbsp;&nbsp;id="custom"<br>
-&nbsp;&nbsp;&nbsp;point="org.eclipse.update.core.featureTypes"<br>
-&nbsp;&nbsp;&nbsp;name="Custom packaged feature"&gt;<br>
-<br>
-&nbsp;&nbsp;&nbsp;&lt;feature-factory<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;class="com.xyz.update.CustomFeatureFactory"&gt;<br>
-&nbsp;&nbsp;&nbsp;&lt;/feature-factory&gt;<br>
-&lt;/extension&gt;<br>
-</code>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- Registered factory classes must implement
-<code><b>org.eclipse.update.core.IFeatureFactory</b></code>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- The platform supplies two standard implementations of feature
-types. One representing the default packaged feature type, and
-the other representing an installed feature type.
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- <br>
-<br><a href="hglegal.htm"><img SRC="ngibmcpy.gif"
-ALT="Copyright IBM Corp. and others 2000, 2002. All Rights Reserved."
-BORDER=0></a>
- </documentation>
- </annotation>
-
-</schema>
diff --git a/update/org.eclipse.update.core/schema/installHandlers.exsd b/update/org.eclipse.update.core/schema/installHandlers.exsd
deleted file mode 100644
index 152ef61..0000000
--- a/update/org.eclipse.update.core/schema/installHandlers.exsd
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.update.core">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.update.core" id="installHandlers" name="Global Install Handlers"/>
- </appInfo>
- <documentation>
- Extension point for registering global install handlers. Global
-install handlers can be referenced by features
-(using the <code>&lt;feature&gt; &lt;install-handler&gt;</code>
-tags) without having to include a copy of the handler code as
-part of the downloadable feature.
- </documentation>
-</annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="install-handler" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- must be specified as <b>org.eclipse.update.core.installHandlers</b>
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- must be specified. Identifies the new install handler
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- optional displayable label for the new install handler
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="install-handler">
- <complexType>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
- fully qualified name of the handler implementation class for the identified
-install handler
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- The following is an example of new global install handler registration.
-<br><br>
-<code>
-&lt;extension<br>
-&nbsp;&nbsp;&nbsp;id="custom"<br>
-&nbsp;&nbsp;&nbsp;point="org.eclipse.update.core.installHandlers"<br>
-&nbsp;&nbsp;&nbsp;name="Custom install handler"&gt;<br>
-<br>
-&nbsp;&nbsp;&nbsp;&lt;install-handler<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;class="com.xyz.update.CustomInstallHandler"&gt;<br>
-&nbsp;&nbsp;&nbsp;&lt;/install-handler&gt;<br>
-&lt;/extension&gt;<br>
-</code>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- Registered install handler classes must implement
-<code><b>org.eclipse.update.core.IInstallHandler</b></code> interface.
-Implementers should extend base class <code><b>org.eclipse.update.core.BaseInstallHandler</b></code>.
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- The platform supplies a simple install handler that is registered as <code><b>org.eclipse.update.core.DefaultInstallHandler</b></code>. If used, it will copy any non-plug-in data entries provided with the feature into the feature installation directory.
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- <br>
-<br><a href="hglegal.htm"><img SRC="ngibmcpy.gif"
-ALT="Copyright IBM Corp. and others 2000, 2002. All Rights Reserved."
-BORDER=0></a>
- </documentation>
- </annotation>
-
-</schema>
diff --git a/update/org.eclipse.update.core/schema/siteTypes.exsd b/update/org.eclipse.update.core/schema/siteTypes.exsd
deleted file mode 100644
index b4e32ae..0000000
--- a/update/org.eclipse.update.core/schema/siteTypes.exsd
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.update.core">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.update.core" id="siteTypes" name="Site Type Factory"/>
- </appInfo>
- <documentation>
- <p>
-The platform update mechanism supports pluggable site type
-implementations. A new site type can be registered in order
-to support
-alternate site layout schemes.
-</p>
-
-<p>
-The <code>siteTypes</code>
-extension point allows alternate site implementations to be
-registered using a symbolic type identifier. Whenever the
-type is referenced using this identifier, the supplied factory
-is used to create the correct concrete site implementation.
-</p>
- </documentation>
-</annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="site-factory" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- must be specified as <b>org.eclipse.update.core.siteTypes</b>
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- must be specified. Identifies the new site type
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- optional displayable label for the new site type
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="site-factory">
- <complexType>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
- fully qualified name of the factory class for the identified
-site type
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- The following is an example of new site type registration.
-<br><br>
-<code>
-&lt;extension<br>
-&nbsp;&nbsp;&nbsp;id="custom"<br>
-&nbsp;&nbsp;&nbsp;point="org.eclipse.update.core.siteTypes"<br>
-&nbsp;&nbsp;&nbsp;name="Custom site"&gt;<br>
-<br>
-&nbsp;&nbsp;&nbsp;&lt;site-factory<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;class="com.xyz.update.CustomSiteFactory"&gt;<br>
-&nbsp;&nbsp;&nbsp;&lt;/site-factory&gt;<br>
-&lt;/extension&gt;<br>
-</code>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- Registered factory classes must implement
-<code><b>org.eclipse.update.core.ISiteFactory</b></code>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- The platform supplies two standard implementations of site
-types. One representing the default update server type, and
-the other representing the local file system site.
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- <br>
-<br><a href="hglegal.htm"><img SRC="ngibmcpy.gif"
-ALT="Copyright IBM Corp. and others 2000, 2002. All Rights Reserved."
-BORDER=0></a>
- </documentation>
- </annotation>
-
-</schema>
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IActivity.java b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IActivity.java
deleted file mode 100644
index 9b39ab4..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IActivity.java
+++ /dev/null
@@ -1,253 +0,0 @@
-package org.eclipse.update.configuration;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import java.util.Date;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-/**
- * Install activity.
- * Represents a record of an installation action performed
- * on a particular installation configuration.
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @see org.eclipse.update.configuration.IInstallConfiguration
- * @since 2.0
- */
-public interface IActivity extends IAdaptable {
-
- /**
- * Indicates feature installation action
- *
- * @since 2.0
- * <p>
- * <b>Note:</b> This field is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public static final int ACTION_FEATURE_INSTALL = 1;
-
- /**
- * Indicates feature removal (uninstallation) action
- *
- * @since 2.0
- * <p>
- * <b>Note:</b> This field is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public static final int ACTION_FEATURE_REMOVE = 2;
-
- /**
- * Indicates an addition of a site to a configuration
- *
- * @since 2.0
- * <p>
- * <b>Note:</b> This field is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public static final int ACTION_SITE_INSTALL = 3;
-
- /**
- * Indicates removal of a site from a configuration
- *
- * @since 2.0
- * <p>
- * <b>Note:</b> This field is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public static final int ACTION_SITE_REMOVE = 4;
-
- /**
- * Indicates feature unconfiguration action
- *
- * @since 2.0
- * <p>
- * <b>Note:</b> This field is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public static final int ACTION_UNCONFIGURE = 5;
-
- /**
- * Indicates feature configuration action
- *
- * @since 2.0
- * <p>
- * <b>Note:</b> This field is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public static final int ACTION_CONFIGURE = 6;
-
- /**
- * Indicates reverting to a prior configuration state
- *
- * @since 2.0
- * <p>
- * <b>Note:</b> This field is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public static final int ACTION_REVERT = 7;
-
- /**
- * Indicates reconcilliation with changes made directly to the site
- * installation directory
- *
- * @since 2.0
- * <p>
- * <b>Note:</b> This field is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public static final int ACTION_RECONCILIATION = 8;
-
- /**
- * Indicates adding the configuration to a preserved state
- *
- * @since 2.0
- * <p>
- * <b>Note:</b> This field is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public static final int ACTION_ADD_PRESERVED = 9;
-
- /**
- * Indicates the action completed cussessfully
- *
- * @since 2.0
- * <p>
- * <b>Note:</b> This field is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public static final int STATUS_OK = 0;
-
- /**
- * Indicates the action did not complete successfully
- *
- * @since 2.0
- * <p>
- * <b>Note:</b> This field is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public static final int STATUS_NOK = 1;
-
- /**
- * Returns the action code for this activity
- *
- * @see #ACTION_FEATURE_INSTALL
- * @see #ACTION_FEATURE_REMOVE
- * @see #ACTION_SITE_INSTALL
- * @see #ACTION_SITE_REMOVE
- * @see #ACTION_UNCONFIGURE
- * @see #ACTION_CONFIGURE
- * @see #ACTION_REVERT
- * @see #ACTION_RECONCILIATION
- * @return action code, as defined in this interface
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public int getAction();
-
- /**
- * Returns the displayable label for this action
- *
- * @return diplayable label for action
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public String getLabel();
-
- /**
- * Returns the creation date of this activity
- *
- * @return activity date
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public Date getDate();
-
- /**
- * Returns the activity completion status
- *
- * @see #STATUS_OK
- * @see #STATUS_NOK
- * @return completion status, as defined in this interface
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public int getStatus();
-
- /**
- * Returns the installation configuration that was the result of
- * this action
- *
- * @return installation configuration
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public IInstallConfiguration getInstallConfiguration();
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IConfiguredSite.java b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IConfiguredSite.java
deleted file mode 100644
index 4382086..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IConfiguredSite.java
+++ /dev/null
@@ -1,336 +0,0 @@
-package org.eclipse.update.configuration;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.core.*;
-
-/**
- * Configured Site.
- * Represents an installation site "filtered" by configuration information.
- * Configured site is the target of the feature update operations (install
- * feature, remove feature, configure feature, unconfigure feature).
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 2.0
- */
-public interface IConfiguredSite extends IAdaptable {
-
- /**
- * Returns the underlying "unfiltered" site.
- *
- * @return the underlying site
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public ISite getSite();
-
- /**
- * Indicates whether updates can be applied to the site.
- *
- * <code>IStatus.isOk()</code> return <code>true</code> if
- * the site can be updated, <code>false</code> otherwise.
- *
- * If updates cannot be aplied, the status contains the error message, and
- * the possible exception.
- *
- * @see IStatus
- * @return an IStatus
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public IStatus verifyUpdatableStatus();
-
- /**
- * Indicates whether updates can be applied to the site.
- *
- * A configuration site is tagged a non-updatable by reading
- * the platform configuration for this site.
- *
- * @return <code>true</code> if the site can be updated,
- * <code>false</code> otherwise
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public boolean isUpdatable();
-
- /**
- * Install the specified feature on this site.
- *
- * @param feature feature to install
- * @param verificationListener verification listener, or <code>null</code>
- * @param monitor progress monitor, or <code>null</code>
- * @exception InstallAbortedException when the user cancels the install
- * @exception CoreException
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public IFeatureReference install(IFeature feature, IVerificationListener verificationListener, IProgressMonitor monitor) throws CoreException;
-
- /**
- * Install the specified feature on this site.
- * Only the specified optional features will be installed
- *
- * @param feature feature to install
- * @param optionalFeatures optional features to install
- * @param verificationListener verification listener, or <code>null</code>
- * @param monitor progress monitor, or <code>null</code>
- * @exception InstallAbortedException when the user cancels the install
- * @exception CoreException
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public IFeatureReference install(IFeature feature, IFeatureReference[] optionalFeatures, IVerificationListener verificationListener, IProgressMonitor monitor) throws CoreException;
-
-
- /**
- * Remove (uninstall) the specified feature from this site
- *
- * @param feature feature to remove
- * @param monitor progress monitor, or <code>null</code>
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public void remove(IFeature feature, IProgressMonitor monitor) throws CoreException;
-
- /**
- * Indicates if the specified feature is "broken". A feature is considered
- * to be broken in the context of this site, if some of the plug-ins
- * referenced by the feature are not installed on this site.
- *
- * The status code is <code>IStatus.ERROR</code> if the feature is considered
- * broken. The Status may contain the reason why the feature is broken.
- * The status code is <code>IStatus.OK</code> if the feature is not considered
- * broken.
- *
- * @param feature the feature
- * @return the status for this feature on this configured site
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public IStatus getBrokenStatus(IFeature feature);
-
- /**
- * Indicates if the specified feature is configured on this site.
- *
- * @param feature the feature
- * @return <code>true</code> if the feature is configured,
- * <code>false</code> otherwise
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public boolean isConfigured(IFeature feature);
-
- /**
- * Configure the specified feature on this site. The configured
- * feature will be included on next startup.
- *
- * @param feature the feature
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public void configure(IFeature feature) throws CoreException;
-
- /**
- * Unconfigure the specified feature from this site. The unconfigured
- * feature will be omitted on the next startup.
- *
- * @param feature the feature
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public boolean unconfigure(IFeature feature) throws CoreException;
-
- /**
- * Return references to features configured on this site.
- *
- * @return an array of feature references, or an empty array.
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public IFeatureReference[] getConfiguredFeatures();
-
- /**
- * Return all features installed on this site (configured as well
- * as unconfigured). Note, that if the site requires reconciliation,
- * the result may not match the result of the corresponding method
- * on the underlying site.
- *
- * @see ISite#getFeatureReferences()
- * @return an array of site feature references, or an empty array.
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public IFeatureReference[] getFeatureReferences();
-
- /**
- * Returns the install configuration object this site is part of.
- *
- * @return install configuration object
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public IInstallConfiguration getInstallConfiguration();
-
- /**
- * Adds a change listener to the configured site.
- *
- * @param listener the listener to add
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public void addConfiguredSiteChangedListener(IConfiguredSiteChangedListener listener);
-
- /**
- * Removes a change listener from the configured site.
- *
- * @param listener the listener to remove
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public void removeConfiguredSiteChangedListener(IConfiguredSiteChangedListener listener);
-
- /**
- * Indicates if the site is an extension site.
- *
- * @return <code>true</code> if the site is an extension site,
- * <code>false</code> otherwise
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public boolean isExtensionSite();
-
- /**
- * Indicates if the site is a product site.
- *
- * @return <code>true</code> if the site is a product site,
- * <code>false</code> otherwise
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public boolean isProductSite();
-
- /**
- * Indicates if the site is a private site.
- * This does not check if this private site belongs to the
- * product that is running.
- *
- * @return <code>true</code> if the site is a private site,
- * <code>false</code> otherwise
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public boolean isPrivateSite();
-
- /**
- * Indicates if the site has been linked by a native
- * installer.
- *
- * @return <code>true</code> if the site is a natively linked site,
- * <code>false</code> otherwise
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public boolean isNativelyLinked() throws CoreException;
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IConfiguredSiteChangedListener.java b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IConfiguredSiteChangedListener.java
deleted file mode 100644
index 813f6d4..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IConfiguredSiteChangedListener.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.eclipse.update.configuration;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import org.eclipse.update.core.IFeature;
-
-/**
- * Configuration change listener. *
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 2.0
- */
-public interface IConfiguredSiteChangedListener {
-
- /**
- * Indicates the specified feature was installed.
- *
- * @param feature the feature
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public void featureInstalled(IFeature feature);
-
- /**
- * Indicates the specified feature was removed (uninstalled)
- *
- * @param feature the feature
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public void featureRemoved(IFeature feature);
-
- /**
- * Indicates the specified feature was configured.
- *
- * @param feature the feature
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public void featureConfigured(IFeature feature);
-
- /**
- * Indicates the specified feature was unconfigured.
- *
- * @param feature the feature
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public void featureUnconfigured(IFeature feature);
-}
-
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IInstallConfiguration.java b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IInstallConfiguration.java
deleted file mode 100644
index a9099cf..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IInstallConfiguration.java
+++ /dev/null
@@ -1,229 +0,0 @@
-package org.eclipse.update.configuration;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import java.io.File;
-import java.util.Date;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-
-/**
- * Installation configuration.
- * Represents a specific configuration of a number of sites as a point
- * in time. Maintains a record of the specific activities that resulted
- * in this configuration. Current installation configuration is
- * the configuration the platform was started with.
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 2.0
- */
-public interface IInstallConfiguration extends IAdaptable {
-
- /**
- * Indicates if this is the current configuration
- *
- * @return <code>true</code> if this is the current configuration,
- * <code>false</code> otherwise
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public boolean isCurrent();
-
- /**
- * Return the sites that are part of this configuration.
- *
- * @return an array of configured sites, or an empty array.
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public IConfiguredSite[] getConfiguredSites();
-
- /**
- * Create a new installation site, based on a local file
- * system directory. Note, the site is not added to the
- * configuration as a result of this call.
- *
- * @param directory file directory
- * @return new site
- * @exception CoreException
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public IConfiguredSite createConfiguredSite(File directory) throws CoreException;
-
- /**
- * Create a new linked site, based on a local file
- * system directory. Note, the site is not added to the
- * configuration as a result of this call.
- * The linked site is only created if the directory is an
- * already existing extension site and if it is not already
- * natively linked to teh local site.
- *
- * @param directory file directory
- * @return new linked site
- * @exception CoreException
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public IConfiguredSite createLinkedConfiguredSite(File directory) throws CoreException;
-
- /**
- * Adds the specified site to this configuration.
- *
- * @param site new site
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public void addConfiguredSite(IConfiguredSite site);
-
- /**
- * Removes the specified site from this configuration.
- *
- * @param site site to remove
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public void removeConfiguredSite(IConfiguredSite site);
-
- /**
- * Adds a configuration change listener.
- *
- * @param listener the listener
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public void addInstallConfigurationChangedListener(IInstallConfigurationChangedListener listener);
-
- /**
- * Removes a configuration change listener.
- *
- * @param listener the listener
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public void removeInstallConfigurationChangedListener(IInstallConfigurationChangedListener listener);
-
- /**
- * Return the list of activities that resulted in this configuration.
- * There is always at least one activity
- *
- * @return an array of activities
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public IActivity[] getActivities();
-
- /**
- * Retrun the date the configuration was created.
- *
- * @return create date
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public Date getCreationDate();
-
- /**
- * Return the configuration label.
- *
- * @return the configuration label. If the configuration label was not
- * explicitly set, a default label is generated based on the creation
- * date
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public String getLabel();
-
- /**
- * Sets the configuration label.
- *
- * @param label the label
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public void setLabel(String label);
-
- /**
- * Returns an integer that represents a time stamp created at the beginning of a new configuration time line.
- * Time line is started when configuration state is created by a full file system reconciliation. All configurations
- * subsequently created will have the same time line until the next full reconciliation. Certain operations
- * (e.g. revert) make sense only between objects that belong to the same time line.
- *
- * @since 2.0.2
- * @return the time stamp of the full system reconciliation
- *
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public long getTimeline();
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IInstallConfigurationChangedListener.java b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IInstallConfigurationChangedListener.java
deleted file mode 100644
index d4a2e8d..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IInstallConfigurationChangedListener.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.eclipse.update.configuration;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-/**
- * Configuration change listener.
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 2.0
- */
-public interface IInstallConfigurationChangedListener {
-
- /**
- * Indicates the specified site was added to the configuration
- *
- * @param site the site
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- void installSiteAdded(IConfiguredSite site);
-
- /**
- * Indicates the specified site was removed from the configuration
- *
- * @param site the site
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- void installSiteRemoved(IConfiguredSite site);
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IInstallDeltaHandler.java b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IInstallDeltaHandler.java
deleted file mode 100644
index 61c5ea8..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IInstallDeltaHandler.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.eclipse.update.configuration;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-/**
- * Install Delta Handler.
- * Presents the changes the reconciler found to the user
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 2.0
- */
-public interface IInstallDeltaHandler{
-
- /**
- * Sets the list of session delta to present to the user
- *
- * @param deltas an Array of <code>ISessionDelta</code>
- * @see org.eclipse.update.configuration.ISesssionDelta
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public void init(ISessionDelta[] deltas);
-
- /**
- * Prompt the user to configure or unconfigure
- * new features found during reconciliation
- *
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public void open();
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ILocalSite.java b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ILocalSite.java
deleted file mode 100644
index ce97500..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ILocalSite.java
+++ /dev/null
@@ -1,262 +0,0 @@
-package org.eclipse.update.configuration;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.core.IFeature;
-
-/**
- * Local Site.
- * Represents the local installation. It consists of the current
- * configuration and the configuration history. A local site
- * manages the number of configuration histories kept. It also allows
- * specific configuration histories to be saved.
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 2.0
- */
-public interface ILocalSite extends IAdaptable {
-
- /**
- * Return the current configuration.
- *
- * @return current configuration
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- IInstallConfiguration getCurrentConfiguration();
-
- /**
- * Return configuration history.
- *
- * @return an array of configurations, or an empty array.
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public IInstallConfiguration[] getConfigurationHistory();
-
- /**
- * Reverts the local site to use the specified configuration.
- * The result of this operation is a new configuration that
- * contains the same configured features as the specified configuration.
- * The new configuration becomes the current configuration.
- *
- * @param configuration configuration state to revert to
- * @param monitor progress monitor
- * @param handler problem handler
- * @exception CoreException
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public void revertTo(
- IInstallConfiguration configuration,
- IProgressMonitor monitor,
- IProblemHandler handler)
- throws CoreException;
-
- /**
- * Creates a new configuration containing the same state as the
- * specified configuration. The new configuration is not added to
- * this lical site.
- *
- * @return cloned configuration
- * @exception CoreException
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public IInstallConfiguration cloneCurrentConfiguration() throws CoreException;
-
- /**
- * Adds the specified configuration to this local site.
- * The new configuration becomes the current one.
- *
- * @param config the configuration
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public void addConfiguration(IInstallConfiguration config);
-
- /**
- * Saves the local site state
- *
- * @exception CoreException
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public void save() throws CoreException;
-
- /**
- * Indicates how many configuration histories should be maintained.
- * Histories beyond the specified count are automatically deleted.
- *
- * @return number of past configurations to keep as history
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public int getMaximumHistoryCount();
-
- /**
- * Sets the number of past configurations to keep in history
- *
- * @param history number of configuration to keep
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public void setMaximumHistoryCount(int history);
-
- /**
- * Adds a site change listener
- *
- * @param listener the listener
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public void addLocalSiteChangedListener(ILocalSiteChangedListener listener);
-
- /**
- * Removes a site listener
- *
- * @param listener the listener
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public void removeLocalSiteChangedListener(ILocalSiteChangedListener listener);
-
- /**
- * Save the specified configuration. Saved configurations are
- * not deleted based on the history count. They must be explicitly
- * removed.
- *
- * @param configuration the configuration to save
- * @return the preserved configuration or <code>null</code> if the configuration to save is <code>null</code>
- * @exception CoreException
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public IInstallConfiguration addToPreservedConfigurations(IInstallConfiguration configuration)
- throws CoreException;
-
- /**
- * Removes the specified configuration from the list of previously
- * saved configurations.
- *
- * @param configuration the configuration to remove
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public void removeFromPreservedConfigurations(IInstallConfiguration configuration);
-
- /**
- * Return the list of saved configurations
- *
- * @return an array of configurations, or an empty array.
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public IInstallConfiguration[] getPreservedConfigurations();
-
- /**
- * Indicates if the 'state' of the specified feature and its children features.
- *
- * A feature is considered to be 'unhappy' in the context of this site,
- * if some of the plug-ins referenced by the feature, or any of its children,
- * are not installed on this site.
- *
- * A feature is considered to be 'happy' in the context of a local site
- * if all the plug-ins referenced by the feature, or any of its children,
- * are installed on the site and no other version of any of the plug-ins
- * are installed on any other site of the local site.
- *
- * A feature is considered to be 'ambiguous' in the context of a local site
- * if all the plug-ins referenced by the feature, or any of its children,
- * are installed on the site and other version of any of the plug-ins
- * are installed on any other site of the local site.
- *
- * @param feature the feature
- * @see IFeature#STATUS_HAPPY
- * @see IFeature#STATUS_UNHAPPY
- * @see IFeature#STATUS_AMBIGUOUS
- * @return the state of the feature
- * @exception CoreException
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public IStatus getFeatureStatus(IFeature feature) throws CoreException ;
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ILocalSiteChangedListener.java b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ILocalSiteChangedListener.java
deleted file mode 100644
index e51dbc3..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ILocalSiteChangedListener.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.eclipse.update.configuration;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-/**
- * Local site change listener.
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 2.0
- */
-public interface ILocalSiteChangedListener {
-
- /**
- * Indicates the current configuration has changed.
- *
- * @param configuration the current cunfiguration
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public void currentInstallConfigurationChanged(IInstallConfiguration configuration);
-
- /**
- * Indicates the specified configuration was removed.
- *
- * @param configuration the configuration
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public void installConfigurationRemoved(IInstallConfiguration configuration);
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ILocalSystemInfoListener.java b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ILocalSystemInfoListener.java
deleted file mode 100644
index 4416ac0..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ILocalSystemInfoListener.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.eclipse.update.configuration;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-
-
-/**
- * Local system change listener interface.
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @see LocalSystemInfo#addInfoListener(ILocalSystemInfoListener)
- * @see LocalSystemInfo#removeInfoListener(ILocalSystemInfoListener)
- * @see LocalSystemInfo#fireSystemInfoChanged(IVolume,int)
- * @since 2.0
- */
-public interface ILocalSystemInfoListener {
-
- /**
- * Volume change notification.
- * Called each time there are relevant volume changes
- * detected. This specifically includes changes to the
- * file system structure as a result of removable drive/ media
- * operations (eg. CD insertion), and changes to volume
- * mount structure.
- * @param volume volume of the changed file
- * system structure. Any current paths beyond
- * the specified 'root' file of the volume are assumed to be invalidated.
- * @param changeType type of the change that occured.
- * @see LocalSystemInfo#VOLUME_ADDED
- * @see LocalSystemInfo#VOLUME_REMOVED
- * @see LocalSystemInfo#VOLUME_CHANGED
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public void systemInfoChanged(IVolume volume, int changeType);
-}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IProblemHandler.java b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IProblemHandler.java
deleted file mode 100644
index 715cf58..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IProblemHandler.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.eclipse.update.configuration;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-/**
- * Generic problem handler. Used to report status from specific
- * install operations. The methods implemented by this interface
- * are callbacks from the update support to the caller of the update
- * methods.
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 2.0
- */
-public interface IProblemHandler {
-
- /**
- * Report problem.
- *
- * @param problemText problem text
- * @return <code>true</code> if the operation should continue,
- * <code>false</code> if the operation should be cancelled
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- boolean reportProblem(String problemText);
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ISessionDelta.java b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ISessionDelta.java
deleted file mode 100644
index b9939f5..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ISessionDelta.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package org.eclipse.update.configuration;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import java.util.Date;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.update.core.IFeatureReference;
-
-/**
- * Installation Change.
- * Represents the changes the reconciler found.
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @since 2.0
- */
-public interface ISessionDelta extends IAdaptable {
-
- /**
- * Indicates a processing type to enable the features
- *
- * @since 2.0
- * <p>
- * <b>Note:</b> This field is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public int ENABLE = 1;
-
- /**
- * Indicates a processing type to disable the features
- *
- * @since 2.0
- * <p>
- * <b>Note:</b> This field is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public int DISABLE = 2;
-
- /**
- * Returns the list of Features found during reconciliation
- *
- * @return an array of feature references, or an empty array
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public IFeatureReference[] getFeatureReferences();
-
- /**
- * Returns the date the reconciliation occured
- *
- * @return the date of the reconciliation
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public Date getDate();
-
- /**
- * Returns the type of the processing type
- * that will affect all the associated features.
- *
- * @return the processing type
- * @see ISessionDelta#ENABLE
- * @see ISessionDelta#DISABLE
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public int getType();
-
- /**
- * Process all the feature references of the
- * Session Delta.
- * Removes the Session Delta from the file system after processing it.
- *
- * @param progressMonitor the progress monitor
- * @throws CoreException if an error occurs.
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public void process(IProgressMonitor progressMonitor) throws CoreException;
-
- /**
- * Removes the Session Delta from the file system without processing it.
- *
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public void delete();
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IVolume.java b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IVolume.java
deleted file mode 100644
index d9572e2..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IVolume.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package org.eclipse.update.configuration;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import java.io.File;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-/**
- * Local Volume Info.
- * Represents local file system information for a specific volume.
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @see org.eclipse.update.configuration.LocalSystemInfo
- * @since 2.0
- */
-public interface IVolume extends IAdaptable {
-
- /**
- * Returns the available free space on this volume.
- * Returns the amount of free space available to this
- * user on the volume. The
- * method takes into account any space quotas or other
- * native mechanisms that may restrict space usage
- * on a given volume.
- * @return the amount of free space available (in units
- * of Kbyte), or an indication the size is not known
- * @see LocalSystemInfo#SIZE_UNKNOWN
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public long getFreeSpace();
-
- /**
- * returns volume label.
- * Returns the label of the volume.
- * @return volume label (as string), or <code>null</code> if
- * the label cannot be determined.
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public String getLabel();
-
- /**
- * Returns volume type.
- * Returns the type of the volume.
- * @return volume type
- * @see LocalSystemInfo#VOLUME_UNKNOWN
- * @see LocalSystemInfo#VOLUME_INVALID_PATH
- * @see LocalSystemInfo#VOLUME_REMOVABLE
- * @see LocalSystemInfo#VOLUME_FIXED
- * @see LocalSystemInfo#VOLUME_REMOTE
- * @see LocalSystemInfo#VOLUME_CDROM
- * @see LocalSystemInfo#VOLUME_FLOPPY_3
- * @see LocalSystemInfo#VOLUME_FLOPPY_5
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public int getType();
-
- /**
- * Returns the volume path.
- * Returns the path that represents the mount point of the volume.
- * @return mount point file
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public File getFile();
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/LocalSystemInfo.java b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/LocalSystemInfo.java
deleted file mode 100644
index d97f02c..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/LocalSystemInfo.java
+++ /dev/null
@@ -1,436 +0,0 @@
-package org.eclipse.update.configuration;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import java.io.File;
-import java.util.ArrayList;
-
-import org.eclipse.update.internal.core.UpdateManagerPlugin;
-import org.eclipse.update.internal.core.Volume;
-
-/**
- * Utility class providing local file system information.
- * The class attempts to load a native library implementation
- * of its methods. If successful, the method calls are delegated
- * to the native implementation. Otherwise a default non-native
- * implementation is used. *
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- * @see ILocalSystemInfoListener
- * @since 2.0
- */
-public class LocalSystemInfo {
-
- /**
- * Indicates the amount of available free space is not known
- *
- * @see LocalSystemInfo#getFreeSpace(File)
- * @since 2.0
- * <p>
- * <b>Note:</b> This field is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public static final long SIZE_UNKNOWN = -1;
-
- /**
- * Indicates the volume type is not known
- *
- * @see LocalSystemInfo#getType(File)
- * @since 2.0
- * <p>
- * <b>Note:</b> This field is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public static final int VOLUME_UNKNOWN = -1;
-
- /**
- * Indicates the volume could not be determined from path
- *
- * @see LocalSystemInfo#getType(File)
- * @since 2.0
- * <p>
- * <b>Note:</b> This field is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public static final int VOLUME_INVALID_PATH = -2;
-
- /**
- * Indicates the volume is removable (other than floppy disk)
- *
- * @see LocalSystemInfo#getType(File)
- * @since 2.0
- * <p>
- * <b>Note:</b> This field is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public static final int VOLUME_REMOVABLE = 1;
-
- /**
- * Indicates the volume is fixed (hard drive)
- *
- * @see LocalSystemInfo#getType(File)
- * @since 2.0
- * <p>
- * <b>Note:</b> This field is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public static final int VOLUME_FIXED = 2;
-
- /**
- * Indicates a remote (network) volume
- *
- * @see LocalSystemInfo#getType(File)
- * @since 2.0
- * <p>
- * <b>Note:</b> This field is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public static final int VOLUME_REMOTE = 3;
-
- /**
- * Indicates a cdrom volume (compact disc)
- *
- * @see LocalSystemInfo#getType(File)
- * @since 2.0
- * <p>
- * <b>Note:</b> This field is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public static final int VOLUME_CDROM = 4;
-
- /**
- * Indicates a ramdisk volume (memory)
- *
- * @see LocalSystemInfo#getType(File)
- * @since 2.0
- * <p>
- * <b>Note:</b> This field is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public static final int VOLUME_RAMDISK = 5;
-
- /**
- * Indicates the volume is removable (floppy disk 5 1/4)
- *
- * @see LocalSystemInfo#getType(File)
- * @since 2.0
- * <p>
- * <b>Note:</b> This field is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public static final int VOLUME_FLOPPY_5 = 6;
-
- /**
- * Indicates the volume is removable (floppy disk 3 1/2)
- *
- * @see LocalSystemInfo#getType(File)
- * @since 2.0
- * <p>
- * <b>Note:</b> This field is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public static final int VOLUME_FLOPPY_3 = 7;
-
- /**
- * Indicates a new volume has been added
- *
- * @see LocalSystemInfo#addInfoListener(File)
- * @see LocalSystemInfo#removeInfoListener(File)
- * @since 2.0
- * <p>
- * <b>Note:</b> This field is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public static final int VOLUME_ADDED = 0;
-
- /**
- * Indicates a volume has been removed
- *
- * @see LocalSystemInfo#addInfoListener(File)
- * @see LocalSystemInfo#removeInfoListener(File)
- * @since 2.0
- * <p>
- * <b>Note:</b> This field is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public static final int VOLUME_REMOVED = 1;
-
- /**
- * Indicates a volume has been changed
- *
- * @see LocalSystemInfo#addInfoListener(File)
- * @see LocalSystemInfo#removeInfoListener(File)
- * @since 2.0
- * <p>
- * <b>Note:</b> This field is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public static final int VOLUME_CHANGED = 2;
-
-
- private static ArrayList listeners = new ArrayList();
- private static boolean hasNatives = false;
- static {
- try {
- System.loadLibrary("update"); //$NON-NLS-1$
- hasNatives = true;
- } catch (UnsatisfiedLinkError e) {
- UpdateManagerPlugin.warn("Unable to load native library 'update'."); //$NON-NLS-1$
- hasNatives = false;
- }
- }
-
- /**
- * Determines available free space on a volume.
- * Returns the amount of free space available to this
- * user on the volume containing the specified path. The
- * method takes into account any space quotas or other
- * native mechanisms that may restrict space usage
- * on a given volume.
- * @param path file path. May contain path elements beyond
- * the volume "root"
- * @return the amount of free space available (in units
- * of Kbyte), or an indication the size is not known
- * @see LocalSystemInfo#SIZE_UNKNOWN
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public static long getFreeSpace(File path) {
- if (hasNatives) {
- try {
- long bytes = nativeGetFreeSpace(path);
- return (bytes!=0)?bytes/1024:0;
- } catch (UnsatisfiedLinkError e) {
- }
- }
- return SIZE_UNKNOWN;
- }
-
-
- /**
- * Lists the file system volume.
- * @return array of volume representing mount
- * points, or <code>null</code> if none found
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public static IVolume[] getVolumes() {
- String[] mountPoints = listMountPoints();
- Volume[] vol = new Volume[0];
- if (mountPoints!=null){
- vol = new Volume[mountPoints.length];
- for (int i = 0; i < mountPoints.length; i++) {
- File root = new File(mountPoints[i]);
- String label = getLabel(root);
- int type = getType(root);
- long size = getFreeSpace(root);
- vol[i] = new Volume(root,label,type,size);
- vol[i].markReadOnly();
- }
- } else {
- UpdateManagerPlugin.warn("Unable to find mount points");
- // fallback
- File [] roots = File.listRoots();
- if (roots.length == 1) {
- // just one root - skip it
- File root = roots[0];
- roots = root.listFiles();
- }
- vol = new Volume[roots.length];
- for (int i = 0; i < roots.length; i++) {
- vol[i] = new Volume(roots[i],null,LocalSystemInfo.VOLUME_UNKNOWN,LocalSystemInfo.SIZE_UNKNOWN);
- vol[i].markReadOnly();
- }
- }
- return vol;
- }
-
-
- /**
- * Add local system change listener.
- * Allows a listener to be added for monitoring changes
- * in the local system information. The listener is notified
- * each time there are relevant volume changes
- * detected. This specifically includes changes to the
- * list of volumes as a result of removable drive/ media
- * operations (eg. CD insertion, removal), and changes to volume
- * mount structure.
- * @param listener change listener
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public static void addInfoListener(ILocalSystemInfoListener listener) {
- if (!listeners.contains(listener))
- listeners.add(listener);
- }
-
- /**
- * Remove local system change listener
- * @param listener change listener
- * @since 2.0
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public static void removeInfoListener(ILocalSystemInfoListener listener) {
- listeners.remove(listener);
- }
-
- /**
- * Notify listeners of change.
- *
- * @param volume the volume representing the
- * change file system structure. Any current paths beyond
- * the specified "root" file of the volume are assumed to be invalidated.
- * @param changeType type of the change that occured.
- * @see LocalSystemInfo#VOLUME_ADDED
- * @see LocalSystemInfo#VOLUME_REMOVED
- * @see LocalSystemInfo#VOLUME_CHANGED
- * <p>
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * </p>
- */
- public static void fireSystemInfoChanged(IVolume volume, int changeType) {
- for (int i=0; i< listeners.size(); i++) {
- ((ILocalSystemInfoListener)listeners.get(i)).systemInfoChanged(volume,changeType);
- }
- }
-
- /*
- * Determines volume label.
- * Returns the label of the volume containing the specified
- * path.
- * @param path file path. May contain path elements beyond
- * the volume "root"
- * @return volume label (as string), or <code>null</code> if
- * the label cannot be determined.
- * @since 2.0
- */
- private static String getLabel(File path) {
- if (hasNatives) {
- try {
- return nativeGetLabel(path);
- } catch (UnsatisfiedLinkError e) {
- }
- }
- return null;
- }
-
- /*
- * Determines volume type.
- * Returns the type of the volume containing the specified
- * path.
- * @param path file path. May contain path elements beyond
- * the volume "root"
- * @return volume type
- * @see LocalSystemInfo#VOLUME_UNKNOWN
- * @see LocalSystemInfo#VOLUME_INVALID_PATH
- * @see LocalSystemInfo#VOLUME_REMOVABLE
- * @see LocalSystemInfo#VOLUME_FIXED
- * @see LocalSystemInfo#VOLUME_REMOTE
- * @see LocalSystemInfo#VOLUME_CDROM
- * @see LocalSystemInfo#VOLUME_FLOPPY_3
- * @see LocalSystemInfo#VOLUME_FLOPPY_5
- * @since 2.0
- */
- private static int getType(File path) {
- if (hasNatives) {
- try {
- return nativeGetType(path);
- } catch (UnsatisfiedLinkError e) {
- }
- }
- return VOLUME_UNKNOWN;
- }
-
- /*
- * Lists the file system mount points.
- * @return array of absolute file paths representing mount
- * points, or <code>null</code> if none found
- * @since 2.0
- */
- private static String[] listMountPoints() {
- if (hasNatives) {
- try {
- String[] mountPoints = nativeListMountPoints();
- return mountPoints;
- } catch (UnsatisfiedLinkError e) {
- }
- }
- return null;
- }
-
- /*
- * Native implementations.
- */
- private static native long nativeGetFreeSpace(File path);
- private static native String nativeGetLabel(File path);
- private static native int nativeGetType(File path);
- private static native String[] nativeListMountPoints();
-}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/package.html b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/package.html
deleted file mode 100644
index e76be03..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/package.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <meta name="Author" content="IBM">
- <meta name="GENERATOR" content="Mozilla/4.72 [en] (Windows NT 5.0; U) [Netscape]">
- <title>Package-level Javadoc</title>
-</head>
-<body>
-Provides support for accessing local installation
-information.
-<h2>
-Package Specification</h2>
-This package contains interfaces for accessing and manipulating the local
-system installation and configuration information. In general, users extending
-the update support by writing additional feature and site implementation
-do not need to make use of interfaces defined in this package.
-<p>
-<b>Note:</b> This package is part of an interim API that is still under development and expected to
-change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-(repeatedly) as the API evolves.
-</p>
-</body>
-</html>
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/ArchiveReference.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/ArchiveReference.java
deleted file mode 100644
index 2f8f0bd..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/ArchiveReference.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import org.eclipse.update.core.model.ArchiveReferenceModel;
-
-/**
- * Convenience implementation of a site archive.
- * <p>
- * This class may be instantiated or subclassed by clients.
- * </p>
- * @see org.eclipse.update.core.IArchiveReference
- * @see org.eclipse.update.core.model.ArchiveReferenceModel
- * @since 2.0
- */
-public class ArchiveReference
- extends ArchiveReferenceModel
- implements IArchiveReference {
-
- /**
- * Constructor for ArchiveReference
- * @since 2.0
- */
- public ArchiveReference() {
- super();
- }
-
- /**
- * @see Object#toString()
- * @since 2.0
- */
- public String toString() {
- String result = "IArchiveReference: "; //$NON-NLS-1$
- result =
- result
- + ((getPath() == null)
- ? getURL().toExternalForm()
- : getPath() + " : " + getURL().toExternalForm());
- //$NON-NLS-1$
- return result;
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/BaseFeatureFactory.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/BaseFeatureFactory.java
deleted file mode 100644
index 5deda8d..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/BaseFeatureFactory.java
+++ /dev/null
@@ -1,148 +0,0 @@
-package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import java.io.IOException;
-import java.net.*;
-import java.util.*;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.update.core.model.*;
-import org.eclipse.update.internal.core.UpdateManagerPlugin;
-import org.eclipse.update.internal.core.UpdateManagerUtils;
-
-/**
- * Base implementation of a feature factory.
- * The factory is responsible for constructing the correct
- * concrete implementation of the model objects for each particular
- * feature type. This class creates model objects that correspond
- * to the concrete implementation classes provided in this package.
- * The actual feature creation method is subclass responsibility.
- * <p>
- * This class must be subclassed by clients.
- * </p>
- * @see org.eclipse.update.core.IFeatureFactory
- * @see org.eclipse.update.core.model.FeatureModelFactory
- * @since 2.0
- */
-public abstract class BaseFeatureFactory
- extends FeatureModelFactory
- implements IFeatureFactory {
-
- /**
- * Create feature. Implementation of this method must be provided by
- * subclass
- *
- * @see IFeatureFactory#createFeature(URL,ISite)
- * @since 2.0
- */
- public abstract IFeature createFeature(URL url, ISite site)
- throws CoreException;
-
- /**
- * Helper method to access resouce bundle for feature. The default
- * implementation attempts to load the appropriately localized
- * feature.properties file.
- *
- * @param url base URL used to load the resource bundle.
- * @return resource bundle, or <code>null</code>.
- * @since 2.0
- */
- protected ResourceBundle getResourceBundle(URL url)
- throws IOException, CoreException {
-
- if (url == null)
- return null;
-
- ResourceBundle bundle = null;
- try {
- url = UpdateManagerUtils.asDirectoryURL(url);
- ClassLoader l = new URLClassLoader(new URL[] { url }, null);
- bundle = ResourceBundle.getBundle(Feature.FEATURE_FILE, Locale.getDefault(), l);
- } catch (MissingResourceException e) {
- UpdateManagerPlugin.warn(e.getLocalizedMessage() + ":" + url.toExternalForm()); //$NON-NLS-1$
- } catch (MalformedURLException e) {
- UpdateManagerPlugin.warn(e.getLocalizedMessage()); //$NON-NLS-1$
- }
- return bundle;
- }
-
- /**
- * Create a concrete implementation of feature model.
- *
- * @see Feature
- * @return feature model
- * @since 2.0
- */
- public FeatureModel createFeatureModel() {
- return new Feature();
- }
-
- /**
- * Create a concrete implementation of included feature reference model.
- *
- * @see IncludedFeatureReference
- * @return feature model
- * @since 2.1
- */
- public IncludedFeatureReferenceModel createIncludedFeatureReferenceModel() {
- return new IncludedFeatureReference();
- }
-
- /**
- * Create a concrete implementation of install handler model.
- *
- * @see InstallHandlerEntry
- * @return install handler entry model
- * @since 2.0
- */
- public InstallHandlerEntryModel createInstallHandlerEntryModel() {
- return new InstallHandlerEntry();
- }
-
- /**
- * Create a concrete implementation of import dependency model.
- *
- * @see Import
- * @return import dependency model
- * @since 2.0
- */
- public ImportModel createImportModel() {
- return new Import();
- }
-
- /**
- * Create a concrete implementation of plug-in entry model.
- *
- * @see PluginEntry
- * @return plug-in entry model
- * @since 2.0
- */
- public PluginEntryModel createPluginEntryModel() {
- return new PluginEntry();
- }
-
- /**
- * Create a concrete implementation of non-plug-in entry model.
- *
- * @see NonPluginEntry
- * @return non-plug-in entry model
- * @since 2.0
- */
- public NonPluginEntryModel createNonPluginEntryModel() {
- return new NonPluginEntry();
- }
-
- /**
- * Create a concrete implementation of annotated URL model.
- *
- * @see URLEntry
- * @return annotated URL model
- * @since 2.0
- */
- public URLEntryModel createURLEntryModel() {
- return new URLEntry();
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/BaseInstallHandler.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/BaseInstallHandler.java
deleted file mode 100644
index 490dec7..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/BaseInstallHandler.java
+++ /dev/null
@@ -1,239 +0,0 @@
-package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import org.eclipse.core.runtime.CoreException;
-
-/**
- * Base implementation of an install handler.
- * This is a convenience implementation of an install handler with
- * null implementation of its methods. It allows subclasses to selectively
- * implement only the methods required for their installation tasks.
- * <p>
- * This class should be subclassed by clients.
- * </p>
- * @see org.eclipse.update.core.IInstallHandler
- * @since 2.0
- */
-
-public class BaseInstallHandler implements IInstallHandler {
-
- /**
- * Update action type
- *
- * @see IInstallHandler#HANDLER_ACTION_INSTALL
- * @see IInstallHandler#HANDLER_ACTION_CONFIGURE
- * @see IInstallHandler#HANDLER_ACTION_UNCONFIGURE
- * @see IInstallHandler#HANDLER_ACTION_UNINSTALL
- * @since 2.0
- */
- protected int type;
-
- /**
- * The target of the action
- * @since 2.0
- */
- protected IFeature feature;
-
- /**
- * Model entry that defines this handler
- *
- * @since 2.0
- */
- protected IInstallHandlerEntry entry;
-
- /**
- * Optional progress monitor, can be <code>null</code>
- *
- * @since 2.0
- */
- protected InstallMonitor monitor;
-
- /**
- * Plug-in entries downloaded
- *
- * @see IInstallHandler#HANDLER_ACTION_INSTALL
- * @since 2.0
- */
- protected IPluginEntry[] pluginEntries;
-
- /**
- * Non-plug-in entries downloaded
- *
- * @see IInstallHandler#HANDLER_ACTION_INSTALL
- * @since 2.0
- */
- protected INonPluginEntry[] nonPluginEntries;
-
- /**
- * Indicates if handler has been initialized
- *
- * @since 2.0
- */
- protected boolean initialized = false;
-
- /**
- * Initialize the install handler.
- *
- * @see IInstallHandler#initialize(int, IFeature, IInstallHandlerEntry, InstallMonitor)
- * @since 2.0
- */
- public void initialize(
- int type,
- IFeature feature,
- IInstallHandlerEntry entry,
- InstallMonitor monitor)
- throws CoreException {
-
- if (this.initialized)
- return;
- else {
- if (feature == null)
- throw new IllegalArgumentException();
- this.type = type;
- this.feature = feature;
- this.entry = entry;
- this.monitor = monitor;
- this.initialized = true;
- }
- }
-
- /**
- * Called at the start of the install action.
- *
- * @see IInstallHandler#installInitiated
- * @since 2.0
- */
- public void installInitiated() throws CoreException {
- }
-
- /**
- * Called after files corresponding to plug-in entries have been downloaded,
- * but before they are actully unpacked and installed.
- *
- * @see IInstallHandler#pluginsDownloaded(IPluginEntry[])
- * @since 2.0
- */
- public void pluginsDownloaded(IPluginEntry[] plugins) throws CoreException {
-
- this.pluginEntries = plugins;
- }
-
- /**
- * Called after files corresponding to non-plug-in entries have been
- * downloaded.
- *
- * @see IInstallHandler#nonPluginDataDownloaded(INonPluginEntry[], IVerificationListener)
- * @since 2.0
- */
- public void nonPluginDataDownloaded(
- INonPluginEntry[] nonPluginData,
- IVerificationListener listener)
- throws CoreException {
-
- this.nonPluginEntries = nonPluginData;
- }
-
- /**
- * Called after the feature files and any downloaded plug-ins have
- * been installed.
- *
- * @see IInstallHandler#pluginsInstalled(IFeatureContentConsumer)
- * @since 2.0
- */
- public void completeInstall(IFeatureContentConsumer consumer)
- throws CoreException {
- }
-
- /**
- * Called at the end of the install action.
- *
- * @see IInstallHandler#installCompleted(boolean)
- * @since 2.0
- */
- public void installCompleted(boolean success) throws CoreException {
- }
-
- /**
- * Called at the start of the configure action.
- *
- * @see IInstallHandler#configureInitiated()
- * @since 2.0
- */
- public void configureInitiated() throws CoreException {
- }
-
- /**
- * Called after the feature has been configured.
- *
- * @see IInstallHandler#completeConfigure()
- * @since 2.0
- */
- public void completeConfigure() throws CoreException {
- }
-
- /**
- * Called at the end of the configure action.
- *
- * @see IInstallHandler#configureCompleted(boolean)
- * @since 2.0
- */
- public void configureCompleted(boolean success) throws CoreException {
- }
-
- /**
- * Called at the start of the unconfigure action.
- *
- * @see IInstallHandler#unconfigureInitiated()
- * @since 2.0
- */
- public void unconfigureInitiated() throws CoreException {
- }
-
- /**
- * Called after the feature has been unconfigured.
- *
- * @see IInstallHandler#completeUnconfigure()
- * @since 2.0
- */
- public void completeUnconfigure() throws CoreException {
- }
-
- /**
- * Called at the end of the unconfigure action.
- *
- * @see IInstallHandler#unconfigureCompleted(boolean)
- * @since 2.0
- */
- public void unconfigureCompleted(boolean success) throws CoreException {
- }
-
- /**
- * Called at the start of the uninstall action.
- *
- * @see IInstallHandler#uninstallInitiated()
- * @since 2.0
- */
- public void uninstallInitiated() throws CoreException {
- }
-
- /**
- * Called after the feature has been uninstalled.
- *
- * @see IInstallHandler#completeUninstall()
- * @since 2.0
- */
- public void completeUninstall() throws CoreException {
- }
-
- /**
- * Called at the end of the uninstall action.
- *
- * @see IInstallHandler#uninstallCompleted(boolean)
- * @since 2.0
- */
- public void uninstallCompleted(boolean success) throws CoreException {
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/BaseSiteFactory.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/BaseSiteFactory.java
deleted file mode 100644
index 080614b..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/BaseSiteFactory.java
+++ /dev/null
@@ -1,140 +0,0 @@
-package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.*;
-import java.util.*;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.update.core.model.*;
-import org.eclipse.update.internal.core.*;
-
-/**
- * Base implementation of a site factory.
- * The factory is responsible for constructing the correct
- * concrete implementation of the model objects for each particular
- * site type. This class creates model objects that correspond
- * to the concrete implementation classes provided in this package.
- * The actual site creation method is subclass responsibility.
- * <p>
- * This class must be subclassed by clients.
- * </p>
- * @see org.eclipse.update.core.ISiteFactory
- * @see org.eclipse.update.core.model.SiteModelFactory
- * @since 2.0
- */
-public abstract class BaseSiteFactory extends SiteModelFactory implements ISiteFactory {
-
- //
- private URLConnection connection = null;
- private IOException exception = null;
-
- /**
- * Create site. Implementation of this method must be provided by
- * subclass
- *
- * @see ISiteFactory#createSite(URL)
- * @since 2.0
- */
- public abstract ISite createSite(URL url) throws CoreException, InvalidSiteTypeException;
-
- /**
- * Helper method to access resouce bundle for site. The default
- * implementation attempts to load the appropriately localized
- * site.properties file.
- *
- * @param url base URL used to load the resource bundle.
- * @return resource bundle, or <code>null</code>.
- * @since 2.0
- */
- protected ResourceBundle getResourceBundle(URL url) {
- ResourceBundle bundle = null;
-
- try {
- url = UpdateManagerUtils.asDirectoryURL(url);
- ClassLoader l = new URLClassLoader(new URL[] { url }, null);
- bundle = ResourceBundle.getBundle(Site.SITE_FILE, Locale.getDefault(), l);
- } catch (MissingResourceException e) {
- UpdateManagerPlugin.warn(e.getLocalizedMessage() + ":" + url.toExternalForm()); //$NON-NLS-1$
- } catch (MalformedURLException e) {
- UpdateManagerPlugin.warn(Policy.bind("BaseSiteFactory.CannotRetriveParentDirectory", url.toExternalForm())); //$NON-NLS-1$
- }
-
- return bundle;
- }
-
- /**
- * Create a concrete implementation of site model.
- *
- * @see Site
- * @return site model
- * @since 2.0
- */
- public SiteModel createSiteMapModel() {
- return new Site();
- }
-
-
- /**
- * Create a concrete implementation of feature reference model.
- *
- * @see FeatureReference
- * @return feature reference model
- * @since 2.0
- */
- public SiteFeatureReferenceModel createFeatureReferenceModel() {
- return new SiteFeatureReference();
- }
-
- /**
- * Create a concrete implementation of archive reference model.
- *
- * @see ArchiveReference
- * @return archive reference model
- * @since 2.0
- */
- public ArchiveReferenceModel createArchiveReferenceModel() {
- return new ArchiveReference();
- }
-
-
- /**
- * Create a concrete implementation of annotated URL model.
- *
- * @see URLEntry
- * @return annotated URL model
- * @since 2.0
- */
- public URLEntryModel createURLEntryModel() {
- return new URLEntry();
- }
-
-
- /**
- * Create a concrete implementation of category model.
- *
- * @see Category
- * @return category model
- * @since 2.0
- */
- public CategoryModel createSiteCategoryModel() {
- return new Category();
- }
-
- /**
- * Open a stream on a URL.
- * manages a time out if the connection is locked or fails
- *
- * @param resolvedURL
- * @return InputStream
- */
- protected InputStream openStream(URL resolvedURL) throws IOException {
- Response response = UpdateManagerPlugin.getPlugin().get(resolvedURL);
- return response.getInputStream();
- }
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/Category.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/Category.java
deleted file mode 100644
index 4ef4dfd..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/Category.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import org.eclipse.update.core.model.CategoryModel;
-
-/**
- * Convenience implementation of feature category definition.
- * <p>
- * This class may be instantiated or subclassed by clients.
- * </p>
- * @see org.eclipse.update.core.ICategory
- * @see org.eclipse.update.core.model.CategoryModel
- * @since 2.0
- */
-public class Category extends CategoryModel implements ICategory {
-
- /**
- * Default Constructor
- */
- public Category() {
- }
-
- /**
- * Constructor
- */
- public Category(String name, String label) {
- setName(name);
- setLabel(label);
- }
-
- /**
- * Retrieve the detailed category description
- * @see ICategory#getDescription()
- */
- public IURLEntry getDescription() {
- return (IURLEntry) getDescriptionModel();
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/ContentReference.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/ContentReference.java
deleted file mode 100644
index 2acac58..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/ContentReference.java
+++ /dev/null
@@ -1,239 +0,0 @@
-package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import java.io.*;
-import java.net.URL;
-
-import org.eclipse.update.internal.core.*;
-
-/**
- * Content reference implements a general access wrapper
- * to feature and site content. The reference specifies
- * a "symbolic" path identifier for the content, and the actual
- * reference as a file, or a URL.
- * <p>
- * This class may be instantiated or subclassed by clients.
- * </p>
- * @see org.eclipse.update.core.JarContentReference
- * @see org.eclipse.update.core.JarEntryContentReference
- * @since 2.0
- */
-public class ContentReference {
-
- /**
- * Unknown size indication
- * @since 2.0
- */
- public static final long UNKNOWN_SIZE = -1;
-
- /**
- * Default executable permission when installing a content reference
- * Will add executable bit if necessary
- *
- * @since 2.0.1
- */
- public static final int DEFAULT_EXECUTABLE_PERMISSION = -1;
-
- private static final String FILE_URL_PROTOCOL = "file"; //$NON-NLS-1$
-
- private String id;
- private URL url; // reference is either URL reference *OR*
- private File file; // local file reference
- private Response response;
- private int permission;
-
- /*
- * do not allow default contruction
- */
- private ContentReference() {
- }
-
- /**
- * Create content reference from URL.
- *
- * @param id "symbolic" path identifier
- * @param url actual referenced URL
- * @since 2.0
- */
- public ContentReference(String id, URL url) {
- this.id = (id == null ? "" : id); //$NON-NLS-1$
- this.url = url; // can be null
- this.file = null;
- }
-
- /**
- * Create content reference from file.
- *
- * @param id "symbolic" path identifier
- * @param file actual referenced file
- * @since 2.0
- */
- public ContentReference(String id, File file) {
- this.id = (id == null ? "" : id); //$NON-NLS-1$
- this.file = file; // can be null
- this.url = null;
- }
-
- /**
- * A factory method to create a content reference of
- * the same type.
- *
- * @param id "symbolic" path identifier
- * @param file actual referenced file
- * @return content reference of the same type
- * @since 2.0
- */
- public ContentReference createContentReference(String id, File file) {
- return new ContentReference(id, file);
- }
-
- /**
- * Retrieves the "symbolic" path identifier for the reference.
- *
- * @return "symbolic" path identifier
- * @since 2.0
- */
- public String getIdentifier() {
- return id;
- }
-
- /**
- * Creates an input stream for the reference.
- *
- * @return input stream
- * @exception IOException unable to create stream
- * @since 2.0
- */
- public InputStream getInputStream() throws IOException {
- if (file != null)
- return new FileInputStream(file);
- else if (url != null) {
- if (response == null) {
- URL resolvedURL = URLEncoder.encode(url);
- response = UpdateManagerPlugin.getPlugin().get(resolvedURL);
- UpdateManagerUtils.checkConnectionResult(response,resolvedURL);
- }
- return response.getInputStream();
- } else
- throw new IOException(Policy.bind("ContentReference.UnableToCreateInputStream", this.toString())); //$NON-NLS-1$
- }
-
- /**
- * Returns the size of the referenced input, if it can be determined.
- *
- * @return input size, or @see #UNKNOWN_SIZE if size cannot be determined.
- * @since 2.0
- */
- public long getInputSize() throws IOException {
- if (file != null)
- return file.length();
- else if (url != null) {
- if (response == null) {
- URL resolvedURL = null;
- try {
- resolvedURL = URLEncoder.encode(url);
- response = UpdateManagerPlugin.getPlugin().get(resolvedURL);
- } catch (IOException e) {
- return ContentReference.UNKNOWN_SIZE;
- }
- UpdateManagerUtils.checkConnectionResult(response,resolvedURL);
- }
- long size = response.getContentLength();
- return size == -1 ? ContentReference.UNKNOWN_SIZE : size;
- } else
- return ContentReference.UNKNOWN_SIZE;
- }
-
- /**
- * Indicates whether the reference is a local file reference.
- *
- * @return <code>true</code> if the reference is local,
- * otherwise <code>false</code>
- * @since 2.0
- */
- public boolean isLocalReference() {
- if (file != null)
- return true;
- else if (url != null)
- return FILE_URL_PROTOCOL.equals(url.getProtocol());
- else
- return false;
- }
-
- /**
- * Returns the content reference as a file. Note, that this method
- * <b>does not</b> cause the file to be downloaded if it
- * is not already local.
- *
- * @return reference as file
- * @exception IOException reference cannot be returned as file
- * @since 2.0
- */
- public File asFile() throws IOException {
- if (file != null)
- return file;
-
- if (url != null && FILE_URL_PROTOCOL.equals(url.getProtocol())) {
- File result = new File(url.getFile());
- if (result.exists())
- return result;
- else
- throw new IOException(Policy.bind("ContentReference.FileDoesNotExist", this.toString())); //$NON-NLS-1$
- }
-
- throw new IOException(Policy.bind("ContentReference.UnableToReturnReferenceAsFile", this.toString())); //$NON-NLS-1$
- }
-
- /**
- * Returns the content reference as a URL.
- *
- * @return reference as URL
- * @exception IOException reference cannot be returned as URL
- * @since 2.0
- */
- public URL asURL() throws IOException {
- if (url != null)
- return url;
-
- if (file != null)
- return file.toURL();
-
- throw new IOException(Policy.bind("ContentReference.UnableToReturnReferenceAsURL", this.toString())); //$NON-NLS-1$
- }
-
- /**
- * Return string representation of this reference.
- *
- * @return string representation
- * @since 2.0
- */
- public String toString() {
- if (file != null)
- return file.getAbsolutePath();
- else
- return url.toExternalForm();
- }
- /**
- * Returns the permission for this file.
- *
- * @return the content reference permission
- * @see DEFAULT_PERMISSION
- * @since 2.0.1
- */
- public int getPermission() {
- return permission;
- }
-
- /**
- * Sets the permission of this content reference.
- *
- * @param permission The permission to set
- */
- public void setPermission(int permission) {
- this.permission = permission;
- }
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/Feature.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/Feature.java
deleted file mode 100644
index b839b0a..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/Feature.java
+++ /dev/null
@@ -1,963 +0,0 @@
-package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import java.io.IOException;
-import java.net.*;
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.core.model.*;
-import org.eclipse.update.internal.core.*;
-
-/**
- * Convenience implementation of a feature.
- * <p>
- * This class may be instantiated or subclassed by clients.
- * </p>
- * @see org.eclipse.update.core.IFeature
- * @see org.eclipse.update.core.model.FeatureModel
- * @since 2.0
- */
-public class Feature extends FeatureModel implements IFeature {
-
- /**
- * Simple file name of the default feature manifest file
- * @since 2.0
- */
- public static final String FEATURE_FILE = "feature"; //$NON-NLS-1$
-
- /**
- * File extension of the default feature manifest file
- * @since 2.0
- */
- public static final String FEATURE_XML = FEATURE_FILE + ".xml"; //$NON-NLS-1$
-
- private ISite site; // feature site
- private IFeatureContentProvider featureContentProvider; // content provider
- private List /*of IFeatureReference*/
- includedFeatureReferences;
-
- /**
- * Feature default constructor
- *
- * @since 2.0
- */
- public Feature() {
- }
-
- /**
- * Compares two features for equality
- *
- * @param object feature object to compare with
- * @return <code>true</code> if the two features are equal,
- * <code>false</code> otherwise
- * @since 2.0
- */
- public boolean equals(Object object) {
- if (!(object instanceof IFeature))
- return false;
- IFeature f = (IFeature) object;
- return getVersionedIdentifier().equals(f.getVersionedIdentifier());
- }
-
- /**
- * Returns the feature identifier.
- *
- * @see IFeature#getVersionedIdentifier()
- * @since 2.0
- */
- public VersionedIdentifier getVersionedIdentifier() {
- return new VersionedIdentifier(getFeatureIdentifier(), getFeatureVersion());
- }
-
- /**
- * Returns the site this feature is associated with.
- *
- * @see IFeature#getSite()
- * @since 2.0
- */
- public ISite getSite() {
- return site;
- }
-
- /**
- * Returns the feature URL.
- *
- * @see IFeature#getURL()
- * @since 2.0
- */
- public URL getURL() {
- IFeatureContentProvider contentProvider = null;
- try {
- contentProvider = getFeatureContentProvider();
- } catch (CoreException e) {
- UpdateManagerPlugin.warn("No content Provider", e);
- }
- return (contentProvider != null) ? contentProvider.getURL() : null;
- }
-
- /**
- * Returns an information entry referencing the location of the
- * feature update site.
- *
- * @see IFeature#getUpdateSiteEntry()
- * @since 2.0
- */
- public IURLEntry getUpdateSiteEntry() {
- return (IURLEntry) getUpdateSiteEntryModel();
- }
-
- /**
- * Return an array of information entries referencing locations of other
- * update sites.
- *
- * @see IFeature#getDiscoverySiteEntries()
- * @since 2.0
- */
- public IURLEntry[] getDiscoverySiteEntries() {
- URLEntryModel[] result = getDiscoverySiteEntryModels();
- if (result.length == 0)
- return new IURLEntry[0];
- else
- return (IURLEntry[]) result;
- }
-
- /**
- * Returns and optional custom install handler entry.
- *
- * @see IFeature#getInstallHandlerEntry()
- * @since 2.0
- */
- public IInstallHandlerEntry getInstallHandlerEntry() {
- return (IInstallHandlerEntry) getInstallHandlerModel();
- }
-
- /**
- * Returns the feature description.
- *
- * @see IFeature#getDescription()
- * @since 2.0
- */
- public IURLEntry getDescription() {
- return (IURLEntry) getDescriptionModel();
- }
-
- /**
- * Returns the copyright information for the feature.
- *
- * @see IFeature#getCopyright()
- * @since 2.0
- */
- public IURLEntry getCopyright() {
- return (IURLEntry) getCopyrightModel();
- }
-
- /**
- * Returns the license information for the feature.
- *
- * @see IFeature#getLicense()
- * @since 2.0
- */
- public IURLEntry getLicense() {
- return (IURLEntry) getLicenseModel();
- }
-
- /**
- * Return optional image for the feature.
- *
- * @see IFeature#getImage()
- * @since 2.0
- */
- public URL getImage() {
- return getImageURL();
- }
-
- /**
- * Return a list of plug-in dependencies for this feature.
- *
- * @see IFeature#getImports()
- * @since 2.0
- */
- public IImport[] getImports() {
- ImportModel[] result = getImportModels();
- if (result.length == 0)
- return new IImport[0];
- else
- return (IImport[]) result;
- }
-
- /**
- * Install the contents of this feature into the specified target feature.
- * This method is a reference implementation of the feature installation
- * protocol. Other concrete feature implementation that override this
- * method need to implement this protocol.
- *
- * @see IFeature#install(IFeature, IVerificationListener, IProgressMonitor)
- * @since 2.0
- */
- public IFeatureReference install(IFeature targetFeature, IVerificationListener verificationListener, IProgressMonitor progress) throws InstallAbortedException, CoreException {
- //TODO
- // call other API with all optional features, or setup variabel meaning install all
- return install(targetFeature, null, verificationListener, progress);
- }
-
- /**
- * Install the contents of this feature into the specified target feature.
- * This method is a reference implementation of the feature installation
- * protocol. Other concrete feature implementation that override this
- * method need to implement this protocol.
- *
- * @see IFeature#install(IFeature, IVerificationListener, IProgressMonitor)
- * @since 2.0
- */
- public IFeatureReference install(IFeature targetFeature, IFeatureReference[] optionalfeatures, IVerificationListener verificationListener, IProgressMonitor progress) throws InstallAbortedException, CoreException {
-
- //DEBUG
- debug("Installing...:" + getURL().toExternalForm());
- ErrorRecoveryLog recoveryLog = ErrorRecoveryLog.getLog();
-
- // make sure we have an InstallMonitor
- InstallMonitor monitor;
- if (progress == null)
- monitor = null;
- else if (progress instanceof InstallMonitor)
- monitor = (InstallMonitor) progress;
- else
- monitor = new InstallMonitor(progress);
-
- // Setup optional install handler
- InstallHandlerProxy handler = new InstallHandlerProxy(IInstallHandler.HANDLER_ACTION_INSTALL, this, this.getInstallHandlerEntry(), monitor);
- boolean success = false;
- Throwable originalException = null;
- InstallAbortedException abortedException = null;
-
- // Get source feature provider and verifier.
- // Initialize target variables.
- IFeatureContentProvider provider = getFeatureContentProvider();
- IVerifier verifier = provider.getVerifier();
- IFeatureReference result = null;
- IFeatureReference alreadyInstalledFeature = null;
- IFeatureContentConsumer consumer = null;
- IPluginEntry[] targetSitePluginEntries = null;
-
- try {
- // determine list of plugins to install
- // find the intersection between the plugin entries already contained
- // on the target site, and plugin entries packaged in source feature
- IPluginEntry[] sourceFeaturePluginEntries = getPluginEntries();
- ISite targetSite = targetFeature.getSite();
- if (targetSite == null) {
- debug("The site to install in is null");
- targetSitePluginEntries = new IPluginEntry[0];
- } else {
- targetSitePluginEntries = targetSite.getPluginEntries();
- }
- IPluginEntry[] pluginsToInstall = UpdateManagerUtils.diff(sourceFeaturePluginEntries, targetSitePluginEntries);
- INonPluginEntry[] nonPluginsToInstall = getNonPluginEntries();
-
- IFeatureReference[] children = getIncludedFeatureReferences();
- if (optionalfeatures != null) {
- children = UpdateManagerUtils.optionalChildrenToInstall(children, optionalfeatures);
- }
-
- // determine number of monitor tasks
- // 2 tasks for the feature jar (download/verify + install)
- // + 2*n tasks for plugin entries (download/verify + install for each)
- // + 1*m tasks per non-plugin data entry (download for each)
- // + 1 task for custom non-plugin entry handling (1 for all combined)
- // + 5*x tasks for children features (5 subtasks per install)
- int taskCount = 2 + 2 * pluginsToInstall.length + nonPluginsToInstall.length + 1 + 5 * children.length;
- if (monitor != null)
- monitor.beginTask("", taskCount);
- SubProgressMonitor subMonitor = null;
-
- // start log
- recoveryLog.open(recoveryLog.START_INSTALL_LOG);
-
- // Start the installation tasks
- handler.installInitiated();
-
- // Download and verify feature archive(s)
- ContentReference[] references = provider.getFeatureEntryArchiveReferences(monitor);
- verifyReferences(verifier, references, monitor, verificationListener, true);
- monitorWork(monitor, 1);
-
- // Download and verify plugin archives
- for (int i = 0; i < pluginsToInstall.length; i++) {
- references = provider.getPluginEntryArchiveReferences(pluginsToInstall[i], monitor);
- verifyReferences(verifier, references, monitor, verificationListener, false);
- monitorWork(monitor, 1);
- }
- handler.pluginsDownloaded(pluginsToInstall);
-
- // Download non-plugin archives. Verification handled by optional install handler
- for (int i = 0; i < nonPluginsToInstall.length; i++) {
- references = provider.getNonPluginEntryArchiveReferences(nonPluginsToInstall[i], monitor);
- monitorWork(monitor, 1);
- }
- handler.nonPluginDataDownloaded(nonPluginsToInstall, verificationListener);
-
- // All archives are downloaded and verified. Get ready to install
- consumer = targetFeature.getFeatureContentConsumer();
-
- // install the children feature
- // check if they are optional, and if they should be installed [2.0.1]
- for (int i = 0; i < children.length; i++) {
- IFeature childFeature = null;
- try {
- childFeature = children[i].getFeature();
- } catch (CoreException e) {
- UpdateManagerPlugin.warn(null, e);
- }
- if (childFeature != null) {
- if (monitor != null)
- subMonitor = new SubProgressMonitor(monitor, 5);
- ((Site) targetSite).install(// need to cast
- childFeature, optionalfeatures, consumer, verifier, verificationListener, subMonitor);
- }
- }
-
- // Install plugin files
- for (int i = 0; i < pluginsToInstall.length; i++) {
- references = provider.getPluginEntryContentReferences(pluginsToInstall[i], monitor);
- IContentConsumer pluginConsumer = consumer.open(pluginsToInstall[i]);
-
- String msg = "";
- if (monitor != null) {
- subMonitor = new SubProgressMonitor(monitor, 1);
- VersionedIdentifier pluginVerId = pluginsToInstall[i].getVersionedIdentifier();
- String pluginID = (pluginVerId == null) ? "" : pluginVerId.getIdentifier();
- msg = Policy.bind("Feature.TaskInstallPluginFiles", pluginID); //$NON-NLS-1$
- }
-
- for (int j = 0; j < references.length; j++) {
- setMonitorTaskName(subMonitor, msg + references[j].getIdentifier());
- pluginConsumer.store(references[j], subMonitor);
- }
-
- if (monitor != null) {
- if (monitor.isCanceled())
- abort();
- }
- }
-
- // check if we need to install feature files [16718]
- // store will throw CoreException if another feature is already
- // installed in the same place
- alreadyInstalledFeature = featureAlreadyInstalled(targetSite); // 18867
- if (alreadyInstalledFeature == null) {
- //Install feature files
- references = provider.getFeatureEntryContentReferences(monitor);
-
- String msg = "";
- if (monitor != null) {
- subMonitor = new SubProgressMonitor(monitor, 1);
- msg = Policy.bind("Feature.TaskInstallFeatureFiles"); //$NON-NLS-1$
- }
-
- for (int i = 0; i < references.length; i++) {
- setMonitorTaskName(subMonitor, msg + " " + references[i].getIdentifier());
- consumer.store(references[i], subMonitor);
- }
- } else {
- if (monitor != null)
- monitor.worked(1);
- }
-
- if (monitor != null) {
- if (monitor.isCanceled())
- abort();
- }
-
- // call handler to complete installation (eg. handle non-plugin entries)
- handler.completeInstall(consumer);
- monitorWork(monitor, 1);
-
- // indicate install success
- success = true;
-
- } catch (InstallAbortedException e) {
- abortedException = e;
- } catch (CoreException e) {
- originalException = e;
- } finally {
- Exception newException = null;
- try {
- if (consumer != null) {
- if (success) {
- result = consumer.close();
- if (result == null) {
- result = alreadyInstalledFeature; // 18867
- if (result != null && optionalfeatures != null && optionalfeatures.length > 0) {
- // reinitialize as new optional children may have been installed
- reinitializeFeature(result);
- }
- }
- // close the log
- recoveryLog.close(recoveryLog.END_INSTALL_LOG);
- } else {
- consumer.abort();
- }
- }
- handler.installCompleted(success);
- // if abort is done, no need for the log to stay
- recoveryLog.delete();
- } catch (Exception e) {
- newException = e;
- }
-
- // original exception wins unless it is InstallAbortedException
- // and an error occured during abort
- if (originalException != null) {
- throw Utilities.newCoreException(Policy.bind("InstallHandler.error", this.getLabel()), originalException);
- }
-
- if (newException != null)
- throw Utilities.newCoreException(Policy.bind("InstallHandler.error", this.getLabel()), newException);
-
- if (abortedException != null) {
- throw abortedException;
- }
-
- }
- return result;
- }
-
- /**
- * Returns an array of plug-in entries referenced by this feature
- *
- * @see IFeature#getPluginEntries()
- * @since 2.0
- */
- public IPluginEntry[] getRawPluginEntries() {
- PluginEntryModel[] result = getPluginEntryModels();
- if (result.length == 0)
- return new IPluginEntry[0];
- else
- return (IPluginEntry[])result;
- }
-
- /*
- * Method filter.
- * @param result
- * @return IPluginEntry[]
- */
- private IPluginEntry[] filterPluginEntry(IPluginEntry[] all) {
- List list = new ArrayList();
- if (all!=null){
- for (int i = 0; i < all.length; i++) {
- if (UpdateManagerUtils.isValidEnvironment(all[i]))
- list.add((IPluginEntry)all[i]);
- }
- }
-
- IPluginEntry[] result = new IPluginEntry[list.size()];
- if (!list.isEmpty()){
- list.toArray(result);
- }
-
- return result;
- }
-
-
- /**
- * Returns the count of referenced plug-in entries.
- *
- * @see IFeature#getPluginEntryCount()
- * @since 2.0
- */
- public int getPluginEntryCount() {
- return getPluginEntries().length;
- }
-
- /**
- * Returns an array of non-plug-in entries referenced by this feature
- *
- * @see IFeature#getNonPluginEntries()
- * @since 2.0
- */
- public INonPluginEntry[] getRawNonPluginEntries() {
- NonPluginEntryModel[] result = getNonPluginEntryModels();
- if (result.length == 0)
- return new INonPluginEntry[0];
- else
- return (INonPluginEntry[]) result;
- }
-
- /**
- * Returns the count of referenced non-plug-in entries.
- *
- * @see IFeature#getNonPluginEntryCount()
- * @since 2.0
- */
- public int getNonPluginEntryCount() {
- return getNonPluginEntryModels().length;
- }
-
- /**
- * Returns an array of feature references included by this feature
- *
- * @return an erray of feature references, or an empty array.
- * @since 2.0
- */
- public IIncludedFeatureReference[] getRawIncludedFeatureReferences() throws CoreException {
- if (includedFeatureReferences == null)
- initializeIncludedReferences();
-
- if (includedFeatureReferences.size() == 0)
- return new IncludedFeatureReference[0];
-
- return (IIncludedFeatureReference[]) includedFeatureReferences.toArray(arrayTypeFor(includedFeatureReferences));
- }
- /**
- * Returns the download size of the feature, if it can be determined.
- *
- * @see IFeature#getDownloadSize()
- * @since 2.0
- */
- public long getDownloadSize() {
- try {
- Set allPluginEntries = new HashSet();
- Set allNonPluginEntries = new HashSet();
-
- IPluginEntry[] plugins = getPluginEntries();
- allPluginEntries.addAll(Arrays.asList(plugins));
- INonPluginEntry[] nonPlugins = getNonPluginEntries();
- allNonPluginEntries.addAll(Arrays.asList(nonPlugins));
-
- IFeatureReference[] children = getIncludedFeatureReferences();
- for (int i = 0; i < children.length; i++) {
- plugins = children[i].getFeature().getPluginEntries();
- allPluginEntries.addAll(Arrays.asList(plugins));
- nonPlugins = children[i].getFeature().getNonPluginEntries();
- allNonPluginEntries.addAll(Arrays.asList(nonPlugins));
- }
-
- IPluginEntry[] totalPlugins = new IPluginEntry[allPluginEntries.size()];
- INonPluginEntry[] totalNonPlugins = new INonPluginEntry[allNonPluginEntries.size()];
- if (allPluginEntries.size() != 0) {
- allPluginEntries.toArray(totalPlugins);
- }
- if (allNonPluginEntries.size() != 0) {
- allNonPluginEntries.toArray(totalNonPlugins);
- }
-
- return getFeatureContentProvider().getDownloadSizeFor(totalPlugins, totalNonPlugins);
-
- } catch (CoreException e) {
- UpdateManagerPlugin.warn(null, e);
- return ContentEntryModel.UNKNOWN_SIZE;
- }
- }
-
- /**
- * Returns the install size of the feature, if it can be determined.
- *
- * @see IFeature#getInstallSize()
- * @since 2.0
- */
- public long getInstallSize() {
- try {
- Set allPluginEntries = new HashSet();
- Set allNonPluginEntries = new HashSet();
-
- IPluginEntry[] plugins = getPluginEntries();
- allPluginEntries.addAll(Arrays.asList(plugins));
- INonPluginEntry[] nonPlugins = getNonPluginEntries();
- allNonPluginEntries.addAll(Arrays.asList(nonPlugins));
-
- IFeatureReference[] children = getIncludedFeatureReferences();
- for (int i = 0; i < children.length; i++) {
- plugins = children[i].getFeature().getPluginEntries();
- allPluginEntries.addAll(Arrays.asList(plugins));
- nonPlugins = children[i].getFeature().getNonPluginEntries();
- allNonPluginEntries.addAll(Arrays.asList(nonPlugins));
- }
-
- IPluginEntry[] totalPlugins = new IPluginEntry[allPluginEntries.size()];
- INonPluginEntry[] totalNonPlugins = new INonPluginEntry[allNonPluginEntries.size()];
- if (allPluginEntries.size() != 0) {
- allPluginEntries.toArray(totalPlugins);
- }
- if (allNonPluginEntries.size() != 0) {
- allNonPluginEntries.toArray(totalNonPlugins);
- }
-
- return getFeatureContentProvider().getInstallSizeFor(totalPlugins, totalNonPlugins);
-
- } catch (CoreException e) {
- UpdateManagerPlugin.warn(null, e);
- return ContentEntryModel.UNKNOWN_SIZE;
- }
- }
-
- /**
- * Returns the content provider for this feature.
- *
- * @see IFeature#getFeatureContentProvider()
- * @since 2.0
- */
- public IFeatureContentProvider getFeatureContentProvider() throws CoreException {
- if (featureContentProvider == null) {
- throw Utilities.newCoreException(Policy.bind("Feature.NoContentProvider", getVersionedIdentifier().toString()), null);
- //$NON-NLS-1$
- }
- return this.featureContentProvider;
- }
-
- /**
- * Returns the content consumer for this feature.
- *
- * @see IFeature#getFeatureContentConsumer()
- * @since 2.0
- */
- public IFeatureContentConsumer getFeatureContentConsumer() throws CoreException {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Sets the site for this feature.
- *
- * @see IFeature#setSite(ISite)
- * @since 2.0
- */
- public void setSite(ISite site) throws CoreException {
- if (this.site != null) {
- String featureURLString = (getURL() != null) ? getURL().toExternalForm() : "";
- throw Utilities.newCoreException(Policy.bind("Feature.SiteAlreadySet", featureURLString), null);
- //$NON-NLS-1$
- }
- this.site = site;
- }
-
- /**
- * Sets the content provider for this feature.
- *
- * @see IFeature#setFeatureContentProvider(IFeatureContentProvider)
- * @since 2.0
- */
- public void setFeatureContentProvider(IFeatureContentProvider featureContentProvider) {
- this.featureContentProvider = featureContentProvider;
- featureContentProvider.setFeature(this);
- }
-
- /**
- * Return the string representation of this fetaure
- *
- * @return feature as string
- * @since 2.0
- */
- public String toString() {
- String URLString = (getURL() == null) ? Policy.bind("Feature.NoURL") : getURL().toExternalForm();
- //$NON-NLS-1$
- String verString = Policy.bind("Feature.FeatureVersionToString", URLString, getVersionedIdentifier().toString());
- //$NON-NLS-1$
- String label = getLabel() == null ? "" : getLabel();
- return verString + " [" + label + "]";
- }
-
- /*
- * Installation has been cancelled, abort and revert
- */
- private void abort() throws CoreException {
- String msg = Policy.bind("Feature.InstallationCancelled"); //$NON-NLS-1$
- throw new InstallAbortedException(msg, null);
- }
-
- /*
- * Initializes includes feature references
- * If the included feature reference is found on the site, add it to the List
- * Otherwise attempt to instanciate it using the same type as this feature and
- * using the default location on the site.
- */
- private void initializeIncludedReferences() throws CoreException {
- includedFeatureReferences = new ArrayList();
-
- IIncludedFeatureReference[] nestedFeatures = getFeatureIncluded();
- if (nestedFeatures.length==0)
- return;
-
- ISite site = getSite();
- if (site == null)
- return;
-
- for (int i = 0; i < nestedFeatures.length; i++) {
- IIncludedFeatureReference include = nestedFeatures[i];
- IIncludedFeatureReference newRef = getPerfectIncludeFeature(site, include);
- includedFeatureReferences.add(newRef);
- }
- }
-
- /**
- * Method filterFeatures.
- * @param list
- * @return List
- */
- private IIncludedFeatureReference[] filterFeatures(IIncludedFeatureReference[] allIncluded) {
- List list = new ArrayList();
- if (allIncluded!=null){
- for (int i = 0; i < allIncluded.length; i++) {
- IIncludedFeatureReference included = allIncluded[i];
- if (included.matchesPlatform())
- list.add(included);
- }
- }
-
- IIncludedFeatureReference[] result = new IIncludedFeatureReference[list.size()];
- if (!list.isEmpty()){
- list.toArray(result);
- }
-
- return result;
- }
-
-
- /*
- *
- */
- private IIncludedFeatureReference getPerfectIncludeFeature(ISite site, IIncludedFeatureReference include) throws CoreException {
-
- // [20367] no site, cannot initialize nested references
- ISiteFeatureReference[] refs = site.getFeatureReferences();
- VersionedIdentifier identifier = include.getVersionedIdentifier();
-
- // too long to compute if not a file system
- // other solution would be to parse feature.xml
- // when parsing file system to create archive features/FeatureId_Ver.jar
- if ("file".equals(site.getURL().getProtocol())) {
- // check if declared on the Site
- if (refs != null) {
- for (int ref = 0; ref < refs.length; ref++) {
- if (refs[ref] != null) {
- VersionedIdentifier id = null;
- try {
- id = refs[ref].getVersionedIdentifier();
- } catch (CoreException e) {
- UpdateManagerPlugin.warn(null, e);
- };
-
- if (identifier.equals(id)) {
- // found a ISiteFeatureReference that matches our IIncludedFeatureReference
- IncludedFeatureReference newRef = new IncludedFeatureReference(refs[ref]);
- newRef.isOptional(include.isOptional());
- newRef.setName(include.getName());
- newRef.setMatchingRule(include.getMatch());
- newRef.setSearchLocation(include.getSearchLocation());
- return newRef;
- }
- }
- }
- }
- }
-
- // instanciate by mapping it based on the site.xml
- // in future we may ask for a factory to create the feature ref
- IncludedFeatureReference newRef = new IncludedFeatureReference(include);
- newRef.setSite(getSite());
- IFeatureReference parentRef = getSite().getFeatureReference(this);
- if (parentRef instanceof FeatureReference) {
- newRef.setType(((FeatureReference) parentRef).getType());
- }
- String featureID = Site.DEFAULT_FEATURE_PATH + identifier.toString() + ".jar";
- URL featureURL = getSite().getSiteContentProvider().getArchiveReference(featureID);
- newRef.setURL(featureURL);
- newRef.setFeatureIdentifier(identifier.getIdentifier());
- newRef.setFeatureVersion(identifier.getVersion().toString());
- try {
- newRef.resolve(getSite().getURL(), null); // no need to get the bundle
- return newRef;
- } catch (Exception e) {
- throw Utilities.newCoreException(Policy.bind("Feature.UnableToInitializeFeatureReference", identifier.toString()), e);
- }
- }
-
- /**
- * Helper method to access resouce bundle for feature. The default
- * implementation attempts to load the appropriately localized
- * feature.properties file.
- *
- * @param url base URL used to load the resource bundle.
- * @return resource bundle, or <code>null</code>.
- * @since 2.0
- */
- private ResourceBundle getResourceBundle(URL url) throws IOException, CoreException {
-
- if (url == null)
- return null;
-
- ResourceBundle bundle = null;
- try {
- url = UpdateManagerUtils.asDirectoryURL(url);
- ClassLoader l = new URLClassLoader(new URL[] { url }, null);
- bundle = ResourceBundle.getBundle(Site.SITE_FILE, Locale.getDefault(), l);
- } catch (MissingResourceException e) {
- UpdateManagerPlugin.warn(e.getLocalizedMessage() + ":" + url.toExternalForm()); //$NON-NLS-1$
- } catch (MalformedURLException e) {
- UpdateManagerPlugin.warn(e.getLocalizedMessage()); //$NON-NLS-1$
- }
- return bundle;
- }
-
- /*
- *
- */
- private void debug(String trace) {
- //DEBUG
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_INSTALL) {
- UpdateManagerPlugin.debug(trace);
- }
- }
-
- /*
- *
- */
- private void setMonitorTaskName(IProgressMonitor monitor, String taskName) {
- if (monitor != null)
- monitor.setTaskName(taskName);
- }
-
- /*
- *
- */
- private void monitorWork(IProgressMonitor monitor, int tick) throws CoreException {
- if (monitor != null) {
- monitor.worked(tick);
- if (monitor.isCanceled()) {
- abort();
- }
- }
- }
-
- /*
- *
- */
- private void verifyReferences(IVerifier verifier, ContentReference[] references, InstallMonitor monitor, IVerificationListener verificationListener, boolean isFeature) throws CoreException {
- IVerificationResult vr = null;
- if (verifier != null) {
- for (int j = 0; j < references.length; j++) {
- vr = verifier.verify(this, references[j], isFeature, monitor);
- if (vr != null) {
- if (verificationListener == null)
- return;
-
- int result = verificationListener.prompt(vr);
-
- if (result == IVerificationListener.CHOICE_ABORT) {
- String msg = Policy.bind("JarVerificationService.CancelInstall"); //$NON-NLS-1$
- Exception e = vr.getVerificationException();
- throw new InstallAbortedException(msg, e);
- }
- if (result == IVerificationListener.CHOICE_ERROR) {
- throw Utilities.newCoreException(Policy.bind("JarVerificationService.UnsucessfulVerification"),
- //$NON-NLS-1$
- vr.getVerificationException());
- }
- }
- }
- }
- }
-
- /*
- * returns reference if the same feature is installed on the site
- * [18867]
- */
- private IFeatureReference featureAlreadyInstalled(ISite targetSite) {
-
- ISiteFeatureReference[] references = targetSite.getFeatureReferences();
- IFeatureReference currentReference = null;
- for (int i = 0; i < references.length; i++) {
- currentReference = references[i];
- // do not compare URL
- try {
- if (this.equals(currentReference.getFeature()))
- return currentReference; // 18867
- } catch (CoreException e) {
- UpdateManagerPlugin.warn(null, e);
- }
- }
-
- UpdateManagerPlugin.warn("ValidateAlreadyInstalled:Feature " + this +" not found on site" + this.getURL());
- return null;
- }
-
- /*
- * re initialize children of the feature, invalidate the cache
- * @param result FeatureReference to reinitialize.
- */
- private void reinitializeFeature(IFeatureReference referenceToReinitialize) {
-
- if (referenceToReinitialize==null) return;
-
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_CONFIGURATION)
- UpdateManagerPlugin.debug("Re initialize feature reference:" + referenceToReinitialize);
-
- IFeature feature = null;
- try {
- feature = referenceToReinitialize.getFeature();
- if (feature != null && feature instanceof Feature) {
- ((Feature) feature).initializeIncludedReferences();
- }
- // bug 24981 - recursively go into hierarchy
- // only if site if file
- ISite site = referenceToReinitialize.getSite();
- if (site==null) return;
- URL url = site.getURL();
- if (url==null) return;
- if ("file".equals(url.getProtocol())){
- IFeatureReference[] included = feature.getIncludedFeatureReferences();
- for (int i = 0; i < included.length; i++) {
- reinitializeFeature(included[i]);
- }
- }
- } catch (CoreException e) {
- UpdateManagerPlugin.warn("", e);
- }
- }
- /**
- * @see org.eclipse.update.core.IFeature#getRawIncludedFeatureReferences()
- */
- public IIncludedFeatureReference[] getIncludedFeatureReferences() throws CoreException {
- return filterFeatures(getRawIncludedFeatureReferences());
- }
-
- /**
- * @see org.eclipse.update.core.IFeature#getRawNonPluginEntries()
- */
- public INonPluginEntry[] getNonPluginEntries() {
- return filterNonPluginEntry(getRawNonPluginEntries());
- }
-
- /**
- * Method filterPluginEntry.
- * @param iNonPluginEntrys
- * @return INonPluginEntry[]
- */
- private INonPluginEntry[] filterNonPluginEntry(INonPluginEntry[] all) {
- List list = new ArrayList();
- if (all!=null){
- for (int i = 0; i < all.length; i++) {
- if (UpdateManagerUtils.isValidEnvironment(all[i]))
- list.add((INonPluginEntry)all[i]);
- }
- }
-
- INonPluginEntry[] result = new INonPluginEntry[list.size()];
- if (!list.isEmpty()){
- list.toArray(result);
- }
-
- return result;
- }
-
-
- /**
- * @see org.eclipse.update.core.IFeature#getRawPluginEntries()
- */
- public IPluginEntry[] getPluginEntries() {
- return filterPluginEntry(getRawPluginEntries());
- }
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/FeatureContentProvider.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/FeatureContentProvider.java
deleted file mode 100644
index 5f75d74..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/FeatureContentProvider.java
+++ /dev/null
@@ -1,432 +0,0 @@
-package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import java.io.*;
-import java.net.URL;
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.core.model.*;
-import org.eclipse.update.internal.core.Policy;
-import org.eclipse.update.internal.core.UpdateManagerPlugin;
-
-/**
- * Base implementation of a feature content provider.
- * This class provides a set of helper methods useful for implementing
- * feature content providers. In particular, methods dealing with
- * downloading and caching of feature files.
- * <p>
- * This class must be subclassed by clients.
- * </p>
- * @see org.eclipse.update.core.IFeatureContentProvider
- * @since 2.0
- */
-public abstract class FeatureContentProvider implements IFeatureContentProvider {
-
- /**
- *
- */
- public class FileFilter {
-
- private String filterString = null;
- private IPath filterPath = null;
-
- /**
- * Constructor for FileFilter.
- */
- public FileFilter(String filter) {
- super();
- this.filterString = filter;
- this.filterPath = new Path(filter);
- }
-
- /**
- * returns true if the name matches the rule
- */
- public boolean accept(String name) {
-
- if (name == null)
- return false;
-
- // no '*' pattern matching
- // must be equals
- IPath namePath = new Path(name);
- if (filterPath.lastSegment().indexOf('*') == -1) {
- return filterPath.equals(namePath);
- }
-
- // check same file extension if extension exists (a.txt/*.txt)
- // or same file name (a.txt,a.*)
- String extension = filterPath.getFileExtension();
- if (!extension.equals("*")) {
- if (!extension.equalsIgnoreCase(namePath.getFileExtension()))
- return false;
- } else {
- IPath noExtension = filterPath.removeFileExtension();
- String fileName = noExtension.lastSegment();
- if (!fileName.equals("*")) {
- if (!namePath.lastSegment().startsWith(fileName))
- return false;
- }
- }
-
- // check same path
- IPath p1 = namePath.removeLastSegments(1);
- IPath p2 = filterPath.removeLastSegments(1);
- return p1.equals(p2);
- }
-
- }
-
- private URL base;
- private IFeature feature;
- private File tmpDir; // local work area for each provider
- public static final String JAR_EXTENSION = ".jar"; //$NON-NLS-1$
-
- private static final String DOT_PERMISSIONS = "permissions.properties";
- private static final String EXECUTABLES = "permissions.executable";
-
- // lock
- private final static Object lock = new Object();
-
- /**
- * Feature content provider constructor
- *
- * @param base feature URL. The interpretation of this URL
- * is specific to each content provider.
- * @since 2.0
- */
- public FeatureContentProvider(URL base) {
- this.base = base;
- this.feature = null;
- }
-
- /**
- * Returns the feature url.
- * @see IFeatureContentProvider#getURL()
- */
- public URL getURL() {
- return base;
- }
-
- /**
- * Returns the feature associated with this content provider.
- * @see IFeatureContentProvider#getFeature()
- */
- public IFeature getFeature() {
- return feature;
- }
-
- /**
- * Sets the feature associated with this content provider.
- * @see IFeatureContentProvider#setFeature(IFeature)
- */
- public void setFeature(IFeature feature) {
- this.feature = feature;
- }
-
- /**
- * Returns the specified reference as a local file system reference.
- * If required, the file represented by the specified content
- * reference is first downloaded to the local system
- *
- * @param ref content reference
- * @param monitor progress monitor, can be <code>null</code>
- * @exception IOException
- * @exception CoreException
- * @since 2.0
- */
- public ContentReference asLocalReference(ContentReference ref, InstallMonitor monitor) throws IOException, CoreException {
-
- // check to see if this is already a local reference
- if (ref.isLocalReference())
- return ref;
-
- // check to see if we already have a local file for this reference
- String key = ref.toString();
-
- // need to synch as another thread my have created the file but
- // is still copying into it
- File localFile = null;
- synchronized (lock) {
-
- localFile = Utilities.lookupLocalFile(key);
- if (localFile != null)
- return ref.createContentReference(ref.getIdentifier(), localFile);
- //
- // download the referenced file into local temporary area
- InputStream is = null;
- OutputStream os = null;
- localFile = Utilities.createLocalFile(getWorkingDirectory(), null /*name*/
- );
- boolean sucess = false;
- if (monitor != null) {
- monitor.saveState();
- monitor.setTaskName(Policy.bind("FeatureContentProvider.Downloading"));
- //$NON-NLS-1$
- monitor.subTask(ref.getIdentifier() + " "); //$NON-NLS-1$
- monitor.setTotalCount(ref.getInputSize());
- monitor.showCopyDetails(true);
- }
-
- try {
- try {
- is = ref.getInputStream();
- } catch (IOException e) {
- throw Utilities.newCoreException(Policy.bind("FeatureContentProvider.UnableToRetrieve", new Object[] { ref }), e);
- }
-
- try {
- os = new BufferedOutputStream(new FileOutputStream(localFile));
- } catch (FileNotFoundException e) {
- throw Utilities.newCoreException(Policy.bind("FeatureContentProvider.UnableToCreate", new Object[] { localFile }), e);
- }
- Utilities.copy(is, os, monitor);
- sucess = true;
-
- // file is downloaded succesfully, map it
- Utilities.mapLocalFile(key,localFile);
- } catch (ClassCastException e) {
- throw Utilities.newCoreException(Policy.bind("FeatureContentProvider.UnableToCreate", new Object[] { localFile }), e);
- } finally {
- //Do not close IS if user cancel,
- //closing IS will read the entire Stream until the end
- if (sucess && is != null)
- try {
- is.close();
- } catch (IOException e) {
- }
- if (os != null)
- try {
- os.close(); // should flush buffer stream
- } catch (IOException e) {
- }
- if (monitor != null)
- monitor.restoreState();
- }
- } // end lock
- ContentReference reference = ref.createContentReference(ref.getIdentifier(), localFile);
- return reference;
- }
-
- /**
- * Returns the specified reference as a local file.
- * If required, the file represented by the specified content
- * reference is first downloaded to the local system
- *
- * @param ref content reference
- * @param monitor progress monitor, can be <code>null</code>
- * @exception IOException
- * @exception CoreException
- * @since 2.0
- */
- public File asLocalFile(ContentReference ref, InstallMonitor monitor) throws IOException, CoreException {
- File file = ref.asFile();
- if (file != null)
- return file;
- ContentReference localRef = asLocalReference(ref, monitor);
- file = localRef.asFile();
- return file;
- }
-
- /**
- * Returns working directory for this content provider
- *
- * @return working directory
- * @exception IOException
- * @since 2.0
- */
- protected File getWorkingDirectory() throws IOException {
- if (tmpDir == null)
- tmpDir = Utilities.createWorkingDirectory();
- return tmpDir;
- }
-
- /**
- * Returns the total size of all archives required for the
- * specified plug-in and non-plug-in entries (the "packaging" view).
- * @see IFeatureContentProvider#getDownloadSizeFor(IPluginEntry[], INonPluginEntry[])
- */
- public long getDownloadSizeFor(IPluginEntry[] pluginEntries, INonPluginEntry[] nonPluginEntries) {
- long result = 0;
-
- // if both are null or empty, return UNKNOWN size
- if ((pluginEntries == null || pluginEntries.length == 0) && (nonPluginEntries == null || nonPluginEntries.length == 0)) {
- return ContentEntryModel.UNKNOWN_SIZE;
- }
-
- // loop on plugin entries
- long size = 0;
- if (pluginEntries != null)
- for (int i = 0; i < pluginEntries.length; i++) {
- size = ((PluginEntryModel) pluginEntries[i]).getDownloadSize();
- if (size == ContentEntryModel.UNKNOWN_SIZE) {
- return ContentEntryModel.UNKNOWN_SIZE;
- }
- result += size;
- }
-
- // loop on non plugin entries
- if (nonPluginEntries != null)
- for (int i = 0; i < nonPluginEntries.length; i++) {
- size = ((NonPluginEntryModel) nonPluginEntries[i]).getDownloadSize();
- if (size == ContentEntryModel.UNKNOWN_SIZE) {
- return ContentEntryModel.UNKNOWN_SIZE;
- }
- result += size;
- }
-
- return result;
- }
-
- /**
- * Returns the total size of all files required for the
- * specified plug-in and non-plug-in entries (the "logical" view).
- * @see IFeatureContentProvider#getInstallSizeFor(IPluginEntry[], INonPluginEntry[])
- */
- public long getInstallSizeFor(IPluginEntry[] pluginEntries, INonPluginEntry[] nonPluginEntries) {
- long result = 0;
-
- // if both are null or empty, return UNKNOWN size
- if ((pluginEntries == null || pluginEntries.length == 0) && (nonPluginEntries == null || nonPluginEntries.length == 0)) {
- return ContentEntryModel.UNKNOWN_SIZE;
- }
-
- // loop on plugin entries
- long size = 0;
- if (pluginEntries != null)
- for (int i = 0; i < pluginEntries.length; i++) {
- size = ((PluginEntryModel) pluginEntries[i]).getInstallSize();
- if (size == ContentEntryModel.UNKNOWN_SIZE) {
- return ContentEntryModel.UNKNOWN_SIZE;
- }
- result += size;
- }
-
- // loop on non plugin entries
- if (nonPluginEntries != null)
- for (int i = 0; i < nonPluginEntries.length; i++) {
- size = ((NonPluginEntryModel) nonPluginEntries[i]).getInstallSize();
- if (size == ContentEntryModel.UNKNOWN_SIZE) {
- return ContentEntryModel.UNKNOWN_SIZE;
- }
- result += size;
- }
-
- return result;
- }
-
- /**
- * Returns the path identifier for a plugin entry.
- * <code>plugins/<pluginId>_<pluginVersion>.jar</code>
- * @return the path identifier
- */
- protected String getPathID(IPluginEntry entry) {
- return Site.DEFAULT_PLUGIN_PATH + entry.getVersionedIdentifier().toString() + JAR_EXTENSION;
- }
-
- /**
- * Returns the path identifer for a non plugin entry.
- * <code>features/<featureId>_<featureVersion>/<dataId></code>
- * @return the path identifier
- */
- protected String getPathID(INonPluginEntry entry) {
- String nonPluginBaseID = Site.DEFAULT_FEATURE_PATH + feature.getVersionedIdentifier().toString() + "/";
- //$NON-NLS-1$
- return nonPluginBaseID + entry.getIdentifier();
- }
-
- /**
- * Sets the permission of all the ContentReferences
- * Check for the .permissions contentReference and use it
- * to set the permissions of other ContentReference
- *
- * @return void
- */
- protected void validatePermissions(ContentReference[] references) {
-
- if (references == null || references.length == 0)
- return;
-
- Map permissions = getPermissions(references);
- if (permissions.isEmpty())
- return;
-
- for (int i = 0; i < references.length; i++) {
- ContentReference contentReference = references[i];
- String id = contentReference.getIdentifier();
- Object value = null;
- if ((value = matchesOneRule(id, permissions)) != null) {
- Integer permission = (Integer) value;
- contentReference.setPermission(permission.intValue());
- }
- }
- }
-
- /**
- * Returns the value of the matching rule or <code>null</code> if none found.
- * A rule is matched if the id is equals to a key, or if the id is resolved by a key.
- * if the id is <code>/path/file.txt</code> it is resolved by <code>/path/*</code>
- * or <code>/path/*.txt</code>
- *
- * @param id the identifier
- * @param permissions list of rules
- * @return Object the value of the matcing rule or <code>null</code>
- */
- private Object matchesOneRule(String id, Map permissions) {
-
- Set keySet = permissions.keySet();
- Iterator iter = keySet.iterator();
- while (iter.hasNext()) {
- FileFilter rule = (FileFilter) iter.next();
- if (rule.accept(id)) {
- return permissions.get(rule);
- }
- }
-
- return null;
- }
-
- /*
- * returns the permission MAP
- */
- private Map getPermissions(ContentReference[] references) {
-
- Map result = new HashMap();
- // search for .permissions
- boolean notfound = true;
- ContentReference permissionReference = null;
- for (int i = 0; i < references.length && notfound; i++) {
- ContentReference contentReference = references[i];
- if (DOT_PERMISSIONS.equals(contentReference.getIdentifier())) {
- notfound = false;
- permissionReference = contentReference;
- }
- }
- if (notfound)
- return result;
-
- Properties prop = new Properties();
- try {
- prop.load(permissionReference.getInputStream());
- } catch (IOException e) {
- UpdateManagerPlugin.warn("", e);
- }
-
- String executables = prop.getProperty(EXECUTABLES);
- if (executables == null)
- return result;
-
- StringTokenizer tokenizer = new StringTokenizer(executables, ",");
- Integer defaultExecutablePermission = new Integer(ContentReference.DEFAULT_EXECUTABLE_PERMISSION);
- while (tokenizer.hasMoreTokens()) {
- FileFilter filter = new FileFilter(tokenizer.nextToken());
- result.put(filter, defaultExecutablePermission);
- }
-
- return result;
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/FeatureReference.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/FeatureReference.java
deleted file mode 100644
index c5f1d47..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/FeatureReference.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.List;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.core.model.FeatureReferenceModel;
-import org.eclipse.update.core.model.SiteModel;
-import org.eclipse.update.internal.core.*;
-
-/**
- * Convenience implementation of a feature reference.
- * <p>
- * This class may be instantiated or subclassed by clients.
- * </p>
- * @see org.eclipse.update.core.IFeatureReference
- * @see org.eclipse.update.core.model.FeatureReferenceModel
- * @since 2.0
- */
-public class FeatureReference extends FeatureReferenceModel implements IFeatureReference {
-
- private List categories;
- private VersionedIdentifier versionId;
-
- /**
- * Feature reference default constructor
- */
- public FeatureReference() {
- super();
- }
-
- /**
- * Constructor FeatureReference.
- * @param ref the reference to copy
- */
- public FeatureReference(IFeatureReference ref) {
- super((FeatureReferenceModel) ref);
- try {
- setURL(ref.getURL());
- } catch (CoreException e) {
- UpdateManagerPlugin.warn("", e);
- }
- }
-
- /**
- * Constructor FeatureReference.
- * @param ref the reference to copy
- */
- public FeatureReference(FeatureReferenceModel ref) {
- super(ref);
- try {
- setURL(ref.getURL());
- } catch (CoreException e) {
- UpdateManagerPlugin.warn("", e);
- }
- }
-
- /**
- * Returns the feature this reference points to based on match and resolution
- * @return the feature on the Site
- */
- public IFeature getFeature() throws CoreException {
- String type = getType();
- if (type == null || type.equals("")) { //$NON-NLS-1$
- // ask the Site for the default type
- type = getSite().getDefaultPackagedFeatureType();
- }
- return getSite().createFeature(type, this.getURL());
- }
-
- /**
- * Returns the update site for the referenced feature
- *
- * @see IFeatureReference#getSite()
- * @since 2.0
- */
- public ISite getSite() {
- return (ISite) getSiteModel();
- }
-
- /**
- * Sets the feature reference URL.
- * This is typically performed as part of the feature reference creation
- * operation. Once set, the url should not be reset.
- *
- * @see IFeatureReference#setURL(URL)
- * @since 2.0
- */
- public void setURL(URL url) throws CoreException {
- if (url != null) {
- setURLString(url.toExternalForm());
- try {
- resolve(url, null);
- } catch (MalformedURLException e) {
- throw Utilities.newCoreException(Policy.bind("FeatureReference.UnableToResolveURL", url.toExternalForm()), e);
- //$NON-NLS-1$
- }
- }
- }
-
- /**
- * Associates a site with the feature reference.
- * This is typically performed as part of the feature reference creation
- * operation. Once set, the site should not be reset.
- *
- * @see IFeatureReference#setSite(ISite)
- * @since 2.0
- */
- public void setSite(ISite site) {
- setSiteModel((SiteModel) site);
- }
-
- /**
- * Returns the feature identifier.
- *
- * @see IFeatureReference#getVersionedIdentifier()
- * @since 2.0
- */
- public VersionedIdentifier getVersionedIdentifier() {
-
- if (versionId != null)
- return versionId;
-
- String id = getFeatureIdentifier();
- String ver = getFeatureVersion();
- if (id != null && ver != null) {
- try {
- versionId = new VersionedIdentifier(id, ver);
- return versionId;
- } catch (Exception e) {
- UpdateManagerPlugin.warn("Unable to create versioned identifier:" + id + ":" + ver);
- }
- }
-
- // we need the exact match or we may have an infinite loop
- versionId = new VersionedIdentifier(getURL().toExternalForm(),null);
- try {
- versionId = getFeature().getVersionedIdentifier();
- } catch (CoreException e){
- UpdateManagerPlugin.warn("",e);
- }
- return versionId;
- }
-
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IArchiveReference.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IArchiveReference.java
deleted file mode 100644
index b1e7f2b..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IArchiveReference.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import java.net.URL;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-/**
- * Site archive interface.
- * Site archive is a representation of a packaged archive (file) located
- * on an update site. It allows a "symbolic" path used to identify
- * a plug-in or non-plug-in feature entry to be explicitly mapped
- * to a specific URL.
- * <p>
- * Clients may implement this interface. However, in most cases clients should
- * directly instantiate or subclass the provided implementation of this
- * interface.
- * </p>
- * @see org.eclipse.update.core.ArchiveReference
- * @since 2.0
- */
-public interface IArchiveReference extends IAdaptable {
-
- /**
- *
- * @return the archive "symbolic" path, or <code>null</code>
- * @since 2.0
- */
- public String getPath();
-
- /**
- * Retrieve the site archive URL
- *
- * @return the archive URL, or <code>null</code>
- * @since 2.0
- */
- public URL getURL();
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/ICategory.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/ICategory.java
deleted file mode 100644
index 841e571..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/ICategory.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import org.eclipse.core.runtime.IAdaptable;
-
-/**
- * Feature category definition.
- * A site can organize its features into categories. Categories
- * can be further organized into hierarchies. Each category name
- * is a composed of the name of its parent and a simple identifier
- * separated by a slash ("/"). For example <code>tools/utilities/print</code>
- * defines a category that is a child of <code>tools/utilities</code> and
- * grandchild of <code>tools</code>.
- * <p>
- * Clients may implement this interface. However, in most cases clients should
- * directly instantiate or subclass the provided implementation of this
- * interface.
- * </p>
- * @see org.eclipse.update.core.Category
- * @since 2.0
- */
-public interface ICategory extends IAdaptable{
-
- /**
- * Retrieve the name of the category. The name can be a simple
- * token (root category) or a number of slash-separated ("/")
- * tokens.
- *
- * @return the category name
- * @since 2.0
- */
- public String getName();
-
- /**
- * Retrieve the displayable label for the category
- *
- * @return displayable category label, or <code>null</code>
- * @since 2.0
- */
- public String getLabel();
-
- /**
- * Retrieve the detailed category description
- *
- * @return category description, or <code>null</code>
- * @since 2.0
- */
- public IURLEntry getDescription();
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IContentConsumer.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IContentConsumer.java
deleted file mode 100644
index 7d49ba7..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IContentConsumer.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-/**
- * Generic content consumer.
- * A generic content consumer is used to store plug-in and non-plug-in files
- * for a feature.
- * <p>
- * Clients may implement this interface. However, in most cases clients
- * will only use the content consumer provided by the feature type(s)
- * implemented by the platform.
- * </p>
- * @see org.eclipse.update.core.IFeatureContentConsumer
- * @since 2.0
- */
-public interface IContentConsumer {
-
- /**
- * Stores a file.
- *
- * @see IFeatureContentConsumer#open(IPluginEntry)
- * @see IFeatureContentConsumer#open(INonPluginEntry)
- * @param ContentReference reference to the file to store
- * @param IProgressMonitor progress monitor, can be <code>null</code>
- * @exception CoreException
- * @since 2.0
- */
- public void store(ContentReference contentReference, IProgressMonitor monitor)
- throws CoreException;
-
- /**
- * Indicates successful completion of the store operations for this
- * consumer
- *
- * @exception CoreException
- * @since 2.0
- */
- public void close() throws CoreException;
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeature.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeature.java
deleted file mode 100644
index 3007e84..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeature.java
+++ /dev/null
@@ -1,426 +0,0 @@
-package org.eclipse.update.core;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import java.net.URL;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.core.model.InstallAbortedException;
-
-/**
- * Feature defines the packaging "container" for a group of related plug-ins,
- * plug-in fragments, and optionally non-plug-in files.
- * <p>
- * Features are treated purely as an installation and packaging construct.
- * They do not play a role during Eclipse plug-in execution.
- * They are simply an inclusive "manifest" of the plug-ins, fragments
- * and other files that make up that feature. If features are logically made
- * up of plug-ins from "sub-features", the top-level feature "manifest"
- * must be fully resolved at packaging time.
- * </p>
- * <p>
- * Clients may implement this interface. However, in most cases clients should
- * directly instantiate or subclass the provided implementation of this
- * interface.
- * </p>
- * @see org.eclipse.update.core.Feature
- * @since 2.0
- */
-public interface IFeature extends IAdaptable, IPlatformEnvironment {
-
- /**
- * Indicates a 'happy' feature
- * A feature is considered to be 'happy' in the context of a local site
- * if all the plug-ins referenced by the feature are installed on the site and no other
- * version of any of the plug-ins are installed on any other site of the local site.
- *
- * @see ILocalSite#getStatus(IFeature)
- * @since 2.0
- */
- public static final int STATUS_HAPPY = 0;
-
- /**
- * Indicates a 'happy' feature
- * A feature is considered to be 'ambiguous' in the context of a local site
- * if all the plug-ins referenced by the feature are installed on the site and other
- * version of any of the plug-ins are installed on any other site of the local site.
- *
- * @see ILocalSite#getStatus(IFeature)
- * @since 2.0
- */
- public static final int STATUS_AMBIGUOUS = 1;
-
- /**
- * Indicates an 'unhappy' feature
- * A feature is considered to be 'unhappy' in the context of this site,
- * if some of the plug-ins referenced by the feature are not installed on this site.
- *
- * @see ILocalSite#getStatus(IFeature)
- * @since 2.0
- */
- public static final int STATUS_UNHAPPY = 2;
-
-
- /**
- * Indicates a disable feature
- *
- * @see ILocalSite#getStatus(IFeature)
- * @since 2.0.2
- */
- public static final int STATUS_DISABLED = -1;
-
- /**
- * Indicates the one-click update will search the
- * location of the nesting root feature.
- *
- * @since 2.0.1
- */
- public static final int SEARCH_LOCATION_DEFAULT = 0;
-
- /**
- * Indicates the one-click update will search the
- * location defined by the feature.
- *
- * @since 2.0.1
- */
- public static final int SEARCH_LOCATION_FEATURE = 1;
-
- /**
- * Indicates the one-click update will search both the
- * location of the nesting root feature and the
- * location defined by the feature.
- *
- * @since 2.0.1
- */
- public static final int SEARCH_LOCATION_BOTH = 2;
-
-
- /**
- * Returns the feature identifier.
- *
- * @return the feature identifier.
- * @since 2.0
- */
- public VersionedIdentifier getVersionedIdentifier();
-
- /**
- * Returns the site this feature is associated with.
- *
- * @return the site for this feature
- * @since 2.0
- */
- public ISite getSite();
-
- /**
- * Returns the displayable label of the feature.
- *
- * @return feature label, or <code>null</code>.
- * @since 2.0
- */
- public String getLabel();
-
- /**
- * Returns the feature URL.
- * This is the URL that was used to create the feature. The interpretation
- * of the URL is dependent on the concrete feature implementation. *
- *
- * @see IFeatureFactory#createFeature(URL, ISite)
- * @return feature URL
- * @since 2.0
- */
- public URL getURL();
-
- /**
- * Returns an information entry referencing the location of the
- * feature update site. The update site can be accessed to obtain
- * feature updates for this feature.
- *
- * @return update site entry, or <code>null</code>.
- * @since 2.0
- */
- public IURLEntry getUpdateSiteEntry();
-
- /**
- * Return an array of information entries referencing locations of other
- * update sites. This mechanism can be used by features to distribute
- * location information about general update sites to clients.
- *
- * @return an array of site entries, or an empty array.
- * @since 2.0
- */
- public IURLEntry[] getDiscoverySiteEntries();
-
- /**
- * Returns a displayable label identifying the provider of this feature
- *
- * @return provider label, or <code>null</code>.
- * @since 2.0
- */
- public String getProvider();
-
- /**
- * Returns and optional custom install handler entry.
- *
- * @return install handler entry, or <code>null</code> if
- * none was specified
- * @since 2.0
- */
- public IInstallHandlerEntry getInstallHandlerEntry();
-
- /**
- * Returns the feature description.
- *
- * @return feature rescription, or <code>null</code>.
- * @since 2.0
- */
- public IURLEntry getDescription();
-
- /**
- * Returns the copyright information for the feature.
- *
- * @return copyright information, or <code>null</code>.
- * @since 2.0
- */
- public IURLEntry getCopyright();
-
- /**
- * Returns the license information for the feature.
- *
- * @return feature license, or <code>null</code>.
- * @since 2.0
- */
- public IURLEntry getLicense();
-
- /**
- * Return optional image for the feature.
- *
- * @return the URL pointing to the image, , or <code>null</code>.
- * @since 2.0
- */
- public URL getImage();
-
- /**
- * Return a list of plug-in dependencies for this feature. A plug-in
- * dependency is a reference to a plug-in required for feature execution
- * that is not packaged as part of the feature.
- *
- * @return the list of required plug-in dependencies, or an empty array.
- * @since 2.0
- */
- public IImport[] getImports();
-
- /**
- * Install the contents of this feature into the specified target feature.
- * All optional features will be installed
- *
- * @param targetFeature
- * @param verificationListener
- * @param monitor
- * @exception InstallAbortedException when the user cancels the install
- * @exception CoreException
- * @since 2.0
- */
- public IFeatureReference install(
- IFeature targetFeature,
- IVerificationListener verificationListener,
- IProgressMonitor monitor)
- throws InstallAbortedException,CoreException;
-
- /**
- * Install the contents of this feature into the specified target feature.
- * Only the listed optional features will be installed.
- *
- * @param targetFeature
- * @param optionalFeatures the optional features to be installed
- * @param verificationListener
- * @param monitor
- * @exception InstallAbortedException when the user cancels the install
- * @exception CoreException
- * @since 2.0.1
- */
- public IFeatureReference install(
- IFeature targetFeature,
- IFeatureReference[] optionalFeatures,
- IVerificationListener verificationListener,
- IProgressMonitor monitor)
- throws InstallAbortedException,CoreException;
-
- /**
- * Returns an array of feature references included by this feature
- * filtered by the operating system, windowing system and architecture system
- * set in <code>Sitemanager</code>
- *
- * @return an erray of feature references, or an empty array.
- * @since 2.0
- */
- public IIncludedFeatureReference[] getIncludedFeatureReferences() throws CoreException;
-
- /**
- * Returns an array of feature references included by this feature
- * No filtering occurs
- *
- * @return an erray of feature references, or an empty array.
- * @since 2.0
- */
- public IIncludedFeatureReference[] getRawIncludedFeatureReferences() throws CoreException;
-
- /**
- * Returns an array of plug-in entries referenced by this feature
- * filtered by the operating system, windowing system and architecture system
- * set in <code>Sitemanager</code>
- *
- * @return an erray of plug-in entries, or an empty array.
- * @since 2.0
- */
- public IPluginEntry[] getPluginEntries();
-
- /**
- * Returns an array of plug-in entries referenced by this feature
- * No filtering occurs
- *
- * @return an erray of plug-in entries, or an empty array.
- * @since 2.0
- */
- public IPluginEntry[] getRawPluginEntries();
-
- /**
- * Returns the count of referenced plug-in entries.
- *
- * @return plug-in entry count
- * @since 2.0
- */
- public int getPluginEntryCount();
-
- /**
- * Returns an array of non-plug-in entries referenced by this feature
- * filtered by the operating system, windowing system and architecture system
- * set in <code>Sitemanager</code>
- *
- * @return an erray of non-plug-in entries, or an empty array.
- * @since 2.0
- */
- public INonPluginEntry[] getNonPluginEntries();
-
- /**
- * Returns an array of non-plug-in entries referenced by this feature
- * No filtering occurs
- *
- * @return an erray of non-plug-in entries, or an empty array.
- * @since 2.0
- */
- public INonPluginEntry[] getRawNonPluginEntries();
-
- /**
- * Returns the count of referenced non-plug-in entries.
- *
- * @return non-plug-in entry count
- * @since 2.0
- */
- public int getNonPluginEntryCount();
-
- /**
- * Returns the download size of the feature, if it can be determined.
- *
- * @see org.eclipse.update.core.model.ContentEntryModel#UNKNOWN_SIZE
- * @return download size of the feature in KiloBytes, or an indication
- * the size could not be determined
- * @since 2.0
- */
- public long getDownloadSize();
-
- /**
- * Returns the install size of the feature, if it can be determined.
- *
- * @see org.eclipse.update.core.model.ContentEntryModel#UNKNOWN_SIZE
- * @return install size of the feature in KiloBytes, or an indication
- * the size could not be determined
- * @since 2.0
- */
- public long getInstallSize();
-
- /**
- * Indicates whether the feature can be used as a primary feature.
- *
- * @return <code>true</code> if this is a primary feature,
- * otherwise <code>false</code>
- * @since 2.0
- */
- public boolean isPrimary();
-
- /**
- * Returns an optional identifier of an application to be used when
- * starting up the platform with this feature as the primary feature.
- * The application identifier must represent a valid application registered
- * in the <code>org.eclipse.core.runtime.applications</code> extension point.
- *
- * @return application identifier, or <code>null</code>
- * @since 2.0
- */
- public String getApplication();
-
- /**
- * Returns an optional identifier of a colocation affinity feature.
- *
- * @return feature identifier, or <code>null</code>.
- * @since 2.0
- */
- public String getAffinityFeature();
-
- /**
- * Returns the content provider for this feature. A content provider
- * is an abstraction of each feature internal packaging structure.
- * It allows the feature content to be accessed in a standard way
- * regardless of the internal packaging. All concrete features
- * need to be able to return a content provider.
- *
- * @return feature content provider
- * @exception CoreExcepton
- * @since 2.0
- */
- public IFeatureContentProvider getFeatureContentProvider()
- throws CoreException;
-
- /**
- * Returns the content consumer for this feature. A content consumer
- * is an abstraction of each feature internal packaging mechanism.
- * It allows content to be stored into a feature in a standard way
- * regardless of the packaging mechanism used. Only concrete features
- * that support storing need to implement a content consumer. The platform
- * implements at least one feature type supporting content consumer.
- * This is the feature type representing a locally-installed
- * feature.
- *
- * @return feature content consumer
- * @exception CoreException
- * @exception UnsupportedOperationException
- * @since 2.0
- */
- public IFeatureContentConsumer getFeatureContentConsumer()
- throws CoreException;
-
- /**
- * Sets the site for this feature. This is typically performed as part
- * of the feature creation operation. Once set, the site
- * should not be reset.
- *
- * @param site the site
- * @throws CoreException site for this feature is already set
- * @since 2.0
- */
- public void setSite(ISite site) throws CoreException;
-
- /**
- * Sets the content provider for this feature. This is typically
- * performed as part of the feature creation operation. Once set, the
- * provider should not be reset.
- *
- * @see IFeatureFactory#createFeature(URL, ISite)
- * @param featureContentProvider content provider
- * @since 2.0
- */
- public void setFeatureContentProvider(IFeatureContentProvider featureContentProvider);
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureContentConsumer.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureContentConsumer.java
deleted file mode 100644
index 2cfa5b8..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureContentConsumer.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-/**
- * Feature content consumer.
- * A feature content consumer is an abstraction of each feature internal
- * packaging mechanism. It allows content to be stored into a feature in
- * a standard way regardless of the packaging mechanism used. Only concrete
- * features that support storing need to implement a content consumer.
- * The platform implements at least one feature type supporting content
- * consumer. This is the feature type representing a locally-installed
- * feature.
- * <p>
- * A feature content consumer delegates the storage of plug-in and
- * non-plug-in files to a generic content consumer.
- * </p>
- * <p>
- * Clients may implement this interface. However, in most cases clients
- * will only use the feature content consumer provided by the feature type(s)
- * implemented by the platform.
- * </p>
- * @see org.eclipse.update.core.IContentConsumer
- * @since 2.0
- */
-public interface IFeatureContentConsumer {
-
-
- /**
- * Store a feature file.
- * Note that only the feature definition files should be stored using
- * this method. Plug-in files and non-plug-in data files should be
- * stored using the content consumers corresponding to their respective
- * entries.
- *
- * @see #open(IPluginEntry)
- * @see #open(INonPluginEntry)
- * @param ContentReference content reference to feature file
- * @param IProgressMonitor progress monitor, can be <code>null</code>
- * @exception CoreException
- * @since 2.0
- */
- public void store(ContentReference contentReference, IProgressMonitor monitor)
- throws CoreException;
-
- /**
- * Opens a generic content consumer for the specified plug-in entry.
- * Plug-in files corresponding to this entry should be stored
- * using this content consumer.
- *
- * @param nonPluginEntry non-plug-in entry
- * @return generic content consumer for the entry
- * @exception CoreException
- * @since 2.0
- */
- public IContentConsumer open(IPluginEntry pluginEntry) throws CoreException;
-
- /**
- * Opens a generic content consumer for the specified non-plug-in entry.
- * Non-plug-in files corresponding to this entry should be stored
- * using this content consumer.
- *
- * @param nonPluginEntry non-plug-in entry
- * @return generic content consumer for the entry
- * @exception CoreException
- * @since 2.0
- */
- public IContentConsumer open(INonPluginEntry nonPluginEntry)
- throws CoreException;
-
- /**
- * Closes this content consumer. This indicates a successful completion
- * of the store operations. The content consumer commits any changes
- * made by this consumer.
- *
- * @return reference to the newly populated feature
- * @exception CoreException
- * @since 2.0
- */
- public IFeatureReference close() throws CoreException;
-
- /**
- * Closes this content consumer, indicating the store operations should
- * be aborted. The content consumer attempts to back out any changes
- * made by this content consumer.
- *
- * @exception CoreException
- * @since 2.0
- */
- public void abort() throws CoreException;
-
- /**
- * Sets the feature for this content consumer.
- * In general, this method should only be called as part of
- * feature creation. Once set, the feature should not be reset.
- *
- * @param feature feature for this content consumer
- * @since 2.0
- */
- public void setFeature(IFeature feature);
-
- /**
- * Returns the feature for this content consumer.
- *
- * @return the feature for this content consumer
- * @since 2.0
- */
- public IFeature getFeature();
-
- /**
- * Sets the parent for this content consumer.
- * In general, this method should only be called as part of
- * feature creation. Once set, the feature should not be reset.
- *
- * @param parent parent feature content consumer.
- * @since 2.0
- */
- public void setParent(IFeatureContentConsumer parent);
-
- /**
- * Returns the feature content consumer that opened
- * this feature content consumer, or <code>null</code>
- * if this feature content consumer is a root feature
- * content consumer.
- *
- * @return the parent feature content consumer, or null.
- * @since 2.0
- */
- public IFeatureContentConsumer getParent();
-
- /**
- * Link the content consumer of the feature as a child
- * content consumer
- *
- * @param feature the child feature.
- * @throws CoreException
- * @since 2.0
- */
- public void addChild(IFeature feature) throws CoreException;
-
- /**
- * Returns the feature content consumers that
- * this feature content consumer opened
- *
- * @return an array of feature content consumer, or en empty array.
- * @since 2.0
- */
- public IFeatureContentConsumer[] getChildren();
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureContentProvider.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureContentProvider.java
deleted file mode 100644
index a2ad313..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureContentProvider.java
+++ /dev/null
@@ -1,258 +0,0 @@
-package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import java.net.URL;
-
-import org.eclipse.core.runtime.CoreException;
-
-/**
- * Feature content provider.
- * A feature content provider is an abstraction of each feature internal
- * packaging structure. It allows the feature content to be accessed in
- * a standard way regardless of the internal packaging. All concrete feature
- * implementations need to implement a feature content provider.
- * <p>
- * There are two ways of looking at a feature content:
- * <ol>
- * <li>the "logical" view, which is a representation of the actual files that
- * make up the feature. These include any files that describe the feature
- * itself, files that are the actual implementation of referenced plug-ins,
- * and files that are the non-plug-in data files associated with the feature
- * <li>the "packaged" view, which is a set of related archive files that
- * contain the "logical" files.
- * </ol>
- * It is the responsibility of a feature content provider to manage the
- * mapping between the "packaged" and "logical" views.
- * </p>
- * <p>
- * Clients may implement this interface. However, in most cases clients should
- * directly instantiate or subclass the provided implementation of this
- * interface.
- * </p>
- * @see org.eclipse.update.core.FeatureContentProvider
- * @since 2.0
- */
-public interface IFeatureContentProvider {
-
- /**
- * Returns the feature url.
- * The exact interpretation of this URL is specific to each content
- * provider. Typically, the URL is a reference to a file that can be
- * used directly, or indirectly, to determine the content of the feature.
- *
- * @return feature url
- * @since 2.0
- */
- public URL getURL();
-
- /**
- * Returns a content reference to the feature manifest. The feature manifest
- * is an xml file, whose format is specified by the platform. Typically
- * a feature will contain the manifest as one of the packaged files.
- * For features that do not contain the manifest, or contain a manifest
- * that does not follow the specified format, this method returns
- * a reference to a computed manifest in the appropriate platform
- * format.
- *
- * @param monitor progress monitor, can be <code>null</code>
- * @return feature manifest reference, or <code>null</code> if the manifest cannot be found.
- * @since 2.0
- */
- public ContentReference getFeatureManifestReference(InstallMonitor monitor)
- throws CoreException;
-
- /**
- * Returns an array of content references of all the "packaged"
- * archives that make up this feature.
- * <p>
- * The number of returned references is dependent on each feature
- * content provider (ie. is dependent on the packaging mechanism used
- * by the particular feature type).
- * </p>
- *
- * @param monitor progress monitor, can be <code>null</code>
- * @return an array of references, or an empty array if no references
- * are found
- * @exception CoreException
- * @since 2.0
- */
- public ContentReference[] getArchiveReferences(InstallMonitor monitor)
- throws CoreException;
-
- /**
- * Returns an array of content references of the "packaged"
- * archives that contain the feature descriptive information.
- * <p>
- * In general, the feature descriptive information should be packaged
- * separately from the "bulk" of the actual feature content.
- * The feature entry archive(s) must be downloaded from an update
- * site in order to present information about the feature to the
- * client. Consequently, keeping the number and size of the feature
- * entry archive(s) to a minimum will speed up the responsiveness of the
- * user interface.
- * </p>
- * <p>
- * The number of returned references is dependent on each feature
- * content provider (ie. is dependent on the packaging mechanism used
- * by the particular feature type).
- * </p>
- *
- * @see IFeatureContentProvider#getFeatureEntryContentReferences(InstallMonitor)
- * @param monitor progress monitor, can be <code>null</code>
- * @return an array of references, or an empty array if no references
- * are found
- * @exception CoreException
- * @since 2.0
- */
- public ContentReference[] getFeatureEntryArchiveReferences(InstallMonitor monitor)
- throws CoreException;
-
- /**
- * Returns an array of content references of the "packaged"
- * archives that contain the files for the specified plug-in entry.
- * <p>
- * The number of returned references is dependent on each feature
- * content provider (ie. is dependent on the packaging mechanism used
- * by the particular feature type).
- * </p>
- *
- * @see IFeatureContentProvider#getPluginEntryContentReferences(IPluginEntry, InstallMonitor)
- * @param pluginEntry plug-in entry
- * @param monitor progress monitor, can be <code>null</code>
- * @return an array of references, or an empty array if no references
- * are found
- * @exception CoreException
- * @since 2.0
- */
- public ContentReference[] getPluginEntryArchiveReferences(
- IPluginEntry pluginEntry,
- InstallMonitor monitor)
- throws CoreException;
-
- /**
- * Returns an array of content references of the "packaged"
- * archives that contain the files for the specified non-plug-in entry.
- * <p>
- * The number of returned references is dependent on each feature
- * content provider (ie. is dependent on the packaging mechanism used
- * by the particular feature type).
- * </p>
- * <p>
- * Note, that the platform does not interpret non-plug-in entries in any
- * way, other that performing any required downloads. Non-plug-in entries
- * are handled by custom install handlers that must be specified for
- * the feature. Consequently, this interface does not make a distinction
- * between the "logical" and "packaged" views for non-plug-in entries.
- * The "packaged" view (returning references to the non-plug-in archives)
- * is the only one supported. It is the responsibility of the custom install
- * handler to understand the "logical" view of non-plug-in archives.
- * </p>
- *
- * @param monitor progress monitor, can be <code>null</code>
- * @return an array of references, or an empty array if no references
- * are found
- * @exception CoreException
- * @since 2.0
- */
- public ContentReference[] getNonPluginEntryArchiveReferences(
- INonPluginEntry nonPluginEntry,
- InstallMonitor monitor)
- throws CoreException;
-
- /**
- * Returns an array of content references to the feature definition files
- * (ie. the "logical" view of the files defining the feature). These
- * are the files required to present information about the feature to the
- * client, and in general, should not contain references to plug-in and
- * non-plug-in files.
- *
- * @see IFeatureContentProvider#getFeatureEntryArchiveReferences(InstallMonitor)
- * @param monitor progress monitor, can be <code>null</code>
- * @return an array of ContentReference or an empty array if no references are found
- * @exception CoreException when an error occurs
- * @since 2.0
- */
- public ContentReference[] getFeatureEntryContentReferences(InstallMonitor monitor)
- throws CoreException;
-
- /**
- * Returns an array of content references to the files implementing
- * the specified plug-in. (ie. the "logical" view of the plug-in).
- *
- * @see IFeatureContentProvider#getPluginEntryArchiveReferences(IPluginEntry, InstallMonitor)
- * @param monitor progress monitor, can be <code>null</code>
- * @return an array of ContentReference or an empty array if no references are found
- * @exception CoreException
- * @since 2.0
- */
- public ContentReference[] getPluginEntryContentReferences(
- IPluginEntry pluginEntry,
- InstallMonitor monitor)
- throws CoreException;
-
- /**
- * Returns the total size of all archives required for the
- * specified plug-in and non-plug-in entries (the "packaging" view).
- *
- * @param pluginEntries an array of plug-in entries
- * @param nonPluginEntries an array of non-plug-in entries
- * @return total download size, or an indication that size could not be
- * determined
- * @see org.eclipse.update.core.model.ContentEntryModel#UNKNOWN_SIZE
- * @exception CoreException
- * @since 2.0
- */
- public long getDownloadSizeFor(
- IPluginEntry[] pluginEntries,
- INonPluginEntry[] nonPluginEntries);
-
- /**
- * Returns the total size of all files required for the
- * specified plug-in and non-plug-in entries (the "logical" view).
- *
- * @param pluginEntries an array of plug-in entries
- * @param nonPluginEntries an array of non-plug-in entries
- * @return total download size, or an indication that size could not be
- * determined
- * @see org.eclipse.update.core.model.ContentEntryModel#UNKNOWN_SIZE
- * @exception CoreException
- * @since 2.0
- */
- public long getInstallSizeFor(
- IPluginEntry[] pluginEntries,
- INonPluginEntry[] nonPluginEntries);
-
- /**
- * Returns the verifier for this feature.
- * If provided, the verifier is called at various point during
- * installation processing to verify downloaded archives. The
- * type of verification provided is dependent on the content
- * provider implementation.
- *
- * @return verifier
- * @exception CoreException
- * @since 2.0
- */
- public IVerifier getVerifier() throws CoreException;
-
- /**
- * Returns the feature associated with this content provider.
- *
- * @return feature for this content provider
- * @since 2.0
- */
- public IFeature getFeature();
-
- /**
- * Sets the feature associated with this content provider.
- * In general, this method should only be called as part of
- * feature creation. Once set, the feature should not be reset.
- *
- * @param feature feature for this content provider
- * @since 2.0
- */
- public void setFeature(IFeature feature);
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureFactory.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureFactory.java
deleted file mode 100644
index 2d596f0..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureFactory.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import java.net.URL;
-
-import org.eclipse.core.runtime.CoreException;
-
-/**
- * Feature factory interface.
- * A feature factory is used to construct new instances of concrete
- * features.
- * <p>
- * Clients may implement this interface. However, in most cases clients should
- * directly instantiate or subclass the provided implementation of this
- * interface.
- * </p>
- * @see org.eclipse.update.core.BaseFeatureFactory
- * @since 2.0
- */
-public interface IFeatureFactory {
-
- /**
- * Returns a feature defined by the supplied URL. The feature
- * is associated with the specified site.
- * <p>
- * The actual interpretation of the URL is feature-type specific.
- * In most cases the URL will point to some feature-specific
- * file that can be used (directly or indirectly) to construct
- * the feature object.
- * </p>
- * @param url URL interpreted by the feature
- * @param site site to be associated with the feature
- * @return concrete feature object
- * @exception CoreException
- * @since 2.0
- */
- public IFeature createFeature(URL url, ISite site) throws CoreException;
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureReference.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureReference.java
deleted file mode 100644
index 305e688..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureReference.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import java.net.URL;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-
-/**
- * Feature reference.
- * A reference to a feature.
- * <p>
- * Clients may implement this interface. However, in most cases clients should
- * directly instantiate or subclass the provided implementation of this
- * interface.
- * </p>
- * @see org.eclipse.update.core.FeatureReference
- * @since 2.0
- */
-public interface IFeatureReference extends IAdaptable {
-
- /**
- * Returns the referenced feature URL.
- *
- * @return feature URL
- * @since 2.0
- */
- public URL getURL();
-
- /**
- * Returns the update site for the referenced feature
- *
- * @return feature site
- * @since 2.0
- */
- public ISite getSite();
-
- /**
- * Returns the referenced feature.
- * This is a factory method that creates the full feature object.
- *
- * @return the referenced feature
- * @since 2.0
- */
- public IFeature getFeature() throws CoreException;
-
- /**
- * Returns the feature identifier.
- *
- * @return the feature identifier.
- * @exception CoreException
- * @since 2.0
- */
- public VersionedIdentifier getVersionedIdentifier() throws CoreException;
-
- /**
- * Sets the feature reference URL.
- * This is typically performed as part of the feature reference creation
- * operation. Once set, the url should not be reset.
- *
- * @param url reference URL
- * @since 2.0
- */
- public void setURL(URL url) throws CoreException;
-
- /**
- * Associates a site with the feature reference.
- * This is typically performed as part of the feature reference creation
- * operation. Once set, the site should not be reset.
- *
- * @param site site for the feature reference
- * @since 2.0
- */
- public void setSite(ISite site);
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IImport.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IImport.java
deleted file mode 100644
index b1ebb5c..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IImport.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.eclipse.update.core;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import org.eclipse.core.runtime.IAdaptable;
-
-/**
- * Plug-in dependency entry.
- * Describes a feture dependency on a particular plug-in. The dependency
- * can specify a specific plug-in version and a matching rule for
- * satisfying the dependency.
- * <p>
- * Clients may implement this interface. However, in most cases clients should
- * directly instantiate or subclass the provided implementation of this
- * interface.
- * </p>
- * @see org.eclipse.update.core.Import
- * @since 2.0
- */
-public interface IImport extends IAdaptable, IUpdateConstants {
-
- /**
- * The import relates to a plugin
- * @since 2.0.2
- */
- public static final int KIND_PLUGIN = 0;
-
- /**
- * The import relates to a feature
- * @since 2.0.2
- */
- public static final int KIND_FEATURE = 1;
-
- /**
- * Returns an identifier of the dependent plug-in.
- *
- * @return plug-in identifier
- * @since 2.0
- */
- public VersionedIdentifier getVersionedIdentifier();
-
- /**
- * Returns the matching rule for the dependency.
- *
- * @return matching rule
- * @since 2.0
- */
- public int getRule();
-
- /**
- * Returns the dependency kind
- *
- * @see KIND_PLUGIN
- * @see KIND_FEATURE
- * @return KIND_PLUGIN if the dependency relates to a plugin,
- * KIND_FEATURE if the dependency relates to a feature.
- */
- public int getKind();
-
- /**
- * Returns the patch mode. If the import is in patch mode,
- * the referenced feature is considered a patch target,
- * and the feature that owns the import is patch carrier.
- * Patch carrier and patched feature are linked in a
- * distinct way: if a patched feature is disabled,
- * all the patches are disabled with it.
- * @return true if the element represents a patch
- * reference, false otherwise.
- */
- public boolean isPatch();
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IIncludedFeatureReference.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IIncludedFeatureReference.java
deleted file mode 100644
index 27d2eaa..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IIncludedFeatureReference.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package org.eclipse.update.core;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.update.configuration.IConfiguredSite;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-
-/**
- * Included Feature reference.
- * A reference to a included feature.
- * <p>
- * Clients may implement this interface. However, in most cases clients should
- * directly instantiate or subclass the provided implementation of this
- * interface.
- * </p>
- * @see org.eclipse.update.core.FeatureReference
- * @since 2.0.1
- */
-public interface IIncludedFeatureReference extends IFeatureReference, IPlatformEnvironment, IAdaptable {
-
- /**
- * Returns the referenced feature.
- * This is a factory method that creates the full feature object.
- * equivalent to getFeature(false,null);
- *
- * @return the referenced feature
- * @since 2.0
- */
- public IFeature getFeature() throws CoreException;
-
- /**
- * Returns the referenced feature.
- * This is a factory method that creates the full feature object.
- *
- * @param perfectMatch <code>true</code> if the perfect match feature feature should be returned
- * <code>false</code> if the best match feature should be returned.
- * @param configuredSite the configured site to search for the Feature. If
- * the configured site is <code>null</code> the search will be done in the current configured site.
- * @return the referenced feature
- * @since 2.0.2
- * <b>Note:</b> This method is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- */
- public IFeature getFeature(boolean perfectMatch,IConfiguredSite configuredSite) throws CoreException;
-
- /**
- * Returns <code>true</code> if the feature is optional, <code>false</code> otherwise.
- *
- * @return boolean
- * @since 2.0.1
- */
- public boolean isOptional();
-
- /**
- * Returns the name of the feature reference.
- *
- * @return feature reference name
- * @since 2.0.1
- */
- public String getName();
-
- /**
- * Returns the matching rule for this included feature.
- * The rule will determine the ability of the included feature to move version
- * without causing the overall feature to appear broken.
- *
- * The default is <code>RULE_PERFECT</code>
- *
- * @see IUpdateConstants#RULE_PERFECT
- * @see IUpdateConstants#RULE_EQUIVALENT
- * @see IUpdateConstants#RULE_COMPATIBLE
- * @see IUpdateConstants#RULE_GREATER_OR_EQUAL
- * @return int representation of feature matching rule.
- * @since 2.0.2
- */
- public int getMatch();
-
- /**
- * Returns the search location for this included feature.
- * The location will be used to search updates for this feature.
- *
- * The default is <code>SEARCH_ROOT</code>
- *
- * @see IFeatureReference#SEARCH_ROOT
- * @see IFeatureReference#SEARCH_SELF
- * @return int representation of feature searching rule.
- * @since 2.0.2
- */
-
- public int getSearchLocation();
-
-
- /**
- * Returns <code>true</code> if the feature references can be run on the platform specified by the
- * <code>Sitemanager</code>.
- * returns <code>false</code> if either the operating system, the windowing system or the architecture system
- * is not <code>null</code> and does not match the one specified in <code>SiteManager</code>
- *
- * @return <code>true</code> if the included feature operating system, windowing system and srchitecture system
- * match the one specified in <code>SiteManager</code>
- */
- public boolean matchesPlatform();
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IInstallHandler.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IInstallHandler.java
deleted file mode 100644
index 15a018d..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IInstallHandler.java
+++ /dev/null
@@ -1,232 +0,0 @@
-package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import org.eclipse.core.runtime.CoreException;
-
-/**
- * Custom install handler.
- * Custom install handlers can optionally be associated with a feature.
- * The actual install handler implementation can be physically delivered
- * as part of the feature package, or can already be installed on the client
- * machine and registered via the <code>org.eclipse.update.core.installHandlers</code>
- * extension point. The install handler methods are called at predetermined
- * point during update actions.
- * <p>
- * Clients may implement this interface. However, in most cases clients should
- * directly subclass the provided implementation of this interface.
- * </p>
- * @see org.eclipse.update.core.BaseInstallHandler
- * @since 2.0
- */
-public interface IInstallHandler {
-
- /**
- * Indicates the handler is being initialized for feature install.
- * @since 2.0
- */
- public static final int HANDLER_ACTION_INSTALL = 1;
-
- /**
- * Indicates the handler is being initialized for feature configure.
- * @since 2.0
- */
- public static final int HANDLER_ACTION_CONFIGURE = 2;
-
- /**
- * Indicates the handler is being initialized for feature unconfigure.
- * @since 2.0
- */
- public static final int HANDLER_ACTION_UNCONFIGURE = 3;
-
- /**
- * Indicates the handler is being initialized for feature uninstall.
- * @since 2.0
- */
- public static final int HANDLER_ACTION_UNINSTALL = 4;
-
- /**
- * Initialize the install handler.
- * Install handlers are always constructed using the default constructor.
- * The are initialized immediately following construction.
- *
- * @param type update action type
- * @param feature the target of the action
- * @param entry model entry that defines this handler
- * @param monitor optional progress monitor, can be <code>null</code>
- * @exception CoreException
- * @since 2.0
- */
- public void initialize(
- int type,
- IFeature feature,
- IInstallHandlerEntry entry,
- InstallMonitor monitor)
- throws CoreException;
-
- /**
- * Called at the start of the install action. At this point, no install
- * processing has taken place.
- *
- * @see #HANDLER_ACTION_INSTALL
- * @exception CoreException terminates the action
- * @since 2.0
- */
- public void installInitiated() throws CoreException;
-
- /**
- * Called after files corresponding to plug-in entries have been downloaded,
- * but before they are actully unpacked and installed.
- *
- * @see #HANDLER_ACTION_INSTALL
- * @param plugins downloaded plug-in entries. Note this may be a subset
- * of the plug-ins actually references by the feature.
- * @exception CoreException terminates the action
- * @since 2.0
- */
- public void pluginsDownloaded(IPluginEntry[] plugins) throws CoreException;
-
- /**
- * Called after files corresponding to non-plug-in entries have been
- * downloaded. The custom install handler can perform any custom
- * verification of the non-plug-in entries (these are not interpreted
- * in any way by the platform (beyond downloading)).
- *
- * @see #HANDLER_ACTION_INSTALL
- * @param nonPluginData downloaded non-plug-in entries.
- * @param listener verification listener, may be <code>null</code>.
- * @exception CoreException terminates the action
- * @since 2.0
- */
- public void nonPluginDataDownloaded(
- INonPluginEntry[] nonPluginData,
- IVerificationListener listener)
- throws CoreException;
-
- /**
- * Called after the feature files and any downloaded plug-ins have
- * been installed. Typically this is the point where the custom
- * install handler can install any non-plug-in entries (these are not
- * interpreted in any way by the platform (beyond downloading)).
- *
- * @see #HANDLER_ACTION_INSTALL
- * @param consumer content consumer for the feature. The install handler
- * can choose to use this consumer to install the non-plug-in data,
- * or can handle the data in any other way. If using the consumer,
- * the install handler should only call
- * @see IFeatureContentConsumer#store(ContentReference, IProgressMonitor)
- * and @see IFeatureContentConsumer#open(INonPluginEntry)
- * methods of the consumer.
- * @exception CoreException terminates the action
- * @since 2.0
- */
- public void completeInstall(IFeatureContentConsumer consumer)
- throws CoreException;
-
- /**
- * Called at the end of the install action.
- *
- * @see #HANDLER_ACTION_INSTALL
- * @param success indicates action success.
- * @exception CoreException terminates the action
- * @since 2.0
- */
- public void installCompleted(boolean success) throws CoreException;
-
- /**
- * Called at the start of the configure action
- *
- * @see #HANDLER_ACTION_CONFIGURE
- * @exception CoreException terminates the action
- * @since 2.0
- */
- public void configureInitiated() throws CoreException;
-
- /**
- * Called after the feature has been configured. The install handler
- * should perform any completion tasks. No arguments are passed
- * to the method. If needed, the install handler can use arguments
- * passed on the initialization call.
- *
- * @see #HANDLER_ACTION_CONFIGURE
- * @exception CoreException terminates the action
- * @since 2.0
- */
- public void completeConfigure() throws CoreException;
-
- /**
- * Called at the end of the configure action.
- *
- * @see #HANDLER_ACTION_CONFIGURE
- * @param success indicates action success.
- * @exception CoreException terminates the action
- * @since 2.0
- */
- public void configureCompleted(boolean success) throws CoreException;
-
- /**
- * Called at the start of the unconfigure action
- *
- * @see #HANDLER_ACTION_UNCONFIGURE
- * @exception CoreException terminates the action
- * @since 2.0
- */
- public void unconfigureInitiated() throws CoreException;
-
- /**
- * Called after the feature has been unconfigured. The install handler
- * should perform any completion tasks. No arguments are passed
- * to the method. If needed, the install handler can use arguments
- * passed on the initialization call.
- *
- * @see #HANDLER_ACTION_UNCONFIGURE
- * @exception CoreException terminates the action
- * @since 2.0
- */
- public void completeUnconfigure() throws CoreException;
-
- /**
- * Called at the end of the unconfigure action.
- *
- * @see #HANDLER_ACTION_UNCONFIGURE
- * @param success indicates action success.
- * @exception CoreException terminates the action
- * @since 2.0
- */
- public void unconfigureCompleted(boolean success) throws CoreException;
-
- /**
- * Called at the start of the uninstall action
- *
- * @see #HANDLER_ACTION_UNINSTALL
- * @exception CoreException terminates the action
- * @since 2.0
- */
- public void uninstallInitiated() throws CoreException;
-
- /**
- * Called after the feature has been uninstalled. The install handler
- * should perform any completion tasks. No arguments are passed
- * to the method. If needed, the install handler can use arguments
- * passed on the initialization call. Note, that at this point
- * the feature files and any unreferenced plug-ins have been
- * removed.
- *
- * @see #HANDLER_ACTION_UNINSTALL
- * @exception CoreException terminates the action
- * @since 2.0
- */
- public void completeUninstall() throws CoreException;
-
- /**
- * Called at the end of the uninstall action.
- *
- * @see #HANDLER_ACTION_UNINSTALL
- * @param success indicates action success.
- * @exception CoreException terminates the action
- * @since 2.0
- */
- public void uninstallCompleted(boolean success) throws CoreException;
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IInstallHandlerEntry.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IInstallHandlerEntry.java
deleted file mode 100644
index 784e5a6..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IInstallHandlerEntry.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import java.net.URL;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-/**
- * Install handler entry.
- * Associates an optional custom install handler with the feature.
- * Install handlers must implement the IInstallHandler interface.
- * <p>
- * Clients may implement this interface. However, in most cases clients should
- * directly instantiate or subclass the provided implementation of this
- * interface.
- * </p>
- * @see org.eclipse.update.core.InstallHandlerEntry
- * @see org.eclipse.update.core.IInstallHandler
- * @since 2.0
- */
-public interface IInstallHandlerEntry extends IAdaptable {
-
- /**
- * Returns optional URL used for browser-triggered installation handling.
- *
- * @return url
- * @since 2.0
- */
- public URL getURL();
-
- /**
- * Returns optional name of a library containing the install
- * handler classes. If specified, the referenced library
- * must be contained in the feature archive.
- *
- * @return install handler library name
- * @since 2.0
- */
- public String getLibrary();
-
- /**
- * Returns install handler name.
- * It is interpreted depending on the value of the library
- * specification. If library is not specified, the name
- * is intepreted as an identifier of a "global" install
- * handler registered in the <code>org.eclipse.update.core.installHandlers</code>
- * extension point. If library is specified, the name is interpreted
- * as a fully qualified name of a class contained in the
- * library. In both cases, the resulting class must
- * implement IInstallHandler. The class is dynamically loaded and
- * called at specific points during feature processing.
- * The handler has visibility to the API classes from the update plug-in,
- * and plug-ins required by the update plugin.
- *
- * @see IInstallHandler
- * @return handler name
- * @since 2.0
- */
- public String getHandlerName();
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/INonPluginEntry.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/INonPluginEntry.java
deleted file mode 100644
index ab025e0..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/INonPluginEntry.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import org.eclipse.core.runtime.IAdaptable;
-
-/**
- * Non-plug-in entry defines an arbitrary non-plug-in data file packaged
- * as part of a feature. Non-plug-in entries are not interpreted by the
- * platform (other than being downloaded as part of an install action).
- * They require a custom install handler to be specified as part of the
- * feature. Note, that defining a non-plug-in entry does not necessarily
- * indicate the non-plug-in file is packaged together with any other
- * feature files. The actual packaging details are determined by the
- * feature content provider for the feature.
- * <p>
- * Clients may implement this interface. However, in most cases clients should
- * directly instantiate or subclass the provided implementation of this
- * interface.
- * </p>
- * @see org.eclipse.update.core.NonPluginEntry
- * @see org.eclipse.update.core.FeatureContentProvider
- * @since 2.0
- */
-public interface INonPluginEntry extends IPlatformEnvironment, IAdaptable {
-
- /**
- * Returns the identifier of this data entry.
- *
- * @return data entry identifier
- * @since 2.0
- */
- public String getIdentifier();
-
- /**
- * Returns the download size of the entry, if it can be determined.
- *
- * @see org.eclipse.update.core.model.ContentEntryModel#UNKNOWN_SIZE
- * @return download size of the feature in KiloBytes, or an indication
- * the size could not be determined
- * @since 2.0
- */
- public long getDownloadSize();
-
- /**
- * Returns the install size of the feature, if it can be determined.
- *
- * @see org.eclipse.update.core.model.ContentEntryModel#UNKNOWN_SIZE
- * @return install size of the feature in KiloBytes, or an indication
- * the size could not be determined
- * @since 2.0
- */
- public long getInstallSize();
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IPlatformEnvironment.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IPlatformEnvironment.java
deleted file mode 100644
index c59212c..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IPlatformEnvironment.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import org.eclipse.core.runtime.IAdaptable;
-
-/**
- * Plug-in entry defines a packaging reference from a feature to a plug-in.
- * It indicates that the referenced plug-in is to be considered as
- * part of the feature. Note, that this does not necessarily indicate
- * that the plug-in files are packaged together with any other
- * feature files. The actual packaging details are determined by the
- * feature content provider for the feature.
- * <p>
- * Clients may implement this interface. However, in most cases clients should
- * directly instantiate or subclass the provided implementation of this
- * interface.
- * </p>
- * @see org.eclipse.update.core.PluginEntry
- * @see org.eclipse.update.core.FeatureContentProvider
- * @since 2.0
- */
-public interface IPlatformEnvironment extends IAdaptable {
-
-
- /**
- * Returns optional operating system specification.
- * A comma-separated list of os designators defined by the platform.
- * Indicates this entry should only be installed on one of the specified
- * os systems. If this attribute is not specified, the entry can be
- * installed on all systems (portable implementation).
- *
- * This information is used as a hint by the installation and update
- * support.
- *
- * @see org.eclipse.core.boot.BootLoader
- * @return the operating system specification, or <code>null</code>.
- * @since 2.0
- */
- public String getOS();
-
- /**
- * Returns optional system architecture specification.
- * A comma-separated list of arch designators defined by the platform.
- * Indicates this entry should only be installed on one of the specified
- * systems. If this attribute is not specified, the entry can be
- * installed on all systems (portable implementation).
- *
- * This information is used as a hint by the installation and update
- * support.
- *
- * @see org.eclipse.core.boot.BootLoader
- * @return system architecture specification, or <code>null</code>.
- * @since 2.0
- */
- public String getWS();
-
- /**
- * Returns optional system architecture specification.
- * A comma-separated list of arch designators defined by the platform.
- * Indicates this entry should only be installed on one of the specified
- * systems. If this attribute is not specified, the entry can be
- * installed on all systems (portable implementation).
- *
- * This information is used as a hint by the installation and update
- * support.
- *
- * @see org.eclipse.core.boot.BootLoader
- * @return system architecture specification, or <code>null</code>.
- * @since 2.0
- */
- public String getOSArch();
-
- /**
- * Returns optional locale specification.
- * A comma-separated list of locale designators defined by Java.
- * Indicates this entry should only be installed on a system running
- * with a compatible locale (using Java locale-matching rules).
- * If this attribute is not specified, the entry can be installed
- * on all systems (language-neutral implementation).
- *
- * This information is used as a hint by the installation and update
- * support.
- *
- * @return the locale specification, or <code>null</code>.
- * @since 2.0
- */
- public String getNL();
-
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IPluginEntry.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IPluginEntry.java
deleted file mode 100644
index 8c24582..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IPluginEntry.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import org.eclipse.core.runtime.IAdaptable;
-
-/**
- * Plug-in entry defines a packaging reference from a feature to a plug-in.
- * It indicates that the referenced plug-in is to be considered as
- * part of the feature. Note, that this does not necessarily indicate
- * that the plug-in files are packaged together with any other
- * feature files. The actual packaging details are determined by the
- * feature content provider for the feature.
- * <p>
- * Clients may implement this interface. However, in most cases clients should
- * directly instantiate or subclass the provided implementation of this
- * interface.
- * </p>
- * @see org.eclipse.update.core.PluginEntry
- * @see org.eclipse.update.core.FeatureContentProvider
- * @since 2.0
- */
-public interface IPluginEntry extends IPlatformEnvironment,IAdaptable {
-
- /**
- * Returns the identifier of this plugin entry
- *
- * @return plugin entry identifier
- * @since 2.0
- */
- public VersionedIdentifier getVersionedIdentifier();
-
- /**
- * Returns an indication whethyer this entry represents a fragment.
- *
- * @return <code>true</code> if the entry represents a plug-in fragment,
- * <code>false</code> if the entry represents a plug-in
- * @since 2.0
- */
- public boolean isFragment();
-
- /**
- * Returns the download size of the entry, if it can be determined.
- *
- * @see org.eclipse.update.core.model.ContentEntryModel#UNKNOWN_SIZE
- * @return download size of the feature in KiloBytes, or an indication
- * the size could not be determined
- * @since 2.0
- */
- public long getDownloadSize();
-
- /**
- * Returns the install size of the feature, if it can be determined.
- *
- * @see org.eclipse.update.core.model.ContentEntryModel#UNKNOWN_SIZE
- * @return install size of the feature in KiloBytes, or an indication
- * the size could not be determined
- * @since 2.0
- */
- public long getInstallSize();
-
- /**
- * Sets the identifier of this plugin entry.
- * This is typically performed as part of the plug-in entry creation
- * operation. Once set, the identifier should not be reset.
- *
- * @param identifier plugin entry identifier
- * @since 2.0
- */
- public void setVersionedIdentifier(VersionedIdentifier identifier);
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/ISite.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/ISite.java
deleted file mode 100644
index 3fc7c25..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/ISite.java
+++ /dev/null
@@ -1,289 +0,0 @@
-package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-import java.net.URL;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.configuration.IConfiguredSite;
-import org.eclipse.update.core.model.InstallAbortedException;
-
-/**
- * Site represents a location containing some number of features (packaged
- * or installed). Sites are treated purely as an installation and packaging
- * construct. They do not play a role during Eclipse plug-in execution.
- * <p>
- * Clients may implement this interface. However, in most cases clients should
- * directly instantiate or subclass the provided implementation of this
- * interface.
- * </p>
- * @see org.eclipse.update.core.Site
- * @since 2.0
- */
-public interface ISite extends IAdaptable {
-
- /**
- * Default type for an installed feature. Different concrete feature
- * implementations can be registered together with their corresponding type
- * using the <code>org.eclipse.update.core.featureTypes</code>
- * extension point.
- *
- * @since 2.0
- */
- public static final String DEFAULT_INSTALLED_FEATURE_TYPE = "org.eclipse.update.core.installed";
- //$NON-NLS-1$
-
- /**
- * Default type for a packaged feature. Different concrete feature
- * implementations can be registered together with their corresponding type
- * using the <code>org.eclipse.update.core.featureTypes</code>
- * extension point.
- *
- * @since 2.0
- */
- public static final String DEFAULT_PACKAGED_FEATURE_TYPE = "org.eclipse.update.core.packaged";
- //$NON-NLS-1$
-
- /**
- * If we are unable to access a site, the returned CoreException will contain
- * this return code.
- *
- * @since 2.0.1
- */
- public static final int SITE_ACCESS_EXCEPTION = 42;
-
- /**
- * Returns the site URL
- *
- * @return site URL
- * @since 2.0
- */
- public URL getURL();
-
- /**
- * Return the site type. Different concrete site implementations can be
- * registered together with their corresponding type using the
- * <code>org.eclipse.update.core.siteTypes</code> extension point.
- *
- * @return site type, or <code>null</code>.
- * @since 2.0
- */
- public String getType();
-
- /**
- * Returns the site description.
- *
- * @return site description, or <code>null</code>.
- * @since 2.0
- */
- public IURLEntry getDescription();
-
- /**
- * Returns an array of categories defined by the site.
- *
- * @return array of site categories, or an empty array.
- * @since 2.0
- */
- public ICategory[] getCategories();
-
- /**
- * Returns the named site category.
- *
- * @param name category name
- * @return named category, or <code>null</code> ifit does not exist
- * @since 2.0
- */
- public ICategory getCategory(String name);
-
- /**
- * Returns an array of references to features on this site.
- *
- * @return an array of feature references, or an empty array.
- * @since 2.0
- */
- public ISiteFeatureReference[] getFeatureReferences();
-
- /**
- * Returns a reference to the specified feature if
- * it is installed on this site.
- *
- * @param feature feature
- * @return feature reference, or <code>null</code> if this feature
- * cannot be located on this site.
- * @since 2.0
- */
- public ISiteFeatureReference getFeatureReference(IFeature feature);
-
- /**
- * Returns an array of plug-in and non-plug-in archives located
- * on this site
- *
- * @return an array of archive references, or an empty array if there are
- * no archives known to this site. Note, that an empty array does not
- * necessarily indicate there are no archives accessible on this site.
- * It simply indicates the site has no prior knowledge of such archives.
- * @since 2.0
- */
- public IArchiveReference[] getArchives();
-
- /**
- * Returns the content provider for this site. A content provider
- * is an abstraction of each site organization. It allows the
- * content of the site to be accessed in a standard way
- * regardless of the organization. All concrete sites
- * need to be able to return a content provider.
- *
- * @return site content provider
- * @exception CoreException
- * @since 2.0
- */
- public ISiteContentProvider getSiteContentProvider() throws CoreException;
-
- /**
- * Returns the default type for a packaged feature supported by this site
- *
- * @return feature type, as registered in the
- * <code>org.eclipse.update.core.featureTypes</code> extension point.
- * @since 2.0
- */
- public String getDefaultPackagedFeatureType();
-
- /**
- * Returns an array of entries corresponding to plug-ins installed
- * on this site.
- *
- * @return array of plug-in entries,or an empty array.
- * @since 2.0
- */
- public IPluginEntry[] getPluginEntries();
-
- /**
- * Returns the number of plug-ins installed on this site
- *
- * @return number of installed plug-ins
- * @since 2.0
- */
- public int getPluginEntryCount();
-
- /**
- * Adds a new plug-in entry to this site.
- *
- * @param pluginEntry plug-in entry
- * @since 2.0
- */
- public void addPluginEntry(IPluginEntry pluginEntry);
-
- /**
- * Returns an array of entries corresponding to plug-ins that are
- * installed on this site and are referenced only by the specified
- * feature. These are plug-ins that are not shared with any other
- * feature.
- *
- * @param feature feature
- * @return an array of plug-in entries, or an empty array.
- * @exception CoreException
- * @since 2.0
- */
- public IPluginEntry[] getPluginEntriesOnlyReferencedBy(IFeature feature) throws CoreException;
-
- /**
- * Returns the size of the files that need to be downloaded in order
- * to install the specified feature on this site, if it can be determined.
- * This method takes into account any plug-ins that are already
- * available on this site.
- *
- * @see org.eclipse.update.core.model.ContentEntryModel#UNKNOWN_SIZE
- * @param feature candidate feature
- * @return download size of the feature in KiloBytes, or an indication
- * the size could not be determined
- * @since 2.0
- */
- public long getDownloadSizeFor(IFeature feature);
-
- /**
- * Returns the size of the files that need to be installed
- * for the specified feature on this site, if it can be determined.
- * This method takes into account any plug-ins that are already
- * installed on this site.
- *
- * @see org.eclipse.update.core.model.ContentEntryModel#UNKNOWN_SIZE
- * @param feature candidate feature
- * @return install size of the feature in KiloBytes, or an indication
- * the size could not be determined
- * @since 2.0
- */
- public long getInstallSizeFor(IFeature site);
-
- /**
- * Installs the specified feature on this site.
- *
- * @param feature feature to install
- * @param verificationListener install verification listener
- * @param monitor install monitor, can be <code>null</code>
- * @exception InstallAbortedException when the user cancels the install
- * @exception CoreException
- * @since 2.0
- */
- public IFeatureReference install(IFeature feature, IVerificationListener verificationListener, IProgressMonitor monitor) throws InstallAbortedException, CoreException;
-
- /**
- * Installs the specified feature on this site.
- * Only optional features passed as parameter will be installed.
- *
- * @param feature feature to install
- * @param optionalfeatures list of optional features to be installed
- * @param verificationListener install verification listener
- * @param monitor install monitor, can be <code>null</code>
- * @exception InstallAbortedException when the user cancels the install
- * @exception CoreException
- * @since 2.0
- */
- public IFeatureReference install(IFeature feature, IFeatureReference[] optionalfeatures, IVerificationListener verificationListener, IProgressMonitor monitor) throws InstallAbortedException, CoreException;
-
- /**
- * Removes (uninstalls) the specified feature from this site. This method
- * takes into account plug-in entries referenced by the specified fetaure
- * that continue to be required by other features installed on this site.
- *
- * @param feature feature to remove
- * @param monitor progress monitor
- * @exception CoreException
- * @since 2.0
- */
- public void remove(IFeature feature, IProgressMonitor monitor) throws CoreException;
-
- /**
- * Sets the site content provider. This is typically performed
- * as part of the site creation operation. Once set, the
- * provider should not be reset.
- *
- * @param siteContentProvider site content provider
- * @since 2.0
- */
- public void setSiteContentProvider(ISiteContentProvider siteContentProvider);
-
- /**
- * Returns the <code>IConfiguredSite</code> for this site in the current
- * configuration or <code>null</code> if none found.
- *
- * @since 2.0.2
- */
- public IConfiguredSite getCurrentConfiguredSite();
-
- /**
- * Creates a new feature object. The feature must exist on this site
- * or a core exception will be thrown. Concrete implementations
- * may elect to cache instances, in which case subsequent calls
- * to create a feature with the same URL will
- * return the same instance.
- * param type the feature type that will be used to select the factory. If
- * <code>null</code> is passed, default feature type will be used.
- * param url URL of the feature archive as listed in the site.
- * return newly created feature object, or a cached value if
- * caching is implemented by this site.
- */
-
- IFeature createFeature(String type, URL url) throws CoreException;
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteContentProvider.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteContentProvider.java
deleted file mode 100644
index c5621f2..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteContentProvider.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import java.net.URL;
-
-import org.eclipse.core.runtime.CoreException;
-
-/**
- * Site content provider.
- * A site content provider is an abstraction of each site internal
- * organization. It allows the site content to be accessed in
- * a standard way regardless of the internal organization. All concrete site
- * implementations need to implement a site content provider.
- * <p>
- * Clients may implement this interface. However, in most cases clients should
- * directly instantiate or subclass the provided implementation of this
- * interface.
- * </p>
- * @see org.eclipse.update.core.SiteContentProvider
- * @since 2.0
- */
-
-public interface ISiteContentProvider {
-
- /**
- * Returns the URL of this site
- *
- * @return site URL
- * @since 2.0
- */
- public URL getURL();
-
-
- /**
- * Returns a URL for the identified archive.
- *
- * @param id archive identifier
- * @return archive URL, or <code>null</code>.
- * @exception CoreException
- * @since 2.0
- */
- public URL getArchiveReference(String id) throws CoreException;
-
- /**
- * Returns the site for this provider.
- *
- * @return provider site
- * @since 2.0
- */
- public ISite getSite();
-
- /**
- * Sets the site for this provider.
- * In general, this method should only be called as part of
- * site creation. Once set, the site should not be reset.
- *
- * @param site provider site
- * @since 2.0
- */
- public void setSite(ISite site);
-}
-
-
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteFactory.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteFactory.java
deleted file mode 100644
index 87d2c93..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteFactory.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import java.net.URL;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.update.core.model.InvalidSiteTypeException;
-
-/**
- * Site factory interface.
- * A site factory is used to construct new instances of concrete
- * sites.
- * <p>
- * Clients may implement this interface. However, in most cases clients should
- * directly instantiate or subclass the provided implementation of this
- * interface.
- * </p>
- * @see org.eclipse.update.core.BaseSiteFactory
- * @since 2.0
- */
-
-public interface ISiteFactory {
-
- /**
- * Returns a site defined by the supplied URL.
- * <p>
- * The actual interpretation of the URL is site-type specific.
- * In most cases the URL will point to some site-specific
- * file that can be used (directly or indirectly) to construct
- * the site object.
- * </p>
- * @param url URL interpreted by the site
- * @return site object
- * @exception CoreException
- * @exception InvalidSiteTypeException the referenced site type is
- * not a supported type for this factory
- * @since 2.0
- */
- public ISite createSite(URL url)
- throws CoreException, InvalidSiteTypeException;
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteFeatureReference.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteFeatureReference.java
deleted file mode 100644
index 0bbd4b7..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteFeatureReference.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import org.eclipse.core.runtime.IAdaptable;
-
-/**
- * Site Feature reference.
- * A reference to a feature on a particular update site.
- * <p>
- * Clients may implement this interface. However, in most cases clients should
- * directly instantiate or subclass the provided implementation of this
- * interface.
- * </p>
- * @see org.eclipse.update.core.FeatureReference
- * @since 2.0
- */
-public interface ISiteFeatureReference extends IFeatureReference, IAdaptable {
-
- /**
- * Returns an array of categories the referenced feature belong to.
- *
- * @return an array of categories, or an empty array
- * @since 2.0
- */
- public ICategory[] getCategories();
-
- /**
- * Adds a category to the referenced feature.
- *
- * @param category new category
- * @since 2.0
- */
- public void addCategory(ICategory category);
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IURLEntry.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IURLEntry.java
deleted file mode 100644
index 6ad338e..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IURLEntry.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import java.net.URL;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-/**
- * URL entry is an annotated URL object. It allows descriptive text to be
- * associated with a URL. When used as description object, the annotation
- * typically corresponds to short descriptive text, with the URL reference
- * pointing to full browsable description.
- * <p>
- * Clients may implement this interface. However, in most cases clients should
- * directly instantiate or subclass the provided implementation of this
- * interface.
- * </p>
- * @see org.eclipse.update.core.URLEntry
- * @since 2.0
- */
-public interface IURLEntry extends IAdaptable {
-
- /**
- * Returns the URL annotation.
- *
- * @return url annotation
- * @since 2.0
- */
- public String getAnnotation();
-
- /**
- * Returns the actual URL.
- *
- * @return url
- * @since 2.0
- */
- public URL getURL();
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IUpdateConstants.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IUpdateConstants.java
deleted file mode 100644
index 6044f94..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IUpdateConstants.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.eclipse.update.core;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-/**
- * Manages a list of static constants.
- *
- * @since 2.0.2
- */
-public interface IUpdateConstants {
-
- /**
- * No matching rule specified
- * @since 2.0
- */
- public static final int RULE_NONE = 0;
-
- /**
- * Dependency can be satisfied only with plug-in version matching
- * exactly the specified version.
- * @since 2.0
- */
- public static final int RULE_PERFECT = 1;
-
- /**
- * Dependency can be satisfied only with plug-in version that is
- * equivalent to the specified version (same major and minor version
- * identifier, greater than or equal service identifier).
- * @since 2.0
- */
- public static final int RULE_EQUIVALENT = 2;
-
- /**
- * Dependency can be satisfied only with plug-in version that is
- * compatible with the specified version (either is equivalent,
- * or greater minor identifier (but same major identifier)).
- * @since 2.0
- */
- public static final int RULE_COMPATIBLE = 3;
-
- /**
- * Dependency can be satisfied only with plug-in version that is
- * greater or equal to the specified version.
- * @since 2.0
- */
- public static final int RULE_GREATER_OR_EQUAL = 4;
-
- /**
- * The search location for updates is defined by the root feature.
- * @since 2.0.2
- */
- public static final int SEARCH_ROOT = 1<<1;
-
- /**
- * The search location for updates is defined by this feature.
- * @since 2.0.2
- */
- public static final int SEARCH_SELF = 1<<2;
-
-
-}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IVerificationListener.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IVerificationListener.java
deleted file mode 100644
index 1f8390c..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IVerificationListener.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-/**
- * Verification listener. This interface abstract the user interaction
- * that may be required as a result of feature installation. In particular,
- * as feature archives are downloaded and verified, the user may need to
- * indicate whether to accept any one of the archives, or abort the
- * installation.
- * <p>
- * Clients may implement this interface.
- * </p>
- * @see org.eclipse.update.core.IVerificationResult
- * @see org.eclipse.update.core.IVerifier
- * @since 2.0
- */
-
-public interface IVerificationListener {
-
- /**
- * Indicate the action that resulted in this notification should be aborted.
- *
- * @since 2.0
- */
- public static final int CHOICE_ABORT = 0;
-
- /**
- * Indicate there was an error in processing the request.
- * The action that resulted in this notification should be aborted.
- *
- * @since 2.0
- */
- public static final int CHOICE_ERROR = 1;
-
- /**
- * Indicate that the target of the verification should be accepted,
- * but the information supplied with the verification result
- * should be trusted only for this request.
- *
- * @since 2.0
- */
- public static final int CHOICE_INSTALL_TRUST_ONCE = 2;
-
- /**
- * Indicate that the target of the verification should be accepted,
- * and the information supplied with the verification result
- * should be trusted for this request, and subsequent requests.
- *
- * @since 2.0
- */
- public static final int CHOICE_INSTALL_TRUST_ALWAYS = 3;
-
- /**
- * Determine if we should continue with the current action
- * based on the indicated verification results. Typically,
- * the implementation of this method will prompt the user
- * for the appropriate answer. However, other respose
- * implementations can be provided.
- *
- * @param result verification result
- * @since 2.0
- */
- public int prompt(IVerificationResult result);
-}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IVerificationResult.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IVerificationResult.java
deleted file mode 100644
index 04f44dc..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IVerificationResult.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-/**
- * Verification result. An object implementing this interface represents
- * a token passed between the update framework and the verifier and verification
- * listener. The verifier uses the token to capture the result of the file
- * verification. It is then passed to the verification listener
- * to optionally present this information to the user (in an
- * implementation-specific way). The verification listener in turn
- * uses this token to capture the desired response.
- * <p>
- * Clients may implement this interface.
- * </p>
- * @see
- * @since 2.0
- */
-public interface IVerificationResult {
-
- /**
- * Indicates the file type is recognized but the file is not signed
- *
- * @see #TYPE_ENTRY_UNRECOGNIZED
- * @since 2.0
- */
- public static final int TYPE_ENTRY_NOT_SIGNED = 1;
-
- /**
- * Indicates the file has been modified since it was signed
- *
- * @since 2.0
- */
- public static final int TYPE_ENTRY_CORRUPTED = 2;
-
- /**
- * Indicates the file is signed by a known signer
- *
- * @since 2.0
- */
- public static final int TYPE_ENTRY_SIGNED_RECOGNIZED = 3;
-
- /**
- * Indicates the file is signed but the signer is not known
- *
- * @since 2.0
- */
- public static final int TYPE_ENTRY_SIGNED_UNRECOGNIZED = 5;
-
- /**
- * Error occurred during verification
- *
- * @since 2.0
- */
- public static final int UNKNOWN_ERROR = 6;
-
- /**
- * Verification was cancelled
- *
- * @since 2.0
- */
- public static final int VERIFICATION_CANCELLED = 7;
-
- /**
- * Could not perform verification due to unrecognized file
- *
- * @see #TYPE_ENTRY_NOT_SIGNED
- * @since 2.0
- */
- public static final int TYPE_ENTRY_UNRECOGNIZED = 8;
-
- /**
- * Returns the content reference that is the target of the verification.
- *
- * @return content reference
- * @since 2.0
- */
- public ContentReference getContentReference();
-
- /**
- * Returns the feature the referenced file is part of.
- *
- * @return feature
- * @since 2.0
- */
- public IFeature getFeature();
-
- /**
- * Returns the verification code.
- *
- * @return verification code, as defined in this interface.
- * @since 2.0
- */
- public int getVerificationCode();
-
- /**
- * Returns any exception caught during verification
- *
- * @return exception, or <code>null</code>.
- * @since 2.0
- */
- public Exception getVerificationException();
-
- /**
- * Returns display text describing the result of the verification.
- *
- * @return result text, or <code>null</code>.
- * @since 2.0
- */
- public String getText();
-
- /**
- * Returns text describing the signer
- *
- * @return signer information, or <code>null</code>.
- * @since 2.0
- */
- public String getSignerInfo();
-
- /**
- * Returns text describing the authority that verified/ certified
- * the signer
- *
- * @return verifier information, or <code>null</code>.
- * @since 2.0
- */
- public String getVerifierInfo();
-
- /**
- * Indicates whether the referenced file is part of the overall feature
- * definition, or one of its component plug-in or non-plug-in entries.
- *
- * @return <code>true</code> if reference is a feature file,
- * <code>false</code> if reference is a plug-in or non-plug-in file
- * @since 2.0
- */
- public boolean isFeatureVerification();
-
- /**
- * Indicates whether the signer and verifier info have already been accepted by the user
- * during a previous verification of one of the file of the feature.
- *
- * @return <code>true</code> if the result has already been accepted, <code>false</code>
- * if the result has not yet been accepted by the user
- * @since 2.0
- */
- public boolean alreadySeen();
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IVerifier.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IVerifier.java
deleted file mode 100644
index d9494be..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IVerifier.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import org.eclipse.core.runtime.CoreException;
-
-/**
- * Verifier. This interface abstracts the archive verification step
- * performed by specific feature implementations. The actual details
- * of the verification are the responsibility of the concrete implementation.
- * <p>
- * Clients may implement this interface.
- * </p>
- * @see org.eclipse.update.core.IVerificationResult
- * @see org.eclipse.update.core.IFeatureContentProvider#getVerifier()
- * @since 2.0
- */
-public interface IVerifier {
-
- /**
- * Perform verification of the specified archive.
- *
- * @param feature feature containing this archive
- * @param reference actual archive reference
- * @param isFeatureVerification <code>true</code> indicates the specified
- * reference should be considered as part of the feature description
- * information (ie. verifying the overall feature),
- * <code>false</code> indicates the specified reference is a plug-in
- * or a non-plug-in archive file (ie. verifying a component of the
- * feature)
- * @param monitor progress monitor, can be <code>null</code>
- * @return verification result
- * @exception CoreException
- * @since 2.0
- */
- public IVerificationResult verify(
- IFeature feature,
- ContentReference reference,
- boolean isFeatureVerification,
- InstallMonitor monitor)
- throws CoreException;
-
- /**
- * Sets the parent verifier.
- *
- * The parent verifier can only be set once by the parent feature.
- * It may used for different verification strategies.
- * (for instance, you may decide that both the parent and current verifier
- * must sucessfully verify the content reference, or that only one of them must verify)
- * @param parentVerifier the parent verifier.
- */
- public void setParent(IVerifier parentVerifier);
-
- /**
- * Returns the parent verifier
- *
- * @return the parent verifier
- * @since 2.0
- */
- public IVerifier getParent();
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/Import.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/Import.java
deleted file mode 100644
index a0478ee..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/Import.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-import org.eclipse.update.core.model.ImportModel;
-import org.eclipse.update.internal.core.UpdateManagerUtils;
-
-/**
- * Convenience implementation of a plug-in dependency.
- * <p>
- * This class may be instantiated or subclassed by clients.
- * </p>
- * @see org.eclipse.update.core.IImport
- * @see org.eclipse.update.core.model.ImportModel
- * @since 2.0
- */
-public class Import extends ImportModel implements IImport {
-
-
- /**
- * Returns an identifier of the dependent plug-in.
- * @see IImport#getIdentifier()
- */
- public VersionedIdentifier getVersionedIdentifier() {
- return new VersionedIdentifier(getIdentifier(), getVersion());
- }
-
- /**
- * Returns the matching rule for the dependency.
- * @see IImport#getRule()
- */
- public int getRule() {
- return UpdateManagerUtils.getMatchingRule(getMatchingRuleName());
- }
-
- /**
- * Returns the dependency kind
- * @see org.eclipse.update.core.IImport#getKind()
- */
- public int getKind() {
- return isFeatureImport()?KIND_FEATURE:KIND_PLUGIN;
- }
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IncludedFeatureReference.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IncludedFeatureReference.java
deleted file mode 100644
index b4ad893..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IncludedFeatureReference.java
+++ /dev/null
@@ -1,205 +0,0 @@
-package org.eclipse.update.core;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.update.configuration.IConfiguredSite;
-import org.eclipse.update.core.model.IncludedFeatureReferenceModel;
-import org.eclipse.update.internal.core.UpdateManagerPlugin;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-/**
- * This is a utility class representing the options of a nested feature.
- * Feature will include other features. This class will represent the options of the inclusion.
- * <p>
- * Clients may instantiate; not intended to be subclassed by clients.
- * </p>
- * @see org.eclipse.update.core.VersionedIdentifier
- * @since 2.0.1
- */
-public class IncludedFeatureReference extends IncludedFeatureReferenceModel implements IIncludedFeatureReference {
-
- private IFeature feature;
-
- /**
- * Construct a included feature reference
- *
- * @since 2.1
- */
- public IncludedFeatureReference() {
- super();
- }
-
-
- /**
- * Construct a feature options
- *
- * @param name string representation of the feature
- * @param isOptional <code>true</code> if the feature is optional, <code>false</code> otherwise.
- * @param matchingRule the matching rule
- * @param searchLocation the location to search for this feature's updates.
- * @since 2.0.2
- */
- public IncludedFeatureReference(IIncludedFeatureReference includedFeatureRef) {
- super((IncludedFeatureReferenceModel)includedFeatureRef);
- }
-
- /**
- * Constructor IncludedFeatureReference.
- * @param iFeatureReference
- */
- public IncludedFeatureReference(IFeatureReference featureReference) {
- super(featureReference);
- }
-
-
- /**
- * Method matches.
- * @param identifier
- * @param id
- * @param options
- * @return boolean
- */
- private boolean matches(VersionedIdentifier baseIdentifier, VersionedIdentifier id) {
- if (baseIdentifier == null || id == null)
- return false;
- if (!id.getIdentifier().equals(baseIdentifier.getIdentifier()))
- return false;
-
- switch (getMatch()) {
- case IImport.RULE_PERFECT :
- return id.getVersion().isPerfect(baseIdentifier.getVersion());
- case IImport.RULE_COMPATIBLE :
- return id.getVersion().isCompatibleWith(baseIdentifier.getVersion());
- case IImport.RULE_EQUIVALENT :
- return id.getVersion().isEquivalentTo(baseIdentifier.getVersion());
- case IImport.RULE_GREATER_OR_EQUAL :
- return id.getVersion().isGreaterOrEqualTo(baseIdentifier.getVersion());
- }
- UpdateManagerPlugin.warn("Unknown matching rule:" + getMatch());
- return false;
- }
-
-
- /*
- * Method retrieveEnabledFeatures.
- * @param site
- */
- private IFeatureReference[] retrieveEnabledFeatures(ISite site) {
- IConfiguredSite configuredSite = site.getCurrentConfiguredSite();
- if (configuredSite == null)
- return new IFeatureReference[0];
- return configuredSite.getConfiguredFeatures();
- }
-
- /*
- * Method isDisabled.
- * @return boolean
- */
- private boolean isDisabled() {
- /*IConfiguredSite cSite = getSite().getConfiguredSite();
- if (cSite==null) return false;
- IFeatureReference[] configured = cSite.getConfiguredFeatures();
- for (int i = 0; i < configured.length; i++) {
- if (this.equals(configured[i])) return false;
- }
- return true;*/
- // FIXME
- return false;
- }
-
- /**
- * @see org.eclipse.update.core.IFeatureReference#getFeature(boolean)
- */
- public IFeature getFeature(boolean perfectMatch,IConfiguredSite configuredSite) throws CoreException {
-
- if (configuredSite==null)
- configuredSite = getSite().getCurrentConfiguredSite();
-
- // if perfect match is asked or if the feature is disabled
- // we return the exact match
- if (perfectMatch || getMatch() == IImport.RULE_PERFECT || isDisabled()) {
- return getFeature(this);
- } else {
- if (feature == null) {
- // find best match
- IFeatureReference bestMatch = getBestMatch(configuredSite);
- feature = getFeature(bestMatch);
- }
- return feature;
- }
- }
-
- /*
- *
- */
- private IFeature getFeature(IFeatureReference ref) throws CoreException {
- String type = getType();
- if (type == null || type.equals("")) { //$NON-NLS-1$
- // ask the Site for the default type
- type = getSite().getDefaultPackagedFeatureType();
- }
- return getSite().createFeature(type, ref.getURL());
- }
-
- /*
- * Method getBestMatch.
- * @param enabledFeatures
- * @param identifier
- * @param options
- * @return Object
- */
- private IIncludedFeatureReference getBestMatch(IConfiguredSite configuredSite) throws CoreException {
- IncludedFeatureReference newRef = null;
-
- if (configuredSite==null) return this;
- IFeatureReference[] enabledFeatures = configuredSite.getConfiguredFeatures();
-
- // find the best feature based on match from enabled features
- for (int ref = 0; ref < enabledFeatures.length; ref++) {
- if (enabledFeatures[ref] != null) {
- VersionedIdentifier id = null;
- try {
- id = enabledFeatures[ref].getVersionedIdentifier();
- } catch (CoreException e) {
- UpdateManagerPlugin.warn(null, e);
- };
- if (matches(getVersionedIdentifier(), id)) {
- if (newRef == null || id.getVersion().isGreaterThan(newRef.getVersionedIdentifier().getVersion())) {
- newRef = new IncludedFeatureReference(enabledFeatures[ref]);
- newRef.setMatchingRule(getMatch());
- newRef.isOptional(isOptional());
- newRef.setName(getName());
- }
- }
- }
- }
-
- if (newRef != null)
- return newRef;
- else
- return this;
- }
- /**
- * @see org.eclipse.update.core.IFeatureReference#getFeature()
- */
- public IFeature getFeature() throws CoreException {
- return getFeature(false,null);
- }
-
- /**
- * @see org.eclipse.update.core.IIncludedFeatureReference#matchesPlatform()
- */
- public boolean matchesPlatform() {
- if (getWS()!=null && !SiteManager.getWS().equalsIgnoreCase(getWS()))
- return false;
- if (getOS() != null && !SiteManager.getOS().equalsIgnoreCase(getOS()))
- return false;
- if (getOSArch()!= null && !SiteManager.getOSArch().equalsIgnoreCase(getOSArch()))
- return false;
- return true;
- }
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/InstallHandlerEntry.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/InstallHandlerEntry.java
deleted file mode 100644
index 72b4f80..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/InstallHandlerEntry.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import org.eclipse.update.core.model.InstallHandlerEntryModel;
-
-/**
- * Convenience implementation of an install handler entry.
- * <p>
- * This class may be instantiated or subclassed by clients.
- * </p>
- * @see org.eclipse.update.core.IInstallHandlerEntry
- * @see org.eclipse.update.core.model.InstallHandlerEntryModel
- * @see org.eclipse.update.core.IInstallHandler
- * @since 2.0
- */
-public class InstallHandlerEntry
- extends InstallHandlerEntryModel
- implements IInstallHandlerEntry {
-
- /**
- * Constructor for InstallHandlerEntry.
- * @since 2.0
- */
- public InstallHandlerEntry() {
- super();
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/InstallMonitor.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/InstallMonitor.java
deleted file mode 100644
index 1fa11e6..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/InstallMonitor.java
+++ /dev/null
@@ -1,248 +0,0 @@
-package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import java.util.Stack;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.update.internal.core.Policy;
-
-/**
- * Install progress monitor
- * Delegating wrapper for IProgressMonitor used for installation handling.
- *
- * @since 2.0
- */
-public class InstallMonitor implements IProgressMonitor {
-
- private IProgressMonitor monitor;
- private Stack tasks;
-
- private String taskString;
- private String subTaskString;
- private boolean showDetails;
- private long totalCopyCount;
-
- private class MonitorState {
-
- private String taskString;
- private String subTaskString;
- private boolean showDetails;
- private long totalCopyCount;
-
- private MonitorState(
- String taskString,
- String subTaskString,
- boolean showDetails,
- long totalCopyCount) {
- this.taskString = taskString;
- this.subTaskString = subTaskString;
- this.showDetails = showDetails;
- this.totalCopyCount = totalCopyCount;
- }
-
- private String getTaskString() {
- return this.taskString;
- }
-
- private String getSubTaskString() {
- return this.subTaskString;
- }
-
- private boolean getShowDetails() {
- return this.showDetails;
- }
-
- private long getTotalCopyCount() {
- return this.totalCopyCount;
- }
- }
-
- private InstallMonitor() {
- }
-
- /**
- * Install monitor constructor
- *
- * @param monitor base install monitor
- * @since 2.0
- */
- public InstallMonitor(IProgressMonitor monitor) {
- this.monitor = monitor;
- this.tasks = new Stack();
- this.taskString = ""; //$NON-NLS-1$
- this.subTaskString = ""; //$NON-NLS-1$
- this.showDetails = false;
- this.totalCopyCount = 0;
- }
-
- /**
- * Begin new monitor task.
- *
- * @see IProgressMonitor#beginTask(String, int)
- * @since 2.0
- */
- public void beginTask(String name, int totalWork) {
- taskString = name;
- monitor.beginTask(name, totalWork);
- }
-
- /**
- * Indicate completion of monitor activity.
- *
- * @see IProgressMonitor#done()
- * @since 2.0
- */
- public void done() {
- monitor.done();
- }
-
- /**
- * Indicate monitor progress.
- *
- * @see IProgressMonitor#internalWorked(double)
- * @since 2.0
- */
- public void internalWorked(double work) {
- monitor.internalWorked(work);
- }
-
- /**
- * Check is use indicated that the operation be cancelled.
- *
- * @see IProgressMonitor#isCanceled()
- * @since 2.0
- */
- public boolean isCanceled() {
- return monitor.isCanceled();
- }
-
- /**
- * Set the cancellation state.
- *
- * @see IProgressMonitor#setCanceled(boolean)
- * @since 2.0
- */
- public void setCanceled(boolean value) {
- monitor.setCanceled(value);
- }
-
- /**
- * Set task name.
- *
- * @see IProgressMonitor#setTaskName(String)
- * @since 2.0
- */
- public void setTaskName(String name) {
- this.taskString = name;
- this.subTaskString = ""; //$NON-NLS-1$
- this.showDetails = false;
- this.totalCopyCount = 0;
- monitor.subTask(""); //$NON-NLS-1$
- monitor.setTaskName(name);
- }
-
- /**
- * Set subtask name.
- *
- * @see IProgressMonitor#subTask(String)
- * @since 2.0
- */
- public void subTask(String name) {
- this.subTaskString = name;
- this.showDetails = false;
- this.totalCopyCount = 0;
- monitor.subTask(name);
- }
-
- /**
- * Indicate monitor progress.
- *
- * @see IProgressMonitor#worked(int)
- * @since 2.0
- */
- public void worked(int work) {
- monitor.worked(work);
- }
-
- /**
- * Save the current monitor state.
- * The states are saved on a push-down stack. Prior states
- * can be restored by calling restorState()
- *
- * @see #restoreState()
- * @since 2.0
- */
- public void saveState() {
- tasks.push(
- new MonitorState(taskString, subTaskString, showDetails, totalCopyCount));
- }
-
- /**
- * Restore the monitor state.
- *
- * @see #saveState()
- * @since 2.0
- */
- public void restoreState() {
- if (tasks.size() > 0) {
- MonitorState state = (MonitorState) tasks.pop();
- setTaskName(state.getTaskString());
- subTask(state.getSubTaskString());
- this.showDetails = state.getShowDetails();
- this.totalCopyCount = state.getTotalCopyCount();
- }
- }
-
- /**
- * Indicate whether the monitor subtask message should include
- * copy progress counts.
- *
- * @see #setCopyCount(long)
- * @see #setTotalCount(long)
- * @param setting <code>true</code> to show the copy count,
- * <code>false</code> otherwise
- * @since 2.0
- */
- public void showCopyDetails(boolean setting) {
- this.showDetails = setting;
- }
-
- /**
- * Sets the total number of bytes to copy.
- *
- * @see #showCopyDetails(boolean)
- * @see #setCopyCount(long)
- * @param count total number of bytes to copy.
- * @since 2.0
- */
- public void setTotalCount(long count) {
- this.totalCopyCount = count;
- }
-
- /**
- * Sets the number of bytes already copied.
- *
- * @see #showCopyDetails(boolean)
- * @see #setTotalCount(long)
- * @param count number of bytes already copied.
- * @since 2.0
- */
- public void setCopyCount(long count) {
- if (showDetails && count > 0) {
- long countK = count / 1024;
- long totalK = totalCopyCount / 1024;
- String msg =
- (totalK <= 0)
- ? Policy.bind("InstallMonitor.DownloadSize", Long.toString(countK))
- : Policy.bind(
- "InstallMonitor.DownloadSizeLong",
- Long.toString(countK),
- Long.toString(totalK));
- //$NON-NLS-1$ //$NON-NLS-2$
- monitor.subTask(subTaskString + msg);
- }
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/JarContentReference.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/JarContentReference.java
deleted file mode 100644
index 306a487..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/JarContentReference.java
+++ /dev/null
@@ -1,349 +0,0 @@
-package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import java.io.*;
-import java.net.URL;
-import java.util.*;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
-
-import org.eclipse.update.core.model.InstallAbortedException;
-import org.eclipse.update.internal.core.Policy;
-import org.eclipse.update.internal.core.UpdateManagerPlugin;
-
-/**
- * Local .jar file content reference
- * <p>
- * This class may be instantiated or subclassed by clients.
- * </p>
- * @see org.eclipse.update.core.ContentReference
- * @see org.eclipse.update.core.JarEntryContentReference
- * @since 2.0
- */
-
-public class JarContentReference extends ContentReference {
-
- private static ArrayList referenceList = new ArrayList();
- private JarFile jarFile;
-
- /**
- * Content selector used in .jar operations.
- * Default implementation causes all file entries to be selected with
- * generated identifiers being the same as the original .jar entry name.
- *
- * @since 2.0
- */
- public static class ContentSelector {
-
- /**
- * Indicates whether the .jar entry should be selected.
- * Default behavior is to select all non-directory entries.
- *
- * @param entry .jar entry
- * @return <code>true</code> if entry is to be selected,
- * <code>false</code> otherwise
- * @since 2.0
- */
- public boolean include(JarEntry entry) {
- return entry == null ? false : !entry.isDirectory();
- }
-
- /**
- * Defines the "symbolic" path identifier for the
- * entry. Default identifier is the same as the jar entry name.
- *
- * @param entry .jar entry
- * @return "symbolic" path identifier
- * @since 2.0
- */
- public String defineIdentifier(JarEntry entry) {
- return entry == null ? null : entry.getName();
- }
- }
-
- /**
- * Create jar content reference from URL.
- *
- * @param id "symbolic" path identifier
- * @param url actual referenced URL
- * @since 2.0
- */
- public JarContentReference(String id, URL url) {
- super(id, url);
- this.jarFile = null;
- referenceList.add(this); // keep track of archives
- }
-
- /**
- * Create jar content reference from file.
- *
- * @param id "symbolic" path identifier
- * @param file actual referenced file
- * @since 2.0
- */
- public JarContentReference(String id, File file) {
- super(id, file);
- this.jarFile = null;
- referenceList.add(this); // keep track of archives
- }
-
- /**
- * A factory method to create a jar content reference.
- *
- * @param id "symbolic" path identifier
- * @param file actual referenced file
- * @return jar content reference
- * @since 2.0
- */
- public ContentReference createContentReference(String id, File file) {
- return new JarContentReference(id, file);
- }
-
- /**
- * Returns the content reference as a jar file. Note, that this method
- * <b>does not</b> cause the file to be downloaded if it
- * is not already local.
- *
- * @return reference as jar file
- * @exception IOException reference cannot be returned as jar file
- * @since 2.0
- */
- protected JarFile asJarFile() throws IOException {
- if (this.jarFile == null) {
- File file = asFile();
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_INSTALL)
- UpdateManagerPlugin.debug("asJarFile :" + file);
- if (file != null && !file.exists()) {
- UpdateManagerPlugin.warn("JarFile does not exits:" + file);
- throw new FileNotFoundException(file.getAbsolutePath());
- }
- this.jarFile = new JarFile(file);
- }
- return jarFile;
- }
-
- /**
- * Unpacks the referenced jar archive into the specified location.
- * Returns content references to the unpacked files.
- *
- * @param dir location to unpack the jar into
- * @param selector selector, used to select entries to unpack, and to define
- * "symbolic" path identifiers for the entries.
- * @param monitor progress monitor
- * @exception IOException
- * @exception InstallAbortedException
- * @since 2.0
- */
- public ContentReference[] unpack(File dir, ContentSelector selector, InstallMonitor monitor) throws IOException, InstallAbortedException {
-
- // make sure we have a selector
- if (selector == null)
- selector = new ContentSelector();
-
- // get archive content
- JarFile jarArchive = this.asJarFile();
- List content = new ArrayList();
- Enumeration entries = jarArchive.entries();
-
- // run through the entries and unjar
- String entryId;
- JarEntry entry;
- InputStream is;
- OutputStream os;
- File localFile;
- try {
- if (monitor != null) {
- monitor.saveState();
- monitor.setTaskName(Policy.bind("JarContentReference.Unpacking"));
- //$NON-NLS-1$
- monitor.subTask(this.getIdentifier());
- monitor.showCopyDetails(false);
- }
- while (entries.hasMoreElements()) {
- entry = (JarEntry) entries.nextElement();
- if (entry != null && selector.include(entry)) {
- is = null;
- os = null;
- entryId = selector.defineIdentifier(entry);
- localFile = Utilities.createLocalFile(dir, entryId); // create temp file
- if (!entry.isDirectory()) {
- try {
- is = jarArchive.getInputStream(entry);
- os = new FileOutputStream(localFile);
- Utilities.copy(is, os, monitor);
- } finally {
- if (is != null)
- try {
- is.close();
- } catch (IOException e) {
- }
- if (os != null)
- try {
- os.close();
- } catch (IOException e) {
- }
- }
- content.add(new ContentReference(entryId, localFile));
- }
- }
- }
- } finally {
- if (monitor != null)
- monitor.restoreState();
- }
- return (ContentReference[]) content.toArray(new ContentReference[0]);
- }
-
- /**
- * Unpacks the named jar entry into the specified location.
- * Returns content reference to the unpacked file.
- *
- * @param dir location to unpack the jar into
- * @param entryName name of the jar entry
- * @param selector selector, used to define "symbolic" path identifier
- * for the entry
- * @param monitor progress monitor
- * @exception IOException
- * @exception InstallAbortedException
- * @since 2.0
- */
- public ContentReference unpack(File dir, String entryName, ContentSelector selector, InstallMonitor monitor) throws IOException, InstallAbortedException {
-
- // make sure we have a selector
- if (selector == null)
- selector = new ContentSelector();
-
- // unjar the entry
- JarFile jarArchive = this.asJarFile();
- entryName = entryName.replace(File.separatorChar, '/');
- JarEntry entry = jarArchive.getJarEntry(entryName);
- String entryId;
- if (entry != null) {
- InputStream is = null;
- OutputStream os = null;
- entryId = selector.defineIdentifier(entry);
- File localFile = Utilities.createLocalFile(dir, entryId); // create temp file
- if (!entry.isDirectory()) {
- try {
- is = jarArchive.getInputStream(entry);
- os = new FileOutputStream(localFile);
- Utilities.copy(is, os, monitor);
- } finally {
- if (is != null)
- try {
- is.close();
- } catch (IOException e) {
- }
- if (os != null)
- try {
- os.close();
- } catch (IOException e) {
- }
- }
- return new ContentReference(entryId, localFile);
- } else
- return null; // entry was a directory
- } else
- throw new FileNotFoundException(this.asFile().getAbsolutePath() + " " + entryName);
- //$NON-NLS-1$
- }
-
- /**
- * Peeks into the referenced jar archive.
- * Returns content references to the jar entries within the jar file.
- *
- * @param selector selector, used to select entries to return, and to define
- * "symbolic" path identifiers for the entries.
- * @param monitor progress monitor
- * @exception IOException
- * @since 2.0
- */
- public ContentReference[] peek(ContentSelector selector, InstallMonitor monitor) throws IOException {
-
- // make sure we have a selector
- if (selector == null)
- selector = new ContentSelector();
-
- // get archive content
- JarFile jarArchive = this.asJarFile();
- List content = new ArrayList();
- Enumeration entries = jarArchive.entries();
-
- // run through the entries and create content references
- JarEntry entry;
- String entryId;
- while (entries.hasMoreElements()) {
- entry = (JarEntry) entries.nextElement();
- if (selector.include(entry)) {
- entryId = selector.defineIdentifier(entry);
- content.add(new JarEntryContentReference(entryId, this, entry));
- }
- }
- return (ContentReference[]) content.toArray(new ContentReference[0]);
- }
-
- /**
- * Peeks into the referenced jar archive looking for the named entry.
- * Returns content reference to the jar entry within the jar file.
- *
- * @param entryName name of the jar entry
- * @param selector selector, used to define "symbolic" path identifier
- * for the entry
- * @param monitor progress monitor
- * @return the content reference ofr <code>null</null> if the entry doesn't exist
- * @exception IOException
- * @since 2.0
- */
- public ContentReference peek(String entryName, ContentSelector selector, InstallMonitor monitor) throws IOException {
-
- // make sure we have a selector
- if (selector == null)
- selector = new ContentSelector();
-
- // assume we have a reference that represents a jar archive.
- JarFile jarArchive = this.asJarFile();
- entryName = entryName.replace(File.separatorChar, '/');
- JarEntry entry = jarArchive.getJarEntry(entryName);
- if (entry == null)
- return null;
-
- String entryId = selector.defineIdentifier(entry);
- return new JarEntryContentReference(entryId, this, entry);
- }
-
- /**
- * Closes the jar archive corresponding to this reference
- *
- * @exception IOException
- * @since 2.0
- */
- public void closeArchive() throws IOException {
- if (this.jarFile != null) {
- this.jarFile.close();
- this.jarFile = null;
- }
- }
-
- /**
- * Perform shutdown processing for jar archive handling.
- * This method is called when platform is shutting down.
- * It is not intended to be called at any other time under
- * normal circumstances. A side-effect of calling this method
- * is that all jars referenced by JarContentReferences are closed.
- *
- * @since 2.0
- */
- public static void shutdown() {
- for (int i = 0; i < referenceList.size(); i++) {
- JarContentReference ref = (JarContentReference) referenceList.get(i);
- try {
- ref.closeArchive(); // ensure we are not leaving open jars
- } catch (IOException e) {
- // we tried, nothing we can do ...
- }
- }
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/JarEntryContentReference.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/JarEntryContentReference.java
deleted file mode 100644
index 5a6d6fe..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/JarEntryContentReference.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import java.io.*;
-import java.net.URL;
-import java.util.jar.JarEntry;
-
-/**
- * .jar file entry content reference
- * <p>
- * This class may be instantiated or subclassed by clients.
- * </p>
- * @see org.eclipse.update.core.ContentReference
- * @see org.eclipse.update.core.JarContentReference
- * @since 2.0
- */
-public class JarEntryContentReference extends ContentReference {
-
- private JarContentReference jarContentReference;
- private JarEntry entry;
-
- /**
- * Create jar entry content reference
- *
- * @param id "symbolic" path identifier
- * @param jarContentReference jar file content reference
- * @param entry jar entry
- * @since 2.0
- */
- public JarEntryContentReference(
- String id,
- JarContentReference jarContentReference,
- JarEntry entry) {
- super(id, (File) null);
- this.jarContentReference = jarContentReference;
- this.entry = entry;
- }
-
- /**
- * Creates an input stream for the reference.
- *
- * @return input stream
- * @exception IOException unable to create stream
- * @since 2.0
- */
- public InputStream getInputStream() throws IOException {
- return jarContentReference.asJarFile().getInputStream(entry);
- }
-
- /**
- * Returns the size of the referenced entry.
- *
- * @return input size
- * @since 2.0
- */
- public long getInputSize() {
- return entry.getSize();
- }
-
- /**
- * Indicates whether the reference is to a an entry within a local jar.
- *
- * @return <code>true</code> if the reference is local,
- * otherwise <code>false</code>
- * @since 2.0
- */
- public boolean isLocalReference() {
- return jarContentReference.isLocalReference();
- }
-
- /**
- * Returns the content reference as a URL.
- *
- * @return reference as URL
- * @exception IOException reference cannot be returned as URL
- * @since 2.0
- */
- public URL asURL() throws IOException {
- String fileName =
- jarContentReference.asFile().getAbsolutePath().replace(File.separatorChar, '/');
- return new URL("jar:file:" + fileName + "!/" + entry.getName());
- //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * Return string representation of this reference.
- *
- * @return string representation
- * @since 2.0
- */
- public String toString() {
- URL url;
- try {
- url = asURL();
- } catch (IOException e) {
- url = null;
- }
- if (url != null)
- return url.toExternalForm();
- else
- return getClass().getName() + "@" + hashCode(); //$NON-NLS-1$
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/NonPluginEntry.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/NonPluginEntry.java
deleted file mode 100644
index 30c4731..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/NonPluginEntry.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import org.eclipse.update.core.model.NonPluginEntryModel;
-
-/**
- * Convenience implementation of non-plug-in entry.
- * <p>
- * This class may be instantiated or subclassed by clients.
- * </p>
- * @see org.eclipse.update.core.INonPluginEntry
- * @see org.eclipse.update.core.model.NonPluginEntryModel
- * @since 2.0
- */
-public class NonPluginEntry
- extends NonPluginEntryModel
- implements INonPluginEntry {
-
- /**
- * Non-plug-in entry default constructor
- */
- public NonPluginEntry() {
- super();
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/PluginEntry.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/PluginEntry.java
deleted file mode 100644
index 3a3ff75..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/PluginEntry.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import org.eclipse.update.core.model.PluginEntryModel;
-
-/**
- * Convenience implementation of plug-in entry.
- * <p>
- * This class may be instantiated or subclassed by clients.
- * </p>
- * @see org.eclipse.update.core.IPluginEntry
- * @see org.eclipse.update.core.model.PluginEntryModel
- * @since 2.0
- */
-public class PluginEntry extends PluginEntryModel implements IPluginEntry {
-
- /**
- * Plug-in entry default constructor
- */
- public PluginEntry() {
- super();
- }
-
- /**
- * Returns the identifier of this plugin entry
- *
- * @see IPluginEntry#getIdentifier()
- * @since 2.0
- */
- public VersionedIdentifier getVersionedIdentifier() {
- return new VersionedIdentifier(getPluginIdentifier(), getPluginVersion());
- }
-
- /**
- * Sets the identifier of this plugin entry.
- *
- * @see IPluginEntry#setVersionedIdentifier(VersionedIdentifier)
- * @since 2.0
- */
- public void setVersionedIdentifier(VersionedIdentifier identifier) {
- setPluginIdentifier(identifier.getIdentifier());
- setPluginVersion(identifier.getVersion().toString());
- }
-
- /**
- * Compares two plugin entries for equality
- *
- * @param object plugin entry object to compare with
- * @return <code>true</code> if the two entries are equal,
- * <code>false</code> otherwise
- * @since 2.0
- */
- public boolean equals(Object object) {
- if (!(object instanceof IPluginEntry))
- return false;
- IPluginEntry e = (IPluginEntry) object;
- return getVersionedIdentifier().equals(e.getVersionedIdentifier());
- }
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/Site.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/Site.java
deleted file mode 100644
index 59a8c9e..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/Site.java
+++ /dev/null
@@ -1,466 +0,0 @@
-package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import java.net.URL;
-import java.util.*;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.update.configuration.IConfiguredSite;
-import org.eclipse.update.core.model.*;
-import org.eclipse.update.internal.URLKey;
-import org.eclipse.update.internal.core.*;
-
-/**
- * Convenience implementation of a site.
- * <p>
- * This class may be instantiated or subclassed by clients.
- * </p>
- * @see org.eclipse.update.core.ISite
- * @see org.eclipse.update.core.model.SiteModel
- * @since 2.0
- */
-public class Site extends SiteModel implements ISite {
-
- /**
- * Default installation path for features
- *
- * @since 2.0
- */
- public static final String DEFAULT_INSTALLED_FEATURE_PATH = "features/";
- //$NON-NLS-1$
-
- /**
- * Default installation path for plug-ins and plug-in fragments
- *
- * @since 2.0
- */
- public static final String DEFAULT_PLUGIN_PATH = "plugins/"; //$NON-NLS-1$
-
- /**
- * Default path on a site where packaged features are located
- *
- * @since 2.0
- */
- public static final String DEFAULT_FEATURE_PATH = "features/"; //$NON-NLS-1$
-
- /**
- * Default site manifest file name
- *
- * @since 2.0
- */
- public static final String SITE_FILE = "site"; //$NON-NLS-1$
-
- /**
- * Default site manifest extension
- *
- * @since 2.0
- */
- public static final String SITE_XML = SITE_FILE + ".xml"; //$NON-NLS-1$
-
- private ISiteContentProvider siteContentProvider;
-
- private Map featureCache = new HashMap(); // key=URLKey value=IFeature
-
- /**
- * Constructor for Site
- */
- public Site() {
- super();
- }
-
- /**
- * Compares two sites for equality
- *
- * @param object site object to compare with
- * @return <code>true</code> if the two sites are equal,
- * <code>false</code> otherwise
- * @since 2.0
- */
- public boolean equals(Object obj) {
- if (!(obj instanceof ISite))
- return false;
- if (getURL() == null)
- return false;
- ISite otherSite = (ISite) obj;
-
- return UpdateManagerUtils.sameURL(getURL(), otherSite.getURL());
- }
-
- /**
- * Returns the site URL
- *
- * @see ISite#getURL()
- * @since 2.0
- */
- public URL getURL() {
- URL url = null;
- try {
- url = getSiteContentProvider().getURL();
- } catch (CoreException e) {
- UpdateManagerPlugin.warn(null, e);
- }
- return url;
- }
-
- /**
- * Returns the site description.
- *
- * @see ISite#getDescription()
- * @since 2.0
- */
- public IURLEntry getDescription() {
- return (IURLEntry) getDescriptionModel();
- }
-
- /**
- * Returns an array of categories defined by the site.
- *
- * @see ISite#getCategories()
- * @since 2.0
- */
- public ICategory[] getCategories() {
- CategoryModel[] result = getCategoryModels();
- if (result.length == 0)
- return new ICategory[0];
- else
- return (ICategory[]) result;
- }
-
- /**
- * Returns the named site category.
- *
- * @see ISite#getCategory(String)
- * @since 2.0
- */
- public ICategory getCategory(String key) {
- ICategory result = null;
- boolean found = false;
- int length = getCategoryModels().length;
-
- for (int i = 0; i < length; i++) {
- if (getCategoryModels()[i].getName().equals(key)) {
- result = (ICategory) getCategoryModels()[i];
- found = true;
- break;
- }
- }
-
- //DEBUG:
- if (!found) {
- String URLString = (this.getURL() != null) ? this.getURL().toExternalForm() : "<no site url>";
- UpdateManagerPlugin.warn(Policy.bind("Site.CannotFindCategory", key, URLString));
- //$NON-NLS-1$ //$NON-NLS-2$
- if (getCategoryModels().length <= 0)
- UpdateManagerPlugin.warn(Policy.bind("Site.NoCategories"));
- //$NON-NLS-1$
- }
-
- return result;
- }
-
- /**
- * Returns an array of references to features on this site.
- *
- * @see ISite#getFeatureReferences()
- * @since 2.0
- */
- public ISiteFeatureReference[] getFeatureReferences() {
- FeatureReferenceModel[] result = getFeatureReferenceModels();
- if (result.length == 0)
- return new ISiteFeatureReference[0];
- else
- return (ISiteFeatureReference[]) result;
- }
-
- /**
- * Returns a reference to the specified feature on this site.
- *
- * @see ISite#getFeatureReference(IFeature)
- * @since 2.0
- */
- public ISiteFeatureReference getFeatureReference(IFeature feature) {
-
- if (feature == null) {
- UpdateManagerPlugin.warn("Site:getFeatureReference: The feature is null");
- return null;
- }
-
- ISiteFeatureReference[] references = getFeatureReferences();
- ISiteFeatureReference currentReference = null;
- for (int i = 0; i < references.length; i++) {
- currentReference = references[i];
- if (UpdateManagerUtils.sameURL(feature.getURL(), currentReference.getURL()))
- return currentReference;
- }
-
- UpdateManagerPlugin.warn("Feature " + feature + " not found on site" + this.getURL());
- return null;
- }
-
- /**
- * Returns an array of plug-in and non-plug-in archives located
- * on this site
- *
- * @see ISite#getArchives()
- * @since 2.0
- */
- public IArchiveReference[] getArchives() {
- ArchiveReferenceModel[] result = getArchiveReferenceModels();
- if (result.length == 0)
- return new IArchiveReference[0];
- else
- return (IArchiveReference[]) result;
- }
-
- /**
- * Returns the content provider for this site.
- *
- * @see ISite#getSiteContentProvider()
- * @since 2.0
- */
- public ISiteContentProvider getSiteContentProvider() throws CoreException {
- if (siteContentProvider == null) {
- throw Utilities.newCoreException(Policy.bind("Site.NoContentProvider"), null);
- //$NON-NLS-1$
- }
- return siteContentProvider;
- }
-
- /**
- * Returns the default type for a packaged feature supported by this site
- *
- * @see ISite#getDefaultInstallableFeatureType()
- * @since 2.0
- */
- public String getDefaultPackagedFeatureType() {
- return DEFAULT_PACKAGED_FEATURE_TYPE;
- }
-
- /**
- * Returns an array of entries corresponding to plug-ins installed
- * on this site.
- *
- * @see IPluginContainer#getPluginEntries()
- * @since 2.0
- */
- public IPluginEntry[] getPluginEntries() {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Returns the number of plug-ins installed on this site
- *
- * @see IPluginContainer#getPluginEntryCount()
- * @since 2.0
- */
- public int getPluginEntryCount() {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Returns an array of entries corresponding to plug-ins that are
- * installed on this site and are referenced only by the specified
- * feature.
- *
- * @see ISite#getPluginEntriesOnlyReferencedBy(IFeature) *
- * @since 2.0
- */
- public IPluginEntry[] getPluginEntriesOnlyReferencedBy(IFeature feature) throws CoreException {
-
- IPluginEntry[] pluginsToRemove = new IPluginEntry[0];
- if (feature == null)
- return pluginsToRemove;
-
- // get the plugins from the feature
- IPluginEntry[] entries = feature.getPluginEntries();
- if (entries != null) {
- // get all the other plugins from all the other features
- Set allPluginID = new HashSet();
- ISiteFeatureReference[] features = getFeatureReferences();
- if (features != null) {
- for (int indexFeatures = 0; indexFeatures < features.length; indexFeatures++) {
- IFeature featureToCompare = null;
- try {
- featureToCompare = features[indexFeatures].getFeature();
- } catch (CoreException e) {
- UpdateManagerPlugin.warn(null, e);
- }
- if (!feature.equals(featureToCompare)) {
- IPluginEntry[] pluginEntries = features[indexFeatures].getFeature().getPluginEntries();
- if (pluginEntries != null) {
- for (int indexEntries = 0; indexEntries < pluginEntries.length; indexEntries++) {
- allPluginID.add(pluginEntries[indexEntries].getVersionedIdentifier());
- }
- }
- }
- }
- }
-
- // create the delta with the plugins that may be still used by other configured or unconfigured feature
- List plugins = new ArrayList();
- for (int indexPlugins = 0; indexPlugins < entries.length; indexPlugins++) {
- if (!allPluginID.contains(entries[indexPlugins].getVersionedIdentifier())) {
- plugins.add(entries[indexPlugins]);
- }
- }
-
- // move List into Array
- if (!plugins.isEmpty()) {
- pluginsToRemove = new IPluginEntry[plugins.size()];
- plugins.toArray(pluginsToRemove);
- }
- }
-
- return pluginsToRemove;
- }
-
- /**
- * Adds a new plug-in entry to this site.
- * This implementation always throws UnsupportedOperationException
- * because this implementation does not support the install action.
- *
- * @see ISite#addPluginEntry(IPluginEntry)
- * @exception java.jang.UnsupportedOperationException
- * @since 2.0
- */
- public void addPluginEntry(IPluginEntry pluginEntry) {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Get download size for the specified feature on this site.
- * This implementation always throws UnsupportedOperationException
- * because this implementation does not support the install action.
- *
- * @see ISite#getDownloadSizeFor(IFeature)
- * @exception java.jang.UnsupportedOperationException
- * @since 2.0
- */
- public long getDownloadSizeFor(IFeature feature) {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Get install size for the specified feature on this site.
- * This implementation always throws UnsupportedOperationException
- * because this implementation does not support the install action.
- *
- * @see ISite#getInstallSizeFor(IFeature)
- * @exception java.jang.UnsupportedOperationException
- * @since 2.0
- */
- public long getInstallSizeFor(IFeature feature) {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Install the specified feature and all optional features on this site.
- * This implementation always throws UnsupportedOperationException
- * because this implementation does not support the install action.
- *
- * @see ISite#install(IFeature, IVerificationListener, IProgressMonitor)
- * @exception InstallAbortedException when the user cancels the install
- * @exception CoreException
- * @exception java.jang.UnsupportedOperationException
- * @since 2.0
- */
- public IFeatureReference install(IFeature sourceFeature, IVerificationListener verificationListener, IProgressMonitor progress) throws InstallAbortedException, CoreException {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Install the specified feature and listed optional features on this site.
- * This implementation always throws UnsupportedOperationException
- * because this implementation does not support the install action.
- *
- * @see ISite#install(IFeature, IVerificationListener, IProgressMonitor)
- * @exception InstallAbortedException when the user cancels the install
- * @exception CoreException
- * @exception java.jang.UnsupportedOperationException
- * @since 2.0
- */
- public IFeatureReference install(IFeature sourceFeature, IFeatureReference[] optionalFeatures, IVerificationListener verificationListener, IProgressMonitor progress) throws InstallAbortedException, CoreException {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Install the specified feature on this site using the content consumer as
- * a context to install the feature in.
- * This implementation always throws UnsupportedOperationException
- * because this implementation does not support the install action.
- *
- * @param feature feature to install
- * @param parentContentConsumer content consumer of the parent feature
- * @param parentVerifier verifier of the parent feature
- * @param verificationListener install verification listener
- * @param monitor install monitor, can be <code>null</code>
- * @exception InstallAbortedException when the user cancels the install
- * @exception CoreException
- * @exception java.jang.UnsupportedOperationException
- * @since 2.0
- */
- public IFeatureReference install(IFeature sourceFeature, IFeatureReference[] optionalFeatures, IFeatureContentConsumer parentContentConsumer, IVerifier parentVerifier, IVerificationListener verificationListener, IProgressMonitor progress)
- throws CoreException {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Remove (uninstall) the specified feature from this site.
- * This implementation always throws UnsupportedOperationException
- * because this implementation does not support the remove action.
- *
- * @see ISite#remove(IFeature, IProgressMonitor)
- * @exception java.jang.UnsupportedOperationException
- * @since 2.0
- */
- public void remove(IFeature feature, IProgressMonitor progress) throws CoreException {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Sets the site content provider.
- *
- * @see ISite#setSiteContentProvider(ISiteContentProvider)
- * @since 2.0
- */
- public void setSiteContentProvider(ISiteContentProvider siteContentProvider) {
- this.siteContentProvider = siteContentProvider;
- }
- /**
- * @see org.eclipse.update.core.model.SiteModel#getConfiguredSite()
- */
- public IConfiguredSite getCurrentConfiguredSite() {
- return (IConfiguredSite) getConfiguredSiteModel();
- }
-
- /**
- * @see org.eclipse.update.core.ISite#createFeature(VersionedIdentifier, String, URL)
- */
- public IFeature createFeature(String type, URL url) throws CoreException {
-
- // First check the cache
- URLKey key = new URLKey(url);
- IFeature feature = (IFeature) featureCache.get(key);
- if (feature != null) return feature;
-
- // Create a new one
- if (type == null || type.equals("")) { //$NON-NLS-1$
- // ask the Site for the default type
- type = getDefaultPackagedFeatureType();
- }
-
- IFeatureFactory factory = FeatureTypeFactory.getInstance().getFactory(type);
- feature = factory.createFeature(url, this);
- if (feature != null) {
- // Add the feature to the cache
- featureCache.put(key, feature);
- }
- return feature;
- }
-
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteContentProvider.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteContentProvider.java
deleted file mode 100644
index 55723b6..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteContentProvider.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.update.internal.core.Policy;
-
-/**
- * Base site content provider
- */
-public abstract class SiteContentProvider implements ISiteContentProvider {
-
- private URL base;
- private ISite site;
-
- /**
- * Constructor for SiteContentProvider.
- */
- public SiteContentProvider(URL url) {
- super();
- this.base = url;
- }
-
- /**
- * Returns the URL of this site
- *
- * @see ISiteContentProvider#getURL()
- * @since 2.0
- */
- public URL getURL() {
- return base;
- }
-
- /**
- * Returns a URL for the identified archive.
- *
- * @see ISiteContentProvider#getArchivesReferences(String)
- * @since 2.0
- */
- public URL getArchiveReference(String archiveID) throws CoreException {
- try {
- return new URL(getURL(), archiveID);
- } catch (MalformedURLException e) {
- throw Utilities.newCoreException(
- Policy.bind(
- "SiteContentProvider.ErrorCreatingURLForArchiveID",
- archiveID,
- getURL().toExternalForm()),
- e);
- //$NON-NLS-1$
- }
- }
-
- /**
- * Returns the site for this provider.
- *
- * @see ISiteContentProvider#getSite()
- * @since 2.0
- */
- public ISite getSite() {
- return site;
- }
-
- /**
- * Sets the site for this provider.
- *
- * @param site site for this provider
- * @since 2.0
- */
- public void setSite(ISite site) {
- this.site = site;
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteFeatureReference.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteFeatureReference.java
deleted file mode 100644
index a78a015..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteFeatureReference.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.update.internal.core.UpdateManagerPlugin;
-
-/**
- * Convenience implementation of a feature reference.
- * <p>
- * This class may be instantiated or subclassed by clients.
- * </p>
- * @see org.eclipse.update.core.IFeatureReference
- * @see org.eclipse.update.core.model.FeatureReferenceModel
- * @since 2.0
- */
-public class SiteFeatureReference extends SiteFeatureReferenceModel implements ISiteFeatureReference {
-
- private List categories;
- private VersionedIdentifier versionId;
-
- /**
- * Feature reference default constructor
- */
- public SiteFeatureReference() {
- super();
- }
-
- /**
- * Constructor FeatureReference.
- * @param ref the reference to copy
- */
- public SiteFeatureReference(ISiteFeatureReference ref) {
- super(ref);
- }
-
- /**
- * Returns an array of categories the referenced feature belong to.
- *
- * @see IFeatureReference#getCategories()
- * @since 2.0
- */
- public ICategory[] getCategories() {
-
- if (categories == null) {
- categories = new ArrayList();
- String[] categoriesAsString = getCategoryNames();
- for (int i = 0; i < categoriesAsString.length; i++) {
- ICategory siteCat = getSite().getCategory(categoriesAsString[i]);
- if (siteCat != null)
- categories.add(siteCat);
- else {
- String siteURL = getSite().getURL() != null ? getSite().getURL().toExternalForm() : null;
- UpdateManagerPlugin.warn("Category " + categoriesAsString[i] + " not found in Site:" + siteURL);
- }
- }
- }
-
- ICategory[] result = new ICategory[0];
-
- if (!(categories == null || categories.isEmpty())) {
- result = new ICategory[categories.size()];
- categories.toArray(result);
- }
- return result;
- }
-
- /**
- * Adds a category to the referenced feature.
- *
- * @see IFeatureReference#addCategory(ICategory)
- * @since 2.0
- */
- public void addCategory(ICategory category) {
- this.addCategoryName(category.getName());
- }
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteFeatureReferenceModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteFeatureReferenceModel.java
deleted file mode 100644
index 4a6cb81..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteFeatureReferenceModel.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package org.eclipse.update.core;
-
-import java.util.*;
-
-/**
- * @author celek
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class SiteFeatureReferenceModel extends FeatureReference {
-
- private List /* of String*/
- categoryNames;
-
- // [2.0.1]
- private IncludedFeatureReference options;
-
- /**
- * Creates an uninitialized feature reference model object.
- *
- * @since 2.0
- */
- public SiteFeatureReferenceModel() {
- super();
- }
-
- /**
- * Constructor FeatureReferenceModel.
- * @param ref
- */
- public SiteFeatureReferenceModel(ISiteFeatureReference ref) {
- super(ref);
- if (ref instanceof SiteFeatureReferenceModel) {
- SiteFeatureReferenceModel refModel = (SiteFeatureReferenceModel) ref;
- setCategoryNames(refModel.getCategoryNames());
- }
- }
-
-
- /**
- * Returns the names of categories the referenced feature belongs to.
- *
- * @return an array of names, or an empty array.
- * @since 2.0
- */
- public String[] getCategoryNames() {
- if (categoryNames == null)
- return new String[0];
-
- return (String[]) categoryNames.toArray(new String[0]);
- }
-
- /**
- * Sets the names of categories this feature belongs to.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param categoryNames an array of category names
- * @since 2.0
- */
- public void setCategoryNames(String[] categoryNames) {
- assertIsWriteable();
- if (categoryNames == null)
- this.categoryNames = null;
- else
- this.categoryNames = new ArrayList(Arrays.asList(categoryNames));
- }
-
- /**
- * Adds the name of a category this feature belongs to.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param categoryName category name
- * @since 2.0
- */
- public void addCategoryName(String categoryName) {
- assertIsWriteable();
- if (this.categoryNames == null)
- this.categoryNames = new ArrayList();
- if (!this.categoryNames.contains(categoryName))
- this.categoryNames.add(categoryName);
- }
-
- /**
- * Removes the name of a categorys this feature belongs to.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param categoryName category name
- * @since 2.0
- */
- public void removeCategoryName(String categoryName) {
- assertIsWriteable();
- if (this.categoryNames != null)
- this.categoryNames.remove(categoryName);
- }
-}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteManager.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteManager.java
deleted file mode 100644
index 8963d9e..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteManager.java
+++ /dev/null
@@ -1,153 +0,0 @@
-package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import java.net.URL;
-
-import org.eclipse.core.boot.BootLoader;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.update.configuration.ILocalSite;
-import org.eclipse.update.internal.core.InternalSiteManager;
-
-/**
- * Site Manager.
- * A helper class used for creating site instance.
- * Site manager is a singleton class. It cannot be instantiated;
- * all functionality is provided by static methods.
- *
- * @see org.eclipse.update.core.ISite
- * @see org.eclipse.update.configuration.ILocalSite
- * @see org.eclipse.update.configuration.IConfiguredSite
- * @since 2.0
- */
-public class SiteManager {
-
- private static String os;
- private static String ws;
- private static String arch;
-
- private SiteManager() {
- }
-
- /**
- * Returns a site object for the site specified by the argument URL.
- * Typically, the URL references a site manifest file on an update
- * site. An update site acts as a source of features for installation
- * actions.
- *
- * @param siteURL site URL
- * @return site object for the url
- * @exception CoreException
- * @since 2.0
- */
- public static ISite getSite(URL siteURL) throws CoreException {
- return InternalSiteManager.getSite(siteURL,true);
- }
-
- /**
- * Returns a site object for the site specified by the argument URL.
- * Typically, the URL references a site manifest file on an update
- * site. An update site acts as a source of features for installation
- * actions.
- *
- * @param siteURL site URL
- * @param usesCache <code>false</code> if the cache should be refreshed, and the site entirely reparsed, <code>false</code> otherwise.
- * @return site object for the url
- * @exception CoreException
- * @since 2.0
- */
- public static ISite getSite(URL siteURL, boolean usesCache) throws CoreException {
- return InternalSiteManager.getSite(siteURL, usesCache);
- }
-
- /**
- * Returns the "local site". A local site is a logical collection
- * of configuration information plus one or more file system
- * installation directories, represented as intividual sites.
- * These are potential targets for installation actions.
- *
- * @return the local site
- * @exception CoreException
- * @since 2.0
- */
- public static ILocalSite getLocalSite() throws CoreException {
- return InternalSiteManager.getLocalSite();
- }
-
- /**
- * Trigger handling of newly discovered features. This method
- * can be called by the executing application whenever it
- * is invoked with the -newUpdates command line argument.
- *
- * @throws CoreException if an error occurs.
- * @since 2.0
- */
- public static void handleNewChanges() throws CoreException{
- InternalSiteManager.handleNewChanges();
- }
- /**
- * Returns the string name of the system architecture
- *
- * @see BootLoader#ARCH_LIST
- * @return String
- * @since 2.1
- */
- public static String getOSArch(){
- if (arch==null)
- arch = BootLoader.getOSArch();
- return arch;
- }
-
- /**
- * Returns the string name of the opearting system
- *
- * @see BootLoader#OS_LIST
- * @return String
- * @since 2.1
- */
- public static String getOS(){
- if (os==null)
- os = BootLoader.getOS();
- return os;
- }
-
- /**
- * Returns the string name of the windowing system
- *
- * @see BootLoader#WS_LIST
- * @return String
- * @since 2.1
- */
- public static String getWS() {
- if (ws==null)
- ws = BootLoader.getWS();
- return ws;
- }
-
- /**
- * Sets the arch.
- * @param arch The arch to set
- */
- public static void setOSArch(String arch) {
- SiteManager.arch = arch;
- }
-
- /**
- * Sets the os.
- * @param os The os to set
- */
- public static void setOS(String os) {
- SiteManager.os = os;
- }
-
- /**
- * Sets the ws.
- * @param ws The ws to set
- */
- public static void setWS(String ws) {
- SiteManager.ws = ws;
- }
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/URLEntry.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/URLEntry.java
deleted file mode 100644
index 2c0e883..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/URLEntry.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import org.eclipse.update.core.model.URLEntryModel;
-import org.eclipse.update.internal.core.Policy;
-
-/**
- * Convenience implementation of an annotated URL.
- * <p>
- * This class may be instantiated or subclassed by clients.
- * </p>
- * @see org.eclipse.update.core.IURLEntry
- * @see org.eclipse.update.core.model.URLEntryModel
- * @since 2.0
- */
-public class URLEntry extends URLEntryModel implements IURLEntry {
-
- /**
- * Default constructor for annotated URL
- *
- * @since 2.0
- */
- public URLEntry() {
- super();
- }
-
- /**
- * Returns a string representation of an annotated URL.
- *
- * @return annotated url as String
- * @since 2.0
- */
- public String toString() {
- String result = "IURLEntry: "; //$NON-NLS-1$
- String URLString =
- (getURL() == null) ? Policy.bind("Feature.NoURL") : getURL().toExternalForm();
- //$NON-NLS-1$
- result =
- result
- + ((getAnnotation() == null) ? URLString : getAnnotation() + " : " + URLString);
- //$NON-NLS-1$
- return result;
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/Utilities.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/Utilities.java
deleted file mode 100644
index 4deb651..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/Utilities.java
+++ /dev/null
@@ -1,358 +0,0 @@
-package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import java.io.*;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.core.model.InstallAbortedException;
-import org.eclipse.update.internal.core.Policy;
-import org.eclipse.update.internal.core.UpdateManagerPlugin;
-
-/**
- * This class is a collection of utility functions that can be
- * used for install processing
- */
-public class Utilities {
-
- private static Map entryMap;
- private static Map timerMap = new HashMap();
- private static Stack bufferPool;
- private static final int BUFFER_SIZE = 4096; //256K
- private static final DateFormat dateFormat = DateFormat.getDateTimeInstance(DateFormat.DEFAULT, DateFormat.DEFAULT, Locale.getDefault());
- private static long tmpseed = (new Date()).getTime();
- private static String dirRoot = null;
-
- /**
- * Returns a new working directory (in temporary space). Ensures
- * the directory exists. Any directory levels that had to be created
- * are marked for deletion on exit.
- *
- * @return working directory
- * @exception IOException
- * @since 2.0
- */
- public static synchronized File createWorkingDirectory() throws IOException {
-
- if (dirRoot == null) {
- dirRoot = System.getProperty("java.io.tmpdir"); //$NON-NLS-1$
- // in Linux, returns '/tmp', we must add '/'
- if (!dirRoot.endsWith(File.separator))
- dirRoot += File.separator;
-
- dirRoot += "eclipse" + File.separator + ".update" + File.separator + Long.toString(tmpseed) + File.separator;
- //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- String tmpName = dirRoot + Long.toString(++tmpseed) + File.separator;
-
- File tmpDir = new File(tmpName);
- verifyPath(tmpDir, false);
- if (!tmpDir.exists())
- throw new FileNotFoundException(tmpName);
- return tmpDir;
- }
-
- /**
- * Create a new working file. The file is marked for deletion on exit.
- *
- * @see #lookupLocalFile(String)
- * @param tmpDir directory location for new file. Any missing directory
- * levels are created (and marked for deletion on exit)
- * @param name optional file name, or <code>null</code>. If name is not
- * specified, a temporary name is generated.
- * @return created working file
- * @exception IOException
- * @since 2.0
- */
- public static synchronized File createLocalFile(File tmpDir, String name) throws IOException {
- // create the local file
- File temp;
- String filePath;
- if (name != null) {
- // create file with specified name
- filePath = name.replace('/', File.separatorChar);
- if (filePath.startsWith(File.separator))
- filePath = filePath.substring(1);
- temp = new File(tmpDir, filePath);
- } else {
- // create file with temp name
- temp = File.createTempFile("eclipse", null, tmpDir); //$NON-NLS-1$
- }
- temp.deleteOnExit();
- verifyPath(temp, true);
-
- return temp;
- }
-
- /**
- * The file is associated with a lookup key.
- * @param key optional lookup key, or <code>null</code>.
- * @param temp the local working file
- * @since 2.0.2
- */
- public synchronized static void mapLocalFile(String key, File temp) {
- // create file association
- if (key != null) {
- if (entryMap == null)
- entryMap = new HashMap();
- entryMap.put(key, temp);
- }
- }
-
- /**
- * Returns a previously cached local file (in temporary area) matching the
- * specified key.
- *
- * @param key lookup key
- * @return cached file, or <code>null</code>.
- * @since 2.0
- */
- public static synchronized File lookupLocalFile(String key) {
- if (entryMap == null)
- return null;
- return (File) entryMap.get(key);
- }
-
- /**
- * Removes the specified key from the local file map. The file is
- * not actually deleted until VM termination.
- *
- * @param key lookup key
- * @since 2.0
- */
- public static synchronized void removeLocalFile(String key) {
- if (entryMap != null)
- entryMap.remove(key);
- }
-
- /**
- * Copies specified input stream to the output stream. Neither stream
- * is closed as part of this operation.
- *
- * @param is input stream
- * @param os output stream
- * @param monitor progress monitor
- * @exception IOException
- * @exception InstallAbortedException
- * @since 2.0
- */
- public static void copy(InputStream is, OutputStream os, InstallMonitor monitor) throws IOException, InstallAbortedException {
- byte[] buf = getBuffer();
- try {
- long currentLen = 0;
- int len = is.read(buf);
- while (len != -1) {
- currentLen += len;
- os.write(buf, 0, len);
- if (monitor != null) {
- monitor.setCopyCount(currentLen);
- if (monitor.isCanceled()) {
- String msg = Policy.bind("Feature.InstallationCancelled"); //$NON-NLS-1$
- throw new InstallAbortedException(msg, null);
- }
- }
- len = is.read(buf);
- }
- } finally {
- freeBuffer(buf);
- }
- }
-
- /**
- * Creates a CoreException from some other exception.
- * The type of the CoreException is <code>IStatus.ERROR</code>
- * If the exception passed as a parameter is also a CoreException,
- * the new CoreException will contain all the status of the passed
- * CoreException.
- *
- * @see IStatus#ERROR
- * @param s exception string
- * @param code the code reported
- * @param e actual exception being reported
- * @return a CoreException
- * @since 2.0
- */
- public static CoreException newCoreException(String s, int code, Throwable e) {
- String id = UpdateManagerPlugin.getPlugin().getDescriptor().getUniqueIdentifier();
-
- // check the case of a multistatus
- IStatus status;
- if (e instanceof CoreException) {
- if (s == null)
- s = "";
- status = new MultiStatus(id, code, s, e);
- IStatus childrenStatus = ((CoreException) e).getStatus();
- ((MultiStatus) status).add(childrenStatus);
- ((MultiStatus) status).addAll(childrenStatus);
- } else {
- StringBuffer completeString = new StringBuffer("");
- if (s != null)
- completeString.append(s);
- if (e != null) {
- completeString.append(" [");
- String msg = e.getLocalizedMessage();
- completeString.append(msg!=null?msg:e.toString());
- completeString.append("]");
- }
- status = new Status(IStatus.ERROR, id, code, completeString.toString(), e);
- }
- return new CoreException(status); //$NON-NLS-1$
- }
-
- /**
- * Creates a CoreException from some other exception.
- * The type of the CoreException is <code>IStatus.ERROR</code>
- * If the exceptionpassed as a parameter is also a CoreException,
- * the new CoreException will contain all the status of the passed
- * CoreException.
- *
- * @see IStatus#ERROR
- * @param s exception string
- * @param e actual exception being reported
- * @return a CoreException
- * @since 2.0
- */
- public static CoreException newCoreException(String s, Throwable e) {
- return newCoreException(s, IStatus.OK, e);
- }
-
- /**
- * Creates a CoreException from two other CoreException
- *
- * @param s overall exception string
- * @param s1 string for first detailed exception
- * @param s2 string for second detailed exception
- * @param e1 first detailed exception
- * @param e2 second detailed exception
- * @return a CoreException with multi-status
- * @since 2.0
- */
- public static CoreException newCoreException(String s, String s1, String s2, CoreException e1, CoreException e2) {
- String id = UpdateManagerPlugin.getPlugin().getDescriptor().getUniqueIdentifier();
- if (s == null)
- s = "";
-
- IStatus childStatus1 = ((CoreException) e1).getStatus();
- IStatus childStatus2 = ((CoreException) e2).getStatus();
- int code = (childStatus1.getCode() == childStatus2.getCode()) ? childStatus1.getCode() : IStatus.OK;
- MultiStatus multi = new MultiStatus(id, code, s, null);
-
- multi.add(childStatus1);
- multi.addAll(childStatus1);
- multi.add(childStatus2);
- multi.addAll(childStatus2);
-
- return new CoreException(multi); //$NON-NLS-1$
- }
-
- /**
- * Formats a Date based on the default Locale
- * If teh Date is <code>null</code> returns an empty String
- *
- * @param date the Date to format
- * @return the formatted Date as a String
- * @since 2.0
- */
- public static String format(Date date) {
- if (date == null)
- return "";
- return dateFormat.format(date);
- }
-
- /**
- * Perform shutdown processing for temporary file handling.
- * This method is called when platform is shutting down.
- * It is not intended to be called at any other time under
- * normal circumstances. A side-effect of calling this method
- * is that the contents of the temporary directory managed
- * by this class are deleted.
- *
- * @since 2.0
- */
- public static void shutdown() {
- if (dirRoot == null)
- return;
-
- File temp = new File(dirRoot); // temp directory root for this run
- cleanupTemp(temp);
- temp.delete();
- }
-
- private static void cleanupTemp(File root) {
- File[] files = root.listFiles();
- for (int i = 0; files != null && i < files.length; i++) {
- if (files[i].isDirectory())
- cleanupTemp(files[i]);
- files[i].delete();
- }
- }
-
- private static void verifyPath(File path, boolean isFile) {
- // if we are expecting a file back off 1 path element
- if (isFile) {
- if (path.getAbsolutePath().endsWith(File.separator)) {
- // make sure this is a file
- path = path.getParentFile();
- isFile = false;
- }
- }
-
- // already exists ... just return
- if (path.exists())
- return;
-
- // does not exist ... ensure parent exists
- File parent = path.getParentFile();
- verifyPath(parent, false);
-
- // ensure directories are made. Mark files or directories for deletion
- if (!isFile)
- path.mkdir();
- path.deleteOnExit();
- }
-
- private static synchronized byte[] getBuffer() {
- if (bufferPool == null) {
- return new byte[BUFFER_SIZE];
- }
-
- try {
- return (byte[]) bufferPool.pop();
- } catch (EmptyStackException e) {
- return new byte[BUFFER_SIZE];
- }
- }
-
- private static synchronized void freeBuffer(byte[] buf) {
- if (bufferPool == null)
- bufferPool = new Stack();
- bufferPool.push(buf);
- }
-
- public static void startTimer(String task) {
- Date d = new Date();
- //UpdateManagerPlugin.debug("TIMER: start " + task + " " + format(d));
- timerMap.put(task, d);
- }
-
- public static void stopTimer(String task) {
- Date d = new Date();
- //UpdateManagerPlugin.debug("TIMER: stop " + task + " " + format(d));
- Date start = (Date) timerMap.get(task);
- if (start == null) {
- //UpdateManagerPlugin.debug("Unknown task:" + task);
- return;
- }
- long diff = d.getTime() - start.getTime();
- Date delta = new Date(diff);
- SimpleDateFormat simple = new SimpleDateFormat("mm:ss:SS");
- //UpdateManagerPlugin.debug("TIMER:" + task + " " + simple.format(delta));
- }
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/Verifier.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/Verifier.java
deleted file mode 100644
index a0ed256..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/Verifier.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import org.eclipse.core.runtime.CoreException;
-
-/**
- * Convenience implementation of a verifier.
- * <p>
- * This class may be subclassed by clients.
- * </p>
- * @see org.eclipse.update.core.IVerifier
- * @since 2.0
- */
-public abstract class Verifier implements IVerifier {
-
- private IVerifier parent;
-
- /**
- * @see IVerifier#verify(IFeature, ContentReference, boolean, InstallMonitor)
- */
- public abstract IVerificationResult verify(
- IFeature feature,
- ContentReference reference,
- boolean isFeatureVerification,
- InstallMonitor monitor)
- throws CoreException ;
-
- /**
- * @see IVerifier#verify(IFeature, ContentReference, boolean, InstallMonitor)
- */
- public void setParent(IVerifier parentVerifier){
- if (this.parent==null){
- this.parent = parentVerifier;
- }
- }
-
- /**
- * Returns the parent verifier
- *
- * @return the parent verifier
- * @since 2.0
- */
- public IVerifier getParent(){
- return parent;
- }
-
-}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/VersionedIdentifier.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/VersionedIdentifier.java
deleted file mode 100644
index 3fc8d1e..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/VersionedIdentifier.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import org.eclipse.core.runtime.PluginVersionIdentifier;
-import org.eclipse.update.internal.core.Policy;
-import org.eclipse.update.internal.core.UpdateManagerPlugin;
-
-/**
- * Versioned Identifier. This is a utility class combining an identification
- * string with a version.
- * <p>
- * Clients may instantiate; not intended to be subclassed by clients.
- * </p>
- * @see org.eclipse.update.core.Version
- * @since 2.0
- */
-public class VersionedIdentifier {
- private String id;
- private PluginVersionIdentifier version;
- private static final String SEPARATOR = "_"; //$NON-NLS-1$
-
- /**
- * Construct a versioned identifier from an identifier and a string
- * representation of a version
- *
- * @see Version#toString()
- * @param id identifier string
- * @param versionName string representation of version
- * @since 2.0
- */
- public VersionedIdentifier(String id, String versionName) {
- if (id == null || (id = id.trim()).equals("")) //$NON-NLS-1$
- throw new IllegalArgumentException(
- Policy.bind("VersionedIdentifier.IdOrVersionNull", id, versionName));
- //$NON-NLS-1$
- this.id = id;
- // 15707
- if (versionName != null){
- // if (PluginVersionIdentifier.validateVersionIdentifier(versionName).isOk())
- try {
- this.version = new PluginVersionIdentifier(versionName);
- } catch (RuntimeException e){
- UpdateManagerPlugin.warn("Invalid Version:"+versionName,e);
- }
- }
- if (this.version==null)
- version = new PluginVersionIdentifier(0, 0, 0);
- }
-
- /**
- * Returns the identifier
- *
- * @return identifier
- * @since 2.0
- */
- public String getIdentifier() {
- return id;
- }
-
- /**
- * Returns the version
- *
- * @return version
- * @since 2.0
- */
- public PluginVersionIdentifier getVersion() {
- return version;
- }
-
- /**
- * Returns a string representation of the versioned identifier.
- *
- * @return string representation of versioned identifier. The resulting
- * string is <id>_<version>, where <id> is the identifier and
- * <version> is the string representation of the version
- * @since 2.0
- */
- public String toString() {
- return id.equals("") ? "" : id + SEPARATOR + version.toString();
- //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * Compares two versioned identifiers for equality
- *
- * @param obj other versioned identifier to compare to
- * @return <code>true</code> if the two objects are equal,
- * <code>false</code> otherwise
- * @since 2.0
- */
- public boolean equals(Object obj) {
- if (!(obj instanceof VersionedIdentifier))
- return false;
- VersionedIdentifier vid = (VersionedIdentifier) obj;
- if (!this.id.equals(vid.id))
- return false;
- return this.version.equals(vid.version);
- }
-
- /**
- * Returns a computed hashcode for the versioned identifier.
- *
- * @return hash code
- * @since 2.0
- */
- public int hashCode() {
- return toString().hashCode();
- }
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/WebInstallHandler.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/WebInstallHandler.java
deleted file mode 100644
index 548d9d5..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/WebInstallHandler.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import org.eclipse.update.internal.core.UpdateManagerPlugin;
-
-/**
- * This is a utility class used find information about the update
- * web application (handling web-triggered requests)
- *
- * @since 2.0
- */
-public abstract class WebInstallHandler {
-
- /**
- * Returns the host identifier for the web application server
- * listener for install requests
- *
- * @return host identifier, or <code>null</code> if web application
- * server is not available
- * @since 2.0
- */
- public static String getWebAppServerHost() {
- return UpdateManagerPlugin.getWebAppServerHost();
- }
-
- /**
- * Returns the port identifier for the web application server
- * listener for install requests
- *
- * @return port identifier, or <code>0</code> if web application
- * server is not available
- * @since 2.0
- */
- public static int getWebAppServerPort() {
- return UpdateManagerPlugin.getWebAppServerPort();
- }
-
- /**
- * Returns the callback string to be passed to the web page
- * containing install triggers.
- *
- * @return callback string
- * @since 2.0
- */
- public static String getCallbackString() {
- String url = getCallbackURLAsString();
- if (url == null)
- return null;
- else
- return "?eclipse=" + url; //$NON-NLS-1$
- }
-
- /**
- * Returns the callback URL (as string) to be passed to the web page
- * containing install triggers.
- *
- * @return callback URL as string
- * @since 2.0
- */
- public static String getCallbackURLAsString() {
- String host = getWebAppServerHost();
- int port = getWebAppServerPort();
- if (host == null || port == 0)
- return null;
- else
- return "http://" + host + ":" + port + "/install";
- //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ArchiveReferenceModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ArchiveReferenceModel.java
deleted file mode 100644
index 12014b7..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ArchiveReferenceModel.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package org.eclipse.update.core.model;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ResourceBundle;
-
-/**
- * Site archive model object.
- * <p>
- * This class may be instantiated or subclassed by clients. However, in most
- * cases clients should instead instantiate or subclass the provided
- * concrete implementation of this model.
- * </p>
- * @see org.eclipse.update.core.ArchiveReference
- * @since 2.0
- */
-public class ArchiveReferenceModel extends ModelObject {
-
- private String path;
- private String urlString;
- private URL url;
-
- /**
- * Creates a uninitialized model object.
- *
- * @since 2.0
- */
- public ArchiveReferenceModel() {
- super();
- }
-
- /**
- * Retrieve the site archive "symbolic" path
- *
- * @return path, or <code>null</code>
- * @since 2.0
- */
- public String getPath() {
- return path;
- }
-
- /**
- * Returns the unresolved URL string for the archive.
- *
- * @return url string, or <code>null</code>
- * @since 2.0
- */
- public String getURLString() {
- return urlString;
- }
-
- /**
- * Returns the resolved URL for the archive.
- *
- * @return url, or <code>null</code>
- * @since 2.0
- */
- public URL getURL() {
- return url;
- }
-
- /**
- * Sets the site archive "symbolic" path.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param path archive "symbolic" path.
- * @since 2.0
- */
- public void setPath(String path) {
- assertIsWriteable();
- this.path = path;
- }
-
- /**
- * Sets the unresolved URL string for the archive.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param urlString unresolved url string.
- * @since 2.0
- */
- public void setURLString(String urlString) {
- assertIsWriteable();
- this.urlString = urlString;
- this.url = null;
- }
-
- /**
- * Resolve the model object.
- * Any URL strings in the model are resolved relative to the
- * base URL argument. Any translatable strings in the model that are
- * specified as translation keys are localized using the supplied
- * resource bundle.
- *
- * @param base URL
- * @param bundle resource bundle
- * @exception MalformedURLException
- * @since 2.0
- */
- public void resolve(URL base, ResourceBundle bundle)
- throws MalformedURLException {
- // resolve local elements
- url = resolveURL(base, bundle, urlString);
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/CategoryModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/CategoryModel.java
deleted file mode 100644
index 236811f..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/CategoryModel.java
+++ /dev/null
@@ -1,205 +0,0 @@
-package org.eclipse.update.core.model;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Comparator;
-import java.util.ResourceBundle;
-
-/**
- * Feature category definition model object.
- * <p>
- * This class may be instantiated or subclassed by clients. However, in most
- * cases clients should instead instantiate or subclass the provided
- * concrete implementation of this model.
- * </p>
- * @see org.eclipse.update.core.Category
- * @since 2.0
- */
-
-public class CategoryModel extends ModelObject {
-
- private String name;
- private String label;
- private String localizedLabel;
- private URLEntryModel description;
- private static Comparator comp;
-
- /**
- * Creates an uninitialized model object.
- *
- * @since 2.0
- */
- public CategoryModel() {
- super();
- }
-
- /**
- * Retrieve the name of the category.
- *
- * @return category name, or <code>null</code>.
- * @since 2.0
- */
- public String getName() {
- return name;
- }
-
- /**
- * Retrieve the displayable label for the category. If the model
- * object has been resolved, the label is localized.
- *
- * @return displayable label, or <code>null</code>.
- * @since 2.0
- */
- public String getLabel() {
- if (localizedLabel != null)
- return localizedLabel;
- else
- return label;
- }
-
- /**
- * Retrieve the non-localized displayable label for the category.
- *
- * @return non-localized displayable label, or <code>null</code>.
- * @since 2.0
- */
- public String getLabelNonLocalized() {
- return label;
- }
-
- /**
- * Retrieve the detailed category description
- *
- * @return category description, or <code>null</code>.
- * @since 2.0
- */
- public URLEntryModel getDescriptionModel() {
- return description;
- }
-
- /**
- * Sets the category displayable label.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param label displayable label, or resource key
- * @since 2.0
- */
- public void setLabel(String label) {
- assertIsWriteable();
- this.label = label;
- this.localizedLabel = null;
- }
-
- /**
- * Sets the category name.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param name category name
- * @since 2.0
- */
- public void setName(String name) {
- assertIsWriteable();
- this.name = name;
- }
-
- /**
- * Sets the category description.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param description category description
- * @since 2.0
- */
- public void setDescriptionModel(URLEntryModel description) {
- assertIsWriteable();
- this.description = description;
- }
-
- /**
- * Marks the model object as read-only.
- *
- * @since 2.0
- */
- public void markReadOnly() {
- super.markReadOnly();
- markReferenceReadOnly(getDescriptionModel());
- }
-
- /**
- * Resolve the model object.
- * Any URL strings in the model are resolved relative to the
- * base URL argument. Any translatable strings in the model that are
- * specified as translation keys are localized using the supplied
- * resource bundle.
- *
- * @param base URL
- * @param bundle resource bundle
- * @exception MalformedURLException
- * @since 2.0
- */
- public void resolve(URL base, ResourceBundle bundle)
- throws MalformedURLException {
- // resolve local elements
- localizedLabel = resolveNLString(bundle, label);
-
- // delegate to references
- resolveReference(getDescriptionModel(), base, bundle);
- }
-
- /**
- * Compare two category models for equality.
- *
- * @see Object#equals(Object)
- * @since 2.0
- */
- public boolean equals(Object obj) {
- boolean result = false;
- if (obj instanceof CategoryModel) {
- CategoryModel otherCategory = (CategoryModel) obj;
- result = getName().equalsIgnoreCase(otherCategory.getName());
- }
- return result;
- }
-
- /**
- * Compute hash code for category model.
- *
- * @see Object#hashCode()
- * @since 2.0
- */
- public int hashCode() {
- return getName().hashCode();
- }
-
- /**
- * Returns a comparator for category models.
- *
- * @return comparator
- * @since 2.0
- */
- public static Comparator getComparator() {
- if (comp == null) {
- comp = new Comparator() {
- /*
- * @see Comparator#compare(Object,Object)
- * Returns 0 if versions are equal.
- * Returns -1 if object1 is after than object2.
- * Returns +1 if object1 is before than object2.
- */
- public int compare(Object o1, Object o2) {
-
- CategoryModel cat1 = (CategoryModel) o1;
- CategoryModel cat2 = (CategoryModel) o2;
-
- if (cat1.equals(cat2))
- return 0;
- return cat1.getName().compareTo(cat2.getName());
- }
- };
- }
- return comp;
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ContentEntryModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ContentEntryModel.java
deleted file mode 100644
index d4fc7f0..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ContentEntryModel.java
+++ /dev/null
@@ -1,190 +0,0 @@
-package org.eclipse.update.core.model;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-/**
- * Content entry model object.
- * This is the base class for plug-in and non-plug-in entry models.
- * <p>
- * This class must be subclassed by clients.
- * </p>
- * @see org.eclipse.update.core.model.PluginEntryModel
- * @see org.eclipse.update.core.model.NonPluginEntryModel
- * @since 2.0
- */
-public abstract class ContentEntryModel extends ModelObject {
-
- /**
- * An indication the size could not be determined
- *
- * @since 2.0
- */
- public static final long UNKNOWN_SIZE = -1;
-
- private long downloadSize = UNKNOWN_SIZE;
- private long installSize = UNKNOWN_SIZE;
- private String os;
- private String ws;
- private String nl;
- private String arch;
-
- /**
- * Creates a uninitialized content entry model object.
- *
- * @since 2.0
- */
- protected ContentEntryModel() {
- super();
- }
-
- /**
- * Returns the download size of the entry, if it can be determined.
- *
- * @return download size of the entry in KiloBytes, or an indication
- * the size could not be determined
- * @since 2.0
- */
-
- public long getDownloadSize() {
- return downloadSize;
- }
-
- /**
- * Returns the install size of the entry, if it can be determined.
- *
- * @return install size of the entry in KiloBytes, or an indication
- * the size could not be determined
- * @since 2.0
- */
- public long getInstallSize() {
- return installSize;
- }
-
- /**
- * Returns optional operating system specification.
- *
- * @see org.eclipse.core.boot.BootLoader
- * @return the operating system specification or <code>null</code>.
- * @since 2.0
- */
- public String getOS() {
- return os;
- }
-
- /**
- * Returns optional windowing system specification.
- *
- * @see org.eclipse.core.boot.BootLoader
- * @return the windowing system specification or <code>null</code>.
- * @since 2.0
- */
-
- public String getWS() {
- return ws;
- }
-
- /**
- * Returns optional system architecture specification.
- *
- * @see org.eclipse.core.boot.BootLoader
- * @return the system architecture specification or <code>null</code>.
- * @since 2.0
- */
- public String getOSArch() {
- return arch;
- }
-
- /**
- * Returns optional locale specification.
- *
- * @return the locale specification, or <code>null</code>.
- * @since 2.0
- */
- public String getNL() {
- return nl;
- }
-
- /**
- * Sets the download size of the entry.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param downloadSize download size of the entry in KiloBytes
- * @since 2.0
- */
- public void setDownloadSize(long downloadSize) {
- assertIsWriteable();
- if (downloadSize < 0)
- this.downloadSize = UNKNOWN_SIZE;
- else
- this.downloadSize = downloadSize;
- }
-
- /**
- * Sets the install size of the entry.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param installSize install size of the entry in KiloBytes
- * @since 2.0
- */
- public void setInstallSize(long installSize) {
- assertIsWriteable();
- if (installSize < 0)
- this.installSize = UNKNOWN_SIZE;
- else
- this.installSize = installSize;
- }
-
- /**
- * Sets the operating system specification.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @see org.eclipse.core.boot.BootLoader
- * @param os comma-separated list of OS identifiers as defined by Eclipse.
- * @since 2.0
- */
- public void setOS(String os) {
- assertIsWriteable();
- this.os = os;
- }
-
- /**
- * Sets the windowing system specification.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @see org.eclipse.core.boot.BootLoader
- * @param ws comma-separated list of WS identifiers as defined by Eclipse.
- * @since 2.0
- */
- public void setWS(String ws) {
- assertIsWriteable();
- this.ws = ws;
- }
-
- /**
- * Sets the system architecture specification.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @see org.eclipse.core.boot.BootLoader
- * @param arch comma-separated list of arch identifiers as defined by Eclipse.
- * @since 2.0
- */
- public void setArch(String arch) {
- assertIsWriteable();
- this.arch = arch;
- }
-
- /**
- * Sets the locale specification.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param nl comma-separated list of locale identifiers.
- * @since 2.0
- */
- public void setNL(String nl) {
- assertIsWriteable();
- this.nl = nl;
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/DefaultFeatureParser.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/DefaultFeatureParser.java
deleted file mode 100644
index a03f747..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/DefaultFeatureParser.java
+++ /dev/null
@@ -1,1467 +0,0 @@
-package org.eclipse.update.core.model;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Iterator;
-import java.util.Stack;
-
-import org.apache.xerces.parsers.SAXParser;
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.core.*;
-import org.xml.sax.*;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * Default feature parser.
- * Parses the feature manifest file as defined by the platform. Defers
- * to a model factory to create the actual concrete model objects. The
- * update framework supplies two factory implementations:
- * <ul>
- * <li>@see org.eclipse.update.core.model.FeatureModelFactory
- * <li>@see org.eclipse.update.core.BaseFeatureFactory
- * </ul>
- *
- * @since 2.0
- */
-public class DefaultFeatureParser extends DefaultHandler {
-
- private SAXParser parser;
- private FeatureModelFactory factory;
- private MultiStatus status;
-
- private boolean URL_ALREADY_SEEN = false;
-
- private static final int STATE_IGNORED_ELEMENT = -1;
- private static final int STATE_INITIAL = 0;
- private static final int STATE_INCLUDES = 1;
- private static final int STATE_FEATURE = 2;
- private static final int STATE_HANDLER = 3;
- private static final int STATE_DESCRIPTION = 4;
- private static final int STATE_COPYRIGHT = 5;
- private static final int STATE_LICENSE = 6;
- private static final int STATE_URL = 7;
- private static final int STATE_UPDATE = 8;
- private static final int STATE_DISCOVERY = 9;
- private static final int STATE_REQUIRES = 10;
- private static final int STATE_IMPORT = 11;
- private static final int STATE_PLUGIN = 12;
- private static final int STATE_DATA = 13;
- private static final String PLUGIN_ID =
- UpdateManagerPlugin.getPlugin().getDescriptor().getUniqueIdentifier();
-
- private static final String FEATURE = "feature"; //$NON-NLS-1$
- private static final String INCLUDES = "includes"; //$NON-NLS-1$
- private static final String HANDLER = "install-handler"; //$NON-NLS-1$
- private static final String DESCRIPTION = "description"; //$NON-NLS-1$
- private static final String COPYRIGHT = "copyright"; //$NON-NLS-1$
- private static final String LICENSE = "license"; //$NON-NLS-1$
- private static final String URL = "url"; //$NON-NLS-1$
- private static final String UPDATE = "update"; //$NON-NLS-1$
- private static final String DISCOVERY = "discovery"; //$NON-NLS-1$
- private static final String REQUIRES = "requires"; //$NON-NLS-1$
- private static final String IMPORT = "import"; //$NON-NLS-1$
- private static final String PLUGIN = "plugin"; //$NON-NLS-1$
- private static final String DATA = "data"; //$NON-NLS-1$
- // Current State Information
- Stack stateStack = new Stack();
-
- // Current object stack (used to hold the current object we are
- // populating in this plugin descriptor
- Stack objectStack = new Stack();
-
- private int currentState;
-
- /**
- * Constructs a feature parser.
- *
- * @param factory feature model factory
- * @since 2.0
- */
- public DefaultFeatureParser(FeatureModelFactory factory) {
- super();
- this.parser = new SAXParser();
- this.parser.setContentHandler(this);
- this.parser.setErrorHandler(this); // 18350
- this.factory = factory;
- }
-
- /**
- * Parses the specified input steam and constructs a feature model.
- * The input stream is not closed as part of this operation.
- *
- * @param in input stream
- * @return feature model
- * @exception SAXException
- * @exception IOException
- * @since 2.0
- */
- public FeatureModel parse(InputStream in) throws SAXException, IOException {
- stateStack.push(new Integer(STATE_INITIAL));
- currentState = ((Integer) stateStack.peek()).intValue();
- parser.parse(new InputSource(in));
- if (objectStack.isEmpty())
- throw new SAXException(Policy.bind("DefaultFeatureParser.NoFeatureTag"));
- //$NON-NLS-1$
- else {
- if (objectStack.peek() instanceof FeatureModel) {
- return (FeatureModel) objectStack.pop();
- } else {
- String stack = ""; //$NON-NLS-1$
- Iterator iter = objectStack.iterator();
- while (iter.hasNext()) {
- stack = "\r\n" + iter.next().toString() + stack; //$NON-NLS-1$
- }
- throw new SAXException(
- Policy.bind("DefaultFeatureParser.WrongParsingStack", stack));
- //$NON-NLS-1$
- }
- }
- }
-
- /**
- * Returns all status objects accumulated by the parser.
- *
- * @return multi-status containing accumulated status, or <code>null</code>.
- * @since 2.0
- */
- public MultiStatus getStatus() {
- return status;
- }
-
- /**
- * Handle start of element tags
- * @see DefaultHandler#startElement(String, String, String, Attributes)
- * @since 2.0
- */
- public void startElement(
- String uri,
- String localName,
- String qName,
- Attributes attributes)
- throws SAXException {
-
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_PARSING)
- debug(
- "Start Element: uri:" + uri + " local Name:" + localName + " qName:" + qName);
- //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
- switch (currentState) {
- case STATE_IGNORED_ELEMENT :
- internalErrorUnknownTag(
- Policy.bind(
- "DefaultFeatureParser.UnknownElement",
- localName,
- getState(currentState)));
- //$NON-NLS-1$
- break;
-
- case STATE_INITIAL :
- handleInitialState(localName, attributes);
- break;
-
- case STATE_FEATURE :
- handleFeatureState(localName, attributes);
- break;
-
- case STATE_INCLUDES :
- handleIncludesState(localName, attributes);
- break;
-
- case STATE_HANDLER :
- handleHandlerState(localName, attributes);
- break;
-
- case STATE_DESCRIPTION :
- handleDescriptionState(localName, attributes);
- break;
-
- case STATE_COPYRIGHT :
- handleCopyrightState(localName, attributes);
- break;
-
- case STATE_LICENSE :
- handleLicenseState(localName, attributes);
- break;
-
- case STATE_URL :
- if (URL_ALREADY_SEEN)
- internalError(Policy.bind("DefaultFeatureParser.TooManyURLtag")); //$NON-NLS-1$
- handleURLState(localName, attributes);
- break;
-
- case STATE_UPDATE :
- handleUpdateState(localName, attributes);
- break;
-
- case STATE_DISCOVERY :
- handleDiscoveryState(localName, attributes);
- break;
-
- case STATE_REQUIRES :
- handleRequiresState(localName, attributes);
- break;
-
- case STATE_IMPORT :
- handleImportState(localName, attributes);
- break;
-
- case STATE_PLUGIN :
- handlePluginState(localName, attributes);
- break;
-
- case STATE_DATA :
- handleDataState(localName, attributes);
- break;
-
- default :
- internalErrorUnknownTag(
- Policy.bind(
- "DefaultFeatureParser.UnknownStartState",
- Integer.toString(currentState)));
- //$NON-NLS-1$
- break;
- }
-
- int newState = ((Integer) stateStack.peek()).intValue();
- if (newState != STATE_IGNORED_ELEMENT)
- currentState = newState;
-
- }
-
- /**
- * Handle end of element tags
- * @see DefaultHandler#endElement(String, String, String)
- * @since 2.0
- */
- public void endElement(String uri, String localName, String qName) {
-
- // variables used
- URLEntryModel info = null;
- FeatureModel featureModel = null;
- String text = null;
- int innerState = 0;
-
- int state = ((Integer) stateStack.peek()).intValue();
- switch (state) {
- case STATE_IGNORED_ELEMENT :
- stateStack.pop();
- break;
-
- case STATE_INITIAL :
- internalError(
- Policy.bind("DefaultFeatureParser.ParsingStackBackToInitialState"));
- //$NON-NLS-1$
- break;
-
- case STATE_FEATURE :
- stateStack.pop();
- if (objectStack.peek() instanceof String) {
- text = (String) objectStack.pop();
- FeatureModel feature = (FeatureModel) objectStack.peek();
- feature.getDescriptionModel().setAnnotation(text);
- }
- //do not pop
- break;
-
- case STATE_INCLUDES :
- stateStack.pop();
- if (objectStack.peek() instanceof IncludedFeatureReferenceModel) {
- IncludedFeatureReferenceModel includedFeatureRefModel = ((IncludedFeatureReferenceModel)objectStack.pop());
- if (objectStack.peek() instanceof FeatureModel) {
- featureModel = (FeatureModel) objectStack.peek();
- featureModel.addIncludedFeatureReferenceModel(includedFeatureRefModel);
- }
- }
- break;
-
- case STATE_HANDLER :
- stateStack.pop();
- if (objectStack.peek() instanceof InstallHandlerEntryModel) {
- InstallHandlerEntryModel handlerModel =
- (InstallHandlerEntryModel) objectStack.pop();
- featureModel = (FeatureModel) objectStack.peek();
- if (featureModel.getInstallHandlerModel() != null)
- internalError(
- Policy.bind("DefaultFeatureParser.ElementAlreadySet", getState(state)));
- //$NON-NLS-1$
- //$NON-NLS-1$
- else
- featureModel.setInstallHandlerModel(handlerModel);
- }
- break;
-
- case STATE_DESCRIPTION :
- stateStack.pop();
-
- text = ""; //$NON-NLS-1$
- while (objectStack.peek() instanceof String) {
- text = (String) objectStack.pop() + text;
- }
- if (objectStack.peek() instanceof URLEntryModel) {
- info = (URLEntryModel) objectStack.pop();
- if (text != null)
- info.setAnnotation(text);
-
- innerState = ((Integer) stateStack.peek()).intValue();
- switch (innerState) {
- case STATE_FEATURE :
- if (objectStack.peek() instanceof FeatureModel) {
- featureModel = (FeatureModel) objectStack.peek();
- if (featureModel.getDescriptionModel() != null)
- internalError(
- Policy.bind("DefaultFeatureParser.ElementAlreadySet", getState(state)));
- //$NON-NLS-1$
- else
- featureModel.setDescriptionModel(info);
- }
- break;
-
- default :
- internalError(
- Policy.bind(
- "DefaultFeatureParser.StateIncludeWrongElement",
- getState(innerState),
- getState(state)));
- //$NON-NLS-1$
- //$NON-NLS-1$
- break;
-
- }
- }
- break;
-
- case STATE_COPYRIGHT :
- stateStack.pop();
- text = ""; //$NON-NLS-1$
- while (objectStack.peek() instanceof String) {
- text = (String) objectStack.pop() + text;
- }
- if (objectStack.peek() instanceof URLEntryModel) {
- info = (URLEntryModel) objectStack.pop();
- if (text != null) {
- info.setAnnotation(text);
- }
-
- innerState = ((Integer) stateStack.peek()).intValue();
- switch (innerState) {
- case STATE_FEATURE :
- if (objectStack.peek() instanceof FeatureModel) {
- featureModel = (FeatureModel) objectStack.peek();
- if (featureModel.getCopyrightModel() != null)
- internalError(
- Policy.bind("DefaultFeatureParser.ElementAlreadySet", getState(state)));
- //$NON-NLS-1$
- else
- featureModel.setCopyrightModel(info);
- }
- break;
-
- default :
- internalError(
- Policy.bind(
- "DefaultFeatureParser.StateIncludeWrongElement",
- getState(innerState),
- getState(state)));
- //$NON-NLS-1$
- break;
-
- }
- }
- break;
-
- case STATE_LICENSE :
- stateStack.pop();
-
- text = ""; //$NON-NLS-1$
- while (objectStack.peek() instanceof String) {
- text = (String) objectStack.pop() + text;
- }
- if (objectStack.peek() instanceof URLEntryModel) {
- info = (URLEntryModel) objectStack.pop();
- if (text != null) {
- info.setAnnotation(text);
- }
-
- innerState = ((Integer) stateStack.peek()).intValue();
- switch (innerState) {
- case STATE_FEATURE :
- if (objectStack.peek() instanceof FeatureModel) {
- featureModel = (FeatureModel) objectStack.peek();
- if (featureModel.getLicenseModel() != null)
- internalError(
- Policy.bind("DefaultFeatureParser.ElementAlreadySet", getState(state)));
- //$NON-NLS-1$
- else
- featureModel.setLicenseModel(info);
- }
- break;
-
- default :
- internalError(
- Policy.bind(
- "DefaultFeatureParser.StateIncludeWrongElement",
- getState(innerState),
- getState(state)));
- //$NON-NLS-1$
- break;
-
- }
- }
- break;
-
- case STATE_URL :
- stateStack.pop();
- URL_ALREADY_SEEN = true;
- break;
-
- case STATE_UPDATE :
- stateStack.pop();
- if (objectStack.peek() instanceof URLEntryModel) {
- info = (URLEntryModel) objectStack.pop();
- if (objectStack.peek() instanceof FeatureModel) {
- featureModel = (FeatureModel) objectStack.peek();
- if (featureModel.getUpdateSiteEntryModel() != null) {
- internalError(
- Policy.bind("DefaultFeatureParser.ElementAlreadySet", getState(state)));
- //$NON-NLS-1$
- } else {
- featureModel.setUpdateSiteEntryModel(info);
- }
- }
- }
- break;
-
- case STATE_DISCOVERY :
- stateStack.pop();
- if (objectStack.peek() instanceof URLEntryModel) {
- info = (URLEntryModel) objectStack.pop();
- if (objectStack.peek() instanceof FeatureModel) {
- featureModel = (FeatureModel) objectStack.peek();
- featureModel.addDiscoverySiteEntryModel(info);
- }
- }
- break;
-
- case STATE_REQUIRES :
- stateStack.pop();
- if (objectStack.peek() instanceof FeatureModel) {
- featureModel = (FeatureModel) objectStack.peek();
- ImportModel [] importModels = featureModel.getImportModels();
- if (importModels.length == 0) {
- internalError(
- Policy.bind("DefaultFeatureParser.RequireStateWithoutImportElement"));
- //$NON-NLS-1$
- //$NON-NLS-1$
- }
- else {
- boolean patchMode=false;
- for (int i=0; i<importModels.length; i++) {
- ImportModel importModel = importModels[i];
- if (importModel.isPatch()) {
- if (patchMode==false)
- patchMode = true;
- else {
- internalError(
- Policy.bind("DefaultFeatureParser.MultiplePatchImports"));
- break;
- }
- }
- }
- }
- }
- break;
-
- case STATE_IMPORT :
- stateStack.pop();
- if (objectStack.peek() instanceof ImportModel) {
- ImportModel importModel = (ImportModel) objectStack.pop();
- if (objectStack.peek() instanceof FeatureModel) {
- featureModel = (FeatureModel) objectStack.peek();
- featureModel.addImportModel(importModel);
- }
- }
- break;
-
- case STATE_PLUGIN :
- stateStack.pop();
- if (objectStack.peek() instanceof PluginEntryModel) {
- PluginEntryModel pluginEntry = (PluginEntryModel) objectStack.pop();
- if (objectStack.peek() instanceof FeatureModel) {
- featureModel = (FeatureModel) objectStack.peek();
- featureModel.addPluginEntryModel(pluginEntry);
- }
- }
- break;
-
- case STATE_DATA :
- stateStack.pop();
- if (objectStack.peek() instanceof NonPluginEntryModel) {
- NonPluginEntryModel nonPluginEntry = (NonPluginEntryModel) objectStack.pop();
- if (objectStack.peek() instanceof FeatureModel) {
- featureModel = (FeatureModel) objectStack.peek();
- featureModel.addNonPluginEntryModel(nonPluginEntry);
- }
- }
- break;
-
- default :
- internalErrorUnknownTag(
- Policy.bind("DefaultFeatureParser.UnknownEndState") + state);
- //$NON-NLS-1$
- //$NON-NLS-1$
- break;
-
- }
-
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_PARSING)
- debug("End Element:" + uri + ":" + localName + ":" + qName);
- //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
-
- /**
- * Handle character text
- * @see DefaultHandler#characters(char[], int, int)
- * @since 2.0
- */
- public void characters(char[] ch, int start, int length) {
- String text = "";
- boolean valid = true;
-/* // remove any \t \r\n and space
- boolean valid = false;
- for (int i = 0; i < ch.length; i++) {
- if (!Character.isWhitespace(ch[i])) {
- valid = true;
- break;
- }
- }
-*/
-
- if (valid) {
- text = new String(ch, start, length).trim();
- }
-
- //only push if not unknown state
- int state = ((Integer) stateStack.peek()).intValue();
- if (state == STATE_DESCRIPTION
- || state == STATE_COPYRIGHT
- || state == STATE_LICENSE)
- objectStack.push(text+"\r\n");
- }
-
- /**
- * Handle errors
- * @see DefaultHandler#error(SAXParseException)
- * @since 2.0
- */
- public void error(SAXParseException ex) {
- logStatus(ex);
- }
-
- /**
- * Handle fatal errors
- * @see DefaultHandler#fatalError(SAXParseException)
- * @exception SAXException
- * @since 2.0
- */
- public void fatalError(SAXParseException ex) throws SAXException {
- logStatus(ex);
- throw ex;
- }
-
- private void handleInitialState(String elementName, Attributes attributes)
- throws SAXException {
- if (elementName.equals(FEATURE)) {
- stateStack.push(new Integer(STATE_FEATURE));
- processFeature(attributes);
- } else
- internalErrorUnknownTag(
- Policy.bind(
- "DefaultFeatureParser.UnknownElement",
- elementName,
- getState(currentState)));
- //$NON-NLS-1$
- }
-
- private void handleFeatureState(String elementName, Attributes attributes)
- throws SAXException {
- if (elementName.equals(HANDLER)) {
- stateStack.push(new Integer(STATE_HANDLER));
- processHandler(attributes);
- } else if (elementName.equals(DESCRIPTION)) {
- stateStack.push(new Integer(STATE_DESCRIPTION));
- processInfo(attributes);
- } else if (elementName.equals(COPYRIGHT)) {
- stateStack.push(new Integer(STATE_COPYRIGHT));
- processInfo(attributes);
- } else if (elementName.equals(LICENSE)) {
- stateStack.push(new Integer(STATE_LICENSE));
- processInfo(attributes);
- } else if (elementName.equals(URL)) {
- stateStack.push(new Integer(STATE_URL));
- //No process as URL tag does not contain any element itself
- } else if (elementName.equals(INCLUDES)) {
- stateStack.push(new Integer(STATE_INCLUDES));
- processIncludes(attributes);
- } else if (elementName.equals(REQUIRES)) {
- stateStack.push(new Integer(STATE_REQUIRES));
- processRequire(attributes);
- } else if (elementName.equals(PLUGIN)) {
- stateStack.push(new Integer(STATE_PLUGIN));
- processPlugin(attributes);
- } else if (elementName.equals(DATA)) {
- stateStack.push(new Integer(STATE_DATA));
- processData(attributes);
- } else
- internalErrorUnknownTag(
- Policy.bind(
- "DefaultFeatureParser.UnknownElement",
- elementName,
- getState(currentState)));
- //$NON-NLS-1$
- }
-
- private void handleHandlerState(String elementName, Attributes attributes)
- throws SAXException {
- if (elementName.equals(DESCRIPTION)) {
- stateStack.push(new Integer(STATE_DESCRIPTION));
- processInfo(attributes);
- } else if (elementName.equals(COPYRIGHT)) {
- stateStack.push(new Integer(STATE_COPYRIGHT));
- processInfo(attributes);
- } else if (elementName.equals(LICENSE)) {
- stateStack.push(new Integer(STATE_LICENSE));
- processInfo(attributes);
- } else if (elementName.equals(URL)) {
- stateStack.push(new Integer(STATE_URL));
- //No process as URL tag does not contain any element itself
- } else if (elementName.equals(INCLUDES)) {
- stateStack.push(new Integer(STATE_INCLUDES));
- processIncludes(attributes);
- } else if (elementName.equals(REQUIRES)) {
- stateStack.push(new Integer(STATE_REQUIRES));
- processRequire(attributes);
- } else if (elementName.equals(PLUGIN)) {
- stateStack.push(new Integer(STATE_PLUGIN));
- processPlugin(attributes);
- } else if (elementName.equals(DATA)) {
- stateStack.push(new Integer(STATE_DATA));
- processData(attributes);
- } else
- internalErrorUnknownTag(
- Policy.bind(
- "DefaultFeatureParser.UnknownElement",
- elementName,
- getState(currentState)));
- //$NON-NLS-1$
- }
-
- private void handleCopyrightState(String elementName, Attributes attributes)
- throws SAXException {
- if (elementName.equals(LICENSE)) {
- stateStack.push(new Integer(STATE_LICENSE));
- processInfo(attributes);
- } else if (elementName.equals(URL)) {
- stateStack.push(new Integer(STATE_URL));
- //No process as URL tag does not contain any element itself
- } else if (elementName.equals(INCLUDES)) {
- stateStack.push(new Integer(STATE_INCLUDES));
- processIncludes(attributes);
- } else if (elementName.equals(REQUIRES)) {
- stateStack.push(new Integer(STATE_REQUIRES));
- processRequire(attributes);
- } else if (elementName.equals(PLUGIN)) {
- stateStack.push(new Integer(STATE_PLUGIN));
- processPlugin(attributes);
- } else if (elementName.equals(DATA)) {
- stateStack.push(new Integer(STATE_DATA));
- processData(attributes);
- } else
- internalErrorUnknownTag(
- Policy.bind(
- "DefaultFeatureParser.UnknownElement",
- elementName,
- getState(currentState)));
- //$NON-NLS-1$
- }
-
- private void handleLicenseState(String elementName, Attributes attributes)
- throws SAXException {
- if (elementName.equals(URL)) {
- stateStack.push(new Integer(STATE_URL));
- //No process as URL tag does not contain any element itself
- } else if (elementName.equals(INCLUDES)) {
- stateStack.push(new Integer(STATE_INCLUDES));
- processIncludes(attributes);
- } else if (elementName.equals(REQUIRES)) {
- stateStack.push(new Integer(STATE_REQUIRES));
- processRequire(attributes);
- } else if (elementName.equals(PLUGIN)) {
- stateStack.push(new Integer(STATE_PLUGIN));
- processPlugin(attributes);
- } else if (elementName.equals(DATA)) {
- stateStack.push(new Integer(STATE_DATA));
- processData(attributes);
- } else
- internalErrorUnknownTag(
- Policy.bind(
- "DefaultFeatureParser.UnknownElement",
- elementName,
- getState(currentState)));
- //$NON-NLS-1$
- }
-
- private void handleDescriptionState(String elementName, Attributes attributes)
- throws SAXException {
- if (elementName.equals(COPYRIGHT)) {
- stateStack.push(new Integer(STATE_COPYRIGHT));
- processInfo(attributes);
- } else if (elementName.equals(LICENSE)) {
- stateStack.push(new Integer(STATE_LICENSE));
- processInfo(attributes);
- } else if (elementName.equals(URL)) {
- stateStack.push(new Integer(STATE_URL));
- //No process as URL tag does not contain any element itself
- } else if (elementName.equals(INCLUDES)) {
- stateStack.push(new Integer(STATE_INCLUDES));
- processIncludes(attributes);
- } else if (elementName.equals(REQUIRES)) {
- stateStack.push(new Integer(STATE_REQUIRES));
- processRequire(attributes);
- } else if (elementName.equals(PLUGIN)) {
- stateStack.push(new Integer(STATE_PLUGIN));
- processPlugin(attributes);
- } else if (elementName.equals(DATA)) {
- stateStack.push(new Integer(STATE_DATA));
- processData(attributes);
- } else
- internalErrorUnknownTag(
- Policy.bind(
- "DefaultFeatureParser.UnknownElement",
- elementName,
- getState(currentState)));
- //$NON-NLS-1$
- }
-
- private void handleURLState(String elementName, Attributes attributes)
- throws SAXException {
- if (elementName.equals(UPDATE)) {
- stateStack.push(new Integer(STATE_UPDATE));
- processURLInfo(attributes);
- } else if (elementName.equals(DISCOVERY)) {
- stateStack.push(new Integer(STATE_DISCOVERY));
- processURLInfo(attributes);
- } else
- internalErrorUnknownTag(
- Policy.bind(
- "DefaultFeatureParser.UnknownElement",
- elementName,
- getState(currentState)));
- //$NON-NLS-1$
- }
-
- private void handleUpdateState(String elementName, Attributes attributes)
- throws SAXException {
- if (elementName.equals(INCLUDES)) {
- stateStack.push(new Integer(STATE_INCLUDES));
- processIncludes(attributes);
- } else if (elementName.equals(REQUIRES)) {
- stateStack.push(new Integer(STATE_REQUIRES));
- processRequire(attributes);
- } else if (elementName.equals(PLUGIN)) {
- stateStack.push(new Integer(STATE_PLUGIN));
- processPlugin(attributes);
- } else if (elementName.equals(DATA)) {
- stateStack.push(new Integer(STATE_DATA));
- processData(attributes);
- } else if (elementName.equals(DISCOVERY)) {
- stateStack.push(new Integer(STATE_DISCOVERY));
- processURLInfo(attributes);
- } else
- internalErrorUnknownTag(
- Policy.bind(
- "DefaultFeatureParser.UnknownElement",
- elementName,
- getState(currentState)));
- //$NON-NLS-1$
- }
-
- private void handleDiscoveryState(String elementName, Attributes attributes)
- throws SAXException {
- if (elementName.equals(INCLUDES)) {
- stateStack.push(new Integer(STATE_INCLUDES));
- processIncludes(attributes);
- } else if (elementName.equals(REQUIRES)) {
- stateStack.push(new Integer(STATE_REQUIRES));
- processRequire(attributes);
- } else if (elementName.equals(PLUGIN)) {
- stateStack.push(new Integer(STATE_PLUGIN));
- processPlugin(attributes);
- } else if (elementName.equals(DATA)) {
- stateStack.push(new Integer(STATE_DATA));
- processData(attributes);
- } else if (elementName.equals(UPDATE)) {
- stateStack.push(new Integer(STATE_UPDATE));
- processURLInfo(attributes);
- } else if (elementName.equals(DISCOVERY)) {
- stateStack.push(new Integer(STATE_DISCOVERY));
- processURLInfo(attributes);
- } else
- internalErrorUnknownTag(
- Policy.bind(
- "DefaultFeatureParser.UnknownElement",
- elementName,
- getState(currentState)));
- //$NON-NLS-1$
- }
-
- private void handleIncludesState(String elementName, Attributes attributes)
- throws SAXException {
- if (elementName.equals(INCLUDES)) {
- stateStack.push(new Integer(STATE_INCLUDES));
- processIncludes(attributes);
- } else if (elementName.equals(REQUIRES)) {
- stateStack.push(new Integer(STATE_REQUIRES));
- processRequire(attributes);
- } else if (elementName.equals(PLUGIN)) {
- stateStack.push(new Integer(STATE_PLUGIN));
- processPlugin(attributes);
- } else if (elementName.equals(DATA)) {
- stateStack.push(new Integer(STATE_DATA));
- processData(attributes);
- } else
- internalErrorUnknownTag(
- Policy.bind(
- "DefaultFeatureParser.UnknownElement",
- elementName,
- getState(currentState)));
- //$NON-NLS-1$
- }
-
-
- private void handleRequiresState(String elementName, Attributes attributes)
- throws SAXException {
- if (elementName.equals(IMPORT)) {
- stateStack.push(new Integer(STATE_IMPORT));
- processImport(attributes);
- } else
- internalErrorUnknownTag(
- Policy.bind(
- "DefaultFeatureParser.UnknownElement",
- elementName,
- getState(currentState)));
- //$NON-NLS-1$
- }
-
- private void handleImportState(String elementName, Attributes attributes)
- throws SAXException {
- if (elementName.equals(PLUGIN)) {
- stateStack.push(new Integer(STATE_PLUGIN));
- processPlugin(attributes);
- } else if (elementName.equals(DATA)) {
- stateStack.push(new Integer(STATE_DATA));
- processData(attributes);
- } else if (elementName.equals(IMPORT)) {
- stateStack.push(new Integer(STATE_IMPORT));
- processImport(attributes);
- } else
- internalErrorUnknownTag(
- Policy.bind(
- "DefaultFeatureParser.UnknownElement",
- elementName,
- getState(currentState)));
- //$NON-NLS-1$
- }
-
- private void handlePluginState(String elementName, Attributes attributes)
- throws SAXException {
- if (elementName.equals(PLUGIN)) {
- stateStack.push(new Integer(STATE_PLUGIN));
- processPlugin(attributes);
- } else if (elementName.equals(DATA)) {
- stateStack.push(new Integer(STATE_DATA));
- processData(attributes);
- } else
- internalErrorUnknownTag(
- Policy.bind(
- "DefaultFeatureParser.UnknownElement",
- elementName,
- getState(currentState)));
- //$NON-NLS-1$
- }
-
- private void handleDataState(String elementName, Attributes attributes)
- throws SAXException {
- if (elementName.equals(DATA)) {
- stateStack.push(new Integer(STATE_DATA));
- processData(attributes);
- } else
- internalErrorUnknownTag(
- Policy.bind(
- "DefaultFeatureParser.UnknownElement",
- elementName,
- getState(currentState)));
- //$NON-NLS-1$
- }
-
- /*
- * Process feature information
- */
- private void processFeature(Attributes attributes) {
-
- // identifier and version
- String id = attributes.getValue("id"); //$NON-NLS-1$
- String ver = attributes.getValue("version"); //$NON-NLS-1$
-
- if (id == null
- || id.trim().equals("") //$NON-NLS-1$
- || ver == null
- || ver.trim().equals("")) { //$NON-NLS-1$
- internalError(
- Policy.bind(
- "DefaultFeatureParser.IdOrVersionInvalid",
- new String[] { id, ver, getState(currentState)}));
- //$NON-NLS-1$
- } else {
- // create feature model
- FeatureModel feature = factory.createFeatureModel();
-
- feature.setFeatureIdentifier(id);
- feature.setFeatureVersion(ver);
-
- // label
- String label = attributes.getValue("label"); //$NON-NLS-1$
- feature.setLabel(label);
-
- // provider
- String provider = attributes.getValue("provider-name"); //$NON-NLS-1$
- feature.setProvider(provider);
-
- //image
- String imageURL = attributes.getValue("image"); //$NON-NLS-1$
- feature.setImageURLString(imageURL);
-
- // OS
- String os = attributes.getValue("os"); //$NON-NLS-1$
- feature.setOS(os);
-
- // WS
- String ws = attributes.getValue("ws"); //$NON-NLS-1$
- feature.setWS(ws);
-
- // NL
- String nl = attributes.getValue("nl"); //$NON-NLS-1$
- feature.setNL(nl);
-
- // arch
- String arch = attributes.getValue("arch"); //$NON-NLS-1$
- feature.setArch(arch);
- feature.setArch(arch);
-
- // primary
- String primary = attributes.getValue("primary"); //$NON-NLS-1$
- feature.isPrimary(primary != null && primary.trim().equalsIgnoreCase("true"));
- //$NON-NLS-1$
-
- // application
- String application = attributes.getValue("application"); //$NON-NLS-1$
- feature.setApplication(application);
-
- // affinity
- String affinity = attributes.getValue("colocation-affinity"); //$NON-NLS-1$
- feature.setAffinityFeature(affinity);
-
- objectStack.push(feature);
-
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_PARSING) {
- debug("End process DefaultFeature tag: id:" //$NON-NLS-1$
- +id + " ver:" //$NON-NLS-1$
- +ver + " label:" //$NON-NLS-1$
- +label + " provider:" //$NON-NLS-1$
- +provider);
- debug("End process DefaultFeature tag: image:" + imageURL); //$NON-NLS-1$
- debug("End process DefaultFeature tag: ws:" //$NON-NLS-1$
- +ws + " os:" //$NON-NLS-1$
- +os + " nl:" //$NON-NLS-1$
- +nl + " application:" //$NON-NLS-1$
- +application);
- }
- }
- }
-
- /*
- * process URL info with element text
- */
- private void processHandler(Attributes attributes) {
- InstallHandlerEntryModel handler = factory.createInstallHandlerEntryModel();
-
- String handlerURL = attributes.getValue("url"); //$NON-NLS-1$
- handler.setURLString(handlerURL);
-
- String library = attributes.getValue("library"); //$NON-NLS-1$
- handler.setLibrary(library);
-
- String clazz = attributes.getValue("handler"); //$NON-NLS-1$
- handler.setHandlerName(clazz);
-
- objectStack.push(handler);
-
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_PARSING)
- debug("Processed Handler: url:" //$NON-NLS-1$
- +handlerURL + " library:" //$NON-NLS-1$
- +library + " class:" //$NON-NLS-1$
- +clazz);
- }
-
- /*
- * process URL info with element text
- */
- private void processInfo(Attributes attributes) {
- URLEntryModel inf = factory.createURLEntryModel();
- String infoURL = attributes.getValue("url"); //$NON-NLS-1$
- inf.setURLString(infoURL);
-
- objectStack.push(inf);
-
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_PARSING)
- debug("Processed Info: url:" + infoURL); //$NON-NLS-1$
- }
-
- /*
- * Process includes information
- */
- private void processIncludes(Attributes attributes) {
-
- // identifier and version
- String id = attributes.getValue("id"); //$NON-NLS-1$
- String ver = attributes.getValue("version"); //$NON-NLS-1$
-
- if (id == null
- || id.trim().equals("") //$NON-NLS-1$
- || ver == null
- || ver.trim().equals("")) { //$NON-NLS-1$
- internalError(
- Policy.bind(
- "DefaultFeatureParser.IdOrVersionInvalid",
- new String[] { id, ver, getState(currentState)}));
- //$NON-NLS-1$
- }
-
- IncludedFeatureReferenceModel includedFeature = factory.createIncludedFeatureReferenceModel();
- includedFeature.setFeatureIdentifier(id);
- includedFeature.setFeatureVersion(ver);
-
- // name
- String name = attributes.getValue("name");
- includedFeature.setName(name);
-
- // optional
- String optional = attributes.getValue("optional");
- boolean isOptional = "true".equalsIgnoreCase(optional);
- includedFeature.isOptional(isOptional);
-
- // match
- String ruleName = attributes.getValue("match");
- int rule = UpdateManagerUtils.getMatchingRule(ruleName);
- includedFeature.setMatchingRule(rule);
-
- // search location
- String locationName = attributes.getValue("search_location");
- int searchLocation = IUpdateConstants.SEARCH_ROOT;
- if("both".equalsIgnoreCase(locationName))
- searchLocation = IUpdateConstants.SEARCH_ROOT & IUpdateConstants.SEARCH_SELF;
- if("root".equalsIgnoreCase(locationName))
- searchLocation = IUpdateConstants.SEARCH_ROOT;
- includedFeature.setSearchLocation(searchLocation);
-
- // os arch ws
- String os = attributes.getValue("os");
- includedFeature.setOS(os);
-
- String ws = attributes.getValue("ws");
- includedFeature.setWS(ws);
-
- String arch = attributes.getValue("arch");
- includedFeature.setArch(arch);
-
- objectStack.push(includedFeature);
-
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_PARSING) {
- debug("End process Includes tag: id:" //$NON-NLS-1$
- +id + " ver:" +ver);//$NON-NLS-1$
- }
- }
-
-
- /*
- * process URL info with label attribute
- */
- private void processURLInfo(Attributes attributes) {
- URLEntryModel inf = factory.createURLEntryModel();
- String infoURL = attributes.getValue("url"); //$NON-NLS-1$
- String label = attributes.getValue("label"); //$NON-NLS-1$
- inf.setURLString(infoURL);
- inf.setAnnotation(label);
-
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_PARSING)
- debug("Processed URLInfo: url:" + infoURL + " label:" + label);
- //$NON-NLS-1$ //$NON-NLS-2$
-
- objectStack.push(inf);
- }
-
- /*
- * process import info
- */
- private void processImport(Attributes attributes) {
- String pluginID = attributes.getValue("plugin"); //$NON-NLS-1$
- String featureID = attributes.getValue("feature"); //$NON-NLS-1$
-
- if(!(pluginID==null ^ featureID==null)) {
- internalError(Policy.bind("DefaultFeatureParser.PluginAndFeatureId"));
- return ;
- }
-
- // since 2.0.2 , manage feature and plugin import
- String id = null;
- if (pluginID==null){
- id = featureID;
- } else {
- id=pluginID;
- }
-
- if (id == null || id.trim().equals("")) //$NON-NLS-1$
- internalError(
- Policy.bind("DefaultFeatureParser.MissingId", getState(currentState)));
- //$NON-NLS-1$
- //$NON-NLS-1$
- else {
- ImportModel imp = factory.createImportModel();
- String ver = attributes.getValue("version"); //$NON-NLS-1$
- String match = attributes.getValue("match"); //$NON-NLS-1$
- String patch = attributes.getValue("patch");
-
- imp.setPatch(patch!=null && patch.equalsIgnoreCase("true"));
-
- if (ver==null){
- if (imp.isPatch()) {
- internalError(
- Policy.bind("DefaultFeatureParser.MissingPatchVersion"));
- }
- ver = "0.0.0";
- match = "greaterOrEqual";
- } else if (match==null) {
- if (imp.isPatch())
- match = "perfect";
- else
- match = "compatible";
- }
-
- imp.setIdentifier(id);
- imp.setVersion(ver);
- imp.setFeatureImport(featureID!=null);
- imp.setMatchingRuleName(match);
-
- if (imp.isPatch()) {
- // patch reference must be perfect.
- if (match!=null && !match.equalsIgnoreCase("perfect")) {
- internalError(
- Policy.bind("DefaultFeatureParser.wrongMatchForPatch"));
- }
- if (imp.isFeatureImport()==false) {
- imp.setPatch(false);
- internalError(
- Policy.bind("DefaultFeatureParser.patchWithPlugin"));
- }
- }
- objectStack.push(imp);
-
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_PARSING) {
- debug("Processed import: id:" + id + " ver:" + ver);
- //$NON-NLS-1$ //$NON-NLS-2$
- debug("Processed import: match:" + match); //$NON-NLS-1$
- }
-
- }
- }
-
- /*
- * process import info
- */
- private void processRequire(Attributes attributes) {
- }
-
- /*
- * process plugin entry info
- */
- private void processPlugin(Attributes attributes) {
- String id = attributes.getValue("id"); //$NON-NLS-1$
- String ver = attributes.getValue("version"); //$NON-NLS-1$
- if (id == null
- || id.trim().equals("") //$NON-NLS-1$
- || ver == null
- || ver.trim().equals("")) { //$NON-NLS-1$
- internalError(
- Policy.bind(
- "DefaultFeatureParser.IdOrVersionInvalid",
- new String[] { id, ver, getState(currentState)}));
- //$NON-NLS-1$
- } else {
- PluginEntryModel pluginEntry = factory.createPluginEntryModel();
- pluginEntry.setPluginIdentifier(id);
- pluginEntry.setPluginVersion(ver);
-
- String fragment = attributes.getValue("fragment"); //$NON-NLS-1$
- pluginEntry.isFragment(
- fragment != null && fragment.trim().equalsIgnoreCase("true"));
- //$NON-NLS-1$
-
- //setOS
- String os = attributes.getValue("os"); //$NON-NLS-1$
- pluginEntry.setOS(os);
-
- //setWS
- String ws = attributes.getValue("ws"); //$NON-NLS-1$
- pluginEntry.setWS(ws);
-
- //setNL
- String nl = attributes.getValue("nl"); //$NON-NLS-1$
- pluginEntry.setNL(nl);
-
- // setArch
- String arch = attributes.getValue("arch"); //$NON-NLS-1$
- pluginEntry.setArch(arch);
-
- // download size
- long download_size = ContentEntryModel.UNKNOWN_SIZE;
- String download = attributes.getValue("download-size"); //$NON-NLS-1$
- if (download != null && !download.trim().equals("")) { //$NON-NLS-1$
- try {
- download_size = Long.valueOf(download).longValue();
- } catch (NumberFormatException e) {
- // use UNKNOWN_SIZE
- }
- }
- pluginEntry.setDownloadSize(download_size);
-
- // install size
- long install_size = ContentEntryModel.UNKNOWN_SIZE;
- String install = attributes.getValue("install-size"); //$NON-NLS-1$
- if (install != null && !install.trim().equals("")) { //$NON-NLS-1$
- try {
- install_size = Long.valueOf(install).longValue();
- } catch (NumberFormatException e) {
- // use UNKNOWN_SIZE
- }
- }
- pluginEntry.setInstallSize(install_size);
-
- objectStack.push(pluginEntry);
-
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_PARSING) {
- debug("Processed Plugin: id:" + id + " ver:" + ver + " fragment:" + fragment);
- //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- debug("Processed Plugin: os:" + os + " ws:" + ws + " nl:" + nl);
- //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- debug("Processed Plugin: download size:" //$NON-NLS-1$
- +download_size + " install size:" //$NON-NLS-1$
- +install_size);
- }
-
- }
- }
-
- /*
- * process non-plug-in entry info
- */
- private void processData(Attributes attributes) {
- String id = attributes.getValue("id"); //$NON-NLS-1$
- if (id == null || id.trim().equals("")) { //$NON-NLS-1$
- internalError(
- Policy.bind("DefaultFeatureParser.MissingId", getState(currentState)));
- //$NON-NLS-1$
- //$NON-NLS-1$
- } else {
- NonPluginEntryModel dataEntry = factory.createNonPluginEntryModel();
- dataEntry.setIdentifier(id);
-
- //setOS
- String os = attributes.getValue("os"); //$NON-NLS-1$
- dataEntry.setOS(os);
-
- //setWS
- String ws = attributes.getValue("ws"); //$NON-NLS-1$
- dataEntry.setWS(ws);
-
- //setNL
- String nl = attributes.getValue("nl"); //$NON-NLS-1$
- dataEntry.setNL(nl);
-
- // setArch
- String arch = attributes.getValue("arch"); //$NON-NLS-1$
- dataEntry.setArch(arch);
-
- // download size
- long download_size = ContentEntryModel.UNKNOWN_SIZE;
- String download = attributes.getValue("download-size"); //$NON-NLS-1$
- if (download != null && !download.trim().equals("")) { //$NON-NLS-1$
- try {
- download_size = Long.valueOf(download).longValue();
- } catch (NumberFormatException e) {
- // use UNKNOWN_SIZE
- }
- }
- dataEntry.setDownloadSize(download_size);
-
- // install size
- long install_size = ContentEntryModel.UNKNOWN_SIZE;
- String install = attributes.getValue("install-size"); //$NON-NLS-1$
- if (install != null && !install.trim().equals("")) { //$NON-NLS-1$
- try {
- install_size = Long.valueOf(install).longValue();
- } catch (NumberFormatException e) {
- // use UNKNOWN_SIZE
- }
- }
- dataEntry.setInstallSize(install_size);
-
- objectStack.push(dataEntry);
-
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_PARSING) {
- debug("Processed Data: id:" + id); //$NON-NLS-1$
- debug("Processed Data: download size:" //$NON-NLS-1$
- +download_size + " install size:" //$NON-NLS-1$
- +install_size);
- }
-
- }
- }
-
- private void debug(String s) {
- UpdateManagerPlugin.debug("DefaultFeatureParser: " + s); //$NON-NLS-1$
- }
-
- private void logStatus(SAXParseException ex) {
- String name = ex.getSystemId();
- if (name == null)
- name = ""; //$NON-NLS-1$
- else
- name = name.substring(1 + name.lastIndexOf("/")); //$NON-NLS-1$
-
- String msg;
- if (name.equals("")) { //$NON-NLS-1$
- msg = Policy.bind("DefaultFeatureParser.ErrorParsing", ex.getMessage());
- //$NON-NLS-1$
- } else {
- String[] values =
- new String[] {
- name,
- Integer.toString(ex.getLineNumber()),
- Integer.toString(ex.getColumnNumber()),
- ex.getMessage()};
- msg = Policy.bind("DefaultFeatureParser.ErrorlineColumnMessage", values);
- //$NON-NLS-1$
- }
- error(new Status(IStatus.ERROR, PLUGIN_ID, Platform.PARSE_PROBLEM, msg, ex));
- }
-
- /*
- * Handles an error state specified by the status. The collection of all logged status
- * objects can be accessed using <code>getStatus()</code>.
- *
- * @param error a status detailing the error condition
- */
- private void error(IStatus error) {
-
-
- if (status==null){
- status =
- new MultiStatus(
- PLUGIN_ID,
- Platform.PARSE_PROBLEM,
- Policy.bind("DefaultFeatureParser.ErrorParsingFeature"),
- null);
- //$NON-NLS-1$
- }
-
- status.add(error);
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_PARSING)
- UpdateManagerPlugin.log(error);
- }
-
- private void internalErrorUnknownTag(String msg) {
- stateStack.push(new Integer(STATE_IGNORED_ELEMENT));
- internalError(msg);
- }
-
- private void internalError(String message) {
- error(
- new Status(IStatus.ERROR, PLUGIN_ID, Platform.PARSE_PROBLEM, message, null));
- }
-
- /*
- * return the state as String
- */
- private String getState(int state) {
-
- switch (state) {
- case STATE_IGNORED_ELEMENT :
- return "Ignored"; //$NON-NLS-1$
-
- case STATE_INITIAL :
- return "Initial"; //$NON-NLS-1$
-
- case STATE_FEATURE :
- return "Feature"; //$NON-NLS-1$
-
- case STATE_HANDLER :
- return "Install Handler"; //$NON-NLS-1$
-
- case STATE_DESCRIPTION :
- return "description"; //$NON-NLS-1$
-
- case STATE_INCLUDES :
- return "includes"; //$NON-NLS-1$
-
- case STATE_COPYRIGHT :
- return "Copyright"; //$NON-NLS-1$
-
- case STATE_LICENSE :
- return "License"; //$NON-NLS-1$
-
- case STATE_URL :
- return "URL"; //$NON-NLS-1$
-
- case STATE_UPDATE :
- return "Update URL"; //$NON-NLS-1$
-
- case STATE_DISCOVERY :
- return "Discovery URL"; //$NON-NLS-1$
-
- case STATE_REQUIRES :
- return "Require"; //$NON-NLS-1$
-
- case STATE_IMPORT :
- return "Import"; //$NON-NLS-1$
-
- case STATE_PLUGIN :
- return "Plugin"; //$NON-NLS-1$
-
- case STATE_DATA :
- return "Data"; //$NON-NLS-1$
-
- default :
- return Policy.bind(
- "DefaultFeatureParser.UnknownState",
- Integer.toString(state));
- //$NON-NLS-1$
- }
-
- }
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/DefaultSiteParser.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/DefaultSiteParser.java
deleted file mode 100644
index fd8e5ac..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/DefaultSiteParser.java
+++ /dev/null
@@ -1,765 +0,0 @@
-package org.eclipse.update.core.model;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import java.io.*;
-import java.util.Iterator;
-import java.util.Stack;
-
-import org.apache.xerces.parsers.SAXParser;
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.core.SiteFeatureReferenceModel;
-import org.eclipse.update.internal.core.Policy;
-import org.eclipse.update.internal.core.UpdateManagerPlugin;
-import org.xml.sax.*;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * Default site parser.
- * Parses the site manifest file as defined by the platform. Defers
- * to a model factory to create the actual concrete model objects. The
- * update framework supplies two factory implementations:
- * <ul>
- * <li>@see org.eclipse.update.core.model.SiteModelFactory
- * <li>@see org.eclipse.update.core.BaseSiteFactory
- * </ul>
- *
- * @since 2.0
- */
-public class DefaultSiteParser extends DefaultHandler {
-
- private SAXParser parser;
- private SiteModelFactory factory;
-
- private MultiStatus status;
-
- private boolean DESCRIPTION_SITE_ALREADY_SEEN = false;
-
- private static final int STATE_IGNORED_ELEMENT = -1;
- private static final int STATE_INITIAL = 0;
- private static final int STATE_SITE = 1;
- private static final int STATE_FEATURE = 2;
- private static final int STATE_ARCHIVE = 3;
- private static final int STATE_CATEGORY = 4;
- private static final int STATE_CATEGORY_DEF = 5;
- private static final int STATE_DESCRIPTION_SITE = 6;
- private static final int STATE_DESCRIPTION_CATEGORY_DEF = 7;
- private static final String PLUGIN_ID =
- UpdateManagerPlugin.getPlugin().getDescriptor().getUniqueIdentifier();
-
- private static final String SITE = "site"; //$NON-NLS-1$
- private static final String FEATURE = "feature"; //$NON-NLS-1$
- private static final String ARCHIVE = "archive"; //$NON-NLS-1$
- private static final String CATEGORY_DEF = "category-def"; //$NON-NLS-1$
- private static final String CATEGORY = "category"; //$NON-NLS-1$
- private static final String DESCRIPTION = "description"; //$NON-NLS-1$
-
- private static final String DEFAULT_INFO_URL = "index.html"; //$NON-NLS-1$
-
- // Current State Information
- Stack stateStack = new Stack();
-
- // Current object stack (used to hold the current object we are
- // populating in this plugin descriptor
- Stack objectStack = new Stack();
-
- private int currentState;
-
- /**
- * Constructs a site parser.
- *
- * @param factory site model factory
- */
- public DefaultSiteParser(SiteModelFactory factory) {
- super();
- this.parser = new SAXParser();
- this.parser.setContentHandler(this);
- this.parser.setErrorHandler(this); // 18350
- this.factory = factory;
-
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_PARSING)
- debug("Created"); //$NON-NLS-1$
- }
-
- /**
- * Parses the specified input steam and constructs a site model.
- * The input stream is not closed as part of this operation.
- *
- * @param in input stream
- * @return site model
- * @exception SAXException
- * @exception IOException
- * @since 2.0
- */
- public SiteModel parse(InputStream in) throws SAXException, IOException {
- stateStack.push(new Integer(STATE_INITIAL));
- currentState = ((Integer) stateStack.peek()).intValue();
- parser.parse(new InputSource(in));
- if (objectStack.isEmpty())
- throw new SAXException(Policy.bind("DefaultSiteParser.NoSiteTag"));
- //$NON-NLS-1$
- else {
- if (objectStack.peek() instanceof SiteModel) {
- return (SiteModel) objectStack.pop();
- } else {
- String stack = ""; //$NON-NLS-1$
- Iterator iter = objectStack.iterator();
- while (iter.hasNext()) {
- stack = stack + iter.next().toString() + "\r\n"; //$NON-NLS-1$
- }
- throw new SAXException(
- Policy.bind("DefaultSiteParser.WrongParsingStack", stack));
- //$NON-NLS-1$
- }
- }
- }
-
- /**
- * Returns all status objects accumulated by the parser.
- *
- * @return multi-status containing accumulated status, or <code>null</code>.
- * @since 2.0
- */
- public MultiStatus getStatus() {
- return status;
- }
-
- /**
- * Handle start of element tags
- * @see DefaultHandler#startElement(String, String, String, Attributes)
- * @since 2.0
- */
- public void startElement(
- String uri,
- String localName,
- String qName,
- Attributes attributes)
- throws SAXException {
-
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_PARSING) {
- debug("State: " + currentState); //$NON-NLS-1$
- debug(
- "Start Element: uri:" + uri + " local Name:" + localName + " qName:" + qName);
- //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
-
- switch (currentState) {
- case STATE_IGNORED_ELEMENT :
- internalErrorUnknownTag(
- Policy.bind(
- "DefaultSiteParser.UnknownElement",
- localName,
- getState(currentState)));
- //$NON-NLS-1$
- break;
- case STATE_INITIAL :
- handleInitialState(localName, attributes);
- break;
-
- case STATE_SITE :
- handleSiteState(localName, attributes);
- break;
-
- case STATE_FEATURE :
- handleFeatureState(localName, attributes);
- break;
-
- case STATE_ARCHIVE :
- handleArchiveState(localName, attributes);
- break;
-
- case STATE_CATEGORY :
- handleCategoryState(localName, attributes);
- break;
-
- case STATE_CATEGORY_DEF :
- handleCategoryDefState(localName, attributes);
- break;
-
- case STATE_DESCRIPTION_SITE :
- handleDescriptionSiteState(localName, attributes);
- break;
-
- case STATE_DESCRIPTION_CATEGORY_DEF :
- handleDescriptionCategoryDefState(localName, attributes);
- break;
-
- default :
- internalErrorUnknownTag(
- Policy.bind("DefaultSiteParser.UnknownStartState", getState(currentState)));
- //$NON-NLS-1$
- break;
- }
- int newState = ((Integer) stateStack.peek()).intValue();
- if (newState != STATE_IGNORED_ELEMENT)
- currentState = newState;
-
- }
-
- /**
- * Handle end of element tags
- * @see DefaultHandler#endElement(String, String, String)
- * @since 2.0
- */
- public void endElement(String uri, String localName, String qName) {
-
- String text = null;
- URLEntryModel info = null;
-
- int state = ((Integer) stateStack.peek()).intValue();
- switch (state) {
- case STATE_IGNORED_ELEMENT :
- case STATE_ARCHIVE :
- case STATE_CATEGORY :
- stateStack.pop();
- break;
-
- case STATE_INITIAL :
- internalError(Policy.bind("DefaultSiteParser.ParsingStackBackToInitialState"));
- //$NON-NLS-1$
- break;
-
- case STATE_SITE :
- stateStack.pop();
- if (objectStack.peek() instanceof String) {
- text = (String) objectStack.pop();
- SiteModel site = (SiteModel) objectStack.peek();
- site.getDescriptionModel().setAnnotation(text);
- }
- //do not pop the object
- break;
-
- case STATE_FEATURE :
- stateStack.pop();
- objectStack.pop();
- break;
-
- case STATE_CATEGORY_DEF :
- stateStack.pop();
- if (objectStack.peek() instanceof String) {
- text = (String) objectStack.pop();
- CategoryModel category = (CategoryModel) objectStack.peek();
- category.getDescriptionModel().setAnnotation(text);
- }
- objectStack.pop();
- break;
-
- case STATE_DESCRIPTION_SITE :
- stateStack.pop();
- text = ""; //$NON-NLS-1$
- while (objectStack.peek() instanceof String) {
- text = (String) objectStack.pop() + text;
- }
-
- info = (URLEntryModel) objectStack.pop();
- if (text != null)
- info.setAnnotation(text);
-
- SiteModel siteModel = (SiteModel) objectStack.peek();
- // override description.
- // do not raise error as previous description may be default one
- // when parsing site tag
- if (DESCRIPTION_SITE_ALREADY_SEEN)
- debug(Policy.bind("DefaultSiteParser.ElementAlreadySet", getState(state)));
- //$NON-NLS-1$
- siteModel.setDescriptionModel(info);
- DESCRIPTION_SITE_ALREADY_SEEN = true;
- break;
-
- case STATE_DESCRIPTION_CATEGORY_DEF :
- stateStack.pop();
- text = ""; //$NON-NLS-1$
- while (objectStack.peek() instanceof String) {
- text = (String) objectStack.pop() + text;
- }
-
- info = (URLEntryModel) objectStack.pop();
- if (text != null)
- info.setAnnotation(text);
-
- CategoryModel category = (CategoryModel) objectStack.peek();
- if (category.getDescriptionModel() != null)
- internalError(
- Policy.bind(
- "DefaultSiteParser.ElementAlreadySet2",
- getState(state),
- category.getLabel()));
- //$NON-NLS-1$
- else
- category.setDescriptionModel(info);
- break;
-
- default :
- internalError(
- Policy.bind("DefaultSiteParser.UnknownEndState", getState(state)));
- //$NON-NLS-1$
- break;
- }
-
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_PARSING)
- debug("End Element:" + uri + ":" + localName + ":" + qName);
- //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
-
- /**
- * Handle character text
- * @see DefaultHandler#characters(char[], int, int)
- * @since 2.0
- */
- public void characters(char[] ch, int start, int length) {
- String text = new String(ch, start, length).trim();
- //only push if description
- int state = ((Integer) stateStack.peek()).intValue();
- if (state == STATE_DESCRIPTION_SITE || state == STATE_DESCRIPTION_CATEGORY_DEF)
- objectStack.push(text);
-
- }
-
- /**
- * Handle errors
- * @see DefaultHandler#error(SAXParseException)
- * @since 2.0
- */
- public void error(SAXParseException ex) {
- logStatus(ex);
- }
-
- /**
- * Handle fatal errors
- * @see DefaultHandler#fatalError(SAXParseException)
- * @exception SAXException
- * @since 2.0
- */
- public void fatalError(SAXParseException ex) throws SAXException {
- logStatus(ex);
- throw ex;
- }
-
- private void handleInitialState(String elementName, Attributes attributes)
- throws SAXException {
- if (elementName.equals(SITE)) {
- stateStack.push(new Integer(STATE_SITE));
- processSite(attributes);
- } else {
- internalErrorUnknownTag(
- Policy.bind(
- "DefaultSiteParser.UnknownElement",
- elementName,
- getState(currentState)));
- //$NON-NLS-1$
- // what we received was not a site.xml, no need to continue
- throw new SAXException(Policy.bind("DefaultSiteParser.InvalidXMLStream")); //$NON-NLS-1$
- }
-
- }
-
- private void handleSiteState(String elementName, Attributes attributes) {
- if (elementName.equals(DESCRIPTION)) {
- stateStack.push(new Integer(STATE_DESCRIPTION_SITE));
- processInfo(attributes);
- } else if (elementName.equals(FEATURE)) {
- stateStack.push(new Integer(STATE_FEATURE));
- processFeature(attributes);
- } else if (elementName.equals(ARCHIVE)) {
- stateStack.push(new Integer(STATE_ARCHIVE));
- processArchive(attributes);
- } else if (elementName.equals(CATEGORY_DEF)) {
- stateStack.push(new Integer(STATE_CATEGORY_DEF));
- processCategoryDef(attributes);
- } else
- internalErrorUnknownTag(
- Policy.bind(
- "DefaultSiteParser.UnknownElement",
- elementName,
- getState(currentState)));
- //$NON-NLS-1$
- }
-
- private void handleFeatureState(String elementName, Attributes attributes) {
- if (elementName.equals(FEATURE)) {
- stateStack.push(new Integer(STATE_FEATURE));
- processFeature(attributes);
- } else if (elementName.equals(ARCHIVE)) {
- stateStack.push(new Integer(STATE_ARCHIVE));
- processArchive(attributes);
- } else if (elementName.equals(CATEGORY_DEF)) {
- stateStack.push(new Integer(STATE_CATEGORY_DEF));
- processCategoryDef(attributes);
- } else if (elementName.equals(CATEGORY)) {
- stateStack.push(new Integer(STATE_CATEGORY));
- processCategory(attributes);
- } else
- internalErrorUnknownTag(
- Policy.bind(
- "DefaultSiteParser.UnknownElement",
- elementName,
- getState(currentState)));
- //$NON-NLS-1$
- }
-
- private void handleArchiveState(String elementName, Attributes attributes) {
- if (elementName.equals(ARCHIVE)) {
- stateStack.push(new Integer(STATE_ARCHIVE));
- processArchive(attributes);
- } else if (elementName.equals(CATEGORY_DEF)) {
- stateStack.push(new Integer(STATE_CATEGORY_DEF));
- processCategoryDef(attributes);
- } else
- internalErrorUnknownTag(
- Policy.bind(
- "DefaultSiteParser.UnknownElement",
- elementName,
- getState(currentState)));
- //$NON-NLS-1$
- }
-
- private void handleCategoryState(String elementName, Attributes attributes) {
- if (elementName.equals(FEATURE)) {
- stateStack.push(new Integer(STATE_FEATURE));
- processFeature(attributes);
- } else if (elementName.equals(ARCHIVE)) {
- stateStack.push(new Integer(STATE_ARCHIVE));
- processArchive(attributes);
- } else if (elementName.equals(CATEGORY_DEF)) {
- stateStack.push(new Integer(STATE_CATEGORY_DEF));
- processCategoryDef(attributes);
- } else if (elementName.equals(CATEGORY)) {
- stateStack.push(new Integer(STATE_CATEGORY));
- processCategory(attributes);
- } else
- internalErrorUnknownTag(
- Policy.bind(
- "DefaultSiteParser.UnknownElement",
- elementName,
- getState(currentState)));
- //$NON-NLS-1$
- }
-
- private void handleCategoryDefState(
- String elementName,
- Attributes attributes) {
- if (elementName.equals(CATEGORY_DEF)) {
- stateStack.push(new Integer(STATE_CATEGORY_DEF));
- processCategoryDef(attributes);
- } else if (elementName.equals(DESCRIPTION)) {
- stateStack.push(new Integer(STATE_DESCRIPTION_CATEGORY_DEF));
- processInfo(attributes);
- } else
- internalErrorUnknownTag(
- Policy.bind(
- "DefaultSiteParser.UnknownElement",
- elementName,
- getState(currentState)));
- //$NON-NLS-1$
- }
-
- private void handleDescriptionSiteState(
- String elementName,
- Attributes attributes) {
- if (elementName.equals(FEATURE)) {
- stateStack.push(new Integer(STATE_FEATURE));
- processFeature(attributes);
- } else if (elementName.equals(ARCHIVE)) {
- stateStack.push(new Integer(STATE_ARCHIVE));
- processArchive(attributes);
- } else if (elementName.equals(CATEGORY_DEF)) {
- stateStack.push(new Integer(STATE_CATEGORY_DEF));
- processCategoryDef(attributes);
- } else
- internalErrorUnknownTag(
- Policy.bind(
- "DefaultSiteParser.UnknownElement",
- elementName,
- getState(currentState)));
- //$NON-NLS-1$
- }
-
- private void handleDescriptionCategoryDefState(
- String elementName,
- Attributes attributes) {
- if (elementName.equals(CATEGORY_DEF)) {
- stateStack.push(new Integer(STATE_CATEGORY_DEF));
- processCategoryDef(attributes);
- } else if (elementName.equals(DESCRIPTION)) {
- stateStack.push(new Integer(STATE_DESCRIPTION_CATEGORY_DEF));
- processInfo(attributes);
- } else
- internalErrorUnknownTag(
- Policy.bind(
- "DefaultSiteParser.UnknownElement",
- elementName,
- getState(currentState)));
- //$NON-NLS-1$
- }
-
- /*
- * process site info
- */
- private void processSite(Attributes attributes) throws SAXException {
- // create site map
- SiteModel site = factory.createSiteMapModel();
-
- // if URL is specified, it replaces the URL of the site
- // used to calculate the location of features and archives
- String siteURL = attributes.getValue("url"); //$NON-NLS-1$
- if (siteURL != null && !("".equals(siteURL.trim()))) { //$NON-NLS-1$
- if (!siteURL.endsWith("/")
- && !siteURL.endsWith(File.separator)) { //$NON-NLS-1$
- siteURL += "/"; //$NON-NLS-1$
- }
- site.setLocationURLString(siteURL);
- }
-
- // provide default description URL
- // If <description> is specified, for the site, it takes precedence
- URLEntryModel description = factory.createURLEntryModel();
- description.setURLString(DEFAULT_INFO_URL);
- site.setDescriptionModel(description);
-
- // verify we can parse the site ...if the site has
- // a different type throw an exception to force reparsing
- // with the matching parser
- String type = attributes.getValue("type"); //$NON-NLS-1$
- if (!factory.canParseSiteType(type)) {
- throw new SAXException(new InvalidSiteTypeException(type));
- }
- site.setType(type);
- objectStack.push(site);
-
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_PARSING)
- debug("End process Site tag: siteURL:" + siteURL + " type:" + type);
- //$NON-NLS-1$ //$NON-NLS-2$
-
- }
-
- /*
- * process feature info
- */
- private void processFeature(Attributes attributes) {
- SiteFeatureReferenceModel feature = factory.createFeatureReferenceModel();
- String urlInfo = attributes.getValue("url"); //$NON-NLS-1$
- if (urlInfo == null || urlInfo.trim().equals("")) //$NON-NLS-1$
- internalError(
- Policy.bind("DefaultSiteParser.Missing", "url", getState(currentState)));
- //$NON-NLS-1$ //$NON-NLS-2$
-
- feature.setURLString(urlInfo);
-
- String type = attributes.getValue("type"); //$NON-NLS-1$
- feature.setType(type);
-
- // identifier and version
- String id = attributes.getValue("id"); //$NON-NLS-1$
- String ver = attributes.getValue("version"); //$NON-NLS-1$
-
- // if one is null, and not the other
- if ((id == null || id.trim().equals("")) //$NON-NLS-1$
- ^ (ver == null || ver.trim().equals(""))) { //$NON-NLS-1$
- String[] values = new String[] { id, ver, getState(currentState)};
- UpdateManagerPlugin.warn(Policy.bind("DefaultFeatureParser.IdOrVersionInvalid",values));
- //$NON-NLS-1$
- } else {
- feature.setFeatureIdentifier(id);
- feature.setFeatureVersion(ver);
- }
-
- SiteModel site = (SiteModel) objectStack.peek();
- site.addFeatureReferenceModel(feature);
- feature.setSiteModel(site);
-
- objectStack.push(feature);
-
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_PARSING)
- debug("End Processing DefaultFeature Tag: url:" + urlInfo + " type:" + type);
- //$NON-NLS-1$ //$NON-NLS-2$
-
- }
-
- /*
- * process archive info
- */
- private void processArchive(Attributes attributes) {
- ArchiveReferenceModel archive = factory.createArchiveReferenceModel();
- String id = attributes.getValue("path"); //$NON-NLS-1$
- if (id == null || id.trim().equals("")) { //$NON-NLS-1$
- internalError(
- Policy.bind("DefaultSiteParser.Missing", "path", getState(currentState)));
- //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- archive.setPath(id);
-
- String url = attributes.getValue("url"); //$NON-NLS-1$
- if (url == null || url.trim().equals("")) { //$NON-NLS-1$
- internalError(
- Policy.bind("DefaultSiteParser.Missing", "archive", getState(currentState)));
- //$NON-NLS-1$ //$NON-NLS-2$
- } else {
- archive.setURLString(url);
-
- SiteModel site = (SiteModel) objectStack.peek();
- site.addArchiveReferenceModel(archive);
- }
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_PARSING)
- debug("End processing Archive: path:" + id + " url:" + url);
- //$NON-NLS-1$ //$NON-NLS-2$
-
- }
-
- /*
- * process the Category info
- */
- private void processCategory(Attributes attributes) {
- String category = attributes.getValue("name"); //$NON-NLS-1$
- SiteFeatureReferenceModel feature = (SiteFeatureReferenceModel) objectStack.peek();
- feature.addCategoryName(category);
-
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_PARSING)
- debug("End processing Category: name:" + category); //$NON-NLS-1$
- }
-
- /*
- * process category def info
- */
- private void processCategoryDef(Attributes attributes) {
- CategoryModel category = factory.createSiteCategoryModel();
- String name = attributes.getValue("name"); //$NON-NLS-1$
- String label = attributes.getValue("label"); //$NON-NLS-1$
- category.setName(name);
- category.setLabel(label);
-
- SiteModel site = (SiteModel) objectStack.peek();
- site.addCategoryModel(category);
- objectStack.push(category);
-
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_PARSING)
- debug("End processing CategoryDef: name:" + name + " label:" + label);
- //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /*
- * process URL info with element text
- */
- private void processInfo(Attributes attributes) {
- URLEntryModel inf = factory.createURLEntryModel();
- String infoURL = attributes.getValue("url"); //$NON-NLS-1$
- inf.setURLString(infoURL);
-
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_PARSING)
- debug("Processed Info: url:" + infoURL); //$NON-NLS-1$
-
- objectStack.push(inf);
- }
-
- /*
- *
- */
- private void debug(String s) {
- UpdateManagerPlugin.debug("DefaultSiteParser"+s);
- }
-
- /*
- *
- */
- private void logStatus(SAXParseException ex) {
- String name = ex.getSystemId();
- if (name == null)
- name = ""; //$NON-NLS-1$
- else
- name = name.substring(1 + name.lastIndexOf("/")); //$NON-NLS-1$
-
- String msg;
- if (name.equals("")) //$NON-NLS-1$
- msg = Policy.bind("DefaultSiteParser.ErrorParsing", ex.getMessage());
- //$NON-NLS-1$
- else {
- String[] values =
- new String[] {
- name,
- Integer.toString(ex.getLineNumber()),
- Integer.toString(ex.getColumnNumber()),
- ex.getMessage()};
- msg = Policy.bind("DefaultSiteParser.ErrorLineColumnMessage", values);
- //$NON-NLS-1$
- }
- error(new Status(IStatus.ERROR, PLUGIN_ID, Platform.PARSE_PROBLEM, msg, ex));
- }
-
- /*
- * Handles an error state specified by the status. The collection of all logged status
- * objects can be accessed using <code>getStatus()</code>.
- *
- * @param error a status detailing the error condition
- */
- private void error(IStatus error) {
-
- if (status == null) {
- status =
- new MultiStatus(
- PLUGIN_ID,
- Platform.PARSE_PROBLEM,
- Policy.bind("DefaultSiteParser.ErrorParsingSite"),
- null);
- //$NON-NLS-1$
- }
-
- status.add(error);
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_PARSING)
- UpdateManagerPlugin.log(error);
- }
-
- /*
- *
- */
- private void internalErrorUnknownTag(String msg) {
- stateStack.push(new Integer(STATE_IGNORED_ELEMENT));
- internalError(msg);
- }
-
- /*
- *
- */
- private void internalError(String message) {
- error(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.OK, message, null));
- }
-
- /*
- * return the state as String
- */
- private String getState(int state) {
-
- switch (state) {
- case STATE_IGNORED_ELEMENT :
- return "Ignored"; //$NON-NLS-1$
-
- case STATE_INITIAL :
- return "Initial"; //$NON-NLS-1$
-
- case STATE_SITE :
- return "Site"; //$NON-NLS-1$
-
- case STATE_FEATURE :
- return "Feature"; //$NON-NLS-1$
-
- case STATE_ARCHIVE :
- return "Archive"; //$NON-NLS-1$
-
- case STATE_CATEGORY :
- return "Category"; //$NON-NLS-1$
-
- case STATE_CATEGORY_DEF :
- return "Category Def"; //$NON-NLS-1$
-
- case STATE_DESCRIPTION_CATEGORY_DEF :
- return "Description / Category Def"; //$NON-NLS-1$
-
- case STATE_DESCRIPTION_SITE :
- return "Description / Site"; //$NON-NLS-1$
-
- default :
- return Policy.bind("DefaultSiteParser.UnknownState"); //$NON-NLS-1$
- }
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/FeatureModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/FeatureModel.java
deleted file mode 100644
index 107edf7..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/FeatureModel.java
+++ /dev/null
@@ -1,842 +0,0 @@
-package org.eclipse.update.core.model;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.*;
-
-import org.eclipse.update.core.IIncludedFeatureReference;
-import org.eclipse.update.core.VersionedIdentifier;
-
-/**
- * Feature model object.
- * <p>
- * This class may be instantiated or subclassed by clients. However, in most
- * cases clients should instead instantiate or subclass the provided
- * concrete implementation of this model.
- * </p>
- * @see org.eclipse.update.core.Feature
- * @since 2.0
- */
-public class FeatureModel extends ModelObject {
-
- private String featureId;
- private String featureVersion;
- private String label;
- private String localizedLabel;
- private String provider;
- private String localizedProvider;
- private String imageURLString;
- private URL imageURL;
- private String os;
- private String ws;
- private String nl;
- private String arch;
- private boolean isPrimary = false;
- private String application;
- private String affinity;
- private InstallHandlerEntryModel installHandler;
- private URLEntryModel description;
- private URLEntryModel copyright;
- private URLEntryModel license;
- private URLEntryModel updateSiteInfo;
- private List /*of InfoModel*/
- discoverySiteInfo;
- private List /*of ImportModel*/
- imports;
- private List /*of PluginEntryModel*/
- pluginEntries;
- private List /*of IncludedFeatureReferenceModel */
- featureIncludes;
- private List /*of NonPluginEntryModel*/
- nonPluginEntries;
- private List /*of ContentGroupModel*/
- groupEntries;
-
- /**
- * Creates an uninitialized feature object.
- *
- * @since 2.0
- */
- public FeatureModel() {
- super();
- }
-
- /**
- * Compares 2 feature models for equality
- *
- * @param obj feature model to compare with
- * @return <code>true</code> if the two models are equal,
- * <code>false</code> otherwise
- * @since 2.0
- */
- public boolean equals(Object obj) {
- if (!(obj instanceof FeatureModel))
- return false;
- FeatureModel model = (FeatureModel) obj;
-
- return (
- featureId.toLowerCase().equals(model.getFeatureIdentifier())
- && featureVersion.toLowerCase().equals(model.getFeatureVersion()));
- }
-
- /**
- * Returns the feature identifier as a string
- *
- * @see org.eclipse.update.core.IFeature#getVersionedIdentifier()
- * @return feature identifier
- * @since 2.0
- */
- public String getFeatureIdentifier() {
- return featureId;
- }
-
- /**
- * Returns the feature version as a string
- *
- * @see org.eclipse.update.core.IFeature#getVersionedIdentifier()
- * @return feature version
- * @since 2.0
- */
- public String getFeatureVersion() {
- return featureVersion;
- }
-
- /**
- * Retrieve the displayable label for the feature. If the model
- * object has been resolved, the label is localized.
- *
- * @return displayable label, or <code>null</code>.
- * @since 2.0
- */
- public String getLabel() {
- if (localizedLabel != null)
- return localizedLabel;
- else
- return label;
- }
-
- /**
- * Retrieve the non-localized displayable label for the feature.
- *
- * @return non-localized displayable label, or <code>null</code>.
- * @since 2.0
- */
- public String getLabelNonLocalized() {
- return label;
- }
-
- /**
- * Retrieve the displayable label for the feature provider. If the model
- * object has been resolved, the label is localized.
- *
- * @return displayable label, or <code>null</code>.
- * @since 2.0
- */
- public String getProvider() {
- if (localizedProvider != null)
- return localizedProvider;
- else
- return provider;
- }
-
- /**
- * Retrieve the non-localized displayable label for the feature provider.
- *
- * @return non-localized displayable label, or <code>null</code>.
- * @since 2.0
- */
- public String getProviderNonLocalized() {
- return provider;
- }
-
- /**
- * Returns the unresolved URL string for the feature image.
- *
- * @return url string, or <code>null</code>
- * @since 2.0
- */
- public String getImageURLString() {
- return imageURLString;
- }
-
- /**
- * Returns the resolved URL for the image.
- *
- * @return url, or <code>null</code>
- * @since 2.0
- */
- public URL getImageURL() {
- return imageURL;
- }
-
- /**
- * Get optional operating system specification as a comma-separated string.
- *
- * @see org.eclipse.core.boot.BootLoader
- * @return the operating system specification string, or <code>null</code>.
- * @since 2.0
- */
- public String getOS() {
- return os;
- }
-
- /**
- * Get optional windowing system specification as a comma-separated string.
- *
- * @see org.eclipse.core.boot.BootLoader
- * @return the windowing system specification string, or <code>null</code>.
- * @since 2.0
- */
- public String getWS() {
- return ws;
- }
-
- /**
- * Get optional system architecture specification as a comma-separated string.
- *
- * @see org.eclipse.core.boot.BootLoader
- * @return the system architecture specification string, or <code>null</code>.
- * @since 2.0
- */
- public String getOSArch() {
- return arch;
- }
-
- /**
- * Get optional locale specification as a comma-separated string.
- *
- * @return the locale specification string, or <code>null</code>.
- * @since 2.0
- */
- public String getNL() {
- return nl;
- }
-
- /**
- * Indicates whether the feature can be used as a primary feature.
- *
- * @return <code>true</code> if this is a primary feature,
- * otherwise <code>false</code>
- * @since 2.0
- */
- public boolean isPrimary() {
- return isPrimary;
- }
-
- /**
- * Returns an optional identifier for the feature application
- *
- * @return application identifier, or <code>null</code>.
- * @since 2.0
- */
- public String getApplication() {
- return application;
- }
-
- /**
- * Returns an optional identifier for the colocation affinity feature
- *
- * @return feature identifier, or <code>null</code>.
- * @since 2.0
- */
- public String getAffinityFeature() {
- return affinity;
- }
-
- /**
- * Returns and optional custom install handler entry.
- *
- * @return install handler entry, or <code>null</code> if
- * none was specified
- * @since 2.0
- */
- public InstallHandlerEntryModel getInstallHandlerModel() {
- return installHandler;
- }
-
- /**
- * Returns the feature description.
- *
- * @return feature rescription, or <code>null</code>.
- * @since 2.0
- */
- public URLEntryModel getDescriptionModel() {
- return description;
- }
-
- /**
- * Returns the copyright information for the feature.
- *
- * @return copyright information, or <code>null</code>.
- * @since 2.0
- */
- public URLEntryModel getCopyrightModel() {
- return copyright;
- }
-
- /**
- * Returns the license information for the feature.
- *
- * @return feature license, or <code>null</code>.
- * @since 2.0
- */
- public URLEntryModel getLicenseModel() {
- return license;
- }
-
- /**
- * Returns an information entry referencing the location of the
- * feature update site.
- *
- * @return update site entry, or <code>null</code>.
- * @since 2.0
- */
- public URLEntryModel getUpdateSiteEntryModel() {
- return updateSiteInfo;
- }
-
- /**
- * Return an array of information entries referencing locations of other
- * update sites.
- *
- * @return an array of site entries, or an empty array.
- * @since 2.0
- * @since 2.0
- */
- public URLEntryModel[] getDiscoverySiteEntryModels() {
- if (discoverySiteInfo == null)
- return new URLEntryModel[0];
-
- return (URLEntryModel[]) discoverySiteInfo.toArray(
- arrayTypeFor(discoverySiteInfo));
- }
-
- /**
- * Return a list of plug-in dependencies for this feature.
- *
- * @return the list of required plug-in dependencies, or an empty array.
- * @since 2.0
- */
- public ImportModel[] getImportModels() {
- if (imports == null)
- return new ImportModel[0];
-
- return (ImportModel[]) imports.toArray(arrayTypeFor(imports));
- }
-
- /**
- * Returns an array of plug-in entries referenced by this feature
- *
- * @return an erray of plug-in entries, or an empty array.
- * @since 2.0
- */
- public PluginEntryModel[] getPluginEntryModels() {
- if (pluginEntries == null)
- return new PluginEntryModel[0];
-
- return (PluginEntryModel[]) pluginEntries.toArray(arrayTypeFor(pluginEntries));
- }
-
- /**
- * Returns an array of versioned identifier referenced by this feature
- *
- * @return an array of versioned identifier, or an empty array.
- * @deprecated use getFeatureIncludeIdentifier instead.
- * @since 2.0
- */
- public VersionedIdentifier[] getFeatureIncludeVersionedIdentifier() {
- if (featureIncludes == null)
- return new VersionedIdentifier[0];
-
- //
- Iterator iter = featureIncludes.iterator();
- VersionedIdentifier[] versionIncluded = new VersionedIdentifier[featureIncludes.size()];
- int index = 0;
- while (iter.hasNext()) {
- IncludedFeatureReferenceModel model = (IncludedFeatureReferenceModel)iter.next();
- versionIncluded[index]=model.getVersionedIdentifier();
- index++;
- }
- return versionIncluded;
- }
-
- /**
- * Returns an array of included feature reference model referenced by this feature.
- *
- * @return an array of included feature reference model, or an empty array.
- * @since 2.0
- */
- public IIncludedFeatureReference[] getFeatureIncluded() {
- if (featureIncludes == null)
- return new IIncludedFeatureReference[0];
- return (IIncludedFeatureReference[]) featureIncludes.toArray(
- arrayTypeFor(featureIncludes));
- }
-
- /**
- * Returns an array of non-plug-in entries referenced by this feature
- *
- * @return an erray of non-plug-in entries, or an empty array.
- * @since 2.0
- */
- public NonPluginEntryModel[] getNonPluginEntryModels() {
- if (nonPluginEntries == null)
- return new NonPluginEntryModel[0];
-
- return (NonPluginEntryModel[]) nonPluginEntries.toArray(
- arrayTypeFor(nonPluginEntries));
- }
-
- /**
- * Sets the feature identifier.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param featureId feature identifier
- * @since 2.0
- */
- public void setFeatureIdentifier(String featureId) {
- assertIsWriteable();
- this.featureId = featureId;
- }
-
- /**
- * Sets the feature version.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param featureVersion feature version
- * @since 2.0
- */
- public void setFeatureVersion(String featureVersion) {
- assertIsWriteable();
- this.featureVersion = featureVersion;
- }
-
- /**
- * Sets the feature displayable label.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param label displayable label
- * @since 2.0
- */
- public void setLabel(String label) {
- assertIsWriteable();
- this.label = label;
- this.localizedLabel = null;
- }
-
- /**
- * Sets the feature provider displayable label.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param provider provider displayable label
- * @since 2.0
- */
- public void setProvider(String provider) {
- assertIsWriteable();
- this.provider = provider;
- this.localizedProvider = null;
- }
-
- /**
- * Sets the unresolved URL for the feature image.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param imageURLString unresolved URL string
- * @since 2.0
- */
- public void setImageURLString(String imageURLString) {
- assertIsWriteable();
- this.imageURLString = imageURLString;
- this.imageURL = null;
- }
-
- /**
- * Sets the operating system specification.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @see org.eclipse.core.boot.BootLoader
- * @param os operating system specification as a comma-separated list
- * @since 2.0
- */
- public void setOS(String os) {
- assertIsWriteable();
- this.os = os;
- }
-
- /**
- * Sets the windowing system specification.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @see org.eclipse.core.boot.BootLoader
- * @param ws windowing system specification as a comma-separated list
- * @since 2.0
- */
- public void setWS(String ws) {
- assertIsWriteable();
- this.ws = ws;
- }
-
- /**
- * Sets the locale specification.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param nl locale specification as a comma-separated list
- * @since 2.0
- */
- public void setNL(String nl) {
- assertIsWriteable();
- this.nl = nl;
- }
-
- /**
- * Sets the system architecture specification.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @see org.eclipse.core.boot.BootLoader
- * @param arch system architecture specification as a comma-separated list
- * @since 2.0
- */
- public void setArch(String arch) {
- assertIsWriteable();
- this.arch = arch;
- }
-
- /**
- * Indicates whether this feature can act as a primary feature.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param isPrimary <code>true</code> if this feature can act as primary,
- * <code>false</code> otherwise
- *
- * @since 2.0
- */
- public void isPrimary(boolean isPrimary) {
- assertIsWriteable();
- this.isPrimary = isPrimary;
- }
-
- /**
- * Sets the feature application identifier.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param application feature application identifier
- * @since 2.0
- */
- public void setApplication(String application) {
- assertIsWriteable();
- this.application = application;
- }
-
- /**
- * Sets the identifier of the Feature this feature should be
- * installed with.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param affinity the identifier of the Feature
- * @since 2.0
- */
- public void setAffinityFeature(String affinity) {
- assertIsWriteable();
- this.affinity = affinity;
- }
-
-
- /**
- * Sets the custom install handler for the feature.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param installHandler install handler entry
- * @since 2.0
- */
- public void setInstallHandlerModel(InstallHandlerEntryModel installHandler) {
- assertIsWriteable();
- this.installHandler = installHandler;
- }
-
- /**
- * Sets the feature description information.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param description feature description information
- * @since 2.0
- */
- public void setDescriptionModel(URLEntryModel description) {
- assertIsWriteable();
- this.description = description;
- }
-
- /**
- * Sets the feature copyright information.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param copyright feature copyright information
- * @since 2.0
- */
- public void setCopyrightModel(URLEntryModel copyright) {
- assertIsWriteable();
- this.copyright = copyright;
- }
-
- /**
- * Sets the feature license information.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param license feature license information
- * @since 2.0
- */
- public void setLicenseModel(URLEntryModel license) {
- assertIsWriteable();
- this.license = license;
- }
-
- /**
- * Sets the feature update site reference.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param updateSiteInfo feature update site reference
- * @since 2.0
- */
- public void setUpdateSiteEntryModel(URLEntryModel updateSiteInfo) {
- assertIsWriteable();
- this.updateSiteInfo = updateSiteInfo;
- }
-
- /**
- * Sets additional update site references.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param discoverySiteInfo additional update site references
- * @since 2.0
- */
- public void setDiscoverySiteEntryModels(URLEntryModel[] discoverySiteInfo) {
- assertIsWriteable();
- if (discoverySiteInfo == null)
- this.discoverySiteInfo = null;
- else
- this.discoverySiteInfo = new ArrayList(Arrays.asList(discoverySiteInfo));
- }
-
- /**
- * Sets the feature plug-in dependency information.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param imports feature plug-in dependency information
- * @since 2.0
- */
- public void setImportModels(ImportModel[] imports) {
- assertIsWriteable();
- if (imports == null)
- this.imports = null;
- else
- this.imports = new ArrayList(Arrays.asList(imports));
- }
-
- /**
- * Sets the feature plug-in references.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param pluginEntries feature plug-in references
- * @since 2.0
- */
- public void setPluginEntryModels(PluginEntryModel[] pluginEntries) {
- assertIsWriteable();
- if (pluginEntries == null)
- this.pluginEntries = null;
- else
- this.pluginEntries = new ArrayList(Arrays.asList(pluginEntries));
- }
-
- /**
- * Sets the feature non-plug-in data references.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param nonPluginEntries feature non-plug-in data references
- * @since 2.0
- */
- public void setNonPluginEntryModels(NonPluginEntryModel[] nonPluginEntries) {
- assertIsWriteable();
- if (nonPluginEntries == null)
- this.nonPluginEntries = null;
- else
- this.nonPluginEntries = new ArrayList(Arrays.asList(nonPluginEntries));
- }
-
- /**
- * Adds an additional update site reference.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param discoverySiteInfo update site reference
- * @since 2.0
- */
- public void addDiscoverySiteEntryModel(URLEntryModel discoverySiteInfo) {
- assertIsWriteable();
- if (this.discoverySiteInfo == null)
- this.discoverySiteInfo = new ArrayList();
- if (!this.discoverySiteInfo.contains(discoverySiteInfo))
- this.discoverySiteInfo.add(discoverySiteInfo);
- }
-
- /**
- * Adds a plug-in dependency entry.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param importEntry plug-in dependency entry
- * @since 2.0
- */
- public void addImportModel(ImportModel importEntry) {
- assertIsWriteable();
- if (this.imports == null)
- this.imports = new ArrayList();
- if (!this.imports.contains(importEntry))
- this.imports.add(importEntry);
- }
-
- /**
- * Adds a plug-in reference.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param pluginEntry plug-in reference
- * @since 2.0
- */
- public void addPluginEntryModel(PluginEntryModel pluginEntry) {
- assertIsWriteable();
- if (this.pluginEntries == null)
- this.pluginEntries = new ArrayList();
- if (!this.pluginEntries.contains(pluginEntry))
- this.pluginEntries.add(pluginEntry);
- }
-
- /**
- * Adds a feature identifier.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param identifier feature identifer
- * @param options the options associated with the nested feature
- * @since 2.1
- */
- public void addIncludedFeatureReferenceModel(IncludedFeatureReferenceModel include){
- assertIsWriteable();
- if (this.featureIncludes==null)
- this.featureIncludes = new ArrayList();
- if (!this.featureIncludes.contains(include))
- this.featureIncludes.add(include);
- }
-
- /**
- * Adds a non-plug-in data reference.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param nonPluginEntry non-plug-in data reference
- * @since 2.0
- */
- public void addNonPluginEntryModel(NonPluginEntryModel nonPluginEntry) {
- assertIsWriteable();
- if (this.nonPluginEntries == null)
- this.nonPluginEntries = new ArrayList();
- if (!this.nonPluginEntries.contains(nonPluginEntry))
- this.nonPluginEntries.add(nonPluginEntry);
- }
-
- /**
- * Removes an update site reference.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param discoverySiteInfo update site reference
- * @since 2.0
- */
- public void removeDiscoverySiteEntryModel(URLEntryModel discoverySiteInfo) {
- assertIsWriteable();
- if (this.discoverySiteInfo != null)
- this.discoverySiteInfo.remove(discoverySiteInfo);
- }
-
- /**
- * Removes a plug-in dependency entry.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param importEntry plug-in dependency entry
- * @since 2.0
- */
- public void removeImportModel(ImportModel importEntry) {
- assertIsWriteable();
- if (this.imports != null)
- this.imports.remove(importEntry);
- }
-
- /**
- * Removes a plug-in reference.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param pluginEntry plug-in reference
- * @since 2.0
- */
- public void removePluginEntryModel(PluginEntryModel pluginEntry) {
- assertIsWriteable();
- if (this.pluginEntries != null)
- this.pluginEntries.remove(pluginEntry);
- }
-
- /**
- * Removes a non-plug-in data reference.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param nonPluginEntry non-plug-in data reference
- * @since 2.0
- */
- public void removeNonPluginEntryModel(NonPluginEntryModel nonPluginEntry) {
- assertIsWriteable();
- if (this.nonPluginEntries != null)
- this.nonPluginEntries.remove(nonPluginEntry);
- }
-
- /**
- * Marks the model object as read-only.
- *
- * @since 2.0
- */
- public void markReadOnly() {
- super.markReadOnly();
- markReferenceReadOnly(getDescriptionModel());
- markReferenceReadOnly(getCopyrightModel());
- markReferenceReadOnly(getLicenseModel());
- markReferenceReadOnly(getUpdateSiteEntryModel());
- markListReferenceReadOnly(getDiscoverySiteEntryModels());
- markListReferenceReadOnly(getImportModels());
- markListReferenceReadOnly(getPluginEntryModels());
- markListReferenceReadOnly(getNonPluginEntryModels());
- }
-
- /**
- * Resolve the model object.
- * Any URL strings in the model are resolved relative to the
- * base URL argument. Any translatable strings in the model that are
- * specified as translation keys are localized using the supplied
- * resource bundle.
- *
- * @param base URL
- * @param bundle resource bundle
- * @exception MalformedURLException
- * @since 2.0
- */
- public void resolve(URL base, ResourceBundle bundle)
- throws MalformedURLException {
- // resolve local elements
- localizedLabel = resolveNLString(bundle, label);
- localizedProvider = resolveNLString(bundle, provider);
- imageURL = resolveURL(base, bundle, imageURLString);
-
- // delegate to references
- resolveReference(getDescriptionModel(), base, bundle);
- resolveReference(getCopyrightModel(), base, bundle);
- resolveReference(getLicenseModel(), base, bundle);
- resolveReference(getUpdateSiteEntryModel(), null, bundle);
- resolveListReference(getDiscoverySiteEntryModels(), null, bundle);
- resolveListReference(getImportModels(), base, bundle);
- resolveListReference(getPluginEntryModels(), base, bundle);
- resolveListReference(getNonPluginEntryModels(), base, bundle);
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/FeatureModelFactory.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/FeatureModelFactory.java
deleted file mode 100644
index 3b8e584..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/FeatureModelFactory.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package org.eclipse.update.core.model;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.update.core.Utilities;
-import org.eclipse.update.internal.core.Policy;
-import org.xml.sax.SAXException;
-
-/**
- * Default feature model factory.
- * <p>
- * This class may be instantiated or subclassed by clients. However, in most
- * cases clients should instead subclass the provided base implementation
- * of this factory.
- * </p>
- * @see org.eclipse.update.core.BaseFeatureFactory
- * @since 2.0
- */
-
-public class FeatureModelFactory {
-
- /**
- * Creates a default model factory.
- *
- * @since 2.0
- */
- public FeatureModelFactory() {
- super();
- }
-
- /**
- * Creates and populates a default feature from stream.
- * The parser assumes the stream contains a default feature manifest
- * (feature.xml) as documented by the platform.
- *
- * @param stream feature stream
- * @return populated feature model
- * @exception ParsingException
- * @exception IOException
- * @exception SAXException
- * @since 2.0
- */
- public FeatureModel parseFeature(InputStream stream)
- throws CoreException, SAXException {
- DefaultFeatureParser parser = new DefaultFeatureParser(this);
- FeatureModel featureModel = null;
- try {
- featureModel = parser.parse(stream);
- if (parser.getStatus()!=null) {
- // some internalError were detected
- IStatus status = parser.getStatus();
- throw new CoreException(status);
- }
- } catch (IOException e) {
- throw Utilities.newCoreException(Policy.bind("FeatureModelFactory.ErrorAccesingFeatureStream"), e); //$NON-NLS-1$
- }
- return featureModel;
- }
-
- /**
- * Create a default feature model.
- *
- * @see FeatureModel
- * @return feature model
- * @since 2.0
- */
- public FeatureModel createFeatureModel() {
- return new FeatureModel();
- }
-
- /**
- * Create a default included feature reference model.
- *
- * @see IncludedFeatureReferenceModel
- * @return feature model
- * @since 2.1
- */
- public IncludedFeatureReferenceModel createIncludedFeatureReferenceModel() {
- return new IncludedFeatureReferenceModel();
- }
-
-
- /**
- * Create a default install handler model.
- *
- * @see InstallHandlerEntryModel
- * @return install handler entry model
- * @since 2.0
- */
- public InstallHandlerEntryModel createInstallHandlerEntryModel() {
- return new InstallHandlerEntryModel();
- }
-
- /**
- * Create a default import dependency model.
- *
- * @see ImportModel
- * @return import dependency model
- * @since 2.0
- */
- public ImportModel createImportModel() {
- return new ImportModel();
- }
-
- /**
- * Create a default plug-in entry model.
- *
- * @see PluginEntryModel
- * @return plug-in entry model
- * @since 2.0
- */
- public PluginEntryModel createPluginEntryModel() {
- return new PluginEntryModel();
- }
-
- /**
- * Create a default non-plug-in entry model.
- *
- * @see NonPluginEntryModel
- * @return non-plug-in entry model
- * @since 2.0
- */
- public NonPluginEntryModel createNonPluginEntryModel() {
- return new NonPluginEntryModel();
- }
-
- /**
- * Create a default annotated URL model.
- *
- * @see URLEntryModel
- * @return annotated URL model
- * @since 2.0
- */
- public URLEntryModel createURLEntryModel() {
- return new URLEntryModel();
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/FeatureReferenceModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/FeatureReferenceModel.java
deleted file mode 100644
index 52d13b4..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/FeatureReferenceModel.java
+++ /dev/null
@@ -1,228 +0,0 @@
-package org.eclipse.update.core.model;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ResourceBundle;
-
-import org.eclipse.update.internal.core.UpdateManagerUtils;
-
-/**
- * Feature reference model object.
- * <p>
- * This class may be instantiated or subclassed by clients. However, in most
- * cases clients should instead instantiate or subclass the provided
- * concrete implementation of this model.
- * </p>
- * @see org.eclipse.update.core.FeatureReference
- * @since 2.0
- */
-public class FeatureReferenceModel extends ModelObject {
-
- private String type;
- private URL url;
- private String urlString;
- private String featureId;
- private String featureVersion;
- private SiteModel site;
-
- /**
- * Creates an uninitialized feature reference model object.
- *
- * @since 2.0
- */
- public FeatureReferenceModel() {
- super();
- }
-
- /**
- * Constructor FeatureReferenceModel.
- * @param ref
- */
- public FeatureReferenceModel(FeatureReferenceModel ref) {
- setFeatureIdentifier(ref.getFeatureIdentifier());
- setFeatureVersion(ref.getFeatureVersion());
- setType(ref.getType());
- setSiteModel(ref.getSiteModel());
- }
-
- /**
- * Compares 2 feature reference models for equality
- *
- * @param object feature reference model to compare with
- * @return <code>true</code> if the two models are equal,
- * <code>false</code> otherwise
- * @since 2.0
- */
- public boolean equals(Object object) {
-
- if (object == null)
- return false;
- if (getURL() == null)
- return false;
-
- if (!(object instanceof FeatureReferenceModel))
- return false;
-
- FeatureReferenceModel f = (FeatureReferenceModel) object;
-
- return UpdateManagerUtils.sameURL(getURL(), f.getURL());
- }
-
- /**
- * Returns the referenced feature type.
- *
- * @return feature type, or <code>null</code> representing the default
- * feature type for the site
- * @since 2.0
- */
- public String getType() {
- return type;
- }
-
- /**
- * Returns the site model for the reference.
- *
- * @return site model
- * @since 2.0
- */
- public SiteModel getSiteModel() {
- return site;
- }
-
- /**
- * Returns the unresolved URL string for the reference.
- *
- * @return url string
- * @since 2.0
- */
- public String getURLString() {
- return urlString;
- }
-
- /**
- * Returns the resolved URL for the feature reference.
- *
- * @return url string
- * @since 2.0
- */
- public URL getURL() {
- return url;
- }
-
- /**
- * Returns the feature identifier as a string
- *
- * @see org.eclipse.update.core.IFeatureReference#getVersionedIdentifier()
- * @return feature identifier
- * @since 2.0
- */
- public String getFeatureIdentifier() {
- return featureId;
- }
-
- /**
- * Returns the feature version as a string
- *
- * @see org.eclipse.update.core.IFeatureReference#getVersionedIdentifier()
- * @return feature version
- * @since 2.0
- */
- public String getFeatureVersion() {
- return featureVersion;
- }
-
- /**
- * Sets the referenced feature type.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param type referenced feature type
- * @since 2.0
- */
- public void setType(String type) {
- assertIsWriteable();
- this.type = type;
- }
-
- /**
- * Sets the site for the referenced.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param site site for the reference
- * @since 2.0
- */
- public void setSiteModel(SiteModel site) {
- assertIsWriteable();
- this.site = site;
- }
-
- /**
- * Sets the unresolved URL for the feature reference.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param urlString unresolved URL string
- * @since 2.0
- */
- public void setURLString(String urlString) {
- assertIsWriteable();
- this.urlString = urlString;
- this.url = null;
- }
-
- /**
- * Sets the feature identifier.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param featureId feature identifier
- * @since 2.0
- */
- public void setFeatureIdentifier(String featureId) {
- assertIsWriteable();
- this.featureId = featureId;
- }
-
- /**
- * Sets the feature version.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param featureVersion feature version
- * @since 2.0
- */
- public void setFeatureVersion(String featureVersion) {
- assertIsWriteable();
- this.featureVersion = featureVersion;
- }
-
- /**
- * Resolve the model object.
- * Any URL strings in the model are resolved relative to the
- * base URL argument. Any translatable strings in the model that are
- * specified as translation keys are localized using the supplied
- * resource bundle.
- *
- * @param base URL
- * @param bundle resource bundle
- * @exception MalformedURLException
- * @since 2.0
- */
- public void resolve(URL base, ResourceBundle bundle) throws MalformedURLException {
- // resolve local elements
- url = resolveURL(base, bundle, urlString);
- }
-
- /**
- * @see Object#toString()
- */
- public String toString() {
- StringBuffer buffer = new StringBuffer();
- buffer.append(getClass().toString() + " :");
- buffer.append(" at ");
- if (url != null)
- buffer.append(url.toExternalForm());
- return buffer.toString();
- }
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ImportModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ImportModel.java
deleted file mode 100644
index 21cb028..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ImportModel.java
+++ /dev/null
@@ -1,176 +0,0 @@
-package org.eclipse.update.core.model;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-/**
- * Plug-in dependency model object.
- * <p>
- * This class may be instantiated or subclassed by clients. However, in most
- * cases clients should instead instantiate or subclass the provided
- * concrete implementation of this model.
- * </p>
- * @see org.eclipse.update.core.Import
- * @since 2.0
- */
-public class ImportModel extends ModelObject {
-
- private String id;
- private String version;
- private String matchingRuleName;
- private boolean featureImport;
- private boolean patch;
-
- /**
- * Creates a uninitialized plug-in dependency model object.
- *
- * @since 2.0
- */
- public ImportModel() {
- super();
- }
-
- /**
- * Returns the dependent plug-in identifier.
- *
- * @deprecated use getIdentifier() instead
- * @return plug-in identifier, or <code>null</code>.
- * @since 2.0
- */
- public String getPluginIdentifier() {
- return id;
- }
-
- /**
- * Returns the dependent identifier.
- *
- * @return identifier, or <code>null</code>.
- * @since 2.0.2
- */
- public String getIdentifier() {
- return id;
- }
-
- /**
- * Returns the dependent plug-in version.
- *
- * @deprecated use getVersion() instead
- * @return plug-in version, or <code>null</code>.
- * @since 2.0
- */
- public String getPluginVersion() {
- return version;
- }
-
- /**
- * Returns the dependent version.
- *
- * @return version, or <code>null</code>.
- * @since 2.0.2
- */
- public String getVersion() {
- return version;
- }
-
- /**
- * Returns the dependent version matching rule name.
- *
- * @return matching rule name, or <code>null</code>.
- * @since 2.0
- */
- public String getMatchingRuleName() {
- return matchingRuleName;
- }
-
- /**
- * Sets the dependent plug-in identifier.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @deprecated use setIdentifier()
- * @param pluginId dependent plug-in identifier
- * @since 2.0
- */
- public void setPluginIdentifier(String pluginId) {
- assertIsWriteable();
- this.id = pluginId;
- }
-
- /**
- * Sets the dependent plug-in version.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @deprecated use setVersion()
- * @param pluginVersion dependent plug-in version
- * @since 2.0
- */
- public void setPluginVersion(String pluginVersion) {
- assertIsWriteable();
- this.version = pluginVersion;
- }
-
- /**
- * Sets the dependent identifier.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param id dependent identifier
- * @since 2.0.2
- */
- public void setIdentifier(String id) {
- assertIsWriteable();
- this.id = id;
- }
-
- /**
- * Sets the dependent version.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param version dependent version
- * @since 2.0.2
- */
- public void setVersion(String version) {
- assertIsWriteable();
- this.version = version;
- }
-
- /**
- * Sets the dependent version matching rule name.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param matchingRuleName dependent version matching rule.
- * @since 2.0
- */
- public void setMatchingRuleName(String matchingRuleName) {
- assertIsWriteable();
- this.matchingRuleName = matchingRuleName;
- }
- /**
- * Returns the isFeatureImport.
- * @return boolean
- */
- public boolean isFeatureImport() {
- return featureImport;
- }
-
- /**
- * Sets the featureImport.
- * @param featureImport The featureImport to set
- */
- public void setFeatureImport(boolean featureImport) {
- this.featureImport = featureImport;
- }
-
- /**
- * Returns the patch mode.
- */
- public boolean isPatch() {
- return patch;
- }
-
- /**
- * Sets the patch mode.
- */
- public void setPatch(boolean patch) {
- this.patch = patch;
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/IncludedFeatureReferenceModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/IncludedFeatureReferenceModel.java
deleted file mode 100644
index 4b0a766..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/IncludedFeatureReferenceModel.java
+++ /dev/null
@@ -1,231 +0,0 @@
-package org.eclipse.update.core.model;
-
-import org.eclipse.update.core.*;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-/**
- * Included Feature reference model object.
- * <p>
- * This class may be instantiated or subclassed by clients. However, in most
- * cases clients should instead instantiate or subclass the provided
- * concrete implementation of this model.
- * </p>
- * @see org.eclipse.update.core.IncludedFeatureReference
- * @since 2.1
- */
-public class IncludedFeatureReferenceModel extends FeatureReference {
-
- // since 2.0.2
- private boolean isOptional;
- private String name;
- private int matchingRule;
- private int searchLocation;
-
- // since 2.1
- private String os;
- private String ws;
- private String arch;
- private String nl;
-
- /**
- * Construct a included feature reference
- *
- * @since 2.1
- */
- public IncludedFeatureReferenceModel() {
- super();
- isOptional(false);
- setMatchingRule(IImport.RULE_PERFECT);
- setSearchLocation(IUpdateConstants.SEARCH_ROOT);
- }
-
-
-
- /**
- * Construct a included feature reference model
- *
- * @param includedFeatureRef the included reference model to copy
- * @since 2.1
- */
- public IncludedFeatureReferenceModel(IncludedFeatureReferenceModel includedFeatureRef) {
- super((FeatureReferenceModel)includedFeatureRef);
- isOptional(includedFeatureRef.isOptional());
- setName(includedFeatureRef.getName());
- setMatchingRule(includedFeatureRef.getMatch());
- setSearchLocation(includedFeatureRef.getSearchLocation());
- }
-
- /**
- * Constructor IncludedFeatureReferenceModel.
- * @param featureReference
- */
- public IncludedFeatureReferenceModel(IFeatureReference featureReference) {
- super((FeatureReferenceModel)featureReference);
- isOptional(false);
- setMatchingRule(IImport.RULE_PERFECT);
- setSearchLocation(IUpdateConstants.SEARCH_ROOT);
- }
-
-
- /**
- * Returns the matching rule for this included feature.
- * The rule will determine the ability of the included feature to move version
- * without causing the overall feature to appear broken.
- *
- * The default is <code>MATCH_PERFECT</code>
- *
- * @see IImport#RULE_PERFECT
- * @see IImport#RULE_EQUIVALENT
- * @see IImport#RULE_COMPATIBLE
- * @see IImport#RULE_GREATER_OR_EQUAL
- * @return int representation of feature matching rule.
- * @since 2.0.2
- */
- public int getMatch(){
- return matchingRule;
- }
-
-
- /**
- * Returns a string representation of the feature identifier.
- *
- * @return string representation of feature identifier or <code>null</code>.
- * @since 2.0.1
- */
- public String getName() {
- return name;
- }
-
-
- /**
- * Returns the search location for this included feature.
- * The location will be used to search updates for this feature.
- *
- * The default is <code>SEARCH_ROOT</code>
- *
- * @see IFeatureReference#SEARCH_ROOT
- * @see IFeatureReference#SEARCH_SELF
- * @return int representation of feature searching rule.
- * @since 2.0.2
- */
-
- public int getSearchLocation(){
- return searchLocation;
- }
-
-
-
- /**
- * Returns the isOptional
- *
- * @return isOptional
- * @since 2.0.1
- */
- public boolean isOptional() {
- return isOptional;
- }
-
-
-
-
- /**
- * Sets the isOptional.
- * @param isOptional The isOptional to set
- */
- public void isOptional(boolean isOptional) {
- this.isOptional = isOptional;
- }
-
- /**
- * Sets the matchingRule.
- * @param matchingRule The matchingRule to set
- */
- public void setMatchingRule(int matchingRule) {
- this.matchingRule = matchingRule;
- }
-
- /**
- * Sets the name.
- * @param name The name to set
- */
- public void setName(String name) {
- this.name = name;
- }
-
- /**
- * Sets the searchLocation.
- * @param searchLocation The searchLocation to set
- */
- public void setSearchLocation(int searchLocation) {
- this.searchLocation = searchLocation;
- }
-
- /**
- * Returns the arch.
- * @return String
- */
- public String getOSArch() {
- return arch;
- }
-
- /**
- * Returns the os.
- * @return String
- */
- public String getOS() {
- return os;
- }
-
- /**
- * Returns the ws.
- * @return String
- */
- public String getWS() {
- return ws;
- }
-
- /**
- * Sets the arch.
- * @param arch The arch to set
- */
- public void setArch(String arch) {
- this.arch = arch;
- }
-
- /**
- * Sets the os.
- * @param os The os to set
- */
- public void setOS(String os) {
- this.os = os;
- }
-
- /**
- * Sets the ws.
- * @param ws The ws to set
- */
- public void setWS(String ws) {
- this.ws = ws;
- }
-
- /**
- * Returns the nl.
- * @return String
- */
- public String getNL() {
- return nl;
- }
-
- /**
- * Sets the nl.
- * @param nl The nl to set
- */
- public void setNL(String nl) {
- this.nl = nl;
- }
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/InstallAbortedException.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/InstallAbortedException.java
deleted file mode 100644
index 6a20374..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/InstallAbortedException.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.eclipse.update.core.model;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import org.eclipse.core.runtime.*;
-
-/**
- * Exception thrown when the user cancelled an installation.
- *
- * @see org.eclipse.update.core.Feature#install(IFeature, IVerificationListener, IProgressMonitor)
- * @since 2.0
- */
-public class InstallAbortedException extends CoreException {
-
- /**
- * Construct the exception indicating enclosing CoreException
- *
- * @since 2.0
- */
- public InstallAbortedException(String msg,Exception e) {
- super(new Status(IStatus.INFO,"org.eclipse.update.core",IStatus.OK,msg,e));
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/InstallHandlerEntryModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/InstallHandlerEntryModel.java
deleted file mode 100644
index f85a127..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/InstallHandlerEntryModel.java
+++ /dev/null
@@ -1,132 +0,0 @@
-package org.eclipse.update.core.model;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ResourceBundle;
-
-/**
- * Install handler entry model object.
- * An object which represents the definition of a custom install handler
- * <p>
- * This class may be instantiated or subclassed by clients. However, in most
- * cases clients should instead instantiate or subclass the provided
- * concrete implementation of this model.
- * </p>
- * @see org.eclipse.update.core.InstallHandlerEntry
- * @since 2.0
- */
-public class InstallHandlerEntryModel extends ModelObject {
-
- private String urlString;
- private URL url;
- private String library;
- private String name;
-
- /**
- * Creates a uninitialized install handler entry model object.
- *
- * @since 2.0
- */
- public InstallHandlerEntryModel() {
- super();
- }
-
- /**
- * Returns the URL string used for browser-triggered installation handling.
- *
- * @return url string or <code>null</code>
- * @since 2.0
- */
- public String getURLString() {
- return urlString;
- }
-
- /**
- * Returns the resolved URL used for browser-triggered installation handling.
- *
- * @return url, or <code>null</code>
- * @since 2.0
- */
- public URL getURL() {
- return url;
- }
-
- /**
- * Returns the name of the custom installer library.
- *
- * @return library path, or <code>null</code>
- * @since 2.0
- */
- public String getLibrary() {
- return library;
- }
-
- /**
- * Returns the name of the custom installer.
- *
- * @return handler name, or <code>null</code>
- * @since 2.0
- */
- public String getHandlerName() {
- return name;
- }
-
- /**
- * Sets URL string used for browser-triggered installation handling.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param urlString trigget page URL string, may be <code>null</code>.
- * @since 2.0
- */
- public void setURLString(String urlString) {
- assertIsWriteable();
- this.urlString = urlString;
- this.url = null;
- }
-
- /**
- * Sets the custom install handler library name.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param library name, may be <code>null</code>.
- * @since 2.0
- */
- public void setLibrary(String library) {
- assertIsWriteable();
- this.library = library;
- }
-
- /**
- * Sets the name of the custom install handler.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param name name of the install handler, may be <code>null</code>.
- * @since 2.0
- */
- public void setHandlerName(String name) {
- assertIsWriteable();
- this.name = name;
- }
-
- /**
- * Resolve the model object.
- * Any URL strings in the model are resolved relative to the
- * base URL argument. Any translatable strings in the model that are
- * specified as translation keys are localized using the supplied
- * resource bundle.
- *
- * @param base URL
- * @param bundle resource bundle
- * @exception MalformedURLException
- * @since 2.0
- */
- public void resolve(URL base, ResourceBundle bundle)
- throws MalformedURLException {
- // resolve local elements
- url = resolveURL(base, bundle, urlString);
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/InvalidSiteTypeException.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/InvalidSiteTypeException.java
deleted file mode 100644
index ff6ad01..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/InvalidSiteTypeException.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.eclipse.update.core.model;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-/**
- * Exception thrown when the type of the site discovered in the site manifest
- * does not correspond to the type expected by the concrete site factory.
- *
- * @see org.eclipse.update.core.model.SiteModelFactory#canParseSiteType(String)
- * @since 2.0
- */
-
-public class InvalidSiteTypeException extends Exception {
-
- private String newSiteType;
-
- /**
- * Construct the exception indicating the detected site type
- *
- * @since 2.0
- */
- public InvalidSiteTypeException(String newType) {
- super();
- newSiteType = newType;
- }
-
- /**
- * Returns the site type detected in the parsed site manifest
- *
- * @return site type
- * @since 2.0
- */
- public String getNewType() {
- return newSiteType;
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ModelObject.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ModelObject.java
deleted file mode 100644
index e7dba06..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ModelObject.java
+++ /dev/null
@@ -1,274 +0,0 @@
-package org.eclipse.update.core.model;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import java.lang.reflect.Array;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.*;
-
-import org.eclipse.core.runtime.PlatformObject;
-import org.eclipse.update.internal.core.Assert;
-import org.eclipse.update.internal.core.Policy;
-
-/**
- * Root model object. Extended by all model objects.
- * <p>
- * This class cannot be instantiated and must be subclassed.
- * </p>
- */
-public abstract class ModelObject extends PlatformObject {
-
- private boolean readOnly = false;
-
- private static final String KEY_PREFIX = "%"; //$NON-NLS-1$
- private static final String KEY_DOUBLE_PREFIX = KEY_PREFIX + KEY_PREFIX;
-
- /**
- * Creates a base model object.
- *
- * @since 2.0
- */
- protected ModelObject() {
- }
-
- /**
- * Checks that this model object is writeable. A runtime exception
- * is thrown if it is not.
- *
- * @since 2.0
- */
- protected final void assertIsWriteable() {
- Assert.isTrue(!isReadOnly(), Policy.bind("ModelObject.ModelReadOnly"));
- //$NON-NLS-1$
- }
-
- /**
- * Sets this model object and all of its descendents to be read-only.
- * Subclasses may extend this implementation.
- *
- * @see #isReadOnly
- * @since 2.0
- */
- public void markReadOnly() {
- readOnly = true;
- }
-
- /**
- * Returns whether or not this model object is read-only.
- *
- * @return <code>true</code> if this model object is read-only,
- * <code>false</code> otherwise
- * @see #markReadOnly
- * @since 2.0
- */
- public boolean isReadOnly() {
- return readOnly;
- }
-
- /**
- * Delegate setting of read-only
- *
- * @param o object to delegate to. Must be of type ModelObject.
- * @see #isReadOnly
- * @since 2.0
- */
- protected void markReferenceReadOnly(ModelObject o) {
- if (o == null)
- return;
- o.markReadOnly();
- }
-
- /**
- * Delegate setting of read-only
- *
- * @param o object array to delegate to. Each element must be of type ModelObject.
- * @see #isReadOnly
- * @since 2.0
- */
- protected void markListReferenceReadOnly(ModelObject[] o) {
- if (o == null)
- return;
- for (int i = 0; i < o.length; i++) {
- o[i].markReadOnly();
- }
- }
-
- /**
- * Resolve the model element. This method allows any relative URL strings
- * to be resolved to actual URL. It also allows any translatable strings
- * to be localized.
- *
- * Subclasses need to override this method to perform the actual resolution.
- * @param base base URL.
- * @param bundle resource bundle.
- * @exception MalformedURLException
- * @since 2.0
- */
- public void resolve(URL base, ResourceBundle bundle)
- throws MalformedURLException {
- return;
- }
-
- /**
- * Delegate resolution to referenced model
- *
- * @param o object to delegate to. Must be of type ModelObject.
- * @param base base URL.
- * @param bundle resource bundle.
- * @exception MalformedURLException
- * @since 2.0
- */
- protected void resolveReference(ModelObject o, URL url, ResourceBundle bundle)
- throws MalformedURLException {
- if (o == null)
- return;
- o.resolve(url, bundle);
- }
-
- /**
- * Delegate resolution to list of referenced models
- *
- * @param o object array to delegate to. Each element must be of type ModelObject.
- * @param base base URL.
- * @param bundle resource bundle.
- * @exception MalformedURLException
- * @since 2.0
- */
- protected void resolveListReference(
- ModelObject[] o,
- URL url,
- ResourceBundle bundle)
- throws MalformedURLException {
- if (o == null)
- return;
- for (int i = 0; i < o.length; i++) {
- o[i].resolve(url, bundle);
- }
- }
-
- /**
- * Resolve a URL based on context
- *
- * @param base base URL.
- * @param bundle resource bundle.
- * @param urlString url string from model.
- * @return URL, or <code>null</code>.
- * @exception MalformedURLException
- * @since 2.0
- */
- protected URL resolveURL(URL context, ResourceBundle bundle, String urlString)
- throws MalformedURLException {
-
- // URL string was not specified
- if (urlString == null || urlString.trim().equals("")) //$NON-NLS-1$
- return null;
-
- // check to see if we have NL-sensitive URL
- String resolvedUrlString = resolveNLString(bundle, urlString);
-
- // if we don't have a base url, use only the supplied string
- if (context == null)
- return new URL(resolvedUrlString);
-
- // otherwise return new URL in context of base URL
- return new URL(context, resolvedUrlString);
- }
-
- /**
- * 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 bundle resource bundle.
- * @param s translatable string from model
- * @return string, or <code>null</code>
- * @since 2.0
- */
- protected String resolveNLString(ResourceBundle b, 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 (b == null)
- return dflt;
-
- try {
- return b.getString(key.substring(1));
- } catch (MissingResourceException e) {
- return dflt;
- }
- }
-
- /**
- * Returns a concrete array type for the elements of the specified
- * list. The method assumes all the elements of the list are the same
- * concrete type as the first element in the list.
- *
- * @param l list
- * @return concrete array type, or <code>null</code> if the array type
- * could not be determined (the list is <code>null</code> or empty)
- * @since 2.0
- */
- protected Object[] arrayTypeFor(List l) {
- if (l == null || l.size() == 0)
- return null;
- return (Object[]) Array.newInstance(l.get(0).getClass(), 0);
- }
-
- /**
- * Returns a concrete array type for the elements of the specified
- * set. The method assumes all the elements of the set are the same
- * concrete type as the first element in the set.
- *
- * @param s set
- * @return concrete array type, or <code>null</code> if the array type
- * could not be determined (the set is <code>null</code> or empty)
- * @since 2.0
- */
- protected Object[] arrayTypeFor(Set s) {
- if (s == null || s.size() == 0)
- return null;
- Iterator i = s.iterator();
- return (Object[]) Array.newInstance(i.next().getClass(), 0);
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/NonPluginEntryModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/NonPluginEntryModel.java
deleted file mode 100644
index bdcfd0d..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/NonPluginEntryModel.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.eclipse.update.core.model;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-/**
- * Non-plug-in entry model object.
- * <p>
- * This class may be instantiated or subclassed by clients. However, in most
- * cases clients should instead instantiate or subclass the provided
- * concrete implementation of this model.
- * </p>
- * @see org.eclipse.update.core.NonPluginEntry
- * @since 2.0
- */
-public class NonPluginEntryModel extends ContentEntryModel {
-
- private String id = null;
-
- /**
- * Creates a uninitialized non-plug-in entry model object.
- *
- * @since 2.0
- */
- public NonPluginEntryModel() {
- super();
- }
-
- /**
- * Returns the entry identifier.
- *
- * @return entry identifier, or <code>null</code>
- * @since 2.0
- */
- public String getIdentifier() {
- return id;
- }
-
- /**
- * Sets the entry identifier.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param id entry identifier.
- * @since 2.0
- */
- public void setIdentifier(String id) {
- assertIsWriteable();
- this.id = id;
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/PluginEntryModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/PluginEntryModel.java
deleted file mode 100644
index eac5ab3..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/PluginEntryModel.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package org.eclipse.update.core.model;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-/**
- * Plug-in entry model object.
- * <p>
- * This class may be instantiated or subclassed by clients. However, in most
- * cases clients should instead instantiate or subclass the provided
- * concrete implementation of this model.
- * </p>
- * @see org.eclipse.update.core.PluginEntry
- * @since 2.0
- */
-public class PluginEntryModel extends ContentEntryModel {
-
- private String pluginId;
- private String pluginVersion;
- private boolean isFragment = false;
-
- /**
- * Creates a uninitialized plug-in entry model object.
- *
- * @since 2.0
- */
- public PluginEntryModel() {
- super();
- }
-
- /**
- * Compares two plug-in models for equality
- *
- * @param obj other model to compare to
- * @return <code>true</code> if the models are equal, <code>false</code> otherwise
- * @since 2.0
- */
- public boolean equals(Object obj) {
- if (!(obj instanceof PluginEntryModel))
- return false;
- PluginEntryModel model = (PluginEntryModel) obj;
-
- return (
- (getPluginIdentifier().equals(model.getPluginIdentifier()))
- && (getPluginVersion().equals(model.getPluginVersion()))
- && (isFragment() == model.isFragment()));
- }
-
- /**
- * Returns the plug-in identifier for this entry.
- *
- * @return the plug-in identifier, or <code>null</code>
- * @since 2.0
- */
- public String getPluginIdentifier() {
- return pluginId;
- }
-
- /**
- * Returns the plug-in version for this entry.
- *
- * @return the plug-in version, or <code>null</code>
- * @since 2.0
- */
- public String getPluginVersion() {
- return pluginVersion;
- }
-
- /**
- * Indicates whether the entry describes a full plug-in, or
- * a plug-in fragment.
- *
- * @return <code>true</code> if the entry is a plug-in fragment,
- * <code>false</code> if the entry is a plug-in
- * @since 2.0
- */
- public boolean isFragment() {
- return isFragment;
- }
-
- /**
- * Sets the entry plug-in identifier.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param pluginId the entry identifier.
- * @since 2.0
- */
- public void setPluginIdentifier(String pluginId) {
- assertIsWriteable();
- this.pluginId = pluginId;
- }
-
- /**
- * Sets the entry plug-in version.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param pluginVersion the entry version.
- * @since 2.0
- */
- public void setPluginVersion(String pluginVersion) {
- assertIsWriteable();
- this.pluginVersion = pluginVersion;
- }
-
- /**
- * Indicates whether this entry represents a fragment or plug-in.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param isFragment fragment setting
- * @since 2.0
- */
- public void isFragment(boolean isFragment) {
- assertIsWriteable();
- this.isFragment = isFragment;
- }
-
- /**
- * @see Object#toString()
- */
- public String toString() {
- String msg = (getPluginIdentifier()!=null)?getPluginIdentifier().toString():"";
- msg += getPluginVersion()!=null?" "+getPluginVersion().toString():"";
- msg += isFragment()?" fragment":" plugin";
- return msg;
- }
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/SiteModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/SiteModel.java
deleted file mode 100644
index 865f1a2..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/SiteModel.java
+++ /dev/null
@@ -1,355 +0,0 @@
-package org.eclipse.update.core.model;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.*;
-
-import org.eclipse.update.core.SiteFeatureReferenceModel;
-import org.eclipse.update.internal.model.ConfiguredSiteModel;
-
-/**
- * Site model object.
- * <p>
- * This class may be instantiated or subclassed by clients. However, in most
- * cases clients should instead instantiate or subclass the provided
- * concrete implementation of this model.
- * </p>
- * @see org.eclipse.update.core.Site
- * @since 2.0
- */
-public class SiteModel extends ModelObject {
-
- private String type;
- private URLEntryModel description;
- private List /*of FeatureReferenceModel*/
- featureReferences;
- private List /*of ArchiveReferenceModel*/
- archiveReferences;
- private Set /*of CategoryModel*/
- categories;
- private String locationURLString;
- private URL locationURL;
- private ConfiguredSiteModel configuredSiteModel;
-
- /**
- * Creates an uninitialized site model object.
- *
- * @since 2.0
- */
- public SiteModel() {
- super();
- }
-
- /**
- * Returns the site type.
- *
- * @return site type, or <code>null</code>.
- * @since 2.0
- */
- public String getType() {
- return type;
- }
-
- /**
- * Returns the site description.
- *
- * @return site description, or <code>null</code>.
- * @since 2.0
- */
- public URLEntryModel getDescriptionModel() {
- return description;
- }
-
- /**
- * Returns an array of feature reference models on this site.
- *
- * @return an array of feature reference models, or an empty array.
- * @since 2.0
- */
- public SiteFeatureReferenceModel[] getFeatureReferenceModels() {
- if (featureReferences == null)
- return new SiteFeatureReferenceModel[0];
-
- return (SiteFeatureReferenceModel[]) featureReferences.toArray(
- arrayTypeFor(featureReferences));
- }
-
- /**
- * Returns an array of plug-in and non-plug-in archive reference models
- * on this site
- *
- * @return an array of archive reference models, or an empty array if there are
- * no archives known to this site.
- * @since 2.0
- */
- public ArchiveReferenceModel[] getArchiveReferenceModels() {
- if (archiveReferences == null)
- return new ArchiveReferenceModel[0];
-
- return (ArchiveReferenceModel[]) archiveReferences.toArray(
- arrayTypeFor(archiveReferences));
- }
-
- /**
- * Returns an array of category models for this site.
- *
- * @return array of site category models, or an empty array.
- * @since 2.0
- */
- public CategoryModel[] getCategoryModels() {
- if (categories == null)
- return new CategoryModel[0];
-
- return (CategoryModel[]) categories.toArray(arrayTypeFor(categories));
- }
-
- /**
- * Returns the unresolved URL string for the site.
- *
- * @return url string, or <code>null</code>
- * @since 2.0
- */
- public String getLocationURLString() {
- return locationURLString;
- }
-
- /**
- * Returns the resolved URL for the site.
- *
- * @return url, or <code>null</code>
- * @since 2.0
- */
- public URL getLocationURL() {
- return locationURL;
- }
-
- /**
- * Sets the site type.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param type site type
- * @since 2.0
- */
- public void setType(String type) {
- assertIsWriteable();
- this.type = type;
- }
-
- /**
- * Sets the site description.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param description site description
- * @since 2.0
- */
- public void setDescriptionModel(URLEntryModel description) {
- assertIsWriteable();
- this.description = description;
- }
-
- /**
- * Sets the feature references for this site.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param featureReferences an array of feature reference models
- * @since 2.0
- */
- public void setFeatureReferenceModels(FeatureReferenceModel[] featureReferences) {
- assertIsWriteable();
- if (featureReferences == null)
- this.featureReferences = null;
- else
- this.featureReferences = new ArrayList(Arrays.asList(featureReferences));
- }
-
- /**
- * Sets the archive references for this site.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param archiveReferences an array of archive reference models
- * @since 2.0
- */
- public void setArchiveReferenceModels(ArchiveReferenceModel[] archiveReferences) {
- assertIsWriteable();
- if (archiveReferences == null)
- this.archiveReferences = null;
- else
- this.archiveReferences = new ArrayList(Arrays.asList(archiveReferences));
- }
-
- /**
- * Sets the site categories.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param categories an array of category models
- * @since 2.0
- */
- public void setCategoryModels(CategoryModel[] categories) {
- assertIsWriteable();
- if (categories == null)
- this.categories = null;
- else {
- this.categories = new TreeSet(CategoryModel.getComparator());
- this.categories.addAll(Arrays.asList(categories));
- }
- }
-
- /**
- * Sets the unresolved URL for the site.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param locationURLString url for the site (as a string)
- * @since 2.0
- */
- public void setLocationURLString(String locationURLString) {
- assertIsWriteable();
- this.locationURLString = locationURLString;
- }
-
- /**
- * Adds a feature reference model to site.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param featureReference feature reference model
- * @since 2.0
- */
- public void addFeatureReferenceModel(SiteFeatureReferenceModel featureReference) {
- assertIsWriteable();
- if (this.featureReferences == null)
- this.featureReferences = new ArrayList();
- if (!this.featureReferences.contains(featureReference))
- this.featureReferences.add(featureReference);
- }
-
- /**
- * Adds an archive reference model to site.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param archiveReference archive reference model
- * @since 2.0
- */
- public void addArchiveReferenceModel(ArchiveReferenceModel archiveReference) {
- assertIsWriteable();
- if (this.archiveReferences == null)
- this.archiveReferences = new ArrayList();
- if (!this.archiveReferences.contains(archiveReference))
- this.archiveReferences.add(archiveReference);
- }
-
- /**
- * Adds a category model to site.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param category category model
- * @since 2.0
- */
- public void addCategoryModel(CategoryModel category) {
- assertIsWriteable();
- if (this.categories == null)
- this.categories = new TreeSet(CategoryModel.getComparator());
- if (!this.categories.contains(category))
- this.categories.add(category);
- }
-
- /**
- * Removes a feature reference model from site.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param featureReference feature reference model
- * @since 2.0
- */
- public void removeFeatureReferenceModel(FeatureReferenceModel featureReference) {
- assertIsWriteable();
- if (this.featureReferences != null)
- this.featureReferences.remove(featureReference);
- }
-
- /**
- * Removes an archive reference model from site.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param archiveReference archive reference model
- * @since 2.0
- */
- public void removeArchiveReferenceModel(ArchiveReferenceModel archiveReference) {
- assertIsWriteable();
- if (this.archiveReferences != null)
- this.archiveReferences.remove(archiveReference);
- }
-
- /**
- * Removes a category model from site.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param category category model
- * @since 2.0
- */
- public void removeCategoryModel(CategoryModel category) {
- assertIsWriteable();
- if (this.categories != null)
- this.categories.remove(category);
- }
-
- /**
- * Marks the model object as read-only.
- *
- * @since 2.0
- */
- public void markReadOnly() {
- super.markReadOnly();
- markReferenceReadOnly(getDescriptionModel());
- markListReferenceReadOnly(getFeatureReferenceModels());
- markListReferenceReadOnly(getArchiveReferenceModels());
- markListReferenceReadOnly(getCategoryModels());
- }
-
- /**
- * Resolve the model object.
- * Any URL strings in the model are resolved relative to the
- * base URL argument. Any translatable strings in the model that are
- * specified as translation keys are localized using the supplied
- * resource bundle.
- *
- * @param base URL
- * @param bundle resource bundle
- * @exception MalformedURLException
- * @since 2.0
- */
- public void resolve(URL base, ResourceBundle bundle)
- throws MalformedURLException {
-
- // Archives and feature are relative to location URL is teh Site element had
- // a URL tag: see spec
- locationURL = resolveURL(base, bundle, getLocationURLString());
- if (locationURL == null)
- locationURL = base;
- resolveListReference(getFeatureReferenceModels(), locationURL, bundle);
- resolveListReference(getArchiveReferenceModels(), locationURL, bundle);
-
- resolveReference(getDescriptionModel(), base, bundle);
- resolveListReference(getCategoryModels(), base, bundle);
- }
-
- /**
- *
- */
- public ConfiguredSiteModel getConfiguredSiteModel() {
- return this.configuredSiteModel;
- }
-
-
-
- /**
- * @see org.eclipse.update.core.ISite#setConfiguredSite(IConfiguredSite)
- */
- public void setConfiguredSiteModel(ConfiguredSiteModel configuredSiteModel) {
- this.configuredSiteModel = configuredSiteModel;
- }
-
-
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/SiteModelFactory.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/SiteModelFactory.java
deleted file mode 100644
index f06bcd7..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/SiteModelFactory.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package org.eclipse.update.core.model;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.update.core.SiteFeatureReferenceModel;
-import org.eclipse.update.core.Utilities;
-import org.eclipse.update.internal.core.Policy;
-import org.xml.sax.SAXException;
-
-/**
- * Default site model factory.
- * <p>
- * This class may be instantiated or subclassed by clients. However, in most
- * cases clients should instead subclass the provided base implementation
- * of this factory.
- * </p>
- * @see org.eclipse.update.core.BaseSiteFactory
- * @since 2.0
- */
-public class SiteModelFactory {
-
- /**
- * Creates a default site factory.
- *
- * @since 2.0
- */
- public SiteModelFactory() {
- super();
- }
-
- /**
- * Indicates whether this factory can handle the specified site type. This
- * method is intended to be overridden by subclasses.
- *
- * @param type site type identifier
- * @return <code>true</code> if the type can be handled, otherwise <code>false</code>
- * @since 2.0
- */
- public boolean canParseSiteType(String type) {
- // return true if type was not specified (ie. is null or empty string)
- return (type == null || type.trim().equals("")); //$NON-NLS-1$
- }
-
- /**
- * Creates and populates a default site from stream.
- * The parser assumes the stream contains a default site manifest
- * (site.xml) as documented by the platform.
- *
- * @param stream site stream
- * @return populated site model
- * @exception ParsingException
- * @exception IOException
- * @exception SAXException
- * @since 2.0
- */
- public SiteModel parseSite(InputStream stream)
- throws CoreException, InvalidSiteTypeException {
- SiteModel result = null;
- try {
- DefaultSiteParser parser = new DefaultSiteParser(this);
- result = parser.parse(stream);
- if (parser.getStatus()!=null) {
- // some internalError were detected
- IStatus status = parser.getStatus();
- throw new CoreException(status);
- }
- } catch (SAXException e) {
- if (e instanceof SAXException) {
- SAXException exception = (SAXException) e;
- // invalid Site type
- if (exception.getException() instanceof InvalidSiteTypeException) {
- throw (InvalidSiteTypeException) exception.getException();
- }
- }
-
- throw Utilities.newCoreException(Policy.bind("SiteModelObject.ErrorParsingSiteStream"),e); //$NON-NLS-1$
- } catch (IOException e){
- throw Utilities.newCoreException(Policy.bind("SiteModelObject.ErrorAccessingSiteStream"),e); //$NON-NLS-1$
- }
- return result;
- }
-
- /**
- * Create a default site model.
- *
- * @see SiteModel
- * @return site model
- * @since 2.0
- */
- public SiteModel createSiteMapModel() {
- return new SiteModel();
- }
-
- /**
- * Create a default site feature reference model.
- *
- * @see SiteFeatureReferenceModel
- * @return site feature reference model
- * @since 2.0
- */
- public SiteFeatureReferenceModel createFeatureReferenceModel() {
- return new SiteFeatureReferenceModel();
- }
-
- /**
- * Create a default archive reference model.
- *
- * @see ArchiveReferenceModel
- * @return archive reference model
- * @since 2.0
- */
- public ArchiveReferenceModel createArchiveReferenceModel() {
- return new ArchiveReferenceModel();
- }
-
- /**
- * Create a default annotated URL model.
- *
- * @see URLEntryModel
- * @return annotated URL model
- * @since 2.0
- */
- public URLEntryModel createURLEntryModel() {
- return new URLEntryModel();
- }
-
- /**
- * Create a default category model.
- *
- * @see CategoryModel
- * @return category model
- * @since 2.0
- */
- public CategoryModel createSiteCategoryModel() {
- return new CategoryModel();
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/URLEntryModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/URLEntryModel.java
deleted file mode 100644
index 81f2095..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/URLEntryModel.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package org.eclipse.update.core.model;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ResourceBundle;
-
-/**
- * Annotated URL model object.
- * <p>
- * This class may be instantiated or subclassed by clients. However, in most
- * cases clients should instead instantiate or subclass the provided
- * concrete implementation of this model.
- * </p>
- * @see org.eclipse.update.core.URLEntry
- * @since 2.0
- */
-
-public class URLEntryModel extends ModelObject {
-
- private String annotation;
- private String localizedAnnotation;
- private String urlString;
- private URL url;
-
- /**
- * Creates a uninitialized annotated URL model object.
- *
- * @since 2.0
- */
- public URLEntryModel() {
- super();
- }
-
- /**
- * Returns the url annotation. If the model object has been resolved,
- * the annotation is localized.
- *
- * @return url annotation, or <code>null</code>.
- * @since 2.0
- */
- public String getAnnotation() {
- if (localizedAnnotation != null)
- return localizedAnnotation;
- else
- return annotation;
- }
-
- /**
- * returns the non-localized url annotation.
- *
- * @return non-localized url annotation, or <code>null</code>.
- * @since 2.0
- */
- public String getAnnotationNonLocalized() {
- return annotation;
- }
-
- /**
- * Returns the unresolved url string.
- *
- * @return url string, or <code>null</code>
- * @since 2.0
- */
- public String getURLString() {
- return urlString;
- }
-
- /**
- * Returns the resolved URL.
- *
- * @return url, or <code>null</code>
- * @since 2.0
- */
- public URL getURL() {
- return url;
- }
-
- /**
- * Sets the annotation.
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param annotation annotation
- * @since 2.0
- */
- public void setAnnotation(String annotation) {
- assertIsWriteable();
- this.annotation = annotation;
- this.localizedAnnotation = null;
- }
-
- /**
- * Sets the url string
- * Throws a runtime exception if this object is marked read-only.
- *
- * @param url url string
- * @since 2.0
- */
- public void setURLString(String urlString) {
- assertIsWriteable();
- this.urlString = urlString;
- this.url = null;
- }
-
- /**
- * Resolve the model object.
- * Any URL strings in the model are resolved relative to the
- * base URL argument. Any translatable strings in the model that are
- * specified as translation keys are localized using the supplied
- * resource bundle.
- *
- * @param base URL
- * @param bundle resource bundle
- * @exception MalformedURLException
- * @since 2.0
- */
- public void resolve(URL base, ResourceBundle bundle) throws MalformedURLException {
- // resolve local elements
- localizedAnnotation = resolveNLString(bundle, annotation);
- url = resolveURL(base, bundle, urlString);
- }
-}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/package.html b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/package.html
deleted file mode 100644
index c8a665d..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/package.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <meta name="Author" content="IBM">
- <meta name="GENERATOR" content="Mozilla/4.72 [en] (Windows NT 5.0; U) [Netscape]">
- <title>Package-level Javadoc</title>
-</head>
-<body>
-Provides model support for extending the base installation
-and update services.
-<h2>
-Package Specification</h2>
-This package provides a convenience implementation of the default model
-objects and parsers used for writing pluggable support of alternate feature
-packaging schemes and update site access mechanisms. In general, most developers
-do not need to directly use the classes defined in this package. Instead,
-they can use the corresponding derived implementation classes contained
-in package <b>org.eclipse.update.core</b>.
-<p>Classes in this package would typically only be used directly when writing
-and alternate set of model objects for a feature and type implementation.
-</body>
-</html>
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/package.html b/update/org.eclipse.update.core/src/org/eclipse/update/core/package.html
deleted file mode 100644
index 6c41140..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/package.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <meta name="Author" content="IBM">
- <meta name="GENERATOR" content="Mozilla/4.72 [en] (Windows NT 5.0; U) [Netscape]">
- <title>Package-level Javadoc</title>
-</head>
-<body>
-Provides support for extending the base installation
-and update services.
-<h2>
-Package Specification</h2>
-This package specifies the API required for writing pluggable support of
-alternate feature packaging schemes and update site access mechanisms.
-For the most part, the classes and interfaces in this package implement
-a code pattern <tt>class Foo extends FooModel implements IFoo</tt>. The
-interface (<tt>IFoo</tt> in the pattern) defines the actual API. The convenience
-classes (<tt>Foo</tt> in the pattern) provide a reference implementation
-of the API based on a model (<tt>IFooModel</tt> in the pattern) contained
-in package <b>org.eclipse.update.core.model</b>. In general, developers
-should extend the convenience classes rather than completely reimplementing
-the specified interfaces.
-</body>
-</html>
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/URLKey.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/URLKey.java
deleted file mode 100644
index e5d9bbe..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/URLKey.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.eclipse.update.internal;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import java.net.URL;
-
-import org.eclipse.update.internal.core.UpdateManagerUtils;
-
-
-/**
- *
- *
- */
-public class URLKey {
-
- private URL url;
-
- /**
- * Constructor for URLKey.
- */
- public URLKey(URL url) {
- super();
- this.url = url;
- }
-
- /**
- * @see java.lang.Object#equals(Object)
- */
- public boolean equals(Object obj) {
- if (obj == null) {
- return false;
- }
-
- if (this == obj) {
- return true;
- }
-
- if (obj instanceof URLKey) {
- return equals(((URLKey) obj).getURL());
- }
-
- if (!(obj instanceof URL)) {
- return false;
- }
-
- URL url2 = (URL)obj;
- if (url == url2) {
- return true;
- }
-
- return UpdateManagerUtils.sameURL(url,url2);
- }
-
- /**
- * @see java.lang.Object#hashCode()
- */
- public int hashCode() {
- return url.hashCode();
- }
-
- /**
- * Returns the url.
- * @return URL
- */
- public URL getURL() {
- return url;
- }
-
-}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Assert.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Assert.java
deleted file mode 100644
index 022e9a8..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Assert.java
+++ /dev/null
@@ -1,162 +0,0 @@
-package org.eclipse.update.internal.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-/**
- * <code>Assert</code> is useful for for embedding runtime sanity checks
- * in code. The static predicate methods all test a condition and throw some
- * type of unchecked exception if the condition does not hold.
- * <p>
- * Assertion failure exceptions, like most runtime exceptions, are
- * thrown when something is misbehaving. Assertion failures are invariably
- * unspecified behavior; consequently, clients should never rely on
- * these being thrown (or not thrown). <b>If you find yourself in the
- * position where you need to catch an assertion failure, you have most
- * certainly written your program incorrectly.</b>
- * </p>
- */
-public final class Assert {
-
- /**
- * <code>AssertionFailedException</code> is a runtime exception thrown
- * by some of the methods in <code>Assert</code>.
- * <p>
- * This class is not declared public to prevent some misuses; programs that catch
- * or otherwise depend on assertion failures are susceptible to unexpected
- * breakage when assertions in the code are added or removed.
- * </p>
- */
- private static class AssertionFailedException extends RuntimeException {
-
- /**
- * Constructs a new exception.
- */
- public AssertionFailedException() {
- }
-
- /**
- * Constructs a new exception with the given message.
- */
- public AssertionFailedException(String detail) {
- super(detail);
- }
- }
-/* This class is not intended to be instantiated. */
-private Assert() {
-}
-/**
- * Asserts that an argument is legal. If the given boolean is
- * not <code>true</code>, an <code>IllegalArgumentException</code>
- * is thrown.
- *
- * @param expression the outcome of the check
- * @return <code>true</code> if the check passes (does not return
- * if the check fails)
- * @exception IllegalArgumentException if the legality test failed
- */
-public static boolean isLegal(boolean expression) {
- // succeed as quickly as possible
- if (expression) {
- return true;
- }
- return isLegal(expression, "");//$NON-NLS-1$
-}
-/**
- * Asserts that an argument is legal. If the given boolean is
- * not <code>true</code>, an <code>IllegalArgumentException</code>
- * is thrown.
- * The given message is included in that exception, to aid debugging.
- *
- * @param expression the outcome of the check
- * @param message the message to include in the exception
- * @return <code>true</code> if the check passes (does not return
- * if the check fails)
- * @exception IllegalArgumentException if the legality test failed
- */
-public static boolean isLegal(boolean expression, String message) {
- if (!expression)
- throw new IllegalArgumentException(message);
- return expression;
-}
-/**
- * Asserts that the given object is not <code>null</code>. If this
- * is not the case, some kind of unchecked exception is thrown.
- * <p>
- * As a general rule, parameters passed to API methods must not be
- * <code>null</code> unless <b>explicitly</b> allowed in the method's
- * specification. Similarly, results returned from API methods are never
- * <code>null</code> unless <b>explicitly</b> allowed in the method's
- * specification. Implementations are encouraged to make regular use of
- * <code>Assert.isNotNull</code> to ensure that <code>null</code>
- * parameters are detected as early as possible.
- * </p>
- *
- * @param object the value to test
- * @exception Throwable an unspecified unchecked exception if the object
- * is <code>null</code>
- */
-public static void isNotNull(Object object) {
- // succeed as quickly as possible
- if (object != null) {
- return;
- }
- isNotNull(object, "");//$NON-NLS-1$
-}
-/**
- * Asserts that the given object is not <code>null</code>. If this
- * is not the case, some kind of unchecked exception is thrown.
- * The given message is included in that exception, to aid debugging.
- * <p>
- * As a general rule, parameters passed to API methods must not be
- * <code>null</code> unless <b>explicitly</b> allowed in the method's
- * specification. Similarly, results returned from API methods are never
- * <code>null</code> unless <b>explicitly</b> allowed in the method's
- * specification. Implementations are encouraged to make regular use of
- * <code>Assert.isNotNull</code> to ensure that <code>null</code>
- * parameters are detected as early as possible.
- * </p>
- *
- * @param object the value to test
- * @param message the message to include in the exception
- * @exception Throwable an unspecified unchecked exception if the object
- * is <code>null</code>
- */
-public static void isNotNull(Object object, String message) {
- if (object == null)
- throw new AssertionFailedException("null argument;" + message);//$NON-NLS-1$
-}
-/**
- * Asserts that the given boolean is <code>true</code>. If this
- * is not the case, some kind of unchecked exception is thrown.
- *
- * @param expression the outcome of the check
- * @return <code>true</code> if the check passes (does not return
- * if the check fails)
- */
-public static boolean isTrue(boolean expression) {
- // succeed as quickly as possible
- if (expression) {
- return true;
- }
- return isTrue(expression, "");//$NON-NLS-1$
-}
-/**
- * Asserts that the given boolean is <code>true</code>. If this
- * is not the case, some kind of unchecked exception is thrown.
- * The given message is included in that exception, to aid debugging.
- *
- * @param expression the outcome of the check
- * @param message the message to include in the exception
- * @return <code>true</code> if the check passes (does not return
- * if the check fails)
- */
-public static boolean isTrue(boolean expression, String message) {
- if (!expression)
- throw new AssertionFailedException("assertion failed; "+message);//$NON-NLS-1$
- return expression;
-}
-}
-
-
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/BaseSiteLocalFactory.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/BaseSiteLocalFactory.java
deleted file mode 100644
index 2b636e2..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/BaseSiteLocalFactory.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.eclipse.update.internal.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-import org.eclipse.update.core.model.SiteModel;
-import org.eclipse.update.internal.model.*;
-/**
- *
- */
-public class BaseSiteLocalFactory {
- /*
- *
- */
- public InstallConfigurationModel createInstallConfigurationModel() {
- return new InstallConfiguration();
- }
- /*
- *
- */
- public ConfigurationActivityModel createConfigurationActivityModel() {
- return new ConfigurationActivity();
- }
- /*
- *
- */
- public ConfiguredSiteModel createConfigurationSiteModel() {
- return new ConfiguredSite();
- }
- /*
- *
- */
- public ConfigurationPolicyModel createConfigurationPolicyModel() {
- return new ConfigurationPolicy();
- }
- /**
- *
- */
- public ConfiguredSiteModel createConfigurationSiteModel(SiteModel site, int policy) {
- //create config site
- ConfiguredSiteModel configSite = this.createConfigurationSiteModel();
- configSite.setSiteModel(site);
- ConfigurationPolicyModel policyModel = this.createConfigurationPolicyModel();
- policyModel.setPolicy(policy);
- configSite.setConfigurationPolicyModel(policyModel);
- ((ConfigurationPolicy) policyModel).setConfiguredSiteModel(configSite);
- return configSite;
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfigurationActivity.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfigurationActivity.java
deleted file mode 100644
index 414b2ae..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfigurationActivity.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package org.eclipse.update.internal.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-import java.io.PrintWriter;
-import org.eclipse.update.configuration.IActivity;
-import org.eclipse.update.configuration.IInstallConfiguration;
-import org.eclipse.update.internal.model.ConfigurationActivityModel;
-import org.eclipse.update.internal.model.InstallConfigurationParser;
-public class ConfigurationActivity
- extends ConfigurationActivityModel
- implements IActivity, IWritable {
-
- /**
- * Default constructor
- */
- public ConfigurationActivity() {
- }
-
- /**
- * Constructor with action
- */
- public ConfigurationActivity(int action) {
- super();
- setAction(action);
- setStatus(STATUS_NOK);
- }
-
- /*
- * @see IWritable#write(int, PrintWriter)
- */
- public void write(int indent, PrintWriter w) {
- String gap= ""; //$NON-NLS-1$
- for (int i= 0; i < indent; i++)
- gap += " "; //$NON-NLS-1$
- String increment= ""; //$NON-NLS-1$
- for (int i= 0; i < IWritable.INDENT; i++)
- increment += " "; //$NON-NLS-1$
-
- // ACTIVITY
- w.print(gap + "<" + InstallConfigurationParser.ACTIVITY + " ");
- //$NON-NLS-1$ //$NON-NLS-2$
- w.println("action=\"" + getAction() + "\" "); //$NON-NLS-1$ //$NON-NLS-2$
- if (getLabel() != null) {
- w.println(gap + increment+ "label=\"" + Writer.xmlSafe(getLabel()) + "\" ");
- //$NON-NLS-1$ //$NON-NLS-2$
- }
- w.println(gap + increment+"date=\"" + getDate().getTime() + "\" ");
- //$NON-NLS-1$ //$NON-NLS-2$
- w.println(gap + increment+"status=\"" + getStatus() + "\">"); //$NON-NLS-1$ //$NON-NLS-2$
-
- // end
- w.println(gap + "</" + InstallConfigurationParser.ACTIVITY + ">");
- //$NON-NLS-1$ //$NON-NLS-2$
- w.println(""); //$NON-NLS-1$
- }
-
- /*
- * @see IActivity#getInstallConfiguration()
- */
- public IInstallConfiguration getInstallConfiguration() {
- return (IInstallConfiguration) getInstallConfigurationModel();
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfigurationPolicy.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfigurationPolicy.java
deleted file mode 100644
index a203b21..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfigurationPolicy.java
+++ /dev/null
@@ -1,505 +0,0 @@
-package org.eclipse.update.internal.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-import java.io.File;
-import java.net.URL;
-import java.util.*;
-
-import org.eclipse.core.boot.IPlatformConfiguration;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.update.configuration.IActivity;
-import org.eclipse.update.configuration.IConfiguredSite;
-import org.eclipse.update.core.*;
-import org.eclipse.update.core.model.FeatureReferenceModel;
-import org.eclipse.update.internal.model.ConfigurationPolicyModel;
-
-/**
- *
- */
-public class ConfigurationPolicy extends ConfigurationPolicyModel {
-
- /**
- * Constructor for ConfigurationPolicyModel.
- */
- public ConfigurationPolicy() {
- }
-
- /**
- * Copy Constructor for ConfigurationPolicyModel.
- */
- public ConfigurationPolicy(ConfigurationPolicy configPolicy) {
- super();
- setPolicy(configPolicy.getPolicy());
- setConfiguredFeatureReferences(configPolicy.getConfiguredFeatures());
- setUnconfiguredFeatureReferences(configPolicy.getUnconfiguredFeatures());
- setConfiguredSiteModel(configPolicy.getConfiguredSiteModel());
- }
-
- /**
- * @since 2.0
- */
- private boolean isUnconfigured(IFeatureReference featureReference) {
-
- if (featureReference == null)
- return false;
-
- // returns true if the feature is part of the configured list
- IFeatureReference[] refs = getUnconfiguredFeatures();
- for (int i = 0; i < refs.length; i++) {
- if (featureReference.equals(refs[i])) {
- return true;
- }
- }
- return false;
- }
-
- /**
- * @since 2.0
- */
- public boolean isConfigured(IFeatureReference featureReference) {
-
- if (featureReference == null)
- return false;
-
- // returns true if the feature is part of the configured list
- IFeatureReference[] refs = getConfiguredFeatures();
- for (int i = 0; i < refs.length; i++) {
- if (featureReference.equals(refs[i])) {
- return true;
- }
- }
- return false;
- }
-
-
-
- /**
- * adds the feature to the list of features if the policy is USER_INCLUDE
- */
- public void configure(IFeatureReference featureReference, boolean callInstallHandler, boolean createActivity) throws CoreException {
-
- if (isConfigured(featureReference)) // already configured
- return;
-
- if (featureReference == null) {
- UpdateManagerPlugin.warn("The feature reference to configure is null");
- return;
- }
-
- IFeature feature = null;
- try {
- feature = featureReference.getFeature();
- } catch (CoreException e) {
- if (!UpdateManagerUtils.isOptional(featureReference)){
- URL url = featureReference.getURL();
- String urlString = (url != null) ? url.toExternalForm() : "<no feature reference url>";
- UpdateManagerPlugin.warn("Error retrieving feature:" + urlString, e);
- return;
- }
- }
- if (feature == null) {
- URL url = featureReference.getURL();
- String urlString = (url != null) ? url.toExternalForm() : "<no feature reference url>";
- UpdateManagerPlugin.warn("The feature to unconfigure is null: feature reference is:" + urlString);
- }
-
- // Setup optional install handler
- InstallHandlerProxy handler = null;
- if (callInstallHandler && feature.getInstallHandlerEntry() != null)
- handler = new InstallHandlerProxy(IInstallHandler.HANDLER_ACTION_CONFIGURE, feature, feature.getInstallHandlerEntry(), null);
- boolean success = false;
- Throwable originalException = null;
-
- // do the configure action
- try {
- if (handler != null)
- handler.configureInitiated();
-
- ConfigurationActivity activity = null;
- if (createActivity) {
- activity = new ConfigurationActivity(IActivity.ACTION_CONFIGURE);
- activity.setLabel(feature.getVersionedIdentifier().toString());
- activity.setDate(new Date());
- }
-
- addConfiguredFeatureReference((FeatureReferenceModel) featureReference);
-
- // everything done ok
- if (activity != null) {
- InstallConfiguration installConfig = (InstallConfiguration) SiteManager.getLocalSite().getCurrentConfiguration();
- activity.setStatus(IActivity.STATUS_OK);
- installConfig.addActivity(activity);
- }
-
- if (handler != null)
- handler.completeConfigure();
-
- success = true;
- } catch (Throwable t) {
- originalException = t;
- } finally {
- Throwable newException = null;
- try {
- if (handler != null)
- handler.configureCompleted(success);
- } catch (Throwable t) {
- newException = t;
- }
- if (originalException != null) // original exception wins
- throw Utilities.newCoreException(Policy.bind("InstallHandler.error", feature.getLabel()), originalException);
- if (newException != null)
- throw Utilities.newCoreException(Policy.bind("InstallHandler.error", feature.getLabel()), newException);
- }
- }
-
- /**
- * check if the plugins to unconfigure are required by other configured feature and
- * adds the feature to the list of unconfigured features
- */
- public boolean unconfigure(IFeatureReference featureReference, boolean callInstallHandler, boolean createActivity) throws CoreException {
-
- if (isUnconfigured(featureReference)){
- UpdateManagerPlugin.warn("Feature already unconfigured");
- return true;
- }
-
- if (featureReference == null) {
- UpdateManagerPlugin.warn("The feature reference to unconfigure is null");
- return false;
- }
-
- IFeature feature = null;
- try {
- feature = featureReference.getFeature();
- } catch (CoreException e) {
- if (!UpdateManagerUtils.isOptional(featureReference)){
- URL url = featureReference.getURL();
- String urlString = (url != null) ? url.toExternalForm() : "<no feature reference url>";
- UpdateManagerPlugin.warn("Error retrieving feature:" + urlString, e);
- return false;
- }
- }
-
- if (feature == null) {
- URL url = featureReference.getURL();
- String urlString = (url != null) ? url.toExternalForm() : "<no feature reference url>";
- UpdateManagerPlugin.warn("The feature to unconfigure is null: feature reference is:" + urlString);
- return false;
- }
-
- // Setup optional install handler
- InstallHandlerProxy handler = null;
- if (callInstallHandler && feature.getInstallHandlerEntry() != null) {
- handler = new InstallHandlerProxy(IInstallHandler.HANDLER_ACTION_UNCONFIGURE, feature, feature.getInstallHandlerEntry(), null);
- }
-
- boolean success = false;
- Throwable originalException = null;
-
- // do the unconfigure action
- try {
-
- ConfigurationActivity activity = null;
- if (createActivity) {
- activity = new ConfigurationActivity(IActivity.ACTION_UNCONFIGURE);
- activity.setLabel(feature.getVersionedIdentifier().toString());
- activity.setDate(new Date());
- }
-
- InstallConfiguration installConfig = null;
-
- // only ask for install config is activity created.
- // prevents loops during reconciliation
- if (activity != null)
- installConfig = ((InstallConfiguration) SiteManager.getLocalSite().getCurrentConfiguration());
-
- // Allow unconfigure if the feature is optional from all the parents
- // or if the feature is mandatory and non of its parent are configured
- // removed, not a core issue (so deep down)
- //if (validateNoConfiguredParents(feature)) {
- if (handler != null)
- handler.unconfigureInitiated();
- addUnconfiguredFeatureReference((FeatureReferenceModel) featureReference);
- if (handler != null)
- handler.completeUnconfigure();
-
- // everything done ok
- if (activity != null) {
- activity.setStatus(IActivity.STATUS_OK);
- installConfig.addActivity(activity);
- }
- success = true;
- //} else {
- // if (activity != null) {
- // activity.setStatus(IActivity.STATUS_NOK);
- // installConfig.addActivityModel((ConfigurationActivityModel) activity);
- // }
- //}
- } catch (Throwable t) {
- originalException = t;
- } finally {
- Throwable newException = null;
- try {
- if (handler != null)
- handler.unconfigureCompleted(success);
- } catch (Throwable t) {
- newException = t;
- }
- if (originalException != null) // original exception wins
- throw Utilities.newCoreException(Policy.bind("InstallHandler.error", feature.getLabel()), originalException);
- if (newException != null)
- throw Utilities.newCoreException(Policy.bind("InstallHandler.error", feature.getLabel()), newException);
- }
-
- if (!success) {
- URL url = featureReference.getURL();
- String urlString = (url != null) ? url.toExternalForm() : "<no feature reference url>";
- UpdateManagerPlugin.warn("Unable to unconfigure:" + urlString);
- }
- return success;
- }
-
- /**
- * Calculates the plugin list for the policy.
- * For "INCLUDE" policy, this corresponds to the plugins for
- * configured features. For "EXCLUDE" policy, this corresponds to the
- * plugins for unconfigured features that are not referenced
- * by any configured features.
- */
- public String[] getPluginPath(ISite site, String[] pluginRead) throws CoreException {
-
- String[] result;
- String[] pluginsToWrite;
- if (getPolicy() == IPlatformConfiguration.ISitePolicy.USER_EXCLUDE) {
- // EXCLUDE: return unconfigured plugins MINUS any plugins that
- // are configured
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_CONFIGURATION)
- UpdateManagerPlugin.warn("UNCONFIGURED PLUGINS");
- String[] unconfigured = getPluginString(site, getUnconfiguredFeatures());
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_CONFIGURATION)
- UpdateManagerPlugin.warn("CONFIGURED PLUGINS");
- String[] configured = getPluginString(site, getConfiguredFeatures());
- pluginsToWrite = delta(configured, unconfigured);
- } else {
- // INCLUDE: return configured plugins
- pluginsToWrite = getPluginString(site, getConfiguredFeatures());
- }
-
- //TRACE
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_RECONCILER) {
- UpdateManagerPlugin.debug("GetPluginPath for: " + ((site == null) ? "<No site>" : site.getURL().toString()));
- for (int i = 0; i < pluginsToWrite.length; i++) {
- UpdateManagerPlugin.debug("To write:" + pluginsToWrite[i]);
- }
- }
-
- // Calculate which plugins we read should still be written out
- // (pluginNotToWrite-pluginRead = delta that should be written out)
- // pluginsToWrite+delta = all that should be written out
- /*IFeatureReference[] arrayOfFeatureRef = null;
- if (getPolicy() == IPlatformConfiguration.ISitePolicy.USER_EXCLUDE) {
- if (getConfiguredFeatures() != null)
- arrayOfFeatureRef = getConfiguredFeatures();
- } else {
- if (getUnconfiguredFeatures() != null)
- arrayOfFeatureRef = getUnconfiguredFeatures();
- }
- String[] pluginsNotToWrite = getPluginString(site, arrayOfFeatureRef);
- //TRACE
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_RECONCILER){
- for (int i = 0; i < pluginsNotToWrite.length; i++) {
- UpdateManagerPlugin.debug("Not to write:"+pluginsNotToWrite[i]);
- }
- }
-
- String[] included = delta(pluginsNotToWrite, pluginRead);
- //TRACE
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_RECONCILER){
- if (included!=null)
- for (int i = 0; i < included.length; i++) {
- UpdateManagerPlugin.debug("Delta with read:"+included[i]);
- }
- }
- result = union(included, pluginsToWrite);*/
-
- result = pluginsToWrite;
-
- return result;
- }
-
- /**
- * @since 2.0
- */
- public IFeatureReference[] getConfiguredFeatures() {
- FeatureReferenceModel[] result = getConfiguredFeaturesModel();
- if (result.length == 0)
- return new IFeatureReference[0];
- else
- return (IFeatureReference[]) result;
- }
-
- /**
- * @since 2.0
- */
- public IFeatureReference[] getUnconfiguredFeatures() {
- FeatureReferenceModel[] result = getUnconfiguredFeaturesModel();
- if (result.length == 0)
- return new IFeatureReference[0];
- else
- return (IFeatureReference[]) result;
- }
-
- /**
- * Gets the configuredSite.
- * @return Returns a IConfiguredSite
- */
- public IConfiguredSite getConfiguredSite() {
- return (IConfiguredSite)getConfiguredSiteModel();
- }
-
- /**
- * removes a feature reference
- */
- public void removeFeatureReference(IFeatureReference featureRef) {
- if (featureRef instanceof FeatureReferenceModel) {
- removeFeatureReference((FeatureReferenceModel) featureRef);
- }
- }
-
- /**
- * return an array of plugin path for the array of feature reference
- * Each plugin path only appears once [bug 21750]
- */
- private String[] getPluginString(ISite site, IFeatureReference[] arrayOfFeatureRef) throws CoreException {
-
- String[] result = new String[0];
-
- // obtain path for each feature
- if (arrayOfFeatureRef != null) {
- //[bug 21750] replace the List by a Set
- Set pluginsString = new HashSet();
- for (int i = 0; i < arrayOfFeatureRef.length; i++) {
- IFeatureReference element = arrayOfFeatureRef[i];
- IFeature feature = null;
- try {
- feature = element.getFeature();
- } catch (CoreException e) {
- UpdateManagerPlugin.warn(null, e);
- };
- IPluginEntry[] entries = null;
- if (feature == null) {
- UpdateManagerPlugin.warn("Null Feature", new Exception());
- entries = new IPluginEntry[0];
- } else {
- entries = feature.getPluginEntries();
- }
-
- for (int index = 0; index < entries.length; index++) {
- IPluginEntry entry = entries[index];
-
- // obtain the path of the plugin directories on the site
- ContentReference[] featureContentReference = null;
- try {
- featureContentReference = feature.getFeatureContentProvider().getPluginEntryArchiveReferences(entry, null /*IProgressMonitor*/
- );
- } catch (CoreException e) {
- UpdateManagerPlugin.warn(null, e);
- }
-
- // transform into a valid String
- if (featureContentReference != null) {
- for (int j = 0; j < featureContentReference.length; j++) {
- URL url = site.getSiteContentProvider().getArchiveReference(featureContentReference[j].getIdentifier());
- if (url != null) {
- // make it relative to teh site
- String path = UpdateManagerUtils.getURLAsString(site.getURL(), url);
- // add end "/"
- path += (path.endsWith(File.separator) || path.endsWith("/")) ? "" : "/";
- //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- // add plugin.xml or fragment.xml
- path += entry.isFragment() ? "fragment.xml" : "plugin.xml";
- //$NON-NLS-1$ //$NON-NLS-2$
- pluginsString.add(path);
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_CONFIGURATION)
- UpdateManagerPlugin.warn("Add plugin: "+path+" to the list");
- }
- }
- }
- }
- }
-
- // transform in String[]
- if (!pluginsString.isEmpty()) {
- result = new String[pluginsString.size()];
- pluginsString.toArray(result);
- }
- }
- return result;
- }
-
- /**
- * we need to figure out which plugin SHOULD NOT be written and
- * remove them from include
- * we can compare the String of the URL
- */
- private String[] delta(String[] pluginsToRemove, String[] allPlugins) {
- // No plugins to remove, return allPlugins
- if (pluginsToRemove == null || pluginsToRemove.length == 0) {
- return allPlugins;
- }
-
- // We didn't read any plugins in platform.cfg
- if (allPlugins == null || allPlugins.length == 0) {
- return new String[0];
- }
-
- // if a String from pluginsToRemove IS in
- // allPlugins, remove it from allPlugins
- List list1 = new ArrayList();
- list1.addAll(Arrays.asList(allPlugins));
- for (int i = 0; i < pluginsToRemove.length; i++) {
- if (list1.contains(pluginsToRemove[i])){
- list1.remove(pluginsToRemove[i]);
- }
- }
-
- String[] resultEntry = new String[list1.size()];
- if (list1.size() > 0)
- list1.toArray(resultEntry);
-
- return resultEntry;
- }
-
- /**
- * Returns and array with the union of plugins
- */
- private String[] union(String[] targetArray, String[] sourceArray) {
-
- // No string
- if (sourceArray == null || sourceArray.length == 0) {
- return targetArray;
- }
-
- // No string
- if (targetArray == null || targetArray.length == 0) {
- return sourceArray;
- }
-
- // if a String from sourceArray is NOT in
- // targetArray, add it to targetArray
- List list1 = new ArrayList();
- list1.addAll(Arrays.asList(targetArray));
- for (int i = 0; i < sourceArray.length; i++) {
- if (!list1.contains(sourceArray[i]))
- list1.add(sourceArray[i]);
- }
-
- String[] resultEntry = new String[list1.size()];
- if (list1.size() > 0)
- list1.toArray(resultEntry);
-
- return resultEntry;
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfiguredSite.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfiguredSite.java
deleted file mode 100644
index 84469a0..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfiguredSite.java
+++ /dev/null
@@ -1,1138 +0,0 @@
-package org.eclipse.update.internal.core;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import java.io.*;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.*;
-
-import org.eclipse.core.boot.BootLoader;
-import org.eclipse.core.boot.IPlatformConfiguration;
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.core.model.InstallAbortedException;
-import org.eclipse.update.internal.model.ConfiguredSiteModel;
-import org.eclipse.update.internal.model.InstallConfigurationParser;
-
-/**
- * A Configured site manages the Configured and unconfigured features of a Site
- */
-public class ConfiguredSite extends ConfiguredSiteModel implements IConfiguredSite, IWritable {
-
- private static final String PRODUCT_SITE_MARKER = ".eclipseproduct";
- private static final String EXTENSION_SITE_MARKER = ".eclipseextension";
- private static final String PRIVATE_SITE_MARKER = ".eclipseUM";
-
- // listeners
- private ListenersList listeners = new ListenersList();
-
- // verification status
- private IStatus verifyStatus;
-
- /*
- * Default Constructor
- */
- public ConfiguredSite() {
- }
-
- /*
- * Copy Constructor
- * As of now, configSite can only be of type ConfiguredSite
- */
- public ConfiguredSite(IConfiguredSite configSite) {
- ConfiguredSite cSite = (ConfiguredSite) configSite;
- setSiteModel(cSite.getSiteModel());
- setConfigurationPolicyModel(new ConfigurationPolicy(cSite.getConfigurationPolicy()));
- isUpdatable(cSite.isUpdatable());
- setPreviousPluginPath(cSite.getPreviousPluginPath());
- setPlatformURLString(cSite.getPlatformURLString());
- }
-
- /*
- * Adds a listener
- */
- public void addConfiguredSiteChangedListener(IConfiguredSiteChangedListener listener) {
- synchronized (listeners) {
- listeners.add(listener);
- }
- }
-
- /*
- * Removes a listener
- */
- public void removeConfiguredSiteChangedListener(IConfiguredSiteChangedListener listener) {
- synchronized (listeners) {
- listeners.remove(listener);
- }
- }
-
- /*
- * @see IWritable#write(int, PrintWriter)
- */
- public void write(int indent, PrintWriter w) {
- String gap = ""; //$NON-NLS-1$
- for (int i = 0; i < indent; i++)
- gap += " "; //$NON-NLS-1$
- String increment = ""; //$NON-NLS-1$
- for (int i = 0; i < IWritable.INDENT; i++)
- increment += " "; //$NON-NLS-1$
-
- // CONFIGURATION SITE
- w.print(gap + "<" + InstallConfigurationParser.CONFIGURATION_SITE + " ");
- //$NON-NLS-1$ //$NON-NLS-2$
- w.println("url=\"" + getSite().getURL().toExternalForm() + "\"");
- //$NON-NLS-1$ //$NON-NLS-2$
- w.println(gap + increment + "platformURL=\"" + getPlatformURLString() + "\"");
- //$NON-NLS-1$ //$NON-NLS-2$
- w.println(gap + increment + "policy=\"" + getConfigurationPolicy().getPolicy() + "\" >");
- //$NON-NLS-1$ //$NON-NLS-2$
-
- // configured features ref
- IFeatureReference[] featuresReferences = getConfiguredFeatures();
- if (featuresReferences != null) {
- for (int index = 0; index < featuresReferences.length; index++) {
- IFeatureReference element = featuresReferences[index];
- w.print(gap + increment + "<" + InstallConfigurationParser.FEATURE + " ");
- //$NON-NLS-1$ //$NON-NLS-2$
- // configured = true
- w.print("configured = \"true\" "); //$NON-NLS-1$
- // feature URL
- String URLInfoString = null;
- if (element.getURL() != null) {
- ISite featureSite = element.getSite();
- URLInfoString = UpdateManagerUtils.getURLAsString(featureSite.getURL(), element.getURL());
- w.print("url=\"" + Writer.xmlSafe(URLInfoString) + "\" ");
- //$NON-NLS-1$ //$NON-NLS-2$
- }
- w.println("/>"); //$NON-NLS-1$
- }
- }
-
- // unconfigured features ref
- featuresReferences = getConfigurationPolicy().getUnconfiguredFeatures();
- if (featuresReferences != null) {
- for (int index = 0; index < featuresReferences.length; index++) {
- IFeatureReference element = featuresReferences[index];
- w.print(gap + increment + "<" + InstallConfigurationParser.FEATURE + " ");
- //$NON-NLS-1$ //$NON-NLS-2$
- // configured = true
- w.print("configured = \"false\" "); //$NON-NLS-1$
- // feature URL
- String URLInfoString = null;
- if (element.getURL() != null) {
- ISite featureSite = element.getSite();
- URLInfoString = UpdateManagerUtils.getURLAsString(featureSite.getURL(), element.getURL());
- w.print("url=\"" + Writer.xmlSafe(URLInfoString) + "\" ");
- //$NON-NLS-1$ //$NON-NLS-2$
- }
- w.println("/>"); //$NON-NLS-1$
- }
- }
-
- // end
- w.println(gap + "</" + InstallConfigurationParser.CONFIGURATION_SITE + ">");
- //$NON-NLS-1$ //$NON-NLS-2$
- w.println(""); //$NON-NLS-1$
- }
-
- /*
- * @see IConfiguredSite#install(IFeature,IVerificationListener, IProgressMonitor)
- */
- public IFeatureReference install(IFeature feature, IVerificationListener verificationListener, IProgressMonitor monitor) throws InstallAbortedException, CoreException {
- return install(feature,null,verificationListener,monitor);
- }
-
- /*
- * @see IConfiguredSite#install(IFeature, IFeatureReference, IVerificationListener, IProgressMonitor)
- */
- public IFeatureReference install(IFeature feature, IFeatureReference[] optionalFeatures, IVerificationListener verificationListener, IProgressMonitor monitor) throws InstallAbortedException, CoreException {
-
- // ConfigSite is read only
- if (!isUpdatable()) {
- String errorMessage = Policy.bind("ConfiguredSite.NonInstallableSite", getSite().getURL().toExternalForm());
- //$NON-NLS-1$
- throw Utilities.newCoreException(errorMessage, null);
- }
-
- // feature is null
- if (feature == null) {
- String errorMessage = Policy.bind("ConfiguredSite.NullFeatureToInstall");
- //$NON-NLS-1$
- throw Utilities.newCoreException(errorMessage, null);
- }
-
- // feature reference to return
- IFeatureReference installedFeatureRef;
- IFeature installedFeature = null;
-
- // create the Activity (INSTALL)
- ConfigurationActivity activity = new ConfigurationActivity(IActivity.ACTION_FEATURE_INSTALL);
- activity.setLabel(feature.getVersionedIdentifier().toString());
- activity.setDate(new Date());
-
- try {
- installedFeatureRef = getSite().install(feature, optionalFeatures, verificationListener, monitor);
-
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_INSTALL) {
- UpdateManagerPlugin.debug("Sucessfully installed: " + installedFeatureRef.getURL().toExternalForm());
- }
-
- if (installedFeatureRef != null) {
- try {
- installedFeature = installedFeatureRef.getFeature();
- } catch (CoreException e) {
- UpdateManagerPlugin.warn(null, e);
- }
- }
-
- // everything done ok
- activity.setStatus(IActivity.STATUS_OK);
-
- // notify listeners
- Object[] siteListeners = listeners.getListeners();
- for (int i = 0; i < siteListeners.length; i++) {
- if (installedFeature != null) {
- IConfiguredSiteChangedListener listener = ((IConfiguredSiteChangedListener) siteListeners[i]);
- listener.featureInstalled(installedFeature);
- }
- }
- } catch (CoreException e) {
- // not ok, set Activity status
- activity.setStatus(IActivity.STATUS_NOK);
- throw e;
- } finally {
- IInstallConfiguration current = SiteManager.getLocalSite().getCurrentConfiguration();
- ((InstallConfiguration) current).addActivity(activity);
- }
- // call the configure task
- if (installedFeature != null)
- configure(installedFeature, optionalFeatures, false);
- /*callInstallHandler*/
-
- return installedFeatureRef;
- }
-
- /*
- * @see IConfiguredSite#remove(IFeature, IProgressMonitor)
- */
- public void remove(IFeature feature, IProgressMonitor monitor) throws CoreException {
-
- // ConfigSite is read only
- if (!isUpdatable()) {
- String errorMessage = Policy.bind("ConfiguredSite.NonUninstallableSite", getSite().getURL().toExternalForm());
- //$NON-NLS-1$
- throw Utilities.newCoreException(errorMessage, null);
- }
-
- // create the Activity
- ConfigurationActivity activity = new ConfigurationActivity(IActivity.ACTION_FEATURE_REMOVE);
- activity.setLabel(feature.getVersionedIdentifier().toString());
- activity.setDate(new Date());
-
- try {
- IFeatureReference referenceToRemove = null;
- ISiteFeatureReference[] featureRef = getSite().getFeatureReferences();
- ISiteFeatureReference ref = getSite().getFeatureReference(feature);
- for (int i = 0; i < featureRef.length; i++) {
- if (featureRef[i].equals(ref)) {
- referenceToRemove = featureRef[i];
- break;
- }
- }
-
- // we found a feature reference on the site matching the feature
- if (referenceToRemove != null) {
- // Check if feature is unconfigured before we remove it
- // our UI will check.
- // For non-UI application, throw error is feature is configured
- if (getConfigurationPolicy().isConfigured(referenceToRemove)) {
- IFeature featureToRemove = ((IFeatureReference) referenceToRemove).getFeature();
- String featureLabel = (featureToRemove == null) ? null : featureToRemove.getLabel();
- throw Utilities.newCoreException(Policy.bind("ConfiguredSite.UnableToRemoveConfiguredFeature"
- //$NON-NLS-1$
- , featureLabel), null);
- }
- } else {
- throw Utilities.newCoreException(Policy.bind("ConfiguredSite.UnableToFindFeature", feature.getURL().toString()),
- //$NON-NLS-1$
- null);
- }
-
- // remove the feature
- getSite().remove(feature, monitor);
- getConfigurationPolicy().removeFeatureReference(referenceToRemove);
- // everything done ok
- activity.setStatus(IActivity.STATUS_OK);
- // notify listeners
- Object[] siteListeners = listeners.getListeners();
- for (int i = 0; i < siteListeners.length; i++) {
- ((IConfiguredSiteChangedListener) siteListeners[i]).featureRemoved(feature);
- }
- } catch (CoreException e) {
- activity.setStatus(IActivity.STATUS_NOK);
- throw e;
- } finally {
- IInstallConfiguration current = SiteManager.getLocalSite().getCurrentConfiguration();
- ((InstallConfiguration) current).addActivity(activity);
- }
- }
-
- /*
- * @see IConfiguredSite#configure(IFeature)
- */
- public void configure(IFeature feature) throws CoreException {
- configure(feature, null, true /*callInstallHandler*/
- );
- }
-
- /*
- *
- */
- private void configure(IFeature feature, IFeatureReference[] optionalFeatures, boolean callInstallHandler) throws CoreException {
-
- if (feature == null) {
- UpdateManagerPlugin.warn("Attempting to configure a null feature in site:" + getSite().getURL().toExternalForm());
- return;
- }
-
- ConfigurationPolicy configPolicy = getConfigurationPolicy();
- if (configPolicy == null)
- return;
-
- // bottom up approach, same configuredSite
- IIncludedFeatureReference[] childrenRef = feature.getIncludedFeatureReferences();
- if (optionalFeatures!=null){
- childrenRef = childrenToConfigure(childrenRef, optionalFeatures);
- }
-
- for (int i = 0; i < childrenRef.length; i++) {
- try {
- IFeature child = childrenRef[i].getFeature();
- configure(child, optionalFeatures, callInstallHandler);
- } catch (CoreException e) {
- // will skip any bad children
- if (!childrenRef[i].isOptional())
- UpdateManagerPlugin.warn("Unable to configure child feature: " + childrenRef[i] + " " + e);
- }
- }
-
- // configure root feature
- IFeatureReference featureReference = getSite().getFeatureReference(feature);
- configPolicy.configure(featureReference, callInstallHandler, true);
-
- // notify listeners
- Object[] siteListeners = listeners.getListeners();
- for (int i = 0; i < siteListeners.length; i++) {
- ((IConfiguredSiteChangedListener) siteListeners[i]).featureConfigured(feature);
- }
- }
-
- /*
- * Return the optional children to configure
- *
- * @param children all the nested features
- * @param optionalfeatures optional features to install
- * @return IFeatureReference[]
- */
- private IIncludedFeatureReference[] childrenToConfigure(IIncludedFeatureReference[] children, IFeatureReference[] optionalfeatures) {
-
- List childrenToInstall = new ArrayList();
- for (int i = 0; i < children.length; i++) {
- IIncludedFeatureReference optionalFeatureToConfigure = children[i];
- if (!optionalFeatureToConfigure.isOptional()){
- childrenToInstall.add(optionalFeatureToConfigure);
- } else {
- for (int j = 0; j < optionalfeatures.length; j++) {
- // must compare feature as optionalFeatures are from the install site
- // where children are on the local site
- try {
- IFeature installedChildren = optionalfeatures[j].getFeature();
- if (installedChildren.equals(optionalFeatureToConfigure.getFeature(true,null))){
- childrenToInstall.add(optionalFeatureToConfigure);
- break;
- }
- } catch (CoreException e){
- UpdateManagerPlugin.warn("",e);
- }
- }
- }
- }
-
- IIncludedFeatureReference[] result = new IIncludedFeatureReference[childrenToInstall.size()];
- if (childrenToInstall.size()>0){
- childrenToInstall.toArray(result);
- }
-
- return result;
- }
-
- /*
- * @see IConfiguredSite#unconfigure(IFeature)
- */
- public boolean unconfigure(IFeature feature) throws CoreException {
- // the first call sould disable without checking for enable parent
- return unconfigure(feature, true, false);
- }
-
- private boolean unconfigure(IFeature feature, boolean includePatches, boolean verifyEnableParent) throws CoreException {
- IFeatureReference featureReference = getSite().getFeatureReference(feature);
-
- if (featureReference == null) {
- UpdateManagerPlugin.warn("Unable to retrieve Feature Reference for feature" + feature);
- return false;
- }
-
- ConfigurationPolicy configPolicy = getConfigurationPolicy();
- if (configPolicy == null)
- return false;
-
- // verify no enable parent
- if (verifyEnableParent && !validateNoConfiguredParents(feature)){
- UpdateManagerPlugin.warn("The feature "+feature.getVersionedIdentifier()+" to disable is needed by another enable feature");
- return false;
- }
-
- boolean sucessfullyUnconfigured = false;
- try {
- sucessfullyUnconfigured = configPolicy.unconfigure(featureReference, true, true);
- } catch (CoreException e) {
- URL url = featureReference.getURL();
- String urlString = (url != null) ? url.toExternalForm() : "<no feature reference url>";
- UpdateManagerPlugin.warn("Unable to unconfigure" + urlString, e);
- throw e;
- }
- if (sucessfullyUnconfigured) {
- // 2.0.2: unconfigure patches that reference this feature.
- // A patch is a feature that contains an import
- // statement with patch="true" and an id/version
- // that matches an already installed and configured
- // feature. When patched feature is unconfigured,
- // all the patches that reference it must be
- // unconfigured as well
- // (in contrast, patched features can be
- // configured without the patches).
- if (includePatches) unconfigurePatches(feature);
-
- // top down approach, same configuredSite
- IIncludedFeatureReference[] childrenRef = feature.getIncludedFeatureReferences();
- for (int i = 0; i < childrenRef.length; i++) {
- try {
- IFeature child = childrenRef[i].getFeature(true,null); // disable the exact feature
- unconfigure(child, includePatches,true);
- } catch (CoreException e) {
- // skip any bad children
- UpdateManagerPlugin.warn("Unable to unconfigure child feature: " + childrenRef[i] + " " + e);
- }
- }
-
- // notify listeners
- Object[] siteListeners = listeners.getListeners();
- for (int i = 0; i < siteListeners.length; i++) {
- IConfiguredSiteChangedListener listener = ((IConfiguredSiteChangedListener) siteListeners[i]);
- listener.featureUnconfigured(feature);
- }
-
- return true;
- } else {
- URL url = featureReference.getURL();
- String urlString = (url != null) ? url.toExternalForm() : "<no feature reference url>";
- UpdateManagerPlugin.warn("Unable to unconfigure:" + urlString);
- return false;
- }
- }
-
- /*
- * Look for features that have an import reference
- * that points to this feature and where patch=true.
- * Unconfigure all the matching patches, but
- * do not do the same lookup for them
- * because patches cannot have patches themselves.
- */
-
- private void unconfigurePatches(IFeature feature) {
- IFeatureReference [] frefs = getConfiguredFeatures();
- for (int i=0; i<frefs.length; i++) {
- IFeatureReference fref = frefs[i];
- try {
- IFeature candidate = fref.getFeature();
- if (candidate.equals(feature)) continue;
-
- IImport [] imports = candidate.getImports();
- for (int j=0; j<imports.length; j++) {
- IImport iimport = imports[j];
- if (iimport.isPatch()) {
- if (iimport.getVersionedIdentifier().equals(feature.getVersionedIdentifier())) {
- // bingo - unconfigure this patch
- unconfigure(candidate, false,false);
- break;
- }
- }
- }
- }
- catch (CoreException e) {
- UpdateManagerPlugin.warn("",e);
- }
- }
- }
-
- /*
- * @see IConfiguredSite#getConfiguredFeatures()
- */
- public IFeatureReference[] getConfiguredFeatures() {
- ConfigurationPolicy configPolicy = getConfigurationPolicy();
- if (configPolicy == null)
- return new ISiteFeatureReference[0];
-
- return configPolicy.getConfiguredFeatures();
- }
-
- /*
- * adds configured and unconfigured feature references
- */
- public IFeatureReference[] getFeatureReferences() {
-
- ConfigurationPolicy configPolicy = getConfigurationPolicy();
- if (configPolicy == null)
- return new ISiteFeatureReference[0];
-
- IFeatureReference[] configuredFeatures = getConfiguredFeatures();
- int confLen = configuredFeatures.length;
- IFeatureReference[] unconfiguredFeatures = configPolicy.getUnconfiguredFeatures();
- int unconfLen = unconfiguredFeatures.length;
-
- IFeatureReference[] result = new IFeatureReference[confLen + unconfLen];
- if (confLen > 0) {
- System.arraycopy(configuredFeatures, 0, result, 0, confLen);
- }
- if (unconfLen > 0) {
- System.arraycopy(unconfiguredFeatures, 0, result, confLen, unconfLen);
- }
-
- return result;
- }
-
- /*
- * Configure and unconfigure appropriate feature to
- * become 'like' currentConfiguration which is the configuration
- * the user wants to revert to.
- *
- * All features from currentConfiguration should be configured
- */
- public void revertTo(IConfiguredSite oldConfiguration, IProgressMonitor monitor, IProblemHandler handler) throws CoreException, InterruptedException {
-
- ConfiguredSite oldConfiguredSite = (ConfiguredSite) oldConfiguration;
-
- // retrieve the feature that were configured
- IFeatureReference[] configuredFeatures = oldConfiguredSite.validConfiguredFeatures(handler);
-
- for (int i = 0; i < configuredFeatures.length; i++) {
- getConfigurationPolicy().configure(configuredFeatures[i], true, true);
- }
-
- // calculate all the features we have to unconfigure from the current state to this state
- // in the history.
- List featureToUnconfigure = oldConfiguredSite.calculateUnconfiguredFeatures(configuredFeatures);
-
- // for each unconfigured feature check if it still exists
- // if so add as unconfigured
- Iterator iter = featureToUnconfigure.iterator();
- while (iter.hasNext()) {
- IFeatureReference element = (IFeatureReference) iter.next();
- try {
- // do not log activity
- getConfigurationPolicy().unconfigure(element, true, true);
- } catch (CoreException e) {
- // log no feature to unconfigure
- String url = element.getURL().toString();
- ISite site = element.getSite();
- String siteString = (site != null) ? site.getURL().toExternalForm() : Policy.bind("ConfiguredSite.NoSite"); //$NON-NLS-1$
- UpdateManagerPlugin.warn(Policy.bind("ConfiguredSite.CannotFindFeatureToUnconfigure", url, siteString), e); //$NON-NLS-1$
- }
- }
- //} // end USER_EXCLUDE
- }
-
- /*
- * We have to keep our configured feature
- * check if they are all valid
- * Return the valid configured features
- */
- private IFeatureReference[] validConfiguredFeatures(IProblemHandler handler) throws InterruptedException {
-
- IFeatureReference[] configuredFeatures = getConfiguredFeatures();
- if (configuredFeatures != null) {
- for (int i = 0; i < configuredFeatures.length; i++) {
- IFeature feature = null;
-
- // attempt to access the feature
- try {
- feature = configuredFeatures[i].getFeature();
- } catch (CoreException e) {
- // notify we cannot find the feature
- UpdateManagerPlugin.warn(null, e);
- String featureString = configuredFeatures[i].getURL().toExternalForm();
- if (!handler.reportProblem(Policy.bind("ConfiguredSite.CannotFindFeatureToConfigure", featureString))) { //$NON-NLS-1$
- throw new InterruptedException();
- }
- }
-
- // verify all the plugins still exist
- if (feature != null) {
- // get plugin identifier
- List sitePluginIdentifiers = new ArrayList();
- ISite site = feature.getSite();
- IPluginEntry[] sitePluginEntries = null;
-
- if (site != null) {
- sitePluginEntries = site.getPluginEntries();
- for (int index = 0; index < sitePluginEntries.length; index++) {
- IPluginEntry entry = sitePluginEntries[index];
- sitePluginIdentifiers.add(entry.getVersionedIdentifier());
- }
- }
-
- if (sitePluginEntries.length > 0) {
- IPluginEntry[] featurePluginEntries = feature.getPluginEntries();
- for (int index = 0; index < featurePluginEntries.length; index++) {
- IPluginEntry currentFeaturePluginEntry = featurePluginEntries[index];
- if (!contains(currentFeaturePluginEntry.getVersionedIdentifier(), sitePluginIdentifiers)) {
- // the plugin defined by the feature
- // doesn't seem to exist on the site
- String msg = "Error verifying existence of plugin:" + currentFeaturePluginEntry.getVersionedIdentifier().toString();
- //$NON-NLS-1$
- UpdateManagerPlugin.log(msg, new Exception());
-
- String siteString = (site != null) ? site.getURL().toExternalForm() : Policy.bind("ConfiguredSite.NoSite");
- //$NON-NLS-1$
- String errorLabel = Policy.bind("ConfiguredSite.CannotFindPluginEntry", currentFeaturePluginEntry.getVersionedIdentifier().toString(), siteString);
- //$NON-NLS-1$ //$NON-NLS-2$
- if (handler == null) {
- throw new InterruptedException(errorLabel);
- }
- if (!handler.reportProblem(Policy.bind(errorLabel))) {
- //$NON-NLS-1$ //$NON-NLS-2$
- throw new InterruptedException();
- }
- } // end if not found in site
- } // end for
- }
- }
- } // end for configured feature
- }
- return configuredFeatures;
- }
-
- /*
- * We are in the process of calculating the delta between what was configured in the current
- * configuration that is not configured now
- *
- * we have to figure out what feature have been unconfigured for the whole
- * history between current and us...
- *
- * is it as simple as get all configured, and unconfigured,
- * the do the delta with what should be configured
- *
- */
- private List calculateUnconfiguredFeatures(IFeatureReference[] configuredFeatures) throws CoreException {
-
- Set featureToUnconfigureSet = new HashSet();
-
- // loop for all history
- // try to see if the configured site existed
- // if it does, get the unconfigured features
- // and the configured one
- IInstallConfiguration[] history = SiteManager.getLocalSite().getConfigurationHistory();
-
- for (int i = 0; i < history.length; i++) {
- IInstallConfiguration element = history[i];
- IConfiguredSite[] configSites = element.getConfiguredSites();
- for (int j = 0; j < configSites.length; j++) {
- ConfiguredSite configSite = (ConfiguredSite) configSites[j];
- if (configSite.getSite().equals(getSite())) {
- featureToUnconfigureSet.addAll(Arrays.asList(configSite.getConfigurationPolicy().getUnconfiguredFeatures()));
- featureToUnconfigureSet.addAll(Arrays.asList(configSite.getConfigurationPolicy().getConfiguredFeatures()));
- }
- }
- }
-
- // remove the unconfigured feature we found that are now to be configured
- // (they may have been unconfigured in the past, but the revert makes them configured)
- List featureToUnconfigureList = remove(configuredFeatures, featureToUnconfigureSet);
-
- return featureToUnconfigureList;
- }
-
- /*
- * Utilities: Remove an array of feature references
- * from a list
- */
- private List remove(IFeatureReference[] featureRefs, Set set) {
- List result = new ArrayList();
-
- if (set == null)
- return result;
-
- // if an element of the list is NOT found in the array,
- // add it to the result list
- Iterator iter = set.iterator();
- while (iter.hasNext()) {
- IFeatureReference element = (IFeatureReference) iter.next();
- boolean found = false;
- for (int i = 0; i < featureRefs.length; i++) {
- if (element.equals(featureRefs[i])) {
- found = true;
- }
- }
-
- if (!found)
- result.add(element);
- }
- return result;
- }
-
- /*
- * I have issues when running list.contain(versionedIdentifier)
- * The code runs the Object.equals instead of the VersionedIdentifier.equals
- */
- private boolean contains(VersionedIdentifier id, List list) {
- boolean found = false;
- if (list != null && !list.isEmpty()) {
- Iterator iter = list.iterator();
- while (iter.hasNext() && !found) {
- VersionedIdentifier element = (VersionedIdentifier) iter.next();
- if (element.equals(id)) {
- found = true;
- }
- }
- }
- return found;
- }
-
-
- /*
- *
- */
- public ConfigurationPolicy getConfigurationPolicy() {
- return (ConfigurationPolicy) getConfigurationPolicyModel();
- }
-
- /*
- *
- */
- public ISite getSite() {
- return (ISite) getSiteModel();
- }
-
- /*
- *
- */
- public IInstallConfiguration getInstallConfiguration() {
- return (IInstallConfiguration) getInstallConfigurationModel();
- }
-
- /*
- *
- */
- public IStatus getBrokenStatus(IFeature feature) {
-
- IStatus featureStatus = createStatus(IStatus.OK, IFeature.STATUS_HAPPY, "", null);
-
- // check the Plugins of all the features
- // every plugin of the feature must be on the site
- IPluginEntry[] siteEntries = getSite().getPluginEntries();
- IPluginEntry[] featuresEntries = feature.getPluginEntries();
- IPluginEntry[] result = UpdateManagerUtils.diff(featuresEntries, siteEntries);
- if (result != null && (result.length != 0)) {
- String msg = Policy.bind("SiteLocal.FeatureUnHappy");
- MultiStatus multi = new MultiStatus(featureStatus.getPlugin(), IFeature.STATUS_UNHAPPY, msg, null);
-
- for (int k = 0; k < result.length; k++) {
- VersionedIdentifier id = result[k].getVersionedIdentifier();
- Object[] values = new String[] { "", "" };
- if (id != null) {
- values = new Object[] { id.getIdentifier(), id.getVersion()};
- }
- String msg1 = Policy.bind("ConfiguredSite.MissingPluginsBrokenFeature", values);
- //$NON-NLS-1$
- UpdateManagerPlugin.warn(msg1);
- IStatus status = createStatus(IStatus.ERROR, IFeature.STATUS_UNHAPPY, msg1, null);
- multi.add(status);
- }
- return multi;
- }
-
- String msg = Policy.bind("SiteLocal.FeatureHappy");
- return createStatus(IStatus.OK, IFeature.STATUS_HAPPY, msg, null);
- }
-
- /*
- *
- */
- public boolean isConfigured(IFeature feature) {
- if (getConfigurationPolicy() == null)
- return false;
- IFeatureReference featureReference = getSite().getFeatureReference(feature);
- if (featureReference == null)
- return false;
- return getConfigurationPolicy().isConfigured(featureReference);
- }
-
- /**
- * @see Object#toString()
- */
- public String toString() {
- if (getSite() == null)
- return "No Site";
- if (getSite().getURL() == null)
- return "No URL";
- return getSite().getURL().toExternalForm();
- }
-
- /**
- * @see IConfiguredSite#verifyUpdatableStatus()
- */
- public IStatus verifyUpdatableStatus() {
-
- if (verifyStatus != null)
- return verifyStatus;
-
- URL siteURL = getSite().getURL();
- if (siteURL == null) {
- verifyStatus = createStatus(IStatus.ERROR, Policy.bind("ConfiguredSite.SiteURLNull"), null); //$NON-NLS-1$
- return verifyStatus;
- }
-
- if (!"file".equalsIgnoreCase(siteURL.getProtocol())) {
- verifyStatus = createStatus(IStatus.ERROR, Policy.bind("ConfiguredSite.NonLocalSite"), null); //$NON-NLS-1$
- return verifyStatus;
- }
-
- String siteLocation = siteURL.getFile();
- File file = new File(siteLocation);
-
- // get the product name of the private marker
- // if there is no private marker, check if the site is contained in another site
- // if there is a marker and this is a different product, return false
- // otherwise don't check if we are contained in another site
- String productName = getProductName(file);
- if (productName != null) {
- if (!productName.equals(getProductIdentifier("id", getProductFile()))) {
- verifyStatus = createStatus(IStatus.ERROR, Policy.bind("ConfiguredSite.NotSameProductId", productName), null); //$NON-NLS-1$
- return verifyStatus;
- }
- } else {
- File container = getSiteContaining(file);
- if (container != null) {
- verifyStatus = createStatus(IStatus.ERROR, Policy.bind("ConfiguredSite.ContainedInAnotherSite", container.getAbsolutePath()), null); //$NON-NLS-1$
- return verifyStatus;
- }
- }
-
- if (!canWrite(file)) {
- verifyStatus = createStatus(IStatus.ERROR, Policy.bind("ConfiguredSite.ReadOnlySite"), null); //$NON-NLS-1$
- return verifyStatus;
- }
-
- verifyStatus = createStatus(IStatus.OK, "", null);
- isUpdatable(true);
- return verifyStatus;
- }
-
- /*
- * Verify we can write on the file system
- */
- private static boolean canWrite(File file) {
- if (!file.isDirectory() && file.getParentFile() != null) {
- file = file.getParentFile();
- }
-
- File tryFile = null;
- FileOutputStream out = null;
- try {
- tryFile = new File(file, "toDelete");
- out = new FileOutputStream(tryFile);
- out.write(0);
- } catch (IOException e) {
- return false;
- } finally {
- try {
- out.close();
- tryFile.delete();
- } catch (Exception e) {
- };
- }
- return true;
- }
-
- /*
- * Check if the directory contains a marker
- * if not ask all directory children to check
- * if one validates the condition, returns the marker
- */
- private static File getSiteContaining(File file) {
-
- if (file == null)
- return null;
-
- UpdateManagerPlugin.warn("IsContained: Checking for markers at:" + file);
- if (file.exists() && file.isDirectory()) {
- File productFile = new File(file, PRODUCT_SITE_MARKER);
- File extensionFile = new File(file, EXTENSION_SITE_MARKER);
- if (productFile.exists() || extensionFile.exists())
- return file;
- // do not check if a marker exists in the current but start from the parent
- // the current is analyze by getProductname()
- if (file.getParentFile() != null) {
- File privateFile = new File(file.getParentFile(), PRIVATE_SITE_MARKER);
- if (privateFile.exists())
- return file.getParentFile();
- }
- }
- return getSiteContaining(file.getParentFile());
- }
-
- /*
- * Returns the name of the product if the identifier of the private Site markup is not
- * the same as the identifier of the product the workbench was started with.
- * If the product is the same, return null.
- */
- private static String getProductName(File file) {
-
- if (file == null)
- return null;
-
- File markerFile = new File(file, PRIVATE_SITE_MARKER);
- if (!markerFile.exists()) {
- return null;
- }
-
- File productFile = getProductFile();
- String productId = null;
- String privateId = null;
- if (productFile != null) {
- productId = getProductIdentifier("id", productFile);
- privateId = getProductIdentifier("id", markerFile);
- if (productId == null) {
- UpdateManagerPlugin.warn("Product ID is null at:" + productFile);
- return null;
- }
- if (!productId.equalsIgnoreCase(privateId)) {
- UpdateManagerPlugin.warn("Product id at" + productFile + " Different than:" + markerFile);
- String name = getProductIdentifier("name", markerFile);
- String version = getProductIdentifier("version", markerFile);
- String markerID = (name == null) ? version : name + ":" + version;
- if (markerID == null)
- markerID = "";
- return markerID;
- } else {
- return privateId;
- }
- } else {
- UpdateManagerPlugin.warn("Product Marker doesn't exist:" + productFile);
- }
-
- return null;
- }
-
- /*
- * Returns the identifier of the product from the property file
- */
- private static String getProductIdentifier(String identifier, File propertyFile) {
- String result = null;
- if (identifier == null)
- return result;
- try {
- InputStream in = new FileInputStream(propertyFile);
- PropertyResourceBundle bundle = new PropertyResourceBundle(in);
- result = bundle.getString(identifier);
- } catch (IOException e) {
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_INSTALL)
- UpdateManagerPlugin.debug("Exception reading property file:" + propertyFile);
- } catch (MissingResourceException e) {
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_INSTALL)
- UpdateManagerPlugin.debug("Exception reading '" + identifier + "' from property file:" + propertyFile);
- }
- return result;
- }
-
- /*
- * Returns the identifier of the product from the property file
- */
- private static File getProductFile() {
-
- String productInstallDirectory = BootLoader.getInstallURL().getFile();
- if (productInstallDirectory != null) {
- File productFile = new File(productInstallDirectory, PRODUCT_SITE_MARKER);
- if (productFile.exists()) {
- return productFile;
- } else {
- UpdateManagerPlugin.warn("Product marker doesn't exist:" + productFile);
- }
- } else {
- UpdateManagerPlugin.warn("Cannot retrieve install URL from BootLoader");
- }
- return null;
- }
-
- /*
- *
- */
- /*package*/
- void createPrivateSiteMarker() {
- URL siteURL = getSite().getURL();
- if (siteURL == null)
- UpdateManagerPlugin.warn("Unable to create marker. The Site url is null.");
-
- if (!"file".equalsIgnoreCase(siteURL.getProtocol()))
- UpdateManagerPlugin.warn("Unable to create private marker. The Site is not on the local file system.");
-
- String siteLocation = siteURL.getFile();
- File productFile = getProductFile();
- if (productFile != null) {
- String productId = getProductIdentifier("id", productFile);
- String productName = getProductIdentifier("name", productFile);
- String productVer = getProductIdentifier("version", productFile);
- if (productId != null) {
- File file = new File(siteLocation, PRIVATE_SITE_MARKER);
- if (!file.exists()) {
- PrintWriter w = null;
- try {
- OutputStream out = new FileOutputStream(file);
- OutputStreamWriter outWriter = new OutputStreamWriter(out, "UTF8"); //$NON-NLS-1$
- BufferedWriter buffWriter = new BufferedWriter(outWriter);
- w = new PrintWriter(buffWriter);
- w.println("id=" + productId);
- if (productName != null)
- w.println("name=" + productName);
- if (productVer != null)
- w.println("version=" + productVer);
- } catch (Exception e) {
- UpdateManagerPlugin.warn("Unable to create private Marker at:" + file, e);
- } finally {
- try {
- w.close();
- } catch (Exception e) {
- };
- }
- }
- }
- }
- }
-
- /*
- * Returns true if the directory of the Site contains
- * .eclipseextension
- */
- public boolean isExtensionSite() {
- return containsMarker(EXTENSION_SITE_MARKER);
- }
-
- /*
- * Returns true if the directory of the Site contains
- * .eclipseextension
- */
- public boolean isProductSite() {
- return containsMarker(PRODUCT_SITE_MARKER);
- }
-
- /*
- * Returns true if the directory of the Site contains
- * .eclipseextension
- */
- public boolean isPrivateSite() {
- return containsMarker(PRIVATE_SITE_MARKER);
- }
-
- /*
- *
- */
- private boolean containsMarker(String marker) {
- ISite site = getSite();
- if (site == null) {
- UpdateManagerPlugin.warn("Contains Markers:The site is null");
- return false;
- }
-
- URL url = site.getURL();
- if (url == null) {
- UpdateManagerPlugin.warn("Contains Markers:Site URL is null");
- return false;
- }
- if (!"file".equalsIgnoreCase(url.getProtocol())) {
- UpdateManagerPlugin.warn("Contains Markers:Non file protocol");
- return false;
- }
- File file = new File(url.getFile());
- if (!file.exists()) {
- UpdateManagerPlugin.warn("Contains Markers:The site doesn't exist:" + file);
- return false;
- }
- File extension = new File(file, marker);
- if (!extension.exists()) {
- UpdateManagerPlugin.warn("Contains Markers:The extensionfile does not exist:" + extension);
- return false;
- }
- return true;
- }
-
- /*
- * Returns true if the Site is already natively linked
- */
- public boolean isNativelyLinked() throws CoreException {
- String platformString = getPlatformURLString();
- if (platformString == null) {
- UpdateManagerPlugin.warn("Unable to retrieve platformString");
- return false;
- }
-
- URL siteURL = null;
- try {
- // check if the site exists and is updatable
- // update configSite
- URL urlToCheck = new URL(platformString);
- IPlatformConfiguration runtimeConfig = BootLoader.getCurrentPlatformConfiguration();
- IPlatformConfiguration.ISiteEntry entry = runtimeConfig.findConfiguredSite(urlToCheck);
- if (entry != null) {
- return entry.isNativelyLinked();
- } else {
- UpdateManagerPlugin.warn("Unable to retrieve site:" + platformString + " from platform.");
- }
-
- // check by comparing URLs
- IPlatformConfiguration.ISiteEntry[] sites = runtimeConfig.getConfiguredSites();
- for (int i = 0; i < sites.length; i++) {
- siteURL = sites[i].getURL();
- URL resolvedURL = Platform.resolve(siteURL);
- if (UpdateManagerUtils.sameURL(resolvedURL, urlToCheck))
- return true;
- }
- } catch (MalformedURLException e) {
- String msg = Policy.bind("ConfiguredSite.UnableResolveURL", platformString);
- throw Utilities.newCoreException(msg, e);
- } catch (IOException e) {
- String msg = Policy.bind("ConfiguredSite.UnableToAccessSite", new Object[] { siteURL });
- throw Utilities.newCoreException(msg, e);
- }
-
- return false;
- }
-
-
- /*
- * we have to check that no configured/enable parent include this feature
- */
- private boolean validateNoConfiguredParents(IFeature feature) throws CoreException {
- if (feature == null) {
- UpdateManagerPlugin.warn("ConfigurationPolicy: validate Feature is null");
- return true;
- }
-
- IFeatureReference[] parents = UpdateManagerUtils.getParentFeatures(feature, getConfiguredFeatures(), false);
- return (parents.length == 0);
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ContentConsumer.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ContentConsumer.java
deleted file mode 100644
index 3cf4259..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ContentConsumer.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.eclipse.update.internal.core;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import org.eclipse.update.core.IContentConsumer;
-
-/**
- * A default implementation for IFeatureContentConsumer
- * </p>
- * @since 2.0
- */
-
-public abstract class ContentConsumer implements IContentConsumer {
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/DefaultInstallHandler.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/DefaultInstallHandler.java
deleted file mode 100644
index 8a5bfc6..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/DefaultInstallHandler.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package org.eclipse.update.internal.core;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import java.io.IOException;
-import java.util.jar.JarEntry;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.update.core.*;
-import org.eclipse.update.core.JarContentReference.ContentSelector;
-import org.eclipse.update.core.model.InstallAbortedException;
-
-/**
- * Default Implementation of InstallHandler
- */
-public class DefaultInstallHandler extends BaseInstallHandler {
-
- /*
- * @see IInstallHandler#nonPluginDataDownloaded(INonPluginEntry[], IVerificationListener)
- */
- public void nonPluginDataDownloaded(
- INonPluginEntry[] nonPluginData,
- IVerificationListener listener)
- throws CoreException {
-
- // verify non-plugin archives. The DefaultInstallHandler assumes
- // the verifier associated with the feature is able to verify the
- // data archives.
- if (nonPluginData == null || nonPluginData.length == 0)
- return;
-
- this.nonPluginEntries = nonPluginData;
- IFeatureContentProvider provider = this.feature.getFeatureContentProvider();
- IVerifier verifier = provider.getVerifier();
- if (verifier == null)
- return;
-
- for (int i = 0; i < this.nonPluginEntries.length; i++) {
- ContentReference[] archives =
- provider.getNonPluginEntryArchiveReferences(nonPluginEntries[i], this.monitor);
- IVerificationResult result;
- for (int j = 0; j < archives.length; j++) {
-
- // see if the data entry is a jar
- ContentReference archive = archives[j];
- if (!(archives[j] instanceof JarContentReference)
- && archives[j].getIdentifier().endsWith(".jar")) {
- try {
- archive =
- new JarContentReference(archives[j].getIdentifier(), archives[j].asFile());
- } catch (IOException e) {
- }
- }
-
- result = verifier.verify(this.feature, archive, false, this.monitor);
- if (result != null)
- promptForVerification(result, listener);
- }
- }
- }
-
- /*
- * @see IInstallHandler#completeInstall(IFeatureContentConsumer)
- */
- public void completeInstall(IFeatureContentConsumer consumer)
- throws CoreException {
-
- // plugins have been installed. Check to see if we have any
- // non-plugin entries that need to be handled.
- if (this.nonPluginEntries == null || this.nonPluginEntries.length == 0)
- return;
-
- // install non-plugin archives
- IFeatureContentProvider provider = this.feature.getFeatureContentProvider();
- for (int i = 0; i < this.nonPluginEntries.length; i++) {
- ContentReference[] archive =
- provider.getNonPluginEntryArchiveReferences(nonPluginEntries[i], this.monitor);
- IContentConsumer nonPluginConsumer = consumer.open(nonPluginEntries[i]);
- for (int j = 0; j < archive.length; j++) {
- String id = archive[j].getIdentifier();
- if (id.endsWith(".jar")) {
- // the non-plugin archive is a jar. Unpack it into
- // a directory constructed using the archive id
- try {
- final String prefix = id.substring(0, id.length() - 4) + "/";
- JarContentReference jarRef = new JarContentReference("", archive[j].asFile());
- ContentSelector selector = new ContentSelector() {
- public String defineIdentifier(JarEntry entry) {
- if (entry == null)
- return null;
- else
- return prefix + entry.getName();
- }
- };
- ContentReference[] entries = jarRef.peek(selector, this.monitor);
- for (int k = 0; k < entries.length; k++) {
- nonPluginConsumer.store(entries[k], this.monitor);
- }
- } catch (IOException e) {
- throw Utilities
- .newCoreException(Policy.bind("JarVerificationService.CancelInstall", id),
- //$NON-NLS-1$
- e);
- }
-
- } else {
- // the non-plugin archive is not a jar. Install it asis.
- nonPluginConsumer.store(archive[j], this.monitor);
- }
- }
- nonPluginConsumer.close();
- }
- }
-
- /*
- *
- */
- private void promptForVerification(
- IVerificationResult verificationResult,
- IVerificationListener listener)
- throws CoreException {
-
- if (listener == null)
- return;
- int result = listener.prompt(verificationResult);
-
- if (result == IVerificationListener.CHOICE_ABORT) {
- Exception e = verificationResult.getVerificationException();
- throw new InstallAbortedException(Policy.bind("JarVerificationService.CancelInstall"),e);
- }
- if (result == IVerificationListener.CHOICE_ERROR) {
- throw Utilities
- .newCoreException(Policy.bind("JarVerificationService.UnsucessfulVerification"),
- //$NON-NLS-1$
- verificationResult.getVerificationException());
- }
-
- return;
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ErrorRecoveryLog.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ErrorRecoveryLog.java
deleted file mode 100644
index 7b8a074..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ErrorRecoveryLog.java
+++ /dev/null
@@ -1,539 +0,0 @@
-package org.eclipse.update.internal.core;
-
-import java.io.*;
-import java.net.URL;
-import java.util.*;
-import java.util.Date;
-import java.util.List;
-
-import org.eclipse.core.boot.BootLoader;
-import org.eclipse.core.boot.IPlatformConfiguration;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.update.core.Utilities;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-/**
- * singleton pattern.
- * manages the error/recover log file
- */
-public class ErrorRecoveryLog {
-
- public static final boolean RECOVERY_ON = false;
-
- private static final String ERROR_RECOVERY_LOG = "platform.cfg.log";
- private static final String LOG_ENTRY_KEY = "LogEntry.";
- private static final String RETURN_CARRIAGE = "\r\n";
- private static final String END_OF_FILE = "eof=eof";
-
- //
- public static final String START_INSTALL_LOG = "START_INSTALL_LOG";
- public static final String PLUGIN_ENTRY = "PLUGIN";
- public static final String FRAGMENT_ENTRY = "FRAGMENT";
- public static final String FEATURE_ENTRY = "FEATURE";
- public static final String ALL_INSTALLED = "ALL_FEATURES_INSTALLED";
- public static final String RENAME_ENTRY = "RENAME";
- public static final String END_INSTALL_LOG = "END_INSTALL_LOG";
- public static final String START_REMOVE_LOG = "REMOVE_LOG";
- public static final String END_ABOUT_REMOVE = "END_ABOUT_TO_REMOVE";
- public static final String DELETE_ENTRY = "DELETE";
- public static final String END_REMOVE_LOG = "END_REMOVE_LOG";
-
- public static boolean forceRemove = false;
-
- private static ErrorRecoveryLog inst;
- private FileWriter out;
- private int index;
- private List paths;
-
- private boolean open = false;
- private int nbOfOpen = 0;
-
-
- /**
- * Constructor for ErrorRecoveryLog.
- */
- private ErrorRecoveryLog() {
- super();
- }
-
- /**
- * Singleton
- */
- public static ErrorRecoveryLog getLog() {
- if (inst == null){
- inst = new ErrorRecoveryLog();
- }
- return inst;
- }
-
- /**
- * get a unique identifer for the file, ensure uniqueness up to now
- */
- public static String getLocalRandomIdentifier(String path) {
-
- if (path==null) return null;
-
- // verify if it will be a directory without creating the file
- // as it doesn't exist yet
- if (path.endsWith(File.separator) || path.endsWith("/"))
- return path;
- File file = new File(path);
- String newName =
- UpdateManagerUtils.getLocalRandomIdentifier(file.getName(), new Date());
- while (new File(newName).exists()) {
- newName =
- UpdateManagerUtils.getLocalRandomIdentifier(file.getName(), new Date());
- }
- File newFile = new File(file.getParentFile(),newName);
- return newFile.getAbsolutePath();
- }
-
- /**
- * returns the log file
- * We do not check if the file exists
- */
- public File getRecoveryLogFile() {
- IPlatformConfiguration configuration =
- BootLoader.getCurrentPlatformConfiguration();
- URL location = configuration.getConfigurationLocation();
- String locationString = location.getFile();
- File platformConfiguration = new File(locationString);
- if (!platformConfiguration.isDirectory()) platformConfiguration = platformConfiguration.getParentFile();
- return new File(platformConfiguration, ERROR_RECOVERY_LOG);
- }
-
-
- /**
- * Open the log
- */
- public void open(String logEntry) throws CoreException {
- if (open) {
- nbOfOpen++;
- UpdateManagerPlugin.warn("Open nested Error/Recovery log #"+nbOfOpen+":"+logEntry);
- return;
- }
-
- File logFile = null;
- try {
- logFile = getRecoveryLogFile();
- out = new FileWriter(logFile);
- index = 0;
- paths=null;
- open=true;
- nbOfOpen=0;
- UpdateManagerPlugin.warn("Start new Error/Recovery log #"+nbOfOpen+":"+logEntry);
- } catch (IOException e) {
- throw Utilities.newCoreException(
- Policy.bind("UpdateManagerUtils.UnableToLog", new Object[] { logFile }),
- e);
- }
-
- append(logEntry);
- }
-
- /**
- * Append the string to the log and flush
- */
- public void append(String logEntry) throws CoreException {
- File logFile = null;
- try {
- if (!open) {
- UpdateManagerPlugin.warn("Internal Error: The Error/Recovery log is not open:"+logEntry);
- return;
- }
-
- StringBuffer buffer = new StringBuffer(LOG_ENTRY_KEY);
- buffer.append(index);
- buffer.append("=");
- buffer.append(logEntry);
- buffer.append(RETURN_CARRIAGE);
-
- out.write(buffer.toString());
- out.flush();
- index++;
- } catch (IOException e) {
- throw Utilities.newCoreException(
- Policy.bind("UpdateManagerUtils.UnableToLog", new Object[] { logFile }),
- e);
- }
- }
-
- /**
- * Append the string to the log and flush
- */
- public void appendPath(String logEntry, String path) throws CoreException {
- if (path == null)
- return;
- StringBuffer buffer = new StringBuffer(logEntry);
- buffer.append(" ");
- buffer.append(path);
- append(buffer.toString());
-
- addPath(path);
- }
-
- /**
- * Close any open recovery log
- */
- public void close(String logEntry) throws CoreException {
-
- if (nbOfOpen>0){
- UpdateManagerPlugin.warn("Close nested Error/Recovery log #"+nbOfOpen+":"+logEntry);
- nbOfOpen--;
- return;
- }
-
- UpdateManagerPlugin.warn("Close Error/Recovery log #"+nbOfOpen+":"+logEntry);
- append(logEntry);
- if (out != null) {
- try {
- out.write(END_OF_FILE);
- out.flush();
- out.close();
- } catch (Exception e) { //eat the exception
- } finally {
- out = null;
- open=false;
- }
- }
- }
-
- /**
- * Delete the file from the file system
- */
- public void delete() {
- File logFile = getRecoveryLogFile();
- //if (logFile.exists())
- //logFile.delete();
- }
-
- /**
- *
- */
- private void addPath(String path){
- if (paths==null) paths = new ArrayList();
- paths.add(path);
- }
-
- /**
- * recover an install or remove that didn't finish
- * Delete file for an unfinished delete
- * Delete file for an unfinshed install if not all the files were installed
- * Rename XML files for an install if all the files were installed but not renamed
- */
- public IStatus recover(){
-
- IStatus mainStatus = createStatus(IStatus.OK,"Recovering status",null);
- MultiStatus multi = new MultiStatus(mainStatus.getPlugin(),mainStatus.getCode(),mainStatus.getMessage(),null);
-
- //check if recovery is on
- if (!RECOVERY_ON){
- UpdateManagerPlugin.warn("Recovering is turned off. Abort recovery");
- return multi;
- }
-
- File logFile = getRecoveryLogFile();
- if (!logFile.exists()){
- multi.add(createStatus(IStatus.ERROR,"Unable to find log file:"+logFile,null));
- return multi;
- }
-
- InputStream in = null;
- Properties prop = null;
- try {
- in = new FileInputStream(logFile);
- prop = new Properties();
- prop.load(in);
- } catch (IOException e){
- UpdateManagerPlugin.warn("Unable to read:"+logFile,e);
- multi.add(createStatus(IStatus.ERROR,"Unable to access property file:"+logFile,e));
- return multi;
- }
-
- String eof = prop.getProperty("eof");
- if(eof!=null && eof.equals("eof")){
- // all is good
- delete();
- UpdateManagerPlugin.warn("Found log file. Log file contains end-of-file. No need to process");
- multi.add(createStatus(IStatus.OK,null,null));
- return multi;
- }
-
- String recovery = prop.getProperty(LOG_ENTRY_KEY+"0");
- if (recovery==null){
- multi.add(createStatus(IStatus.ERROR,"Unable to read log file. File doesn't contain the log entry:"+logFile,null));
- return multi;
- }
-
- if(recovery.equalsIgnoreCase(START_INSTALL_LOG)){
- multi.addAll(processRecoverInstall(prop));
- return multi;
- }
-
- if(recovery.equalsIgnoreCase(START_REMOVE_LOG)){
- multi.addAll(processRecoverRemove(prop));
- return multi;
- }
-
- multi.add(createStatus(IStatus.ERROR,"Unable to read log file. Unable to determine recovery to execute based on the first line of :"+logFile,null));
- return multi;
- }
-
- /*
- * creates a Status
- */
- private IStatus createStatus(int statusSeverity, String msg, Exception e){
- String id =
- UpdateManagerPlugin.getPlugin().getDescriptor().getUniqueIdentifier();
-
- StringBuffer completeString = new StringBuffer("");
- if (msg!=null)
- completeString.append(msg);
- if (e!=null){
- completeString.append("\r\n[");
- completeString.append(e.toString());
- completeString.append("]\r\n");
- }
- return new Status(statusSeverity, id, IStatus.OK, completeString.toString(), e);
- }
-
- /*
- *
- */
- private IStatus processRecoverInstall(Properties prop){
-
- IStatus mainStatus = createStatus(IStatus.OK,"",null);
- MultiStatus multi = new MultiStatus(mainStatus.getPlugin(),mainStatus.getCode(),"",null);
-
- Collection values = prop.values();
-
- if(values.contains(END_INSTALL_LOG)){
- // all is good
- delete();
- UpdateManagerPlugin.warn("Found log file. Log file contains END_INSTALL_LOG. No need to process rename");
- multi.add(createStatus(IStatus.OK,null,null));
- return multi;
- }
-
- if (values.contains(ALL_INSTALLED) && !forceRemove){
- // finish install by renaming
- int index = 0;
- boolean found = false;
- String val = prop.getProperty(LOG_ENTRY_KEY+index);
- while(val!=null && !found){
- if(val.equalsIgnoreCase(ALL_INSTALLED)) found = true;
- IStatus renameStatus = processRename(val);
- UpdateManagerPlugin.log(renameStatus);
- if(renameStatus.getSeverity()!=IStatus.OK){
- multi.add(renameStatus);
- }
- index++;
- val = prop.getProperty(LOG_ENTRY_KEY+index);
- }
- if (val==null){
- UpdateManagerPlugin.warn("Unable to find value for :"+LOG_ENTRY_KEY+index);
- multi.add(createStatus(IStatus.ERROR,"Wrong log file. Unable to find entry for:"+LOG_ENTRY_KEY+index,null));
- return multi;
- }
- // process recovery finished
- delete();
- UpdateManagerPlugin.warn("Found log file. Successfully recovered by renaming. Feature is installed.");
- multi.add(createStatus(IStatus.OK,null,null));
- } else {
- // remove all because install did not lay out all the files
- // or recovery is not allowed
- int index = 0;
- String val = prop.getProperty(LOG_ENTRY_KEY+index);
- while(val!=null){
- IStatus removeStatus = processRemove(val);
- UpdateManagerPlugin.log(removeStatus);
- if(removeStatus.getSeverity()!=IStatus.OK){
- multi.addAll(removeStatus);
- }
- index++;
- val = prop.getProperty(LOG_ENTRY_KEY+index);
- }
- // process recovery finished
- delete();
- UpdateManagerPlugin.warn("Found log file. Successfully recovered by removing. Feature is removed.");
- multi.add(createStatus(IStatus.OK,null,null));
- }
- return multi;
- }
-
- /*
- *
- */
- private IStatus processRename(String val){
-
- // get the path
- int index = -1;
- String newFileName = null;
- if (val.startsWith(PLUGIN_ENTRY)){
- index = PLUGIN_ENTRY.length();
- newFileName= "plugin.xml";
- }
- if (val.startsWith(FRAGMENT_ENTRY)){
- index = FRAGMENT_ENTRY.length();
- newFileName= "fragment.xml";
- }
- if (val.startsWith(FEATURE_ENTRY)){
- index = FEATURE_ENTRY.length();
- newFileName= "feature.xml";
- }
-
- if (index==-1){
- return createStatus(IStatus.ERROR,"Unable to determine what action was taken by parsing"+val,null);
- }
-
- String oldName = val.substring(index+1);
- File oldFile = new File(oldName);
- File parentFile = oldFile.getParentFile();
- File newFile = new File(parentFile,newFileName);
- if (!oldFile.exists()){
- if (newFile.exists()){
- // ok the file has been renamed apparently
- return createStatus(IStatus.OK,"File already renamed into:"+newFile,null);
- } else {
- // the file doesn't exist, log as problem, and force the removal of the feature
- return createStatus(IStatus.ERROR,"Unable to find file:"+oldFile,null);
- }
- }
-
- boolean sucess = false;
- if (newFile.exists()) {
- UpdateManagerUtils.removeFromFileSystem(newFile);
- UpdateManagerPlugin.warn("Removing already existing file:"+newFile);
- }
- sucess = oldFile.renameTo(newFile);
-
- if(!sucess){
- String msg =("Unable to rename old in new:"+oldFile+newFile);
- return createStatus(IStatus.ERROR,msg,null);
- }
- return createStatus(IStatus.OK,"Sucessfully renamed:"+oldFile+" to:"+newFile,null);
- }
-
- /*
- *
- */
- private IStatus processRemove(String val){
-
- IStatus mainStatus = createStatus(IStatus.OK,"",null);
- MultiStatus multi = new MultiStatus(mainStatus.getPlugin(),mainStatus.getCode(),"",null);
-
- // get the path
- int index = -1;
- if (val.startsWith(PLUGIN_ENTRY)){
- index = PLUGIN_ENTRY.length();
- }
- if (val.startsWith(FRAGMENT_ENTRY)){
- index = FRAGMENT_ENTRY.length();
- }
- if (val.startsWith(FEATURE_ENTRY)){
- index = FEATURE_ENTRY.length();
- }
-
- if (index==-1){
- return createStatus(IStatus.ERROR,"Unable to determine what action was taken by parsing"+val,null);
- }
-
- String oldName = val.substring(index+1);
- File oldFile = new File(oldName);
- File parentFile = oldFile.getParentFile();
- if (!parentFile.exists()){
- // the directory doesn't exist, log as problem, and force the removal of the feature
- multi.add(createStatus(IStatus.ERROR,"Unable to find file:"+oldFile,null));
- return multi;
- }
-
- multi.addAll(removeFromFileSystem(parentFile));
- return multi;
- }
-
- /**
- * return a multi status,
- * the children are the file that couldn't be removed
- */
- public IStatus removeFromFileSystem(File file) {
-
- IStatus mainStatus = createStatus(IStatus.OK,"",null);
- MultiStatus multi = new MultiStatus(mainStatus.getPlugin(),mainStatus.getCode(),"",null);
-
- if (!file.exists()){
- multi.add(createStatus(IStatus.ERROR,"Unable to find file to remove:"+file,null));
- return multi;
- }
-
- if (file.isDirectory()) {
- String[] files = file.list();
- if (files != null) // be careful since file.list() can return null
- for (int i = 0; i < files.length; ++i){
- multi.addAll(removeFromFileSystem(new File(file, files[i])));
- }
- }
-
- if (!file.delete()) {
- String msg = "Unable to remove file" +file.getAbsolutePath();
- //$NON-NLS-1$
- multi.add(createStatus(IStatus.ERROR,msg,null));
- }
- return multi;
- }
-
- /*
- *
- */
- private IStatus processRecoverRemove(Properties prop){
-
- IStatus mainStatus = createStatus(IStatus.OK,"",null);
- MultiStatus multi = new MultiStatus(mainStatus.getPlugin(),mainStatus.getCode(),"",null);
-
- Collection values = prop.values();
-
- if(values.contains(END_REMOVE_LOG)){
- // all is good
- delete();
- UpdateManagerPlugin.warn("Found log file. Log file contains END_REMOVE_LOG. No need to process rename");
- multi.add(createStatus(IStatus.OK,null,null));
- return multi;
- }
-
- if (!values.contains(END_ABOUT_REMOVE)){
- // finish install by renaming
- multi.add(createStatus(IStatus.ERROR,"The remove process didn't start. Please remove the disable feature from the program.",null));
- return multi;
- } else {
- // finish install by renaming
- int index = 0;
- boolean found = false;
- String val = prop.getProperty(LOG_ENTRY_KEY+index);
- while(val!=null && !found){
- if(val.equalsIgnoreCase(END_ABOUT_REMOVE)) found = true;
- IStatus renameStatus = processRemove(val);
- UpdateManagerPlugin.log(renameStatus);
- if(renameStatus.getSeverity()!=IStatus.OK){
- multi.add(renameStatus);
- }
- index++;
- val = prop.getProperty(LOG_ENTRY_KEY+index);
- }
- if (val==null){
- UpdateManagerPlugin.warn("Unable to find value for :"+LOG_ENTRY_KEY+index);
- multi.add(createStatus(IStatus.ERROR,"Wrong log file. Unable to find entry for:"+LOG_ENTRY_KEY+index,null));
- return multi;
- }
- // process recovery finished
- delete();
- UpdateManagerPlugin.warn("Found log file. Successfully recovered by deleting. Feature is removed.");
- multi.add(createStatus(IStatus.OK,null,null));
- }
- return multi;
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureContentConsumer.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureContentConsumer.java
deleted file mode 100644
index 8863c9b..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureContentConsumer.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.eclipse.update.internal.core;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import org.eclipse.update.core.IFeatureContentConsumer;
-import org.eclipse.update.core.model.ModelObject;
-
-/**
- * A default implementation for IFeatureContentConsumer
- * </p>
- * @since 2.0
- */
-
-public abstract class FeatureContentConsumer extends ModelObject
- implements IFeatureContentConsumer {
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureExecutableContentConsumer.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureExecutableContentConsumer.java
deleted file mode 100644
index f3695dc..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureExecutableContentConsumer.java
+++ /dev/null
@@ -1,175 +0,0 @@
-package org.eclipse.update.internal.core;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import java.util.*;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.update.core.*;
-
-/**
- * ContentConsumer Implementation for a FeatureExecutable
- */
-
-public class FeatureExecutableContentConsumer extends FeatureContentConsumer {
-
- private IFeature feature;
- private boolean closed= false;
- private boolean aborted= false;
- private ISiteContentConsumer contentConsumer;
- private IFeatureContentConsumer parent = null;
- private List /* of IFeatureContentCOnsumer */ children;
-
- /*
- * @see IContentConsumer#open(INonPluginEntry)
- */
- public IContentConsumer open(INonPluginEntry nonPluginEntry)
- throws CoreException {
- ContentConsumer cons = new NonPluginEntryContentConsumer(
- getContentConsumer().open(nonPluginEntry));
- return cons;
- }
-
- /*
- * @see IContentConsumer#open(IPluginEntry)
- */
- public IContentConsumer open(IPluginEntry pluginEntry) throws CoreException {
- ContentConsumer cons = new PluginEntryContentConsumer(getContentConsumer().open(pluginEntry));
- return cons;
- }
-
- /*
- * @see IContentConsumer#addChild(IFeature)
- */
- public void addChild(IFeature child) throws CoreException {
- IFeatureContentConsumer childConsumer = child.getFeatureContentConsumer();
- childConsumer.setParent(this);
- if (children==null) children = new ArrayList();
- children.add(childConsumer);
- return;
- }
-
-
- /*
- * @see IFeatureContentConsumer#store(ContentReference, IProgressMonitor)
- */
- public void store(ContentReference contentReference, IProgressMonitor monitor)
- throws CoreException {
- getContentConsumer().store(contentReference, monitor);
- }
-
- /*
- * @see IFeatureContentConsumer#close()
- */
- public IFeatureReference close() throws CoreException {
-
- if (!closed && getParent()!=null){
- closed=true;
- return null;
- }
-
- // parent consumer, log we are about to rename
- // log files have been downloaded
- if (getParent()==null){
- ErrorRecoveryLog.getLog().append(ErrorRecoveryLog.ALL_INSTALLED);
- }
-
- IFeatureReference ref= null;
- if (contentConsumer != null)
- ref = contentConsumer.close();
-
- // close nested feature
- IFeatureContentConsumer[] children = getChildren();
- for (int i = 0; i < children.length; i++) {
- children[i].close();
- }
-
- return ref;
- }
-
- /*
- * @see IFeatureContentConsumer#setFeature(IFeature)
- */
- public void setFeature(IFeature feature) {
- this.feature= feature;
- }
-
- /*
- * Sets the parent
- */
- public void setParent(IFeatureContentConsumer featureContentConsumer) {
- this.parent= featureContentConsumer;
- }
-
- /*
- * returns the Content Consumer for the feature
- *
- * Right now we are the only one to implement SiteContentConsumer
- * Need to be exposed as API post v2.0
- */
- private ISiteContentConsumer getContentConsumer() throws CoreException {
- if (contentConsumer == null)
- if (feature.getSite() instanceof SiteFile) {
- SiteFile site= (SiteFile) feature.getSite();
- contentConsumer= site.createSiteContentConsumer(feature);
- } else {
- throw new UnsupportedOperationException();
- }
- return contentConsumer;
- }
-
- /*
- * @see IFeatureContentConsumer#abort()
- */
- public void abort() throws CoreException {
-
- if (aborted) return;
-
- IFeatureContentConsumer[] children = getChildren();
- for (int i = 0; i < children.length; i++) {
- try {
- children[i].abort();
- } catch (Exception e){
- //do Nothing
- }
- }
-
- // do not close plugin and non plugin content consumer
- // the contentConsumer will abort them
- // we do not need to abort the NonPluginEntryContentConsumer and PluginEntryContentConsume
-
- //implement the cleanup
- if (contentConsumer!=null)
- contentConsumer.abort();
-
- aborted = true;
- }
-
- /*
- * @see IFeatureContentConsumer#getFeature()
- */
- public IFeature getFeature(){
- return feature;
- }
-
- /*
- * @see IFeatureContentConsumer#getParent()
- */
- public IFeatureContentConsumer getParent(){
- return parent;
- }
-
- /*
- * @see IFeatureContentConsumer#getChildren()
- */
- public IFeatureContentConsumer[] getChildren(){
- if (children==null)
- return new IFeatureContentConsumer[0];
-
- return (IFeatureContentConsumer[]) children.toArray(arrayTypeFor(children));
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureExecutableContentProvider.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureExecutableContentProvider.java
deleted file mode 100644
index 167ed99..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureExecutableContentProvider.java
+++ /dev/null
@@ -1,268 +0,0 @@
-package org.eclipse.update.internal.core;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.core.*;
-
-/**
- * Default implementation of a Executable Feature Content Provider
- */
-
-public class FeatureExecutableContentProvider extends FeatureContentProvider {
-
- /*
- * Constructor
- */
- public FeatureExecutableContentProvider(URL url) {
- super(url);
- }
-
- /*
- * Return the path for a pluginEntry
- */
- private String getPath(IPluginEntry pluginEntry)
- throws IOException, CoreException {
-
- // get the URL of the Archive file that contains the plugin entry
- ISiteContentProvider provider = getFeature().getSite().getSiteContentProvider();
- URL fileURL = provider.getArchiveReference(getPathID(pluginEntry));
- String result = fileURL.getFile();
-
- // return the list of all subdirectories
- if (!result.endsWith(File.separator))
- result += File.separator;
- File pluginDir = new File(result);
- if (!pluginDir.exists())
- throw new IOException(
- Policy.bind("FeatureExecutableContentProvider.FileDoesNotExist", result));
- //$NON-NLS-1$ //$NON-NLS-2$
-
- return result;
- }
-
- /*
- * Returns the path for the Feature
- */
- private String getFeaturePath() throws IOException {
- String result = getFeature().getURL().getFile();
-
- // return the list of all subdirectories
- if (!(result.endsWith(File.separator) || result.endsWith("/"))) //$NON-NLS-1$
- result += File.separator;
- File pluginDir = new File(result);
- if (!pluginDir.exists())
- throw new IOException(
- Policy.bind("FeatureExecutableContentProvider.FileDoesNotExist", result));
- //$NON-NLS-1$ //$NON-NLS-2$
-
- return result;
- }
-
- /*
- * Returns all the files under the directory
- * Recursive call
- */
- private List getFiles(File dir) throws IOException {
- List result = new ArrayList();
-
- if (!dir.isDirectory()) {
- String msg =
- Policy.bind(
- "FeatureExecutableContentProvider.InvalidDirectory",
- dir.getAbsolutePath());
- //$NON-NLS-1$
- throw new IOException(msg);
-
- }
-
- File[] files = dir.listFiles();
- if (files != null)
- for (int i = 0; i < files.length; ++i) {
- if (files[i].isDirectory()) {
- result.addAll(getFiles(files[i]));
- } else {
- result.add(files[i]);
- }
- }
-
- return result;
- }
-
- /*
- * @see IFeatureContentProvider#getVerifier()
- */
- public IVerifier getVerifier() throws CoreException {
- return null;
- }
-
- /*
- * @see IFeatureContentProvider#getFeatureManifestReference()
- */
- public ContentReference getFeatureManifestReference(InstallMonitor monitor)
- throws CoreException {
- ContentReference result = null;
- try {
- result = new ContentReference(Feature.FEATURE_XML, new URL(getURL(), Feature.FEATURE_XML));
-
- } catch (MalformedURLException e) {
- throw Utilities.newCoreException(
- Policy.bind(
- "FeatureExecutableContentProvider.UnableToCreateURLFor",
- getURL().toExternalForm() + " " + Feature.FEATURE_XML),
- e);
- //$NON-NLS-1$ //$NON-NLS-2$
- }
- return result;
- }
-
- /*
- * @see IFeatureContentProvider#getArchiveReferences()
- */
- public ContentReference[] getArchiveReferences(InstallMonitor monitor)
- throws CoreException {
- // executable feature does not contain archives
- return new ContentReference[0];
- }
-
- /*
- * @see IFeatureContentProvider#getPluginEntryArchiveReferences(IPluginEntry)
- */
- public ContentReference[] getPluginEntryArchiveReferences(
- IPluginEntry pluginEntry,
- InstallMonitor monitor)
- throws CoreException {
- ContentReference[] result = new ContentReference[1];
- try {
- result[0] =
- new ContentReference(getPathID(pluginEntry), new File(getPath(pluginEntry)));
- } catch (IOException e) {
- throw Utilities.newCoreException(
- Policy.bind(
- "FeatureExecutableContentProvider.UnableToRetrievePluginEntry",
- pluginEntry.getVersionedIdentifier().toString()),
- e);
- //$NON-NLS-1$
- }
- return result;
- }
-
- /*
- * @see IFeatureContentProvider#getNonPluginEntryArchiveReferences(INonPluginEntry)
- */
- public ContentReference[] getNonPluginEntryArchiveReferences(
- INonPluginEntry nonPluginEntry,
- InstallMonitor monitor)
- throws CoreException {
-
- ContentReference[] result = new ContentReference[1];
- URL fileURL;
-
- //try {
- // get the URL of the Archive file that contains the plugin entry
- ISiteContentProvider provider = getFeature().getSite().getSiteContentProvider();
- fileURL = provider.getArchiveReference(getPathID(nonPluginEntry));
-
- String fileString = fileURL.getFile();
- File nonPluginData = new File(fileString);
- if (!nonPluginData.exists())
- throw Utilities.newCoreException(
- Policy.bind("FeatureExecutableContentProvider.FileDoesNotExist", fileString),
- null);
- //$NON-NLS-1$ //$NON-NLS-2$
-
- try {
- result[0] =
- new ContentReference(nonPluginEntry.getIdentifier(), nonPluginData.toURL());
- } catch (MalformedURLException e) {
- throw Utilities.newCoreException(
- Policy.bind(
- "FeatureExecutableContentProvider.UnableToRetrieveNonPluginEntry",
- nonPluginEntry.getIdentifier().toString()),
- e);
- //$NON-NLS-1$
- }
- return result;
- }
-
- /*
- * @see IFeatureContentProvider#getFeatureEntryArchiveReferences()
- */
- public ContentReference[] getFeatureEntryArchiveReferences(InstallMonitor monitor)
- throws CoreException {
- ContentReference[] contentReferences = new ContentReference[1];
- contentReferences[0] = new ContentReference(null, getURL());
- return contentReferences;
- }
-
- /*
- * @see IFeatureContentProvider#getFeatureEntryArchivesContentReferences()
- */
- public ContentReference[] getFeatureEntryContentReferences(InstallMonitor monitor)
- throws CoreException {
- ContentReference[] result = new ContentReference[0];
- try {
- File featureDir = new File(getFeaturePath());
- List files = getFiles(featureDir);
- result = new ContentReference[files.size()];
- for (int i = 0; i < result.length; i++) {
- File currentFile = (File) files.get(i);
- result[i] = new ContentReference(currentFile.getName(), currentFile.toURL());
- }
- } catch (IOException e) {
- throw Utilities.newCoreException(
- Policy.bind(
- "FeatureExecutableContentProvider.UnableToRetrieveFeatureEntryContentRef",
- getFeature().getVersionedIdentifier().toString()),
- e);
- //$NON-NLS-1$
- }
- return result;
- }
-
- /*
- * @see IFeatureContentProvider#getPluginEntryContentReferences(IPluginEntry)
- */
- public ContentReference[] getPluginEntryContentReferences(
- IPluginEntry pluginEntry,
- InstallMonitor monitor)
- throws CoreException {
-
- ContentReference[] result = new ContentReference[0];
-
- try {
- // return the list of all subdirectories
- File pluginDir = new File(getPath(pluginEntry));
- URL pluginURL = pluginDir.toURL();
- List files = getFiles(pluginDir);
- result = new ContentReference[files.size()];
- for (int i = 0; i < result.length; i++) {
- File currentFile = (File) files.get(i);
- String relativeString = UpdateManagerUtils.getURLAsString(pluginURL, currentFile.toURL());
- result[i] = new ContentReference(relativeString, currentFile.toURL());
- }
- } catch (IOException e) {
- throw Utilities.newCoreException(
- Policy.bind(
- "FeatureExecutableContentProvider.UnableToRetriveArchiveContentRef")
- + pluginEntry.getVersionedIdentifier().toString(),
- e);
- //$NON-NLS-1$
- }
-
- //[20866] we did not preserve executable bit
- validatePermissions(result);
-
- return result;
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureExecutableFactory.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureExecutableFactory.java
deleted file mode 100644
index d97f814..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureExecutableFactory.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package org.eclipse.update.internal.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-import java.io.File;
-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.FeatureModel;
-
-/**
- * FeatureFactory for Executable Features
- */
-public class FeatureExecutableFactory extends BaseFeatureFactory {
-
- /*
- * @see IFeatureFactory#createFeature(URL,ISite)
- */
- public IFeature createFeature(URL url, ISite site) throws CoreException {
-
- TargetFeature feature = null;
- InputStream featureStream = null;
-
- if (url == null)
- return createFeature(site);
-
- // the URL should point to a directory
- url = validate(url);
-
- try {
- IFeatureContentProvider contentProvider =
- new FeatureExecutableContentProvider(url);
- IFeatureContentConsumer contentConsumer =
- new FeatureExecutableContentConsumer();
-
- URL nonResolvedURL =
- contentProvider.getFeatureManifestReference(null /*IProgressMonitor*/
- ).asURL();
- URL resolvedURL = URLEncoder.encode(nonResolvedURL);
- featureStream = UpdateManagerPlugin.getPlugin().get(resolvedURL).getInputStream();
-
- feature = (TargetFeature) this.parseFeature(featureStream);
- feature.setSite(site);
-
- feature.setFeatureContentProvider(contentProvider);
- feature.setContentConsumer(contentConsumer);
-
- feature.resolve(url, getResourceBundle(url));
- feature.markReadOnly();
- } catch (CoreException e){
- throw e;
- } catch (Exception e){
- throw Utilities.newCoreException(
- Policy.bind("FeatureFactory.CreatingError", url.toExternalForm()),
- e);
- //$NON-NLS-1$
- } finally {
- try {
- featureStream.close();
- } catch (Exception e) {
- }
- }
- return feature;
- }
-
- /*
- * @see FeatureModelFactory#createFeatureModel()
- */
- public FeatureModel createFeatureModel() {
- return new TargetFeature();
- }
-
- /*
- * Creates an empty feature on the site
- */
- private IFeature createFeature(ISite site) throws CoreException {
- TargetFeature feature = null;
-
- IFeatureContentProvider contentProvider =
- new FeatureExecutableContentProvider(null);
- IFeatureContentConsumer contentConsumer =
- new FeatureExecutableContentConsumer();
- feature = (TargetFeature) createFeatureModel();
- feature.setSite(site);
- feature.setFeatureContentProvider(contentProvider);
- feature.setContentConsumer(contentConsumer);
-
- // do not mark read only yet...
- return feature;
- }
-
- /*
- * validates a URL as a directory URL
- */
- private URL validate(URL url) throws CoreException {
-
- if (url == null)
- throw Utilities.newCoreException(
- Policy.bind("FeatureExecutableFactory.NullURL"),
- null);
- //$NON-NLS-1$
-
- if (!(url.getFile().endsWith("/")
- || url.getFile().endsWith(File.separator)
- || url.getFile().endsWith(Feature.FEATURE_XML))) { //$NON-NLS-1$
- try {
- String path = url.getFile() + "/"; //$NON-NLS-1$
- url = new URL(url.getProtocol(), url.getHost(), url.getPort(), path);
- } catch (MalformedURLException e) {
- throw Utilities.newCoreException(
- Policy.bind("FeatureExecutableFactory.CannotCreateURL", url.toExternalForm()),
- e);
- //$NON-NLS-1$
- }
- }
- return url;
- }
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeaturePackagedContentProvider.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeaturePackagedContentProvider.java
deleted file mode 100644
index a17969f..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeaturePackagedContentProvider.java
+++ /dev/null
@@ -1,276 +0,0 @@
-package org.eclipse.update.internal.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-import java.io.*;
-import java.net.URL;
-import java.util.*;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.security.JarVerifier;
-
-/**
- * Content Provider of a Feature Package
- */
-public class FeaturePackagedContentProvider extends FeatureContentProvider {
-
- private ContentReference localManifest = null;
- private ContentReference[] localFeatureFiles = new ContentReference[0];
- private IVerifier jarVerifier = null;
-
- /*
- * filer for file with .jar
- */
- public static final FilenameFilter filter = new FilenameFilter() {
- public boolean accept(File dir, String name) {
- return name.endsWith(FeaturePackagedContentProvider.JAR_EXTENSION);
- }
- };
-
- /*
- * Constructor
- */
- public FeaturePackagedContentProvider(URL url) {
- super(url);
- }
-
- /*
- * Returns a new verifier for each top-level install
- * (if the verifier has a parent, return the verifier
- * otherwise reinitialize)
- */
- public IVerifier getVerifier() throws CoreException {
- if (jarVerifier == null || jarVerifier.getParent() == null) {
- jarVerifier = new JarVerifier();
- return jarVerifier;
- }
-
- // re-init will be done if the parent changes
- return jarVerifier;
- }
-
- /*
- * @see IFeatureContentProvider#getFeatureManifestReference()
- */
- public ContentReference getFeatureManifestReference(InstallMonitor monitor) throws CoreException {
-
- // check to see if we already have local copy of the manifest
- if (localManifest != null)
- return localManifest;
- ContentReference[] featureArchiveReference = getFeatureEntryArchiveReferences(monitor);
- JarContentReference featureJarReference = null;
- try {
-
- // force feature archive to local.
- // This content provider always assumes exactly 1 archive file (index [0])
- featureJarReference = (JarContentReference) asLocalReference(featureArchiveReference[0], null);
- // we need to unpack archive locally for UI browser references to be resolved correctly
- localFeatureFiles = featureJarReference.unpack(getWorkingDirectory(), null, monitor);
- } catch (IOException e) {
- throw errorRetrieving(Feature.FEATURE_XML, featureJarReference, getURL(), e);
- //$NON-NLS-1$
- }
-
- // find the manifest in the unpacked feature files
- for (int i = 0; i < localFeatureFiles.length; i++) {
- if (localFeatureFiles[i].getIdentifier().equals(Feature.FEATURE_XML)) {
- localManifest = localFeatureFiles[i];
- // cache reference to manifest
- return localManifest;
- }
- }
-
- // the manifest has not been found
- String[] values = new String[] { Feature.FEATURE_XML, getURL().toExternalForm()};
- throw Utilities.newCoreException(Policy.bind("FeaturePackagedContentProvider.NoManifestFile", values), new Exception());
- //$NON-NLS-1$
-
- }
-
- /*
- * @see IFeatureContentProvider#getArchiveReferences()
- */
- public ContentReference[] getArchiveReferences(InstallMonitor monitor) throws CoreException {
-
- IPluginEntry[] entries = getFeature().getPluginEntries();
- INonPluginEntry[] nonEntries = getFeature().getNonPluginEntries();
- List listAllContentRef = new ArrayList();
- ContentReference[] allContentRef = new ContentReference[0];
-
- // feature
- listAllContentRef.addAll(Arrays.asList(getFeatureEntryArchiveReferences(monitor)));
-
- // plugins
- for (int i = 0; i < entries.length; i++) {
- listAllContentRef.addAll(Arrays.asList(getPluginEntryArchiveReferences(entries[i], monitor)));
- }
-
- // non plugins
- for (int i = 0; i < nonEntries.length; i++) {
- listAllContentRef.addAll(Arrays.asList(getNonPluginEntryArchiveReferences(nonEntries[i], monitor)));
- }
-
- // transform List in Array
- if (listAllContentRef.size() > 0) {
- allContentRef = new ContentReference[listAllContentRef.size()];
- listAllContentRef.toArray(allContentRef);
- }
-
- return allContentRef;
- }
-
- /*
- * @see IFeatureContentProvider#getFeatureEntryArchiveReferences()
- */
- public ContentReference[] getFeatureEntryArchiveReferences(InstallMonitor monitor) throws CoreException {
-
- //1 jar file <-> 1 feature
- // we will return the JAR file
- ContentReference[] references = new ContentReference[1];
- ContentReference currentReference = null;
- String archiveID = null;
-
- try {
- archiveID = (getFeature() != null) ? getFeature().getVersionedIdentifier().toString() : "";
- //$NON-NLS-1$
- currentReference = new JarContentReference(archiveID, getURL());
- currentReference = asLocalReference(currentReference, monitor);
- references[0] = currentReference;
- } catch (IOException e) {
- throw errorRetrieving(archiveID, currentReference, getFeature().getURL(), e);
- //$NON-NLS-1$
- }
- return references;
- }
-
- /*
- * @see IFeatureContentProvider#getPluginEntryArchiveReferences(IPluginEntry)
- */
- public ContentReference[] getPluginEntryArchiveReferences(IPluginEntry pluginEntry, InstallMonitor monitor) throws CoreException {
-
- // 1 plugin <-> 1 jar
- // we return the JAR file
- ContentReference[] references = new ContentReference[1];
- String archiveID = getPathID(pluginEntry);
- ISite site = (getFeature() == null) ? null : getFeature().getSite();
- ISiteContentProvider siteContentProvider = (site == null) ? null : site.getSiteContentProvider();
- URL url = (siteContentProvider == null) ? null : siteContentProvider.getArchiveReference(archiveID);
-
- try {
- references[0] = asLocalReference(new JarContentReference(archiveID, url), monitor);
- } catch (IOException e) {
- throw errorRetrieving(archiveID, references[0], getFeature().getURL(), e);
- //$NON-NLS-1$
- }
- return references;
- }
-
- /*
- * @see IFeatureContentProvider#getNonPluginEntryArchiveReferences(INonPluginEntry)
- */
- public ContentReference[] getNonPluginEntryArchiveReferences(INonPluginEntry nonPluginEntry, InstallMonitor monitor) throws CoreException {
-
- // archive = feature/<id>_<ver>/<file>
- String archiveID = Site.DEFAULT_FEATURE_PATH + ((getFeature() != null) ? getFeature().getVersionedIdentifier().toString() : "");
- //$NON-NLS-1$
- archiveID += "/" + nonPluginEntry.getIdentifier(); //$NON-NLS-1$
-
- ContentReference[] references = new ContentReference[1];
- ContentReference currentReference = null;
-
- try {
- ISite site = (getFeature() == null) ? null : getFeature().getSite();
- ISiteContentProvider siteContentProvider = (site == null) ? null : site.getSiteContentProvider();
- URL url = (siteContentProvider == null) ? null : siteContentProvider.getArchiveReference(archiveID);
-
- currentReference = new ContentReference(nonPluginEntry.getIdentifier(), url);
- currentReference = asLocalReference(currentReference, monitor);
- references[0] = currentReference;
-
- } catch (IOException e) {
- throw errorRetrieving(archiveID, currentReference, getFeature().getURL(), e);
- //$NON-NLS-1$
- }
-
- return references;
- }
-
- /*
- * @see IFeatureContentProvider#getFeatureEntryContentReferences()
- */
- public ContentReference[] getFeatureEntryContentReferences(InstallMonitor monitor) throws CoreException {
-
- return localFeatureFiles; // return cached feature references
- // Note: assumes this content provider is always called first to
- // get the feature manifest. This forces the feature files
- // to be unpacked and caches the references
- }
-
- /*
- * @see IFeatureContentProvider#getPluginEntryContentReferences(IPluginEntry)
- */
- public ContentReference[] getPluginEntryContentReferences(IPluginEntry pluginEntry, InstallMonitor monitor) throws CoreException {
-
- ContentReference[] references = getPluginEntryArchiveReferences(pluginEntry, monitor);
- ContentReference[] pluginReferences = new ContentReference[0];
-
- try {
- if (references[0] instanceof JarContentReference) {
- JarContentReference localRef = (JarContentReference) asLocalReference(references[0], monitor);
- pluginReferences = localRef.peek(null, monitor);
- } else {
- // return the list of all subdirectories
- List files = getFiles(references[0].asFile());
- pluginReferences = new ContentReference[files.size()];
- for (int i = 0; i < pluginReferences.length; i++) {
- File currentFile = (File) files.get(i);
- pluginReferences[i] = new ContentReference(null, currentFile.toURL());
- }
- };
-
- //[20866] we did not preserve executable bit
- validatePermissions(pluginReferences);
-
- } catch (IOException e) {
- throw errorRetrieving(pluginEntry.getVersionedIdentifier().toString(), references[0], getFeature().getURL(), e);
- //$NON-NLS-1$
- }
- return pluginReferences;
- }
-
- /*
- * return all the files under the directory
- */
- private List getFiles(File dir) throws IOException {
- List result = new ArrayList();
-
- if (!dir.isDirectory())
- throw new IOException(Policy.bind("FeaturePackagedContentProvider.InvalidDirectory", dir.getPath())); //$NON-NLS-1$
-
- File[] files = dir.listFiles();
- if (files != null) // be careful since it can be null
- for (int i = 0; i < files.length; ++i) {
- if (files[i].isDirectory()) {
- result.addAll(getFiles(files[i]));
- } else {
- result.add(files[i]);
- }
- }
- return result;
- }
-
- /*
- *
- */
- private CoreException errorRetrieving(String obj, ContentReference archive, URL url, Exception e) {
-
- String[] values = new String[] { obj };
-
- return Utilities.newCoreException(Policy.bind("FeaturePackagedContentProvider.ErrorRetrieving", values), e);
- //$NON-NLS-1$
-
- }
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeaturePackagedFactory.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeaturePackagedFactory.java
deleted file mode 100644
index 5506a15..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeaturePackagedFactory.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package org.eclipse.update.internal.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-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.URLEntryModel;
-
-/**
- * Factory for Feature Packaged
- */
-public class FeaturePackagedFactory extends BaseFeatureFactory {
-
- /*
- * @see IFeatureFactory#createFeature(URL,ISite)
- */
- public IFeature createFeature(URL url,ISite site) throws CoreException {
- Feature feature = null;
- InputStream featureStream = null;
-
- try {
- IFeatureContentProvider contentProvider = new FeaturePackagedContentProvider(url);
- ContentReference manifest = contentProvider.getFeatureManifestReference(null/*IProgressMonitor*/);
- featureStream = manifest.getInputStream();
- feature = (Feature)parseFeature(featureStream);
-
- // if there is no update URL for the Feature
- // use the Site URL
- if (feature.getUpdateSiteEntry()==null){
- URLEntryModel entryModel = createURLEntryModel();
- URL siteUrl = site.getURL();
- if (siteUrl!=null){
- entryModel.setURLString(siteUrl.toExternalForm());
- entryModel.resolve(siteUrl,null);
- feature.setUpdateSiteEntryModel(entryModel);
- }
- }
- feature.setFeatureContentProvider(contentProvider);
- feature.setSite(site);
- URL baseUrl = null;
- try {
- baseUrl = new URL(manifest.asURL(),"."); // make sure we have URL to feature directory //$NON-NLS-1$
- } catch(MalformedURLException e) {
- }
- feature.resolve(baseUrl, getResourceBundle(baseUrl));
- feature.markReadOnly();
- } catch (CoreException e){
- throw e;
- } catch (Exception e) {
- throw Utilities.newCoreException(Policy.bind("FeatureFactory.CreatingError", url.toExternalForm()), e); //$NON-NLS-1$
- }finally {
- try {
- featureStream.close();
- } catch (Exception e) {
- }
- }
- return feature;
- }
-
-}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureTypeFactory.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureTypeFactory.java
deleted file mode 100644
index 353bae4..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureTypeFactory.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package org.eclipse.update.internal.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.core.IFeatureFactory;
-import org.eclipse.update.core.Utilities;
-
-/**
- * Manages FeatureFactory extension point
- */
-public final class FeatureTypeFactory {
-
- private static FeatureTypeFactory inst;
- private Map factories;
-
- private static final String SIMPLE_EXTENSION_ID = "featureTypes";
- //$NON-NLS-1$
-
- /*
- * hide constructor
- */
- private FeatureTypeFactory() {
- }
-
- /*
- * Singleton pattern
- */
- public static FeatureTypeFactory getInstance() {
- if (inst == null)
- inst = new FeatureTypeFactory();
- return inst;
- }
-
- /*
- * return the factory for the associated type
- */
- public IFeatureFactory getFactory(String type) throws CoreException {
- //
- Object instance = getFactories().get(type);
- if (instance == null) {
- instance = createFactoryFor(type);
- getFactories().put(type, instance);
- }
- return (IFeatureFactory) instance;
- }
-
- /*
- * creates a factory for the associated type and cache it
- */
- private IFeatureFactory createFactoryFor(String type) throws CoreException {
- IFeatureFactory result = null;
-
- String pluginID =
- UpdateManagerPlugin.getPlugin().getDescriptor().getUniqueIdentifier();
- IPluginRegistry pluginRegistry = Platform.getPluginRegistry();
- IConfigurationElement[] elements =
- pluginRegistry.getConfigurationElementsFor(pluginID, SIMPLE_EXTENSION_ID, type);
-
- if (elements == null || elements.length == 0) {
- throw Utilities.newCoreException(
- Policy.bind("FeatureTypeFactory.UnableToFindFeatureFactory", type),
- null);
- //$NON-NLS-1$
- }
-
- IConfigurationElement element = elements[0];
- result = (IFeatureFactory) element.createExecutableExtension("class");
- //$NON-NLS-1$
- return result;
- }
-
- /*
- *
- */
- private Map getFactories() {
- if (factories == null)
- factories = new HashMap();
- return factories;
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FileResponse.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FileResponse.java
deleted file mode 100644
index 21e69cc..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FileResponse.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.eclipse.update.internal.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-import java.io.InputStream;
-
-//import org.eclipse.update.internal.core.net.http.IContext;
-//import org.eclipse.update.internal.core.net.http.client.IStatusCodes;
-//import org.eclipse.update.internal.core.net.http.client.Response;
-
-/**
- * A File repsonse message
- */
-public class FileResponse extends Response {
-
- /**
- *
- */
- public FileResponse(InputStream in) {
- //super(IStatusCodes.HTTP_OK,"", context, in);
- super(in);
- }
-
-}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/HttpClient.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/HttpClient.java
deleted file mode 100644
index 69a2a46..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/HttpClient.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.eclipse.update.internal.core;
-
-import java.net.Authenticator;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-public class HttpClient {
-
- /**
- * Method close.
- */
- public void close() {
- }
-
- /**
- * Method setAuthenticator.
- * @param authenticator
- */
- public void setAuthenticator(Authenticator authenticator) {
- Authenticator.setDefault(authenticator);
- }
-
-}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/HttpResponse.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/HttpResponse.java
deleted file mode 100644
index 2b2a48e..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/HttpResponse.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.eclipse.update.internal.core;
-
-import java.net.URL;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-public class HttpResponse extends Response {
-
- /**
- *
- */
- public HttpResponse(URL url) {
- //super(IStatusCodes.HTTP_OK,"", context, in);
- super(url);
- }
-
-}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ISiteContentConsumer.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ISiteContentConsumer.java
deleted file mode 100644
index a336f4b..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ISiteContentConsumer.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.eclipse.update.internal.core;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.update.core.*;
-
- /**
- * A site content consumer manages the storage or archives, plugins and
- * feature inside an <code> ISite</code>
- */
-
-public interface ISiteContentConsumer {
-
- /**
- * Stores a content reference into the SiteContentConsumer
- * @param ContentReference the content reference to store
- * @param IProgressMonitor the progress monitor
- * @throws CoreException if an error occurs storing the content reference
- * @since 2.0
- */
- public void store(ContentReference contentReference, IProgressMonitor monitor) throws CoreException;
-
- /**
- * opens a Non plugin Entry for storage
- * @return the new FeatureContentConsumer for this <code>INonPluginEntry</code>
- * @throws CoreException if the opens is done on a FeatureContentConsumer parent other than an IFeature.
- * @since 2.0
- */
- public IContentConsumer open(INonPluginEntry nonPluginEntry) throws CoreException;
-
- /**
- * opens a Non plugin Entry for storage
- * @return the new FeatureContentConsumer for this <code>IPluginEntry</code>
- * @throws CoreException if the opens is done on a FeatureContentConsumer parent other than an IFeature.
- * @since 2.0
- */
- public IContentConsumer open(IPluginEntry pluginEntry) throws CoreException;
-
- /**
- * closes the opened SiteContentConsumer
- * @throws CoreException
- * @since 2.0
- */
- public IFeatureReference close() throws CoreException ;
-
-
- /**
- * aborts the opened SiteContentConsumer
- * @throws CoreException
- * @since 2.0
- */
- public void abort() throws CoreException;
-
-}
-
-
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/IStatusCodes.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/IStatusCodes.java
deleted file mode 100644
index 1fe2f2c..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/IStatusCodes.java
+++ /dev/null
@@ -1,64 +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 v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.update.internal.core;
-
-/**
- * HTTP status codes.
- * <p>
- * <b>Note:</b> This class/interface is part of an interim API that is still under
- * development and expected to change significantly before reaching stability.
- * It is being made available at this early stage to solicit feedback from pioneering
- * adopters on the understanding that any code that uses this API will almost
- * certainly be broken (repeatedly) as the API evolves.
- * </p>
- */
-public interface IStatusCodes {
- public static final int HTTP_CONTINUE = 100;
- public static final int HTTP_SWITCHING_PROTOCOLS = 101;
- public static final int HTTP_OK = 200;
- public static final int HTTP_CREATED = 201;
- public static final int HTTP_ACCEPTED = 202;
- public static final int HTTP_NON_AUTHORITATIVE_INFORMATION = 203;
- public static final int HTTP_NO_CONTENT = 204;
- public static final int HTTP_RESET_CONTENT = 205;
- public static final int HTTP_PARTIAL_CONTENT = 206;
- public static final int HTTP_MULTIPLE_CHOICES = 300;
- public static final int HTTP_MOVED_PERMANENTLY = 301;
- public static final int HTTP_MOVED_TEMPORARILY = 302;
- public static final int HTTP_SEE_OTHER = 303;
- public static final int HTTP_NOT_MODIFIED = 304;
- public static final int HTTP_USE_PROXY = 305;
- public static final int HTTP_TEMPORARY_REDIRECT = 307;
- public static final int HTTP_BAD_REQUEST = 400;
- public static final int HTTP_UNAUTHORIZED = 401;
- public static final int HTTP_PAYMENT_REQUIRED = 402;
- public static final int HTTP_FORBIDDEN = 403;
- public static final int HTTP_NOT_FOUND = 404;
- public static final int HTTP_METHOD_NOT_ALLOWED = 405;
- public static final int HTTP_NOT_ACCEPTABLE = 406;
- public static final int HTTP_PROXY_AUTHENTICATION_REQUIRED = 407;
- public static final int HTTP_REQUEST_TIMEOUT = 408;
- public static final int HTTP_CONFLICT = 409;
- public static final int HTTP_GONE = 410;
- public static final int HTTP_LENGTH_REQUIRED = 411;
- public static final int HTTP_PRECONDITION_FAILED = 412;
- public static final int HTTP_REQUEST_TOO_LONG = 413;
- public static final int HTTP_REQUEST_URI_TOO_LONG = 414;
- public static final int HTTP_UNSUPPORTED_MEDIA_TYPE = 415;
- public static final int HTTP_REQUESTED_RANGE_NOT_SATISFIABLE = 416;
- public static final int HTTP_EXPECTATION_FAILED = 417;
- public static final int HTTP_INTERNAL_SERVER_ERROR = 500;
- public static final int HTTP_NOT_IMPLEMENTED = 501;
- public static final int HTTP_BAD_GATEWAY = 502;
- public static final int HTTP_SERVICE_UNAVAILABLE = 503;
- public static final int HTTP_GATEWAY_TIMEOUT = 504;
- public static final int HTTP_HTTP_VERSION_NOT_SUPPORTED = 505;
-}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/IWritable.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/IWritable.java
deleted file mode 100644
index 3efcdd7..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/IWritable.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.eclipse.update.internal.core;
-
-import java.io.PrintWriter;
-
-/**
- * Called when we want the model to persist as XML
- */
-
-public interface IWritable {
-
- public static final int INDENT = 3;
-
- void write(int indent, PrintWriter w);
-
-
-}
-
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InstallConfiguration.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InstallConfiguration.java
deleted file mode 100644
index 7ee2336..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InstallConfiguration.java
+++ /dev/null
@@ -1,797 +0,0 @@
-package org.eclipse.update.internal.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-import java.io.*;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.*;
-
-import org.eclipse.core.boot.BootLoader;
-import org.eclipse.core.boot.IPlatformConfiguration;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.model.PluginDescriptorModel;
-import org.eclipse.core.runtime.model.PluginFragmentModel;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.core.model.SiteModel;
-import org.eclipse.update.internal.model.*;
-
-/**
- * Manages ConfiguredSites
- *
- */
-
-public class InstallConfiguration extends InstallConfigurationModel implements IInstallConfiguration, IWritable {
-
- private ListenersList listeners = new ListenersList();
-
- /*
- * default constructor.
- */
- public InstallConfiguration() {
- }
-
- /*
- * copy constructor
- */
- public InstallConfiguration(IInstallConfiguration config, URL newLocation, String label) throws MalformedURLException {
- setLocationURLString(newLocation.toExternalForm());
- setLabel(label);
-
- // do not copy list of listeners nor activities
- // make a copy of the siteConfiguration object
- if (config != null) {
- IConfiguredSite[] csites = config.getConfiguredSites();
- if (csites != null) {
- for (int i = 0; i < csites.length; i++) {
- ConfiguredSite configSite = new ConfiguredSite(csites[i]);
- addConfigurationSiteModel(configSite);
- }
- }
- }
-
- // set dummy date and timeline as caller can call set date if the
- // date on the URL string has to be the same
- Date now = new Date();
- setCreationDate(now);
- setTimeline(now.getTime());
- setCurrent(false);
- resolve(newLocation, null);
- }
-
- /*
- * Returns the list of configured sites or an empty array
- */
- public IConfiguredSite[] getConfiguredSites() {
- ConfiguredSiteModel[] result = getConfigurationSitesModel();
- if (result.length == 0)
- return new IConfiguredSite[0];
- else
- return (IConfiguredSite[]) result;
- }
-
- /*
- * Returns the default site policy
- */
- private int getDefaultPolicy() {
- return IPlatformConfiguration.ISitePolicy.USER_EXCLUDE;
- }
-
- /**
- * Creates a Configuration Site and a new Site
- * The policy is from <code> org.eclipse.core.boot.IPlatformConfiguration</code>
- */
- public IConfiguredSite createConfiguredSite(File file) throws CoreException {
-
- ISite site = InternalSiteManager.createSite(file);
-
- //create a config site around the site
- // even if the site == null
- BaseSiteLocalFactory factory = new BaseSiteLocalFactory();
- ConfiguredSite configSite = (ConfiguredSite) factory.createConfigurationSiteModel((SiteModel) site, getDefaultPolicy());
-
- if (site != null && configSite.verifyUpdatableStatus().isOK()) {
- configSite.setPlatformURLString(site.getURL().toExternalForm());
-
- // obtain the list of plugins
- IPlatformConfiguration runtimeConfiguration = BootLoader.getCurrentPlatformConfiguration();
- ConfigurationPolicy configurationPolicy = (ConfigurationPolicy) configSite.getConfigurationPolicy();
- String[] pluginPath = new String[0];
- if (configurationPolicy.getPolicy() == IPlatformConfiguration.ISitePolicy.USER_INCLUDE)
- pluginPath = configurationPolicy.getPluginPath(site, null);
-
- // create new Site in configuration
- IPlatformConfiguration.ISitePolicy sitePolicy = runtimeConfiguration.createSitePolicy(configurationPolicy.getPolicy(), pluginPath);
-
- // change runtime
- IPlatformConfiguration.ISiteEntry siteEntry = runtimeConfiguration.createSiteEntry(site.getURL(), sitePolicy);
- runtimeConfiguration.configureSite(siteEntry);
-
- // if the privatre marker doesn't already exist create it
- configSite.createPrivateSiteMarker();
- }
-
- return configSite;
- }
-
- /**
- * Creates a Configuration Site and a new Site as a private link site
- * The policy is from <code> org.eclipse.core.boot.IPlatformConfiguration</code>
- */
- public IConfiguredSite createLinkedConfiguredSite(File file) throws CoreException {
-
- ISite site = InternalSiteManager.createSite(file);
-
- //create a config site around the site
- // even if the site == null
- BaseSiteLocalFactory factory = new BaseSiteLocalFactory();
- ConfiguredSite configSite = (ConfiguredSite) factory.createConfigurationSiteModel((SiteModel) site, getDefaultPolicy());
-
- if (!configSite.isExtensionSite()) {
- String msg = Policy.bind("InstallConfiguration.NotAnExtensionSite");
- throw Utilities.newCoreException(msg, null);
- }
-
- if (configSite.isNativelyLinked()) {
- throw Utilities.newCoreException("InstallConfiguration.AlreadyNativelyLinked", null);
- }
-
- if (site != null) {
- configSite.setPlatformURLString(site.getURL().toExternalForm());
-
- // obtain the list of plugins
- IPlatformConfiguration runtimeConfiguration = BootLoader.getCurrentPlatformConfiguration();
- ConfigurationPolicy configurationPolicy = (ConfigurationPolicy) configSite.getConfigurationPolicy();
- String[] pluginPath = new String[0];
- if (configurationPolicy.getPolicy() == IPlatformConfiguration.ISitePolicy.USER_INCLUDE)
- pluginPath = configurationPolicy.getPluginPath(site, null);
-
- // create new Site in configuration
- IPlatformConfiguration.ISitePolicy sitePolicy = runtimeConfiguration.createSitePolicy(configurationPolicy.getPolicy(), pluginPath);
-
- // change runtime
- IPlatformConfiguration.ISiteEntry siteEntry = runtimeConfiguration.createSiteEntry(site.getURL(), sitePolicy);
- runtimeConfiguration.configureSite(siteEntry);
-
- }
-
- // configure all features as enable
- configure(configSite);
-
- return configSite;
- }
-
- /*
- *Configure all features as Enable Check we only enable highest version
- */
- private void configure(ConfiguredSite linkedSite) throws CoreException {
- ISite site = linkedSite.getSite();
- ISiteFeatureReference[] newFeaturesRef = site.getFeatureReferences();
-
- for (int i = 0; i < newFeaturesRef.length; i++) {
- // TRACE
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_RECONCILER) {
- String reconciliationType = "enable (optimistic)";
- UpdateManagerPlugin.debug("New Linked Site:New Feature: " + newFeaturesRef[i].getURL() + " as " + reconciliationType);
- }
- ConfigurationPolicy policy = linkedSite.getConfigurationPolicy();
- policy.configure(newFeaturesRef[i], true, false);
- }
- SiteReconciler.checkConfiguredFeatures(linkedSite);
- }
-
- /*
- *
- */
- public void addConfiguredSite(IConfiguredSite site) {
- if (!isCurrent() && isReadOnly())
- return;
-
- ConfigurationActivity activity = new ConfigurationActivity(IActivity.ACTION_SITE_INSTALL);
- activity.setLabel(site.getSite().getURL().toExternalForm());
- activity.setDate(new Date());
- ConfiguredSiteModel configSiteModel = (ConfiguredSiteModel) site;
- addConfigurationSiteModel(configSiteModel);
- configSiteModel.setInstallConfigurationModel(this);
-
- // notify listeners
- Object[] configurationListeners = listeners.getListeners();
- for (int i = 0; i < configurationListeners.length; i++) {
- IInstallConfigurationChangedListener listener = ((IInstallConfigurationChangedListener) configurationListeners[i]);
- listener.installSiteAdded(site);
- }
-
- // everything done ok
- activity.setStatus(IActivity.STATUS_OK);
- this.addActivity(activity);
- }
-
- /**
- * Method addActivity.
- * @param activity
- */
- public void addActivity(IActivity activity) {
- addActivityModel((ConfigurationActivityModel)activity);
- }
-
-
- /*
- *
- */
- public void removeConfiguredSite(IConfiguredSite site) {
-
- if (removeConfigurationSiteModel((ConfiguredSiteModel) site)) {
- // notify listeners
- Object[] configurationListeners = listeners.getListeners();
- for (int i = 0; i < configurationListeners.length; i++) {
- IInstallConfigurationChangedListener listener = ((IInstallConfigurationChangedListener) configurationListeners[i]);
- listener.installSiteAdded(site);
- }
-
- //activity
- ConfigurationActivity activity = new ConfigurationActivity(IActivity.ACTION_SITE_REMOVE);
- activity.setLabel(site.getSite().getURL().toExternalForm());
- activity.setDate(new Date());
- activity.setStatus(IActivity.STATUS_OK);
- this.addActivity(activity);
- }
- }
-
- /*
- * @see IInstallConfiguration#addInstallConfigurationChangedListener(IInstallConfigurationChangedListener)
- */
- public void addInstallConfigurationChangedListener(IInstallConfigurationChangedListener listener) {
- synchronized (listeners) {
- listeners.add(listener);
- }
- }
-
- /*
- * @see IInstallConfiguration#removeInstallConfigurationChangedListener(IInstallConfigurationChangedListener)
- */
- public void removeInstallConfigurationChangedListener(IInstallConfigurationChangedListener listener) {
- synchronized (listeners) {
- listeners.remove(listener);
- }
- }
-
- /*
- * write the Configuration.xml file
- */
- private void export(File exportFile) throws CoreException {
- try {
- Writer writer = new Writer(exportFile, "UTF8"); //$NON-NLS-1$
- writer.write(this);
- } catch (FileNotFoundException e) {
- throw Utilities.newCoreException(Policy.bind("InstallConfiguration.UnableToSaveConfiguration", exportFile.getAbsolutePath()), e);
- //$NON-NLS-1$
- } catch (UnsupportedEncodingException e) {
- throw Utilities.newCoreException(Policy.bind("InstallConfiguration.UnableToEncodeConfiguration", exportFile.getAbsolutePath()), e);
- //$NON-NLS-1$
- }
- }
-
- /*
- * Deletes the configuration from its URL/location
- */
- public void remove() {
- // save the configuration
- if ("file".equalsIgnoreCase(getURL().getProtocol())) { //$NON-NLS-1$
- // the location points to a file
- File file = new File(getURL().getFile());
- UpdateManagerUtils.removeFromFileSystem(file);
- }
- }
-
- /*
- * Saves the configuration into its URL/location
- * and changes the platform configuration.
- * The runtime site entries from platform.cfg are updated as required
- * (cannot recreate these because must preserve other runtime state) [18520]
- */
- public void save(boolean isTransient) throws CoreException {
-
- // save the configuration.xml file
- saveConfigurationFile(isTransient);
-
- // Write info into platform for the next runtime
- IPlatformConfiguration runtimeConfiguration = BootLoader.getCurrentPlatformConfiguration();
- ConfiguredSiteModel[] configurationSites = getConfigurationSitesModel();
-
- // clean configured Entries from platform runtime
- IPlatformConfiguration.IFeatureEntry[] configuredFeatureEntries = runtimeConfiguration.getConfiguredFeatureEntries();
- for (int i = 0; i < configuredFeatureEntries.length; i++) {
- runtimeConfiguration.unconfigureFeatureEntry(configuredFeatureEntries[i]);
- }
-
- // [19958] remember sites currently configured by runtime (use
- // temp configuration object rather than a straight list to ensure
- // correct lookup)
- IPlatformConfiguration tempConfig = null;
- try {
- tempConfig = BootLoader.getPlatformConfiguration(null);
- IPlatformConfiguration.ISiteEntry[] tmpSites = runtimeConfiguration.getConfiguredSites();
- for (int i = 0; i < tmpSites.length; i++) {
- tempConfig.configureSite(tmpSites[i]);
- }
- } catch (IOException e) {
- // assume no currently configured sites
- }
-
- //check sites
- checkSites(configurationSites, runtimeConfiguration);
-
- // Write the plugin path, primary feature and platform
- // into platform.cfg
- for (int i = 0; i < configurationSites.length; i++) {
- ConfiguredSite cSite = ((ConfiguredSite) configurationSites[i]);
- ConfigurationPolicy configurationPolicy = cSite.getConfigurationPolicy();
-
- savePluginPath(cSite, runtimeConfiguration, tempConfig);
-
- // IF primary feature URL or platform feature URL that we need to pass to runtime config
- // is part of platform:base:, write it as platform:base: URL
- IFeatureReference[] configuredFeaturesRef = configurationPolicy.getConfiguredFeatures();
- for (int j = 0; j < configuredFeaturesRef.length; j++) {
- IFeature feature = null;
- try {
- feature = configuredFeaturesRef[j].getFeature();
- } catch (CoreException e) {
- UpdateManagerPlugin.warn(null, e);
- }
- saveFeatureEntry(cSite, feature, runtimeConfiguration);
- }
- }
-
- // [19958] remove any extra site entries from runtime configuration
- // (site entries that no longer exist in this configuration)
- if (tempConfig != null) {
- IPlatformConfiguration.ISiteEntry[] tmpSites = tempConfig.getConfiguredSites();
- for (int i = 0; i < tmpSites.length; i++) {
- runtimeConfiguration.unconfigureSite(tmpSites[i]);
- }
- }
-
- try {
- runtimeConfiguration.save();
- } catch (IOException e) {
- CoreException exc = Utilities.newCoreException(Policy.bind("InstallConfiguration.UnableToSavePlatformConfiguration", runtimeConfiguration.getConfigurationLocation().toExternalForm()), e);
- //$NON-NLS-1$
- UpdateManagerPlugin.warn("",exc);
- }
-
- }
-
- /*
- * Write the plugin path for each site
- * Do not check if the site already existed before [16696].
- * Reuse any runtime site objects in platform.cfg (to preserve state) [18520].
- */
- private void savePluginPath(ConfiguredSite cSite, IPlatformConfiguration runtimeConfiguration, IPlatformConfiguration tempConfig) // [19958]
- throws CoreException {
-
- ConfigurationPolicy configurationPolicy = cSite.getConfigurationPolicy();
-
- // create a ISitePolicy (policy, pluginPath)
- // for the site
- String[] pluginPath = configurationPolicy.getPluginPath(cSite.getSite(), cSite.getPreviousPluginPath());
- IPlatformConfiguration.ISitePolicy sitePolicy = runtimeConfiguration.createSitePolicy(configurationPolicy.getPolicy(), pluginPath);
-
- // get the URL of the site that matches the one platform.cfg gave us
- URL urlToCheck = null;
- try {
- urlToCheck = new URL(cSite.getPlatformURLString());
- } catch (MalformedURLException e) {
- throw Utilities.newCoreException(Policy.bind("InstallConfiguration.UnableToCreateURL", cSite.getPlatformURLString()), e);
- //$NON-NLS-1$
- } catch (ClassCastException e) {
- throw Utilities.newCoreException(Policy.bind("InstallConfiguration.UnableToCast"), e);
- //$NON-NLS-1$
- }
-
- // update runtime configuration [18520]
- // Note: we must not blindly replace the site entries because they
- // contain additional runtime state that needs to be preserved.
- IPlatformConfiguration.ISiteEntry siteEntry = runtimeConfiguration.findConfiguredSite(urlToCheck);
- if (siteEntry == null)
- siteEntry = runtimeConfiguration.createSiteEntry(urlToCheck, sitePolicy);
- else {
- siteEntry.setSitePolicy(sitePolicy);
- if (tempConfig != null) // [19958] remove reused entries from list
- tempConfig.unconfigureSite(siteEntry);
- }
- runtimeConfiguration.configureSite(siteEntry, true /*replace if exists*/
- );
- }
-
- /*
- * Save the Feature entry
- * The feature can be a primary feature and/or a platform feature
- */
- private void saveFeatureEntry(ConfiguredSite cSite, IFeature feature, IPlatformConfiguration runtimeConfiguration) throws CoreException {
- if (feature == null)
- return;
-
- // get the URL of the plugin that corresponds to the feature (pluginid = featureid)
- String id = feature.getVersionedIdentifier().getIdentifier();
- IPluginEntry[] entries = feature.getPluginEntries();
- URL url = null;
- IPluginEntry featurePlugin = null;
- for (int k = 0; k < entries.length; k++) {
- if (id.equalsIgnoreCase(entries[k].getVersionedIdentifier().getIdentifier())) {
- url = getRuntimeConfigurationURL(entries[k], cSite);
- featurePlugin = entries[k];
- }
- }
- String pluginVersion = null;
- if (featurePlugin != null)
- pluginVersion = featurePlugin.getVersionedIdentifier().getVersion().toString();
-
- // write the primary features
- if (feature.isPrimary()) {
- // get any fragments for the feature plugin
- ArrayList list = new ArrayList();
- if (url != null)
- list.add(url);
- if (featurePlugin != null) {
- URL[] fragments = getRuntimeFragmentURLs(featurePlugin);
- list.addAll(Arrays.asList(fragments));
- }
- URL[] roots = (URL[]) list.toArray(new URL[0]);
-
- // save information in runtime platform state
- String version = feature.getVersionedIdentifier().getVersion().toString();
- String application = feature.getApplication();
- IPlatformConfiguration.IFeatureEntry featureEntry = runtimeConfiguration.createFeatureEntry(id, version, pluginVersion, true, application, roots);
- runtimeConfiguration.configureFeatureEntry(featureEntry);
- } else {
- // write non-primary feature entries
- String version = feature.getVersionedIdentifier().getVersion().toString();
- IPlatformConfiguration.IFeatureEntry featureEntry = runtimeConfiguration.createFeatureEntry(id, version, pluginVersion, false, null, null);
- runtimeConfiguration.configureFeatureEntry(featureEntry);
- }
-
- // write the platform features (features that contain special platform plugins)
- IPluginEntry[] platformPlugins = getPlatformPlugins(feature, runtimeConfiguration);
- for (int k = 0; k < platformPlugins.length; k++) {
- id = platformPlugins[k].getVersionedIdentifier().getIdentifier();
- url = getRuntimeConfigurationURL(platformPlugins[k], cSite);
- if (url != null) {
- runtimeConfiguration.setBootstrapPluginLocation(id, url);
- }
- }
- }
-
- /*
- * Log if we are about to create a site that didn't exist before
- * in platform.cfg [16696].
- */
- private void checkSites(ConfiguredSiteModel[] configurationSites, IPlatformConfiguration runtimeConfiguration) throws CoreException {
-
- // check all the sites we are about to write already existed
- // they should have existed either because they were created by
- // updateManager or because we read them from platform.cfg
- for (int i = 0; i < configurationSites.length; i++) {
- // get the URL of the site that matches the one platform.cfg gave us
- URL urlToCheck = null;
- try {
- urlToCheck = new URL(configurationSites[i].getPlatformURLString());
- } catch (MalformedURLException e) {
- UpdateManagerPlugin.warn(Policy.bind("InstallConfiguration.UnableToCreateURL", configurationSites[i].getPlatformURLString()), e);
- //$NON-NLS-1$
- } catch (ClassCastException e) {
- UpdateManagerPlugin.warn(Policy.bind("InstallConfiguration.UnableToCast"), e);
- //$NON-NLS-1$
- }
-
- // if the URL doesn't exits log it
- IPlatformConfiguration.ISiteEntry siteEntry = runtimeConfiguration.findConfiguredSite(urlToCheck);
- if (siteEntry == null) {
- UpdateManagerPlugin.warn(Policy.bind("Unable to find site {0} in platform configuration {1}.", urlToCheck.toExternalForm(), runtimeConfiguration.getConfigurationLocation().toExternalForm()));
- //$NON-NLS-1$
- }
- }
- }
-
- /*
- *
- */
- public void saveConfigurationFile(boolean isTransient) throws CoreException {
- // save the configuration
- if ("file".equalsIgnoreCase(getURL().getProtocol())) { //$NON-NLS-1$
- // the location points to a file
- File file = new File(getURL().getFile());
- if (!file.exists()) {
- //log + 24642 [works for all activities]
- UpdateManagerPlugin.log(this);
- }
- if (isTransient)
- file.deleteOnExit();
- export(file);
- }
- }
-
- /*
- * @see IWritable#write(int, PrintWriter)
- */
- public void write(int indent, PrintWriter w) {
- String gap = ""; //$NON-NLS-1$
- for (int i = 0; i < indent; i++)
- gap += " "; //$NON-NLS-1$
- String increment = ""; //$NON-NLS-1$
- for (int i = 0; i < IWritable.INDENT; i++)
- increment += " "; //$NON-NLS-1$
-
- //CONFIGURATION
- w.print(gap + "<" + InstallConfigurationParser.CONFIGURATION + " ");
- //$NON-NLS-1$ //$NON-NLS-2$
- long time = (getCreationDate() != null) ? getCreationDate().getTime() : 0L;
- w.print("date=\"" + time + "\" "); //$NON-NLS-1$ //$NON-NLS-2$
- w.print("timeline=\"" + getTimeline() + "\" "); //$NON-NLS-1$ //$NON-NLS-2$
- w.println(">"); //$NON-NLS-1$
-
- // site configurations
- if (getConfigurationSitesModel() != null) {
- ConfiguredSiteModel[] sites = getConfigurationSitesModel();
- for (int i = 0; i < sites.length; i++) {
- ConfiguredSite element = (ConfiguredSite) sites[i];
- ((IWritable) element).write(indent + IWritable.INDENT, w);
- }
- }
-
- // activities
- if (getActivityModel() != null) {
- ConfigurationActivityModel[] activities = getActivityModel();
- for (int i = 0; i < activities.length; i++) {
- ConfigurationActivity element = (ConfigurationActivity) activities[i];
- ((IWritable) element).write(indent + IWritable.INDENT, w);
- }
- }
-
- // end
- w.println(gap + "</" + InstallConfigurationParser.CONFIGURATION + ">");
- //$NON-NLS-1$ //$NON-NLS-2$
- w.println(""); //$NON-NLS-1$
- }
-
- /*
- * reverts this configuration to the match the new one
- *
- * Compare the oldSites with the currentOne. the old state is the state we want to revert to.
- *
- * If a site was in old state, but not in the currentOne, keep it in the hash.
- * If a site is in the currentOne but was not in the old state, unconfigure all features and add it in the hash
- * If a site was in baoth state, calculate the 'delta' and re-set it in the hash map
- *
- * At the end, set the configured site from the new sites hash map
- *
- */
- public void revertTo(IInstallConfiguration configuration, IProgressMonitor monitor, IProblemHandler handler) throws CoreException, InterruptedException {
-
- IConfiguredSite[] oldConfigSites = configuration.getConfiguredSites();
- IConfiguredSite[] nowConfigSites = this.getConfiguredSites();
-
- // create a hashtable of the *old* and *new* sites
- Map oldSitesMap = new Hashtable(0);
- Map newSitesMap = new Hashtable(0);
- for (int i = 0; i < oldConfigSites.length; i++) {
- IConfiguredSite element = oldConfigSites[i];
- oldSitesMap.put(element.getSite().getURL().toExternalForm(), element);
- newSitesMap.put(element.getSite().getURL().toExternalForm(), element);
- }
- // create list of all the sites that map the *old* sites
- // we want the intersection between the old sites and the current sites
- if (nowConfigSites != null) {
- String key = null;
-
- for (int i = 0; i < nowConfigSites.length; i++) {
- key = nowConfigSites[i].getSite().getURL().toExternalForm();
- IConfiguredSite oldSite = (IConfiguredSite) oldSitesMap.get(key);
- if (oldSite != null) {
- // the Site existed before, calculate the delta between its current state and the
- // state we are reverting to and put it back into the map
- ((ConfiguredSite) nowConfigSites[i]).revertTo(oldSite, monitor, handler);
- } else {
- // the site didn't exist in the InstallConfiguration we are reverting to
- // unconfigure everything from this site so it is still present
- ISiteFeatureReference[] featuresToUnconfigure = nowConfigSites[i].getSite().getFeatureReferences();
- for (int j = 0; j < featuresToUnconfigure.length; j++) {
- IFeature featureToUnconfigure = null;
- try {
- featureToUnconfigure = featuresToUnconfigure[j].getFeature();
- } catch (CoreException e) {
- UpdateManagerPlugin.warn(null, e);
- }
- if (featureToUnconfigure != null)
- nowConfigSites[i].unconfigure(featureToUnconfigure);
- }
- }
- newSitesMap.put(key,nowConfigSites[i]);
- }
-
- // the new configuration has the exact same sites as the old configuration
- // the old configuration in the Map are either as-is because they don't exist
- // in the current one, or they are the delta from the current one to the old one
- Collection sites = newSitesMap.values();
- if (sites != null && !sites.isEmpty()) {
- ConfiguredSiteModel[] sitesModel = new ConfiguredSiteModel[sites.size()];
- sites.toArray(sitesModel);
- setConfigurationSiteModel(sitesModel);
- }
- }
- }
-
- /*
- * @see IInstallConfiguration#getActivities()
- */
- public IActivity[] getActivities() {
- if (getActivityModel().length == 0)
- return new IActivity[0];
- return (IActivity[]) getActivityModel();
- }
-
- /*
- * returns the list of platform plugins of the feature or an empty list
- * if the feature doesn't contain any platform plugins
- */
- private IPluginEntry[] getPlatformPlugins(IFeature feature, IPlatformConfiguration runtimeConfiguration) {
- Map featurePlatformPlugins = new HashMap();
- String[] platformPluginID = runtimeConfiguration.getBootstrapPluginIdentifiers();
- IPluginEntry[] featurePlugins = feature.getPluginEntries();
-
- for (int i = 0; i < platformPluginID.length; i++) {
- String featurePluginId = null;
- for (int j = 0; j < featurePlugins.length; j++) {
- featurePluginId = featurePlugins[j].getVersionedIdentifier().getIdentifier();
- if (platformPluginID[i].equals(featurePluginId)) {
- featurePlatformPlugins.put(platformPluginID[i], featurePlugins[j]);
- }
- }
- }
-
- Collection values = featurePlatformPlugins.values();
- if (values == null || values.size() == 0)
- return new IPluginEntry[0];
-
- IPluginEntry[] result = new IPluginEntry[values.size()];
- Iterator iter = values.iterator();
- int index = 0;
- while (iter.hasNext()) {
- result[index] = ((IPluginEntry) iter.next());
- index++;
- }
- return result;
- }
-
- /*
- * returns the URL of the pluginEntry on the site
- * Transform the URL to use platform: protocol if needed
- * return null if the URL to write is not valid
- */
- private URL getRuntimeConfigurationURL(IPluginEntry entry, ConfiguredSite cSite) throws CoreException {
-
- String rootString = cSite.getPlatformURLString();
- String pluginPathID = getPathID(entry);
- try {
- ISiteContentProvider siteContentProvider = cSite.getSite().getSiteContentProvider();
- URL pluginEntryfullURL = siteContentProvider.getArchiveReference(pluginPathID);
-
- //
- if (!rootString.startsWith("platform")) {
- // DEBUG:
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_CONFIGURATION)
- UpdateManagerPlugin.debug("getRuntimeConfiguration Plugin Entry Full URL:" + pluginEntryfullURL + " Platform String:" + rootString + " [NON PLATFORM URL].");
- return pluginEntryfullURL;
- }
-
- //URL pluginEntryRootURL = Platform.resolve(new URL(rootString));
- // Do not resolve [16507], just use platform:base/ as a root
- // rootString = platform:base
- // pluginRoot = /home/a
- // pluginFull = /home/a/c/boot.jar
- // relative = platform:/base/c/boot.jar
- URL pluginEntryRootURL = cSite.getSite().getURL();
- String relativeString = UpdateManagerUtils.getURLAsString(pluginEntryRootURL, pluginEntryfullURL);
- URL result = new URL(new URL(rootString), relativeString);
-
- // DEBUG:
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_CONFIGURATION)
- UpdateManagerPlugin.debug("getRuntimeConfiguration plugin Entry Full URL:" + pluginEntryfullURL + " Platform String:" + rootString + " Site URL:" + pluginEntryRootURL + " Relative:" + relativeString);
-
- // verify we are about to write a valid file URL
- // check with fullURL as it is not resolved to platform:base/
- if (pluginEntryfullURL != null) {
- if ("file".equals(pluginEntryfullURL.getProtocol())) {
- String fileString = pluginEntryfullURL.getFile();
- if (!new File(fileString).exists()) {
- UpdateManagerPlugin.warn("The URL:" + result + " doesn't point to a valid platform plugin.The URL will not be written in the platform configuration", new Exception());
- return null;
- }
- }
- }
-
- return result;
- } catch (IOException e) {
- throw Utilities.newCoreException(Policy.bind("InstallConfiguration.UnableToCreateURL", rootString), e);
- //$NON-NLS-1$
- }
- }
-
- /*
- * Return URLs for any fragments that are associated with the specified plugin entry
- */
- private URL[] getRuntimeFragmentURLs(IPluginEntry entry) throws CoreException {
-
- // get the identifier associated with the entry
- VersionedIdentifier vid = entry.getVersionedIdentifier();
-
- // get the plugin descriptor from the registry
- IPluginRegistry reg = Platform.getPluginRegistry();
- IPluginDescriptor desc = reg.getPluginDescriptor(vid.getIdentifier());
- ArrayList list = new ArrayList();
- if (desc != null) {
- try {
- // get all of the fragments
- PluginDescriptorModel descModel = (PluginDescriptorModel) desc;
- PluginFragmentModel[] frags = descModel.getFragments();
-
- for (int i = 0; frags != null && i < frags.length; i++) {
- String location = frags[i].getLocation();
- try {
- URL locationURL = new URL(location);
- locationURL = Platform.resolve(locationURL);
- list.add(asInstallRelativeURL(locationURL));
- } catch (IOException e) {
- // skip bad fragments
- }
- }
-
- } catch (ClassCastException e) {
- // cannot determine fragments
- }
- }
- return (URL[]) list.toArray(new URL[0]);
- }
-
- /**
- * Returns the path identifier for a plugin entry.
- * <code>plugins/<pluginId>_<pluginVersion>.jar</code>
- * @return the path identifier
- */
- private String getPathID(IPluginEntry entry) {
- return Site.DEFAULT_PLUGIN_PATH + entry.getVersionedIdentifier().toString() + FeatureContentProvider.JAR_EXTENSION;
- }
-
- /**
- * Try to recast URL as platform:/base/
- */
- private URL asInstallRelativeURL(URL url) {
- // get location of install
- URL install = BootLoader.getInstallURL();
-
- // try to determine if supplied URL can be recast as install-relative
- if (install.getProtocol().equals(url.getProtocol())) {
- if (install.getProtocol().equals("file")) {
- String installS = new File(install.getFile()).getAbsolutePath().replace(File.separatorChar, '/');
- if (!installS.endsWith("/"))
- installS += "/";
- String urlS = new File(url.getFile()).getAbsolutePath().replace(File.separatorChar, '/');
- if (!urlS.endsWith("/"))
- urlS += "/";
- int ix = installS.lastIndexOf("/");
- if (ix != -1) {
- installS = installS.substring(0, ix + 1);
- if (urlS.startsWith(installS)) {
- try {
- return new URL("platform:/base/" + urlS.substring(installS.length()));
- } catch (MalformedURLException e) {
- }
- }
- }
- }
- }
- return url;
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InstallHandlerProxy.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InstallHandlerProxy.java
deleted file mode 100644
index 34b1b36..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InstallHandlerProxy.java
+++ /dev/null
@@ -1,520 +0,0 @@
-package org.eclipse.update.internal.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.net.URL;
-import java.net.URLClassLoader;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IPluginRegistry;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.update.core.ContentReference;
-import org.eclipse.update.core.IFeature;
-import org.eclipse.update.core.IFeatureContentConsumer;
-import org.eclipse.update.core.IInstallHandler;
-import org.eclipse.update.core.IInstallHandlerEntry;
-import org.eclipse.update.core.INonPluginEntry;
-import org.eclipse.update.core.IPluginEntry;
-import org.eclipse.update.core.IVerificationListener;
-import org.eclipse.update.core.InstallMonitor;
-import org.eclipse.update.core.Utilities;
-
-public class InstallHandlerProxy implements IInstallHandler {
-
- private IFeature feature = null;
- private int type;
- private IInstallHandler handler = null;
- private IStatus savedStatus = null;
- private boolean DEBUG = false;
-
- private static final String EXT_PLUGIN = "org.eclipse.update.core";
- private static final String EXT_POINT = "installHandlers";
-
- private InstallHandlerProxy() {
- }
-
- public InstallHandlerProxy(
- int type,
- IFeature feature,
- IInstallHandlerEntry entry,
- InstallMonitor monitor)
- throws CoreException {
-
- initialize(type, feature, entry, monitor);
- }
-
- /*
- * @see IInstallHandler#initialize
- */
- public void initialize(
- int type,
- IFeature feature,
- IInstallHandlerEntry entry,
- InstallMonitor monitor)
- throws CoreException {
-
- DEBUG = UpdateManagerPlugin.DEBUG_SHOW_IHANDLER;
- // validate arguments
- if (feature == null)
- throw new IllegalArgumentException();
- this.feature = feature;
- this.type = type;
-
- // check if we have a handler entry specified in the feature.xml
- if (entry == null) {
- if (DEBUG)
- debug("not specified");
- return; // no handler entry
- }
-
- String library = entry.getLibrary();
- String handlerName = entry.getHandlerName();
- if (handlerName == null || handlerName.trim().equals("")) {
- if (DEBUG)
- debug("not specified");
- return; // no handler class spacified in entry
- }
- if (DEBUG) {
- debug("handler=" + handlerName);
- debug("path= " + library);
- }
-
- // get handler instance
- try {
- if (library == null || library.trim().equals(""))
- this.handler = getGlobalHandler(handlerName);
- else
- this.handler = getLocalHandler(library, handlerName);
- if (this.handler == null)
- return;
- handler.initialize(type, feature, entry, monitor);
- } catch (ClassNotFoundException e) {
- handleExceptionInInit(
- Policy.bind("InstallHandler.notFound", feature.getLabel()),
- e);
- //$NON-NLS-1$
- } catch (ClassCastException e) {
- handleExceptionInInit(
- Policy.bind("InstallHandler.invalidHandler", feature.getLabel()),
- e);
- //$NON-NLS-1$
- } catch (CoreException e) {
- handleExceptionInInit(null, e);
- } catch (Exception e) {
- handleExceptionInInit(
- Policy.bind("InstallHandler.unableToCreateHandler", feature.getLabel()),
- e);
- //$NON-NLS-1$
- }
-
- }
-
- /*
- * @see IInstallHandler#installInitiated
- */
- public void installInitiated() throws CoreException {
- if (handler == null)
- return;
- else {
- try {
- if (DEBUG)
- debug("calling installInitiated()");
- handler.installInitiated();
- } catch (Throwable e) {
- handleExceptionInCall(e, feature);
- }
- }
- }
-
- /*
- * @see IInstallHandler#allPluginsDownloaded
- */
- public void pluginsDownloaded(IPluginEntry[] plugins) throws CoreException {
- if (handler == null)
- return;
- else {
- try {
- if (DEBUG)
- debug("calling pluginsDownloaded()");
- handler.pluginsDownloaded(plugins);
- } catch (Throwable e) {
- handleExceptionInCall(e, feature);
- }
- }
- }
-
- /*
- * @see IInstallHandler#allPluginsInstalled
- */
- public void completeInstall(IFeatureContentConsumer consumer)
- throws CoreException {
- if (handler == null)
- return;
- else {
- try {
- if (DEBUG)
- debug("calling completeInstall()");
- handler.completeInstall(consumer);
- } catch (Throwable e) {
- handleExceptionInCall(e, feature);
- }
- }
- }
-
- /*
- * @see IInstallHandler#allDataDownloaded
- */
- public void nonPluginDataDownloaded(
- INonPluginEntry[] nonPluginData,
- IVerificationListener listener)
- throws CoreException {
- if (handler == null)
- return;
- else {
- try {
- if (DEBUG)
- debug("calling nonPluginDataDownloaded()");
- handler.nonPluginDataDownloaded(nonPluginData, listener);
- } catch (Throwable e) {
- handleExceptionInCall(e, feature);
- }
- }
- }
-
- /*
- * @see IInstallHandler#installCompleted
- */
- public void installCompleted(boolean success) throws CoreException {
- if (handler == null)
- return;
- else {
- try {
- if (DEBUG)
- debug("calling installCompleted()");
- handler.installCompleted(success);
- } catch (Throwable e) {
- handleExceptionInCall(e, feature);
- }
- }
- }
-
- /*
- * @see IInstallHandler#configureInitiated
- */
- public void configureInitiated() throws CoreException {
- if (handler == null)
- return;
- else {
- try {
- if (DEBUG)
- debug("calling configureInitiated()");
- handler.configureInitiated();
- } catch (Throwable e) {
- handleExceptionInCall(e, feature);
- }
- }
- }
-
- /*
- * @see IInstallHandler#completeConfigure
- */
- public void completeConfigure() throws CoreException {
- if (handler == null)
- return;
- else {
- try {
- if (DEBUG)
- debug("calling completeConfigure()");
- handler.completeConfigure();
- } catch (Throwable e) {
- handleExceptionInCall(e, feature);
- }
- }
- }
-
- /*
- * @see IInstallHandler#configureCompleted
- */
- public void configureCompleted(boolean success) throws CoreException {
- if (handler == null)
- return;
- else {
- try {
- if (DEBUG)
- debug("calling configureCompleted()");
- handler.configureCompleted(success);
- } catch (Throwable e) {
- handleExceptionInCall(e, feature);
- }
- }
- }
-
- /*
- * @see IInstallHandler#unconfigureInitiated
- */
- public void unconfigureInitiated() throws CoreException {
- if (handler == null)
- return;
- else {
- try {
- if (DEBUG)
- debug("calling unconfigureInitiated()");
- handler.unconfigureInitiated();
- } catch (Throwable e) {
- handleExceptionInCall(e, feature);
- }
- }
- }
-
- /*
- * @see IInstallHandler#completeUnconfigure
- */
- public void completeUnconfigure() throws CoreException {
- if (handler == null)
- return;
- else {
- try {
- if (DEBUG)
- debug("calling completeUnconfigure()");
- handler.completeUnconfigure();
- } catch (Throwable e) {
- handleExceptionInCall(e, feature);
- }
- }
- }
-
- /*
- * @see IInstallHandler#unconfigureCompleted
- */
- public void unconfigureCompleted(boolean success) throws CoreException {
- if (handler == null) {
- if (savedStatus == null)
- return;
- else
- throw new CoreException(savedStatus); // delayed exception
- } else {
- try {
- if (DEBUG)
- debug("calling unconfigureCompleted()");
- handler.unconfigureCompleted(success);
- } catch (Throwable e) {
- handleExceptionInCall(e, feature);
- }
- if (savedStatus != null)
- throw new CoreException(savedStatus); // delayed exception
- }
- }
-
- /*
- * @see IInstallHandler#uninstallInitiated
- */
- public void uninstallInitiated() throws CoreException {
- if (handler == null)
- return;
- else {
- try {
- if (DEBUG)
- debug("calling uninstallInitiated()");
- handler.uninstallInitiated();
- } catch (Throwable e) {
- handleExceptionInCall(e, feature);
- }
- }
- }
-
- /*
- * @see IInstallHandler#completeUninstall
- */
- public void completeUninstall() throws CoreException {
- if (handler == null)
- return;
- else {
- try {
- if (DEBUG)
- debug("calling completeUninstall()");
- handler.completeUninstall();
- } catch (Throwable e) {
- handleExceptionInCall(e, feature);
- }
- }
- }
-
- /*
- * @see IInstallHandler#uninstallCompleted
- */
- public void uninstallCompleted(boolean success) throws CoreException {
- if (handler == null) {
- if (savedStatus == null)
- return;
- else
- throw new CoreException(savedStatus); // delayed exception
- } else {
- try {
- if (DEBUG)
- debug("calling uninstallCompleted()");
- handler.uninstallCompleted(success);
- } catch (Throwable e) {
- handleExceptionInCall(e, feature);
- }
- if (savedStatus != null)
- throw new CoreException(savedStatus); // delayed exception
- }
- }
-
- /*
- * common exception handling for initialization
- */
- private void handleExceptionInInit(String s, Exception e)
- throws CoreException {
-
- CoreException ce;
- if (e instanceof CoreException)
- ce = (CoreException) e;
- else
- ce = Utilities.newCoreException(s, e);
-
- if (isUndoAction()) {
- // for "undo" operations, deactivate handler and log error
- String id =
- UpdateManagerPlugin.getPlugin().getDescriptor().getUniqueIdentifier();
- IStatus status =
- new Status(IStatus.ERROR, id, 0, "InstallHandler.deactivated", ce);
- //$NON-NLS-1$
- UpdateManagerPlugin.getPlugin().getLog().log(status);
- handler = null; // disable subsequent handler calls
- savedStatus = status;
- } else
- // for "do" operations, hurl ...
- throw ce;
- }
-
- /*
- * common exception handling for calls to install handler
- */
- private void handleExceptionInCall(Throwable e, IFeature feature)
- throws CoreException {
-
- CoreException ce;
- if (e instanceof CoreException)
- ce = (CoreException) e;
- else
- ce =
- Utilities.newCoreException(
- Policy.bind("InstallHandler.callException", feature.getLabel()),
- e);
- //$NON-NLS-1$
-
- if (isUndoAction()) {
- // for "undo" operations, deactivate handler and log error
- String id =
- UpdateManagerPlugin.getPlugin().getDescriptor().getUniqueIdentifier();
- IStatus status =
- new Status(IStatus.ERROR, id, 0, "InstallHandler.deactivated", ce);
- //$NON-NLS-1$
- UpdateManagerPlugin.getPlugin().getLog().log(status);
- handler = null; // disable subsequent handler calls
- savedStatus = status;
- } else
- // for "do" operations, hurl ...
- throw ce;
- }
-
- /*
- * Indicates whether we are doing (install, configure) or
- * undoing (uninstall, unconfigure)
- */
- private boolean isUndoAction() {
- if (this.type == IInstallHandler.HANDLER_ACTION_INSTALL
- || this.type == IInstallHandler.HANDLER_ACTION_CONFIGURE)
- return false; // causes exception to be thrown and action aborted
- else
- return true; // causes exception to be logged and action continues
- }
-
- /*
- * get an instance of handler downloaded as part of the feature
- */
- private IInstallHandler getLocalHandler(String lib, String name)
- throws Exception {
-
- // Get baseline URL for handler (relative to feature.xml). For
- // features being installed from a server (eg. http protocol)
- // the URL will most likely be to a local file copy containing the
- // unpacked feature jar.
- ContentReference baseRef =
- feature.getFeatureContentProvider().getFeatureManifestReference(null);
- URL base = null;
- if (baseRef != null)
- base = baseRef.asURL();
- if (base == null)
- throw Utilities.newCoreException(
- Policy.bind("InstallHandler.unableToCreateHandler", this.feature.getLabel()),
- null);
- //$NON-NLS-1$
-
- // determine loader class path
- URL cp = new URL(base, lib);
- if (this.type == IInstallHandler.HANDLER_ACTION_UNINSTALL) {
- // check if we are doing uninstall
- // ... need to make temp copy of library (being removed)
- File tempLib = File.createTempFile("tmp", ".jar");
- tempLib.deleteOnExit();
- FileOutputStream fos = null;
- InputStream is = null;
- try {
- fos = new FileOutputStream(tempLib);
- is = UpdateManagerPlugin.getPlugin().get(cp).getInputStream();
- Utilities.copy(is, fos, null);
- } finally {
- if (fos != null)
- try {
- fos.close();
- } catch (Exception e) {
- }
- if (is != null)
- try {
- is.close();
- } catch (Exception e) {
- }
- }
- cp = tempLib.toURL();
- }
-
- // create class loader, load and instantiate handler
- URLClassLoader loader =
- new URLClassLoader(new URL[] { cp }, this.getClass().getClassLoader());
- Class clazz = loader.loadClass(name);
- IInstallHandler handler = (IInstallHandler) clazz.newInstance();
- return handler;
- }
-
- /*
- * get instance of global handler registered via extension point
- */
- private IInstallHandler getGlobalHandler(String name) throws Exception {
-
- IPluginRegistry reg = Platform.getPluginRegistry();
- IConfigurationElement[] handlerExtension =
- reg.getConfigurationElementsFor(EXT_PLUGIN, EXT_POINT, name);
- if (handlerExtension == null || handlerExtension.length <= 0)
- throw Utilities.newCoreException(
- Policy.bind("InstallHandler.unableToCreateHandler", this.feature.getLabel()),
- null);
- //$NON-NLS-1$
-
- return (IInstallHandler) handlerExtension[0].createExecutableExtension("class");
- }
-
- private void debug(String s) {
- String pfx = (feature==null) ? "" : feature.getVersionedIdentifier().toString();
- System.out.println("InstallHandler["+pfx+"]: " + s);
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InternalSiteManager.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InternalSiteManager.java
deleted file mode 100644
index 4ed49b8..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InternalSiteManager.java
+++ /dev/null
@@ -1,348 +0,0 @@
-package org.eclipse.update.internal.core;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import java.io.File;
-import java.lang.reflect.Array;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.core.model.InvalidSiteTypeException;
-import org.eclipse.update.internal.model.InstallChangeParser;
-
-/**
- *
- */
-public class InternalSiteManager {
-
- public static ILocalSite localSite;
-
- public static final String DEFAULT_SITE_TYPE = SiteURLContentProvider.SITE_TYPE;
- private static final String DEFAULT_EXECUTABLE_SITE_TYPE = SiteFileContentProvider.SITE_TYPE;
- private static final String SIMPLE_EXTENSION_ID = "deltaHandler";
- //$NON-NLS-1$
-
- // cache found sites
- private static Map sites = new HashMap();
- public static boolean globalUseCache = true;
-
- // true if an exception occured creating localSite
- // so we cache it and don't attempt to create it again
- private static CoreException exceptionOccured = null;
-
- /*
- * @see SiteManager#getLocalSite()
- */
- public static ILocalSite getLocalSite() throws CoreException {
- return internalGetLocalSite(false);
- }
-
- /*
- * Internal call if optimistic reconciliation needed
- */
- private static ILocalSite internalGetLocalSite(boolean isOptimistic) throws CoreException {
-
- // if an exception occured while retrieving the Site
- // rethrow it
- if (exceptionOccured != null)
- throw exceptionOccured;
-
- if (localSite == null) {
- try {
- localSite = SiteLocal.internalGetLocalSite(isOptimistic);
- } catch (CoreException e) {
- exceptionOccured = e;
- throw e;
- }
- }
- return localSite;
- }
-
- /*
- * @see ILocalSite#getSite(URL)
- */
- public static ISite getSite(URL siteURL, boolean useCache) throws CoreException {
- ISite site = null;
-
- if (siteURL == null)
- return null;
-
- // use cache if set up globally (globalUseCache=true)
- // and passed as parameter (useCache=true)
- if ((useCache && globalUseCache) && sites.containsKey(siteURL)) {
- site = (ISite) sites.get(siteURL);
- return site;
- }
-
- try {
- site = attemptCreateSite(DEFAULT_SITE_TYPE, siteURL);
- } catch (CoreException preservedException) {
- // attempt a retry is the protocol is file, with executbale type
- if (!"file".equalsIgnoreCase(siteURL.getProtocol()))
- throw preservedException;
- try {
- site = attemptCreateSite(DEFAULT_EXECUTABLE_SITE_TYPE, siteURL);
- } catch (CoreException retryException) {
- IStatus firstStatus = preservedException.getStatus();
- MultiStatus multi = new MultiStatus(firstStatus.getPlugin(), IStatus.OK, Policy.bind("InternalSiteManager.FailedRetryAccessingSite"), retryException); //$NON-NLS-1$
- multi.addAll(firstStatus);
- throw preservedException;
- }
- }
-
- if (site != null)
- sites.put(siteURL, site);
-
- return site;
- }
-
- /*
- * Attempt to create a site
- * if the site guessed is not the type found,
- * attempt to create a type with the type found in the site.xml
- */
- private static ISite attemptCreateSite(String guessedTypeSite, URL siteURL) throws CoreException {
- ISite site = null;
-
- try {
- site = createSite(guessedTypeSite, siteURL);
- } catch (InvalidSiteTypeException e) {
-
- // the type in the site.xml is not the one expected
- // attempt to use this type instead
-
- //DEBUG:
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_TYPE) {
- UpdateManagerPlugin.debug("The Site :" + siteURL.toExternalForm() + " is a different type than the guessed type based on the protocol. new Type:" + e.getNewType());
- //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- InvalidSiteTypeException exception = (InvalidSiteTypeException) e;
- try {
- if (exception.getNewType() == null)
- throw e;
- site = createSite(exception.getNewType(), siteURL);
- } catch (InvalidSiteTypeException e1) {
- throw Utilities.newCoreException(Policy.bind("InternalSiteManager.UnableToCreateSiteWithType", e.getNewType(), siteURL.toExternalForm()), e1);
- //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
-
- return site;
- }
-
- /*
- * create an instance of a class that implements ISite
- *
- * the URL can be of the following form
- * 1 protocol://...../
- * 2 protocol://.....
- * 3 protocol://..../site.xml
- * 4 protocol://...#...
- *
- * 1 If the file of the file of teh url ends with '/', attempt to open the stream.
- * if it fails, add site.xml and attempt to open the stream
- *
- * 2 attempt to open the stream
- * fail
- * add '/site.xml' and attempt to open the stream
- * sucess
- * attempt to parse, if it fails, add '/site.xml' and attempt to open the stream
- *
- * 3 open the stream
- *
- * 4 open the stream
- */
- private static ISite createSite(String siteType, URL url) throws CoreException, InvalidSiteTypeException {
- ISite site = null;
- ISiteFactory factory = SiteTypeFactory.getInstance().getFactory(siteType);
-
- try {
-
- site = factory.createSite(url);
-
- } catch (CoreException 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 Utilities.newCoreException(Policy.bind("InternalSiteManager.UnableToAccessURL", url.toExternalForm()), e);
- //$NON-NLS-1$
- } else if (url.getFile().endsWith("/")) { //$NON-NLS-1$
- // 1 try to add site.xml
- URL urlRetry;
- try {
- urlRetry = new URL(url, Site.SITE_XML);
- } catch (MalformedURLException e1) {
- throw Utilities.newCoreException(Policy.bind("InternalSiteManager.UnableToCreateURL", url.toExternalForm() + "+" + Site.SITE_XML), e1);
- //$NON-NLS-1$ //$NON-NLS-2$
- }
- try {
- site = factory.createSite(urlRetry);
- } catch (CoreException e1) {
- throw Utilities.newCoreException(Policy.bind("InternalSiteManager.UnableToAccessURL", url.toExternalForm()), url.toExternalForm(), urlRetry.toExternalForm(), e, e1);
- //$NON-NLS-1$
- }
- } else if (url.getFile().endsWith(Site.SITE_XML)) {
- // 3 nothing we can do
- throw Utilities.newCoreException(Policy.bind("InternalSiteManager.UnableToAccessURL", url.toExternalForm()), e);
- //$NON-NLS-1$
- } else {
- // 2 try to add /site.xml
- URL urlRetry;
- try {
- urlRetry = new URL(url.getProtocol(), url.getHost(), url.getPort(), url.getFile() + "/" + Site.SITE_XML);
- //$NON-NLS-1$
- } catch (MalformedURLException e1) {
- throw Utilities.newCoreException(Policy.bind("InternalSiteManager.UnableToCreateURL", url.toExternalForm() + "+" + Site.SITE_XML), e1);
- //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- try {
- site = factory.createSite(urlRetry);
- } catch (CoreException e1) {
- throw Utilities.newCoreException(Policy.bind("InternalSiteManager.UnableToAccessURL", url.toExternalForm()), url.toExternalForm(), urlRetry.toExternalForm(), e, e1);
- //$NON-NLS-1$
- }
- }
- }
- return site;
- }
-
- /*
- * Creates a new site on the file system
- * This is the only Site we can create.
- *
- * @param siteLocation
- * @throws CoreException
- */
- public static ISite createSite(File siteLocation) throws CoreException {
- ISite site = null;
- if (siteLocation != null) {
- try {
- URL siteURL = siteLocation.toURL();
- site = getSite(siteURL, false);
- } catch (MalformedURLException e) {
- throw Utilities.newCoreException(Policy.bind("InternalSiteManager.UnableToCreateURL", siteLocation.getAbsolutePath()), e);
- //$NON-NLS-1$
- }
- }
- return site;
- }
-
- /*
- * Prompt the user to configure or unconfigure
- * newly discoverd features.
- * @throws CoreException if an error occurs.
- * @since 2.0
- */
- public static void handleNewChanges() throws CoreException {
- // find extension point
- IInstallDeltaHandler handler = null;
-
- String pluginID = UpdateManagerPlugin.getPlugin().getDescriptor().getUniqueIdentifier();
-
- IPluginRegistry pluginRegistry = Platform.getPluginRegistry();
-
- IConfigurationElement[] elements = pluginRegistry.getConfigurationElementsFor(pluginID, SIMPLE_EXTENSION_ID);
-
- if (elements == null || elements.length == 0) {
- throw Utilities.newCoreException(Policy.bind("SiteReconciler.UnableToFindInstallDeltaFactory", pluginID + "." + SIMPLE_EXTENSION_ID), null);
- //$NON-NLS-1$
- } else {
- IConfigurationElement element = elements[0];
- handler = (IInstallDeltaHandler) element.createExecutableExtension("class");
- //$NON-NLS-1$
- }
-
- // instanciate and open
- if (handler != null) {
- ISessionDelta[] deltas = getSessionDeltas();
- handler.init(deltas);
- handler.open();
- }
- }
-
- /*
- * Returns the list of sessions deltas found on the file system
- *
- * Do not cache, calculate everytime
- * because we delete the file in SessionDelta when the session
- * has been seen by the user
- *
- * So the shared state is the file system itself
- */
- private static ISessionDelta[] getSessionDeltas() {
- List sessionDeltas = new ArrayList();
- IPath path = UpdateManagerPlugin.getPlugin().getStateLocation();
- InstallChangeParser parser;
-
- File file = path.toFile();
- if (file.isDirectory()) {
- File[] allFiles = file.listFiles();
- for (int i = 0; i < allFiles.length; i++) {
- try {
- // TRACE
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_RECONCILER) {
- UpdateManagerPlugin.debug("Found delta change:" + allFiles[i]);
- }
- parser = new InstallChangeParser(allFiles[i]);
- ISessionDelta change = parser.getInstallChange();
- if (change != null) {
- sessionDeltas.add(change);
- }
- } catch (Exception e) {
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_RECONCILER) {
- UpdateManagerPlugin.log("Unable to parse install change:" + allFiles[i], e);
- }
- }
- }
- }
-
- if (sessionDeltas.size() == 0)
- return new ISessionDelta[0];
-
- return (ISessionDelta[]) sessionDeltas.toArray(arrayTypeFor(sessionDeltas));
- }
-
- /*
- * Returns a concrete array type for the elements of the specified
- * list. The method assumes all the elements of the list are the same
- * concrete type as the first element in the list.
- *
- * @param l list
- * @return concrete array type, or <code>null</code> if the array type
- * could not be determined (the list is <code>null</code> or empty)
- * @since 2.0
- */
- private static Object[] arrayTypeFor(List l) {
- if (l == null || l.size() == 0)
- return null;
- return (Object[]) Array.newInstance(l.get(0).getClass(), 0);
- }
-
- /*
- * Reconcile the local site following a specific reconciliation strategy
- * The parameter is true if we need to follow an optimistic reconciliation
- * returns true if there are delta to process
- *
- * Called internally by UpdateManagerReconciler aplication
- */
- public static boolean reconcile(boolean optimisticReconciliation) throws CoreException {
- // reconcile
- internalGetLocalSite(optimisticReconciliation);
-
- // check if new features have been found
- if (localSite instanceof SiteLocal) {
- return ((SiteLocal) localSite).newFeaturesFound;
- }
- return false;
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ListenersList.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ListenersList.java
deleted file mode 100644
index 138c84e..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ListenersList.java
+++ /dev/null
@@ -1,158 +0,0 @@
-package org.eclipse.update.internal.core;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-/**
- * This class is used to maintain a list of listeners, and
- * is used in the implementations of several classes within JFace
- * which allow you to register listeners of various kinds.
- * It is a fairly lightweight object, occupying minimal space when
- * no listeners are registered.
- * <p>
- * Note that the <code>add</code> method checks for and eliminates
- * duplicates based on identity (not equality). Likewise, the
- * <code>remove</code> method compares based on identity.
- * </p>
- * <p>
- * Use the <code>getListeners</code> method when notifying listeners.
- * Note that no garbage is created if no listeners are registered.
- * The recommended code sequence for notifying all registered listeners
- * of say, <code>FooListener.eventHappened</code>, is:
- * <pre>
- * Object[] listeners = myListenerList.getListeners();
- * for (int i = 0; i < listeners.length; ++i) {
- * ((FooListener) listeners[i]).eventHappened(event);
- * }
- * </pre>
- * </p>
- */
-
-public class ListenersList {
- /**
- * The initial capacity of the list. Always >= 1.
- */
- private int capacity;
-
- /**
- * The current number of listeners.
- * Maintains invariant: 0 <= size <= listeners.length.
- */
- private int size;
-
- /**
- * The list of listeners. Initially <code>null</code> but initialized
- * to an array of size capacity the first time a listener is added.
- * Maintains invariant: listeners != null IFF size != 0
- */
- private Object[] listeners = null;
-
- /**
- * The empty array singleton instance, returned by getListeners()
- * when size == 0.
- */
- private static final Object[] EmptyArray = new Object[0];
-/**
- * Creates a listener list with an initial capacity of 3.
- */
-public ListenersList() {
- this(3);
-}
-/**
- * Creates a listener list with the given initial capacity.
- *
- * @param capacity the number of listeners which this list can initially accept
- * without growing its internal representation; must be at least 1
- */
-public ListenersList(int capacity) {
- Assert.isTrue(capacity >= 1);
- this.capacity = capacity;
-}
-/**
- * Adds the given listener to this list. Has no effect if an identical listener
- * is already registered.
- *
- * @param listener the listener
- */
-public void add(Object listener) {
- Assert.isNotNull(listener);
- if (size == 0) {
- listeners = new Object[capacity];
- } else {
- // check for duplicates using identity
- for (int i = 0; i < size; ++i) {
- if (listeners[i] == listener) {
- return;
- }
- }
- // grow array if necessary
- if (size == listeners.length) {
- System.arraycopy(listeners, 0, listeners = new Object[size * 2 + 1], 0, size);
- }
- }
- listeners[size++] = listener;
-}
-/**
- * Returns an array containing all the registered listeners.
- * The resulting array is unaffected by subsequent adds or removes.
- * If there are no listeners registered, the result is an empty array
- * singleton instance (no garbage is created).
- * Use this method when notifying listeners, so that any modifications
- * to the listener list during the notification will have no effect on the
- * notification itself.
- *
- * @return the list of registered listeners
- */
-public Object[] getListeners() {
- if (size == 0)
- return EmptyArray;
- Object[] result = new Object[size];
- System.arraycopy(listeners, 0, result, 0, size);
- return result;
-}
-/**
- * Returns whether this listener list is empty.
- *
- * @return <code>true</code> if there are no registered listeners, and
- * <code>false</code> otherwise
- */
-public boolean isEmpty() {
- return size == 0;
-}
-/**
- * Removes the given listener from this list. Has no effect if an identical
- * listener was not already registered.
- *
- * @param listener the listener
- */
-public void remove(Object listener) {
- Assert.isNotNull(listener);
- for (int i = 0; i < size; ++i) {
- if (listeners[i] == listener) {
- if (size == 1) {
- listeners = null;
- size = 0;
- }
- else {
- System.arraycopy(listeners, i + 1, listeners, i, --size - i);
- listeners[size] = null;
- }
- return;
- }
- }
-}
-/**
- * Returns the number of registered listeners.
- *
- * @return the number of registered listeners
- */
-public int size() {
- return size;
-}
-}
-
-
-
-
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/NonPluginEntryContentConsumer.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/NonPluginEntryContentConsumer.java
deleted file mode 100644
index 3735f0b..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/NonPluginEntryContentConsumer.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.eclipse.update.internal.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.update.core.ContentReference;
-import org.eclipse.update.core.IContentConsumer;
-
-/**
- * ContentConsumer for a non plugin entry of a feature
- */
-
-public class NonPluginEntryContentConsumer extends ContentConsumer {
-
- private boolean closed = false;
-
- private IContentConsumer contentConsumer;
-
- /*
- * Constructor
- */
- public NonPluginEntryContentConsumer(IContentConsumer contentConsumer){
- this.contentConsumer = contentConsumer;
- }
-
- /*
- * @see ContentConsumer#store(ContentReference, IProgressMonitor)
- */
- public void store(ContentReference contentReference, IProgressMonitor monitor) throws CoreException {
- if (!closed){
- contentConsumer.store( contentReference,monitor);
- } else {
- UpdateManagerPlugin.warn("Attempt to store in a closed NonPluginEntryContentConsumer",new Exception());
- }
- }
-
- /*
- * @see ContentConsumer#close()
- */
- public void close() throws CoreException {
- if (!closed){
- closed = true;
- contentConsumer.close();
- } else {
- UpdateManagerPlugin.warn("Attempt to close a closed NonPluginEntryContentConsumer",new Exception());
- }
- }
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/PluginEntryContentConsumer.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/PluginEntryContentConsumer.java
deleted file mode 100644
index 2e4700e..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/PluginEntryContentConsumer.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.eclipse.update.internal.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.update.core.ContentReference;
-import org.eclipse.update.core.IContentConsumer;
-
-/**
- * ContentConsumer for a plugin entry of a feature
- */
-
-public class PluginEntryContentConsumer extends ContentConsumer {
-
- private boolean closed = false;
-
- private IContentConsumer contentConsumer;
-
- /*
- * Constructor
- */
- public PluginEntryContentConsumer(IContentConsumer contentConsumer){
- this.contentConsumer = contentConsumer;
- }
-
- /*
- * @see ContentConsumer#store(ContentReference, IProgressMonitor)
- */
- public void store(ContentReference contentReference, IProgressMonitor monitor) throws CoreException {
- if (!closed){
- contentConsumer.store(contentReference,monitor);
- } else {
- UpdateManagerPlugin.warn("Attempt to store in a closed PluginEntryContentConsumer",new Exception());
- }
- }
-
- /*
- * @see ContentConsumer#close()
- */
- public void close() throws CoreException {
- if (!closed){
- closed = true;
- contentConsumer.close();
- } else {
- UpdateManagerPlugin.warn("Attempt to close a closed PluginEntryContentConsumer",new Exception());
- }
- }
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Policy.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Policy.java
deleted file mode 100644
index 104786e..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Policy.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package org.eclipse.update.internal.core;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.SubProgressMonitor;
-
-public class Policy {
- protected static ResourceBundle bundle = null;
-
- /**
- * Creates a NLS catalog for the given locale.
- */
- public static void localize(String bundleName) {
- bundle = ResourceBundle.getBundle(bundleName);
- }
-
- /**
- * Lookup the message with the given ID in this catalog and bind its
- * substitution locations with the given string.
- */
- public static String bind(String id, String binding) {
- return bind(id, new String[] { binding });
- }
-
- /**
- * Lookup the message with the given ID in this catalog and bind its
- * substitution locations with the given strings.
- */
- public static String bind(String id, String binding1, String binding2) {
- return bind(id, new String[] { binding1, binding2 });
- }
-
- /**
- * Gets a string from the resource bundle. We don't want to crash because of a missing String.
- * Returns the key if not found.
- */
- public static String bind(String key) {
- try {
- return bundle.getString(key);
- } catch (MissingResourceException e) {
- return key;
- } catch (NullPointerException e) {
- return "!" + key + "!"; //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
-
- /**
- * Gets a string from the resource bundle and binds it with the given arguments. If the key is
- * not found, return the key.
- */
- public static String bind(String key, Object[] args) {
- try {
- return MessageFormat.format(bind(key), args);
- } catch (MissingResourceException e) {
- return key;
- } catch (NullPointerException e) {
- return "!" + key + "!"; //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
-
- /**
- * Progress monitor helpers
- */
- public static void checkCanceled(IProgressMonitor monitor) {
- if (monitor.isCanceled())
- throw new OperationCanceledException();
- }
- public static IProgressMonitor monitorFor(IProgressMonitor monitor) {
- if (monitor == null)
- return new NullProgressMonitor();
- return monitor;
- }
-
- public static IProgressMonitor subMonitorFor(IProgressMonitor monitor, int ticks) {
- if (monitor == null)
- return new NullProgressMonitor();
- if (monitor instanceof NullProgressMonitor)
- return monitor;
- return new SubProgressMonitor(monitor, ticks);
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Response.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Response.java
deleted file mode 100644
index 34016fb..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Response.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package org.eclipse.update.internal.core;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.*;
-import java.net.URL;
-import java.net.URLConnection;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-public class Response {
-
- private URL url;
- private InputStream in;
- private URLConnection connection;
-
- /**
- *
- */
- public Response(InputStream in) {
- super();
- this.in = in;
- }
-
- /**
- *
- */
- public Response(URL url) {
- super();
- this.url = url;
- }
-
- /**
- * Method getInputStream.
- * @return InputStream
- */
- public InputStream getInputStream() throws IOException {
- if (in==null && url!=null){
- this.connection = url.openConnection();
- this.in = connection.getInputStream();
- }
- return in;
- }
-
- /**
- * Method getContentLength.
- * @return long
- */
- public long getContentLength() {
- if (connection!=null) return connection.getContentLength();
- return 0;
- }
-
- /**
- * Method getStatusCode.
- * @return int
- */
- public int getStatusCode() {
- if (connection!=null){
- if (connection instanceof HttpURLConnection)
- try {
- return ((HttpURLConnection)connection).getResponseCode();
- } catch (IOException e){
- UpdateManagerPlugin.warn("",e);
- }
- }
- return IStatusCodes.HTTP_OK;
- }
-
- /**
- * Method getStatusMessage.
- * @return String
- */
- public String getStatusMessage() {
- if (connection!=null){
- if (connection instanceof HttpURLConnection)
- try {
- return ((HttpURLConnection)connection).getResponseMessage();
- } catch (IOException e) {
- UpdateManagerPlugin.warn("",e);
- }
- }
- return "";
- }
-
-}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SessionDelta.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SessionDelta.java
deleted file mode 100644
index 43ecfd7..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SessionDelta.java
+++ /dev/null
@@ -1,266 +0,0 @@
-package org.eclipse.update.internal.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-import java.io.File;
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.core.model.ModelObject;
-
-/**
- *
- */
-public class SessionDelta extends ModelObject implements ISessionDelta {
-
- private Date date;
- private List featureReferences;
- private File file;
- private int process;
- private boolean deleted = false;
-
- /**
- * Constructor for SessionDelta.
- */
- public SessionDelta() {
- super();
- process = ENABLE;
- deleted = false;
- }
-
- /**
- * @see ISessionDelta#getFeatureReferences()
- */
- public IFeatureReference[] getFeatureReferences() {
- if (featureReferences == null)
- return new IFeatureReference[0];
-
- return (IFeatureReference[]) featureReferences.toArray(arrayTypeFor(featureReferences));
- }
-
- /**
- * @see ISessionDelta#getDate()
- */
- public Date getDate() {
- return date;
- }
-
- /**
- * @see ISessionDelta#process(IProgressMonitor)
- */
- public void process(IProgressMonitor pm) throws CoreException {
-
- createInstallConfiguration();
-
- // process all feature references to configure
- // find the configured site each feature belongs to
- if (process == ENABLE) {
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_CONFIGURATION)
- UpdateManagerPlugin.warn("ENABLE SESSION DELTA");
- if (featureReferences != null && featureReferences.size() > 0) {
- // manage ProgressMonitor
- if (pm != null) {
- int nbFeatures = featureReferences.size();
- pm.beginTask(Policy.bind("SessionDelta.EnableFeatures"), nbFeatures);
- }
- // since 2.0.2 ISite.getConfiguredSite()
- // find the configuredSite that maintains this featureReference
- // configure the feature
- Iterator iterator = featureReferences.iterator();
- IFeatureReference ref = null;
- IConfiguredSite configSite = null;
- IFeature featureToConfigure = null;
- while (iterator.hasNext()) {
- ref = (IFeatureReference) iterator.next();
-
- try {
- featureToConfigure = ref.getFeature();
- } catch (CoreException e) {
- UpdateManagerPlugin.warn(null, e);
- }
-
- if (featureToConfigure != null) {
- if (pm != null)
- pm.worked(1);
-
- configSite = ref.getSite().getCurrentConfiguredSite();
- try {
- // make sure only the latest version of the configured features
- // is configured across sites [16502]
- if (enable(featureToConfigure)) {
- configSite.configure(featureToConfigure);
- } else {
- configSite.unconfigure(featureToConfigure);
- }
- } catch (CoreException e) {
- // if I cannot configure one,
- //then continue with others
- UpdateManagerPlugin.warn("Unable to configure feature:" + featureToConfigure, e);
- }
- } else {
- UpdateManagerPlugin.warn("Unable to configure null feature:" + ref,null);
- }
-
- }
- }
- }
-
- delete();
- saveLocalSite();
- }
-
- /*
- *
- */
- public void delete() {
- if (deleted) {
- UpdateManagerPlugin.warn("Attempt to delete an already deleted session delta:" + file);
- return;
- }
-
- // remove the file from the file system
- if (file != null) {
- UpdateManagerUtils.removeFromFileSystem(file);
- UpdateManagerPlugin.warn("Removing SessionDelta:" + file);
- } else {
- UpdateManagerPlugin.warn("Unable to remove SessionDelta. File is null");
- }
-
- deleted = true;
- }
-
- /**
- * @see IAdaptable#getAdapter(Class)
- */
- public Object getAdapter(Class adapter) {
- return null;
- }
-
- /*
- *
- */
- public void addReference(IFeatureReference reference) {
- if (featureReferences == null)
- featureReferences = new ArrayList();
- featureReferences.add(reference);
- }
-
- /*
- *
- */
- public void setCreationDate(Date date) {
- this.date = date;
- }
-
- /*
- * Sets the file.
- * We will remove the file
- */
- public void setFile(File file) {
- this.file = file;
- }
-
- /*@
- * @see ISessionDelta#getType()
- */
- public int getType() {
- return process;
- }
-
- private void createInstallConfiguration() throws CoreException {
- ILocalSite localSite = SiteManager.getLocalSite();
- IInstallConfiguration config = localSite.cloneCurrentConfiguration();
- config.setLabel(Utilities.format(config.getCreationDate()));
- localSite.addConfiguration(config);
- }
-
- private void saveLocalSite() throws CoreException {
- ILocalSite localSite = SiteManager.getLocalSite();
- localSite.save();
- }
-
- /**
- * return true if this feature should be configured
- * A feature should be configure if it has the highest version across
- * all configured features with the same identifier
- */
- private boolean enable(IFeature newlyConfiguredFeatures) throws CoreException {
-
- ILocalSite siteLocal = SiteManager.getLocalSite();
- IInstallConfiguration currentConfiguration = siteLocal.getCurrentConfiguration();
- IConfiguredSite[] configuredSites;
- IFeatureReference[] configuredFeaturesRef;
- IFeature feature;
- configuredSites = currentConfiguration.getConfiguredSites();
- for (int i = 0; i < configuredSites.length; i++) {
- configuredFeaturesRef = configuredSites[i].getConfiguredFeatures();
- for (int j = 0; j < configuredFeaturesRef.length; j++) {
- try {
- feature = configuredFeaturesRef[j].getFeature();
- int result = compare(newlyConfiguredFeatures, feature);
- if (result != 0) {
- if (result == 1) {
- ConfiguredSite cSite = (ConfiguredSite) configuredSites[i];
- cSite.unconfigure(feature);
- return true;
- }
- if (result == 2) {
- return false;
- }
- }
- } catch (CoreException e) {
- UpdateManagerPlugin.warn(null, e);
- }
- }
- }
- // feature not found, configure it then
- return true;
- }
-
- /**
- * compare two feature references
- * returns 0 if the feature are different
- * returns 1 if the version of feature 1 is greater than the version of feature 2
- * returns 2 if opposite
- */
- private int compare(IFeature feature1, IFeature feature2) throws CoreException {
-
- // TRACE
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_RECONCILER) {
- UpdateManagerPlugin.debug("Compare: " + feature1 + " && " + feature2);
- }
-
- if (feature1 == null)
- return 0;
-
- if (feature1 == null || feature2 == null) {
- return 0;
- }
-
- VersionedIdentifier id1 = feature1.getVersionedIdentifier();
- VersionedIdentifier id2 = feature2.getVersionedIdentifier();
-
- if (id1 == null || id2 == null) {
- return 0;
- }
-
- if (id1.getIdentifier() != null && id1.getIdentifier().equals(id2.getIdentifier())) {
- PluginVersionIdentifier version1 = id1.getVersion();
- PluginVersionIdentifier version2 = id2.getVersion();
- if (version1 != null) {
- if (version1.isGreaterThan(version2)) {
- return 1;
- } else {
- return 2;
- }
- } else {
- return 2;
- }
- }
- return 0;
- };
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteContentConsumer.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteContentConsumer.java
deleted file mode 100644
index 54bf317..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteContentConsumer.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.eclipse.update.internal.core;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import org.eclipse.update.core.ISite;
-
-/**
- * A default implementation for IFeatureContentConsumer
- * </p>
- * @since 2.0
- */
-
-public abstract class SiteContentConsumer implements ISiteContentConsumer {
-
- private ISite site;
-
- /*
- * @see ISiteContentConsumer#setSite(ISite)
- */
- /**
- * Sets the site.
- * @param site The site to set
- */
- public void setSite(ISite site) {
- this.site = site;
- }
-
- /**
- * Gets the site.
- * @return Returns a ISite
- */
- public ISite getSite() {
- return site;
- }
-
-}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFile.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFile.java
deleted file mode 100644
index df75bd5..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFile.java
+++ /dev/null
@@ -1,428 +0,0 @@
-package org.eclipse.update.internal.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-import java.io.IOException;
-import java.util.*;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.update.core.*;
-import org.eclipse.update.core.model.*;
-
-/**
- * Site on the File System
- */
-public class SiteFile extends Site {
-
- /**
- * plugin entries
- */
- private List pluginEntries = new ArrayList(0);
-
- /**
- *
- */
- public ISiteContentConsumer createSiteContentConsumer(IFeature targetFeature) throws CoreException {
- SiteFileContentConsumer consumer = new SiteFileContentConsumer(targetFeature);
- consumer.setSite(this);
- return consumer;
- }
-
- /**
- * @see ISite#getDefaultInstallableFeatureType()
- */
- public String getDefaultPackagedFeatureType() {
- return DEFAULT_INSTALLED_FEATURE_TYPE;
- }
-
- /*
- * @see ISite#install(IFeature, IVerifier, IProgressMonitor)
- */
- public IFeatureReference install(IFeature sourceFeature, IVerificationListener verificationListener, IProgressMonitor progress) throws CoreException {
- return install(sourceFeature,null,verificationListener,progress);
- }
-
- /*
- * @see ISite#install(IFeature, IVerifier, IProgressMonitor)
- */
- public IFeatureReference install(IFeature sourceFeature, IFeatureReference[] optionalfeatures, IVerificationListener verificationListener, IProgressMonitor progress) throws CoreException {
-
- if (sourceFeature == null)
- return null;
-
- // make sure we have an InstallMonitor
- InstallMonitor monitor;
- if (progress == null)
- monitor = null;
- else if (progress instanceof InstallMonitor)
- monitor = (InstallMonitor) progress;
- else
- monitor = new InstallMonitor(progress);
-
- // create new executable feature and install source content into it
- IFeature localFeature = createExecutableFeature(sourceFeature);
-
- IFeatureReference localFeatureReference = null;
- localFeatureReference = sourceFeature.install(localFeature, optionalfeatures, verificationListener, monitor);
-
- return localFeatureReference;
- }
-
- /*
- * @see ISite#install(IFeature,IFeatureContentConsumer, IVerifier,IVerificationLIstener, IProgressMonitor)
- */
- public IFeatureReference install(IFeature sourceFeature, IFeatureReference[] optionalfeatures, IFeatureContentConsumer parentContentConsumer, IVerifier parentVerifier, IVerificationListener verificationListener, IProgressMonitor progress)
- throws InstallAbortedException, CoreException {
-
- if (sourceFeature == null)
- return null;
-
- // make sure we have an InstallMonitor
- InstallMonitor monitor;
- if (progress == null)
- monitor = null;
- else if (progress instanceof InstallMonitor)
- monitor = (InstallMonitor) progress;
- else
- monitor = new InstallMonitor(progress);
-
- // create new executable feature and install source content into it
- IFeature localFeature = createExecutableFeature(sourceFeature);
- parentContentConsumer.addChild(localFeature);
-
- // set the verifier
- IVerifier vr = sourceFeature.getFeatureContentProvider().getVerifier();
- if (vr != null)
- vr.setParent(parentVerifier);
-
- IFeatureReference localFeatureReference = null;
- localFeatureReference = sourceFeature.install(localFeature, optionalfeatures, verificationListener, monitor);
-
- return localFeatureReference;
- }
-
- /*
- * @see ISite#remove(IFeature, IProgressMonitor)
- */
- public void remove(IFeature feature, IProgressMonitor progress) throws CoreException {
-
- if (feature == null) {
- UpdateManagerPlugin.warn("Feature to remove is null");
- return;
- }
-
- ErrorRecoveryLog recoveryLog = ErrorRecoveryLog.getLog();
-
- // make sure we have an InstallMonitor
- InstallMonitor monitor;
- if (progress == null)
- monitor = null;
- else if (progress instanceof InstallMonitor)
- monitor = (InstallMonitor) progress;
- else
- monitor = new InstallMonitor(progress);
-
- // Setup optional install handler
- InstallHandlerProxy handler = new InstallHandlerProxy(IInstallHandler.HANDLER_ACTION_UNINSTALL, feature, feature.getInstallHandlerEntry(), monitor);
- boolean success = false;
- Throwable originalException = null;
-
- try {
-
- // start log
- recoveryLog.open(recoveryLog.START_REMOVE_LOG);
-
- aboutToRemove(feature);
-
- // log files have been downloaded
- recoveryLog.append(recoveryLog.END_ABOUT_REMOVE);
-
- handler.uninstallInitiated();
-
- // remove the feature and the plugins if they are not used and not activated
- // get the plugins from the feature
- IPluginEntry[] pluginsToRemove = getPluginEntriesOnlyReferencedBy(feature);
-
- if (monitor != null) {
- monitor.beginTask(Policy.bind("SiteFile.Removing") + feature.getLabel(), pluginsToRemove.length + 1);
- //$NON-NLS-1$
- }
-
- // remove feature reference from the site
- ISiteFeatureReference[] featureReferences = getFeatureReferences();
- if (featureReferences != null) {
- for (int indexRef = 0; indexRef < featureReferences.length; indexRef++) {
- IFeatureReference element = featureReferences[indexRef];
- if (element.equals(feature)) {
- removeFeatureReferenceModel((FeatureReferenceModel) element);
- break;
- }
- }
- }
-
- // remove the feature content
- ContentReference[] references = feature.getFeatureContentProvider().getFeatureEntryArchiveReferences(monitor);
- for (int i = 0; i < references.length; i++) {
- try {
- UpdateManagerUtils.removeFromFileSystem(references[i].asFile());
- if (monitor != null)
- monitor.worked(1);
- } catch (IOException e) {
- throw Utilities.newCoreException(Policy.bind("SiteFile.CannotRemoveFeature", feature.getVersionedIdentifier().getIdentifier(), getURL().toExternalForm()), e);
- //$NON-NLS-1$
- }
- }
-
- //finds the contentReferences for an IPluginEntry
- // and remove it
- for (int i = 0; i < pluginsToRemove.length; i++) {
- remove(feature, pluginsToRemove[i], monitor);
- }
-
- // remove any children feature
- IFeatureReference[] childrenRef = feature.getIncludedFeatureReferences();
- for (int i = 0; i < childrenRef.length; i++) {
- IFeature childFeature = null;
- try {
- childFeature = childrenRef[i].getFeature();
- } catch (CoreException e) {
- UpdateManagerPlugin.warn("Unable to retrieve feature to remove for:" + childrenRef[i]);
- }
- if (childFeature != null)
- remove(childrenRef[i].getFeature(), monitor);
- }
-
- handler.completeUninstall();
-
- success = true;
- } catch (Throwable t) {
- originalException = t;
- } finally {
- Throwable newException = null;
- try {
- if (success) {
- // close the log
- recoveryLog.close(recoveryLog.END_REMOVE_LOG);
- recoveryLog.delete();
- } else {
- recoveryLog.close(recoveryLog.END_REMOVE_LOG);
- }
- handler.uninstallCompleted(success);
- } catch (Throwable t) {
- newException = t;
- }
- if (originalException != null) // original exception wins
- throw Utilities.newCoreException(Policy.bind("InstallHandler.error", feature.getLabel()), originalException);
- //$NON-NLS-1$
- if (newException != null)
- throw Utilities.newCoreException(Policy.bind("InstallHandler.error", feature.getLabel()), newException);
- //$NON-NLS-1$
- }
- }
-
- /**
- * returns the download size
- * of the feature to be installed on the site.
- * If the site is <code>null</code> returns the maximum size
- *
- * If one plug-in entry has an unknown size.
- * then the download size is unknown.
- *
- * @see ISite#getDownloadSize(IFeature)
- *
- */
- public long getDownloadSizeFor(IFeature feature) {
- long result = 0;
- IPluginEntry[] entriesToInstall = feature.getPluginEntries();
- IPluginEntry[] siteEntries = this.getPluginEntries();
- entriesToInstall = UpdateManagerUtils.diff(entriesToInstall, siteEntries);
- //[18355]
- INonPluginEntry[] nonPluginEntriesToInstall = feature.getNonPluginEntries();
-
- try {
- result = feature.getFeatureContentProvider().getDownloadSizeFor(entriesToInstall, nonPluginEntriesToInstall);
- } catch (CoreException e) {
- UpdateManagerPlugin.warn(null, e);
- result = ContentEntryModel.UNKNOWN_SIZE;
- }
- return result;
- }
-
- /**
- * returns the download size
- * of the feature to be installed on the site.
- * If the site is <code>null</code> returns the maximum size
- *
- * If one plug-in entry has an unknown size.
- * then the download size is unknown.
- *
- * @see ISite#getDownloadSizeFor(IFeature)
- *
- */
- public long getInstallSizeFor(IFeature feature) {
- long result = 0;
-
- try {
- List pluginsToInstall = new ArrayList();
-
- // get all the plugins [17304]
- pluginsToInstall.addAll(Arrays.asList(feature.getPluginEntries()));
- IFeatureReference[] children = feature.getIncludedFeatureReferences();
- IFeature currentFeature = null;
- for (int i = 0; i < children.length; i++) {
- currentFeature = children[i].getFeature();
- if (currentFeature != null) {
- pluginsToInstall.addAll(Arrays.asList(currentFeature.getPluginEntries()));
- }
- }
-
- IPluginEntry[] entriesToInstall = new IPluginEntry[0];
- if (pluginsToInstall.size() > 0) {
- entriesToInstall = new IPluginEntry[pluginsToInstall.size()];
- pluginsToInstall.toArray(entriesToInstall);
- }
-
- IPluginEntry[] siteEntries = this.getPluginEntries();
- entriesToInstall = UpdateManagerUtils.diff(entriesToInstall, siteEntries);
-
- //[18355]
- INonPluginEntry[] nonPluginEntriesToInstall = feature.getNonPluginEntries();
-
- result = feature.getFeatureContentProvider().getInstallSizeFor(entriesToInstall, nonPluginEntriesToInstall);
- } catch (CoreException e) {
- UpdateManagerPlugin.warn(null, e);
- result = ContentEntryModel.UNKNOWN_SIZE;
- }
-
- return result;
- }
-
- /**
- * Adds a plugin entry
- * Either from parsing the file system or
- * installing a feature
- *
- * We cannot figure out the list of plugins by reading the Site.xml as
- * the archives tag are optionals
- */
- public void addPluginEntry(IPluginEntry pluginEntry) {
- pluginEntries.add(pluginEntry);
- }
-
- /**
- * @see IPluginContainer#getPluginEntries()
- */
- public IPluginEntry[] getPluginEntries() {
- IPluginEntry[] result = new IPluginEntry[0];
- if (!(pluginEntries == null || pluginEntries.isEmpty())) {
- result = new IPluginEntry[pluginEntries.size()];
- pluginEntries.toArray(result);
- }
- return result;
- }
-
- /**
- * @see IPluginContainer#getPluginEntryCount()
- */
- public int getPluginEntryCount() {
- return getPluginEntries().length;
- }
-
- /**
- *
- */
- private IFeature createExecutableFeature(IFeature sourceFeature) throws CoreException {
- IFeature result = null;
- IFeatureFactory factory = FeatureTypeFactory.getInstance().getFactory(DEFAULT_INSTALLED_FEATURE_TYPE);
- result = factory.createFeature(/*URL*/
- null, this);
-
- // at least set the version identifier to be the same
- ((FeatureModel) result).setFeatureIdentifier(sourceFeature.getVersionedIdentifier().getIdentifier());
- ((FeatureModel) result).setFeatureVersion(sourceFeature.getVersionedIdentifier().getVersion().toString());
- return result;
- }
-
- /**
- *
- */
- private void remove(IFeature feature, IPluginEntry pluginEntry, InstallMonitor monitor) throws CoreException {
-
- if (pluginEntry == null)
- return;
-
- ContentReference[] references = feature.getFeatureContentProvider().getPluginEntryArchiveReferences(pluginEntry, monitor);
- for (int i = 0; i < references.length; i++) {
- try {
- UpdateManagerUtils.removeFromFileSystem(references[i].asFile());
- if (monitor != null)
- monitor.worked(1);
- } catch (IOException e) {
- throw Utilities.newCoreException(Policy.bind("SiteFile.CannotRemovePlugin", pluginEntry.getVersionedIdentifier().toString(), getURL().toExternalForm()), e);
- //$NON-NLS-1$
- }
- }
- }
-
- /*
- *
- */
- private void aboutToRemove(IFeature feature) throws CoreException {
-
- ErrorRecoveryLog recoveryLog = ErrorRecoveryLog.getLog();
- // if the recovery is not turned on
- if (!ErrorRecoveryLog.RECOVERY_ON)
- return;
-
- //logFeature
- if (feature != null) {
- // log feature URL
- ContentReference[] references = feature.getFeatureContentProvider().getFeatureEntryArchiveReferences(null);
- for (int i = 0; i < references.length; i++) {
- try {
- recoveryLog.appendPath(ErrorRecoveryLog.FEATURE_ENTRY, references[i].asFile().getAbsolutePath());
- } catch (IOException e) {
- String id = UpdateManagerPlugin.getPlugin().getDescriptor().getUniqueIdentifier();
- throw Utilities.newCoreException(Policy.bind("SiteFile.CannotRemoveFeature", feature.getVersionedIdentifier().getIdentifier(), getURL().toExternalForm()), e);
- //$NON-NLS-1$
- }
- }
- // log pluginEntry URL
- IPluginEntry[] pluginsToRemove = getPluginEntriesOnlyReferencedBy(feature);
- IPluginEntry pluginEntry;
- for (int i = 0; i < pluginsToRemove.length; i++) {
- pluginEntry = pluginsToRemove[i];
-
- references = feature.getFeatureContentProvider().getPluginEntryArchiveReferences(pluginEntry, null);
- for (int j = 0; j < references.length; j++) {
- try {
- String entry = null;
- if (pluginEntry.isFragment())
- entry = ErrorRecoveryLog.FRAGMENT_ENTRY;
- else
- entry = ErrorRecoveryLog.PLUGIN_ENTRY;
- recoveryLog.appendPath(entry, references[j].asFile().getAbsolutePath());
- } catch (IOException e) {
- throw Utilities.newCoreException(Policy.bind("SiteFile.CannotRemovePlugin", pluginEntry.getVersionedIdentifier().toString(), getURL().toExternalForm()), e);
- //$NON-NLS-1$
- }
- }
- }
- }
-
- // call recursively for each children
- IFeatureReference[] childrenRef = feature.getIncludedFeatureReferences();
- IFeature childFeature = null;
- for (int i = 0; i < childrenRef.length; i++) {
- try {
- childFeature = childrenRef[i].getFeature();
- } catch (CoreException e) {
- UpdateManagerPlugin.warn("Unable to retrieve feature to remove for:" + childrenRef[i]);
- }
- aboutToRemove(childFeature);
- }
- }
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileContentConsumer.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileContentConsumer.java
deleted file mode 100644
index 9c09ec2..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileContentConsumer.java
+++ /dev/null
@@ -1,287 +0,0 @@
-package org.eclipse.update.internal.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-import java.io.*;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.*;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.update.core.*;
-import org.eclipse.update.core.model.ArchiveReferenceModel;
-
-/**
- * ContentConsummer for a SiteFile
- */
-public class SiteFileContentConsumer extends SiteContentConsumer {
-
- private String path;
- private IFeature feature;
- private boolean closed = false;
-
- // recovery
- private String oldPath;
- private String newPath;
-
- // for abort
- private List /* of SiteFilePluginContentConsumer */
- contentConsumers;
- private List /*of path as String */
- installedFiles;
-
- /*
- * Constructor
- */
- public SiteFileContentConsumer(IFeature feature) {
- this.feature = feature;
- installedFiles = new ArrayList();
- }
-
- /*
- * Returns the path in which the Feature will be installed
- */
- private String getFeaturePath() throws CoreException {
- String featurePath = null;
- try {
- VersionedIdentifier featureIdentifier = feature.getVersionedIdentifier();
- String path = Site.DEFAULT_INSTALLED_FEATURE_PATH + featureIdentifier.toString() + File.separator;
- URL newURL = new URL(getSite().getURL(), path);
- featurePath = newURL.getFile();
- } catch (MalformedURLException e) {
- throw Utilities.newCoreException(Policy.bind("SiteFileContentConsumer.UnableToCreateURL") + e.getMessage(), e);
- //$NON-NLS-1$
- }
- return featurePath;
- }
-
- /*
- * @see ISiteContentConsumer#open(INonPluginEntry)
- */
- public IContentConsumer open(INonPluginEntry nonPluginEntry) throws CoreException {
- return new SiteFileNonPluginContentConsumer(getFeaturePath());
- }
-
- /*
- * @see ISiteContentConsumer#open(IPluginEntry)
- */
- public IContentConsumer open(IPluginEntry pluginEntry) throws CoreException {
- SiteFilePluginContentConsumer cons = new SiteFilePluginContentConsumer(pluginEntry, getSite());
- addContentConsumers(cons);
- return cons;
- }
-
- /*
- * @see ISiteContentConsumer#store(ContentReference, IProgressMonitor)
- */
- public void store(ContentReference contentReference, IProgressMonitor monitor) throws CoreException {
-
- if (closed) {
- UpdateManagerPlugin.warn("Attempt to store in a closed SiteFileContentConsumer", new Exception());
- return;
- }
-
- InputStream inStream = null;
- String featurePath = getFeaturePath();
- String contentKey = contentReference.getIdentifier();
- featurePath += contentKey;
-
- // error recovery
- if (featurePath.endsWith(Feature.FEATURE_XML)) {
- oldPath = featurePath.replace(File.separatorChar, '/');
- File localFile = new File(oldPath);
- if (localFile.exists()) {
- throw Utilities.newCoreException(Policy.bind("UpdateManagerUtils.FileAlreadyExists", new Object[] { localFile }), null);
- }
- featurePath = ErrorRecoveryLog.getLocalRandomIdentifier(featurePath);
- newPath = featurePath;
- ErrorRecoveryLog.getLog().appendPath(ErrorRecoveryLog.FEATURE_ENTRY, featurePath);
- }
-
- try {
- inStream = contentReference.getInputStream();
- UpdateManagerUtils.copyToLocal(inStream, featurePath, null);
- UpdateManagerUtils.checkPermissions(contentReference, featurePath); // 20305
- installedFiles.add(featurePath);
- } catch (IOException e) {
- throw Utilities.newCoreException(Policy.bind("GlobalConsumer.ErrorCreatingFile", featurePath), e);
- //$NON-NLS-1$
- } finally {
- try {
- // close stream
- inStream.close();
- } catch (Exception e) {
- }
- }
-
- }
-
- /*
- * @see ISiteContentConsumer#close()
- */
- public IFeatureReference close() throws CoreException {
-
- if (closed)
- UpdateManagerPlugin.warn("Attempt to close a closed SiteFileContentConsumer", new Exception());
-
- // create a new Feature reference to be added to the site
- SiteFeatureReference ref = new SiteFeatureReference();
- ref.setSite(getSite());
- File file = null;
-
- try {
- file = new File(getFeaturePath());
- ref.setURL(file.toURL());
- } catch (MalformedURLException e) {
- throw Utilities.newCoreException(Policy.bind("SiteFileContentConsumer.UnableToCreateURLForFile", file.getAbsolutePath()), e);
- //$NON-NLS-1$
- }
-
- //rename file back
- if (newPath != null) {
- ErrorRecoveryLog.getLog().appendPath(ErrorRecoveryLog.RENAME_ENTRY, newPath);
- boolean sucess = false;
- File fileToRename = new File(newPath);
- if (fileToRename.exists()) {
- File renamedFile = new File(oldPath);
- if (renamedFile.exists()) {
- UpdateManagerUtils.removeFromFileSystem(renamedFile);
- UpdateManagerPlugin.warn("Removing already existing file:" + oldPath);
- }
- sucess = fileToRename.renameTo(renamedFile);
- }
- if (!sucess) {
- String msg = Policy.bind("ContentConsumer.UnableToRename", newPath, oldPath);
- throw Utilities.newCoreException(msg, new Exception(msg));
- }
- }
-
- // close plugin and non plugin content consumer
- if (contentConsumers != null) {
- Iterator iter = contentConsumers.iterator();
- while (iter.hasNext()) {
- ContentConsumer element = (ContentConsumer) iter.next();
- element.close();
- }
- }
- contentConsumers = null;
-
- if (ref != null) {
- // the feature MUST have renamed the plugins at that point
- // (by closing the PluginContentConsumer)
- commitPlugins(ref);
- ref.markReadOnly();
- }
-
- closed = true;
- return ref;
- }
-
- /*
- * @see ISiteContentConsumer#abort()
- */
- public void abort() throws CoreException {
-
- if (closed) {
- UpdateManagerPlugin.warn("Attempt to abort a closed SiteFileContentConsumer", new Exception());
- return;
- }
-
- //abort all plugins content consumer opened
- if (contentConsumers != null) {
- Iterator iter = contentConsumers.iterator();
- while (iter.hasNext()) {
- SiteFilePluginContentConsumer element = (SiteFilePluginContentConsumer) iter.next();
- element.abort();
- }
- }
- contentConsumers = null;
- boolean sucess = true;
-
- //Remove feature.xml first if it exists
- if (oldPath != null) {
- ErrorRecoveryLog.getLog().appendPath(ErrorRecoveryLog.DELETE_ENTRY, oldPath);
- File fileToDelete = new File(oldPath);
- if (fileToDelete.exists()) {
- sucess = fileToDelete.delete();
- }
- }
-
- if (!sucess) {
- String msg = Policy.bind("Unable to delete", oldPath);
- UpdateManagerPlugin.log(msg, null);
- } else {
- // remove the feature files;
- Iterator iter = installedFiles.iterator();
- File featureFile = null;
- while (iter.hasNext()) {
- String path = (String) iter.next();
- featureFile = new File(path);
- UpdateManagerUtils.removeFromFileSystem(featureFile);
- }
-
- // remove the feature directory if empty
- String featurePath = getFeaturePath();
- UpdateManagerUtils.removeEmptyDirectoriesFromFileSystem(new File(featurePath));
- }
- closed = true;
- return;
- }
-
- /*
- * commit the plugins installed as archive on the site
- * (creates the map between the plugin id and the location of the plugin)
- */
- private void commitPlugins(IFeatureReference localFeatureReference) throws CoreException {
-
- // get the feature
- ((SiteFile) getSite()).addFeatureReferenceModel((SiteFeatureReferenceModel) localFeatureReference);
- IFeature localFeature = null;
- try {
- localFeature = localFeatureReference.getFeature();
- } catch (CoreException e) {
- UpdateManagerPlugin.warn(null, e);
- return;
- }
-
- if (localFeature == null)
- return;
-
- // add the installed plugins directories as archives entry
- SiteFileFactory archiveFactory = new SiteFileFactory();
- ArchiveReferenceModel archive = null;
- IPluginEntry[] pluginEntries = localFeature.getPluginEntries();
- for (int i = 0; i < pluginEntries.length; i++) {
- String versionId = pluginEntries[i].getVersionedIdentifier().toString();
- String pluginID = Site.DEFAULT_PLUGIN_PATH + versionId + FeaturePackagedContentProvider.JAR_EXTENSION;
- archive = archiveFactory.createArchiveReferenceModel();
- archive.setPath(pluginID);
- try {
- URL url = new URL(getSite().getURL(), Site.DEFAULT_PLUGIN_PATH + versionId + File.separator);
- archive.setURLString(url.toExternalForm());
- archive.resolve(url, null);
- ((SiteFile) getSite()).addArchiveReferenceModel(archive);
- } catch (MalformedURLException e) {
-
- String urlString = (getSite().getURL() != null) ? getSite().getURL().toExternalForm() : "";
- //$NON-NLS-1$
- urlString += Site.DEFAULT_PLUGIN_PATH + pluginEntries[i].toString();
- throw Utilities.newCoreException(Policy.bind("SiteFile.UnableToCreateURL", urlString), e);
- //$NON-NLS-1$
- }
- }
- return;
- }
-
- /*
- * Adds a SiteFilePluginContentConsumer to the list
- */
- private void addContentConsumers(ContentConsumer cons) {
- if (contentConsumers == null)
- contentConsumers = new ArrayList();
- contentConsumers.add(cons);
- }
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileContentProvider.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileContentProvider.java
deleted file mode 100644
index dd76b16..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileContentProvider.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.eclipse.update.internal.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-import java.net.URL;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.update.core.*;
-
-/**
- * Site on the File System
- */
-public class SiteFileContentProvider extends SiteContentProvider {
-
- private String path;
-
- public static final String SITE_TYPE = "org.eclipse.update.core.file"; //$NON-NLS-1$
-
- /**
- * Constructor for FileSite
- */
- public SiteFileContentProvider(URL url) {
- super(url);
- }
-
-
-
- /**
- * move into contentSelector, comment to provider and consumer (SiteFile)
- */
- private String getFeaturePath(VersionedIdentifier featureIdentifier) {
- String path = getURL().getFile();
- String featurePath = path + Site.DEFAULT_INSTALLED_FEATURE_PATH + featureIdentifier.toString();
- return featurePath;
- }
-
-
- /*
- * @see ISiteContentProvider#getArchiveReference(String)
- */
- public URL getArchiveReference(String archiveId) throws CoreException {
- URL contentURL = null;
-
- contentURL = getArchiveURLfor(archiveId);
- // if there is no mapping in the site.xml
- // for this archiveId, use the default one
- if (contentURL==null) {
- return super.getArchiveReference(archiveId);
- }
-
- return contentURL;
- }
-
- /**
- * return the URL associated with the id of the archive for this site
- * return null if the archiveId is null, empty or
- * if teh list of archives on the site is null or empty
- * of if there is no URL associated with the archiveID for this site
- */
- private URL getArchiveURLfor(String archiveId) {
- URL result = null;
- boolean found = false;
-
- IArchiveReference[] siteArchives = getSite().getArchives();
- if (siteArchives.length > 0) {
- for (int i = 0; i < siteArchives.length && !found; i++) {
- if (archiveId.trim().equalsIgnoreCase(siteArchives[i].getPath())) {
- result = siteArchives[i].getURL();
- found = true;
- break;
- }
- }
- }
- return result;
- }
-}
-
-
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileFactory.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileFactory.java
deleted file mode 100644
index 0ffe043..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileFactory.java
+++ /dev/null
@@ -1,409 +0,0 @@
-package org.eclipse.update.internal.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-import java.io.*;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.core.model.*;
-import org.eclipse.update.internal.model.*;
-import org.xml.sax.SAXException;
-
-public class SiteFileFactory extends BaseSiteFactory {
-
- // private when parsing file system
- private SiteFile site;
-
- /**
- * manages the versionedIdentifier and location of parsed plugins
- */
- public class PluginIdentifier {
- private VersionedIdentifier id;
- private File location;
- private boolean isFragment = false;
-
- public PluginIdentifier(VersionedIdentifier id, File location, boolean fragment) {
- this.id = id;
- this.location = location;
- this.isFragment = fragment;
- }
-
- public String getIdentifier() {
- if (id != null)
- return id.getIdentifier();
- return null;
- }
-
- public PluginVersionIdentifier getVersion() {
- if (id != null)
- return id.getVersion();
- return null;
- }
-
- public boolean isFragment() {
- return isFragment;
- }
-
- public File getLocation() {
- return location;
- }
-
- public String toString() {
- String msg = "";
- if (id != null)
- msg = id.toString();
- return msg; //$NON-NLS-1$
- }
- }
-
- /*
- * @see ISiteFactory#createSite(URL,boolean)
- */
- public ISite createSite(URL url) throws CoreException, InvalidSiteTypeException {
-
- Site site = null;
- InputStream siteStream = null;
- SiteModelFactory factory = (SiteModelFactory) this;
-
- try {
- // if url points to a directory
- // attempt to parse site.xml
- String path = url.getFile();
- File siteLocation = new File(path);
- if (siteLocation.isDirectory()) {
- path = siteLocation.getAbsolutePath().replace(File.separatorChar, '/');
- if (!path.endsWith("/"))
- path += "/";
- url = new URL("file:" + path); //$NON-NLS-1$
-
- if (new File(siteLocation, Site.SITE_XML).exists()) {
- siteStream = new FileInputStream(new File(siteLocation, Site.SITE_XML));
- site = (Site) factory.parseSite(siteStream);
- } else {
- // parse siteLocation
- site = parseSite(siteLocation);
- }
- } else {
- // we are not pointing to a directory
- // attempt to parse the file
- try {
- URL resolvedURL = URLEncoder.encode(url);
- siteStream = openStream(resolvedURL);
- site = (Site) factory.parseSite(siteStream);
- } catch (IOException e) {
-
- // attempt to parse parent directory
- File file = new File(url.getFile());
- File parentDirectory = file.getParentFile();
-
- // do not create directory if it doesn't exist [18318]
- // instead hrow error
- if (parentDirectory != null && !parentDirectory.exists())
- throw Utilities.newCoreException(Policy.bind("SiteFileFactory.DirectoryDoesNotExist", file.getAbsolutePath()), null);
- //$NON-NLS-1$
-
- if (parentDirectory == null || !parentDirectory.isDirectory())
- throw Utilities.newCoreException(Policy.bind("SiteFileFactory.UnableToObtainParentDirectory", file.getAbsolutePath()), null);
- //$NON-NLS-1$
-
- site = parseSite(parentDirectory);
-
- }
- }
-
- SiteContentProvider contentProvider = new SiteFileContentProvider(url);
- site.setSiteContentProvider(contentProvider);
- contentProvider.setSite(site);
- site.resolve(url, getResourceBundle(url));
-
- // Do not set read only as may install in it
- //site.markReadOnly();
- } catch (MalformedURLException e) {
- throw Utilities.newCoreException(Policy.bind("SiteFileFactory.UnableToCreateURL", url == null ? "" : url.toExternalForm()), e);
- //$NON-NLS-1$
- } catch (IOException e) {
- throw Utilities.newCoreException(Policy.bind("SiteFileFactory.UnableToAccessSite"),ISite.SITE_ACCESS_EXCEPTION, e);//$NON-NLS-1$
- } finally {
- try {
- if (siteStream != null)
- siteStream.close();
- } catch (Exception e) {
- }
- }
- return site;
- }
- /**
- * Method parseSite.
- */
- private Site parseSite(File directory) throws CoreException {
-
- this.site = (SiteFile) createSiteMapModel();
-
- if (!directory.exists())
- throw Utilities.newCoreException(Policy.bind("SiteFileFactory.FileDoesNotExist", directory.getAbsolutePath()), null);
- //$NON-NLS-1$
-
- File pluginPath = new File(directory, Site.DEFAULT_PLUGIN_PATH);
-
- //PACKAGED
- parsePackagedFeature(directory); // in case it contains JAR files
-
- parsePackagedPlugins(pluginPath);
-
- // INSTALLED
- parseInstalledFeature(directory);
-
- parseInstalledPlugin(pluginPath);
-
- return (Site) site;
-
- }
-
- /**
- * Method parseFeature.
- * @throws CoreException
- */
- private void parseInstalledFeature(File directory) throws CoreException {
-
- File featureDir = new File(directory, Site.DEFAULT_INSTALLED_FEATURE_PATH);
- if (featureDir.exists()) {
- String[] dir;
- SiteFeatureReferenceModel featureRef;
- URL featureURL;
- File currentFeatureDir;
- String newFilePath = null;
-
- try {
- // handle the installed featuresConfigured under featuresConfigured subdirectory
- dir = featureDir.list();
- for (int index = 0; index < dir.length; index++) {
-
- // the URL must ends with '/' for the bundle to be resolved
- newFilePath = dir[index] + (dir[index].endsWith("/") ? "/" : "");
- currentFeatureDir = new File(featureDir, newFilePath);
- // check if feature.xml exists
- File featureXMLFile = new File(currentFeatureDir, Feature.FEATURE_XML);
- if (!featureXMLFile.exists()) {
- UpdateManagerPlugin.warn("Unable to find feature.xml in directory:" + currentFeatureDir);
- } else {
- SiteFileFactory archiveFactory = new SiteFileFactory();
- featureURL = currentFeatureDir.toURL();
- featureRef = archiveFactory.createFeatureReferenceModel();
- featureRef.setSiteModel(site);
- featureRef.setURLString(featureURL.toExternalForm());
- featureRef.setType(ISite.DEFAULT_INSTALLED_FEATURE_TYPE);
- ((Site) site).addFeatureReferenceModel(featureRef);
- }
- }
- } catch (MalformedURLException e) {
- throw Utilities.newCoreException(Policy.bind("SiteFileFactory.UnableToCreateURLForFile", newFilePath), e);
- //$NON-NLS-1$
- }
- }
- }
-
- /**
- * Method parseFeature.
- * @throws CoreException
- */
- private void parsePackagedFeature(File directory) throws CoreException {
-
- // FEATURES
- File featureDir = new File(directory, Site.DEFAULT_FEATURE_PATH);
- if (featureDir.exists()) {
- String[] dir;
- SiteFeatureReferenceModel featureRef;
- URL featureURL;
- File currentFeatureFile;
- String newFilePath = null;
-
- try {
- // only list JAR files
- dir = featureDir.list(FeaturePackagedContentProvider.filter);
- for (int index = 0; index < dir.length; index++) {
-
- // check if the JAR file contains a feature.xml
- currentFeatureFile = new File(featureDir, dir[index]);
- JarContentReference ref = new JarContentReference("", currentFeatureFile);
- ContentReference result = null;
- try {
- result = ref.peek(Feature.FEATURE_XML, null, null);
- } catch (IOException e) {
- UpdateManagerPlugin.warn("Exception retrieving feature.xml in file:" + currentFeatureFile, e);
- };
- if (result == null) {
- UpdateManagerPlugin.warn("Unable to find feature.xml in file:" + currentFeatureFile);
- } else {
- featureURL = currentFeatureFile.toURL();
- SiteFileFactory archiveFactory = new SiteFileFactory();
- featureRef = archiveFactory.createFeatureReferenceModel();
- featureRef.setSiteModel(site);
- featureRef.setURLString(featureURL.toExternalForm());
- featureRef.setType(ISite.DEFAULT_PACKAGED_FEATURE_TYPE);
- site.addFeatureReferenceModel(featureRef);
- }
- }
- } catch (MalformedURLException e) {
- throw Utilities.newCoreException(Policy.bind("SiteFileFactory.UnableToCreateURLForFile", newFilePath), e);
- //$NON-NLS-1$
- }
- }
- }
-
- /**
- * Method parsePlugins.
- *
- * look into each plugin/fragment directory, crack the plugin.xml open (or fragment.xml ???)
- * get id and version, calculate URL...
- *
- * @return VersionedIdentifier
- * @throws CoreException
- */
- private void parseInstalledPlugin(File dir) throws CoreException {
- PluginIdentifier plugin = null;
- File pluginFile = null;
-
- try {
- if (dir.exists() && dir.isDirectory()) {
- File[] files = dir.listFiles();
- DefaultPluginParser parser = new DefaultPluginParser();
- for (int i = 0; i < files.length; i++) {
- if (files[i].isDirectory()) {
-
- if (!(pluginFile = new File(files[i], "plugin.xml")).exists()) { //$NON-NLS-1$
- pluginFile = new File(files[i], "fragment.xml"); //$NON-NLS-1$
- }
-
- if (pluginFile != null && pluginFile.exists() && !pluginFile.isDirectory()) {
- IPluginEntry entry = parser.parse(new FileInputStream(pluginFile));
- VersionedIdentifier identifier = entry.getVersionedIdentifier();
- plugin = new PluginIdentifier(identifier, files[i], entry.isFragment());
-
- addParsedPlugin(plugin);
- }
- } // files[i] is a directory
- }
- } // path is a directory
- } catch (IOException e) {
- String pluginFileString = (pluginFile == null) ? null : pluginFile.getAbsolutePath();
- throw Utilities.newCoreException(Policy.bind("SiteFileFactory.ErrorAccessing", pluginFileString), e);
- //$NON-NLS-1$
- } catch (SAXException e) {
- String pluginFileString = (pluginFile == null) ? null : pluginFile.getAbsolutePath();
- throw Utilities.newCoreException(Policy.bind("SiteFileFactory.ErrorParsingFile", pluginFileString), e);
- //$NON-NLS-1$
- }
-
- }
-
- /**
- * tranform each Plugin and Fragment into an ArchiveReferenceModel
- * and a PluginEntry for the Site
- */
- private void addParsedPlugin(PluginIdentifier plugin) throws CoreException {
-
- String location = null;
- try {
- if (plugin != null) {
-
- // create the plugin Entry
- PluginEntry entry = new PluginEntry();
- entry.setPluginIdentifier(plugin.getIdentifier());
- entry.setPluginVersion(plugin.getVersion().toString());
- entry.isFragment(plugin.isFragment());
- ((Site) site).addPluginEntry(entry);
-
- // Create the Site mapping ArchiveRef->PluginEntry
- // the id of the archiveRef is plugins\<pluginid>_<ver>.jar as per the specs
- SiteFileFactory archiveFactory = new SiteFileFactory();
- ArchiveReferenceModel archive = archiveFactory.createArchiveReferenceModel();
- String pluginID = Site.DEFAULT_PLUGIN_PATH + plugin.toString() + FeaturePackagedContentProvider.JAR_EXTENSION;
- archive.setPath(pluginID);
- location = plugin.getLocation().toURL().toExternalForm();
- archive.setURLString(location);
- ((Site) site).addArchiveReferenceModel(archive);
-
- // TRACE
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_PARSING) {
- UpdateManagerPlugin.debug("Added archive to site:" + pluginID + " pointing to: " + location);
- }
- }
- } catch (MalformedURLException e) {
- throw Utilities.newCoreException(Policy.bind("SiteFileFactory.UnableToCreateURLForFile", location), e);
- //$NON-NLS-1$
- }
- }
-
- /**
- *
- */
- private void parsePackagedPlugins(File pluginDir) throws CoreException {
-
- File file = null;
- String[] dir;
-
- PluginIdentifier plugin;
- ContentReference ref = null;
- String refString = null;
-
- try {
- if (pluginDir.exists()) {
- dir = pluginDir.list(FeaturePackagedContentProvider.filter);
- for (int i = 0; i < dir.length; i++) {
- file = new File(pluginDir, dir[i]);
- JarContentReference jarReference = new JarContentReference(null, file);
- ref = jarReference.peek("plugin.xml", null, null); //$NON-NLS-1$
- if (ref == null)
- jarReference.peek("fragment.xml", null, null); //$NON-NLS-1$
-
- refString = (ref == null) ? null : ref.asURL().toExternalForm();
-
- if (ref != null) {
- IPluginEntry entry = new DefaultPluginParser().parse(ref.getInputStream());
- VersionedIdentifier identifier = entry.getVersionedIdentifier();
- plugin = new PluginIdentifier(identifier, file, entry.isFragment());
- addParsedPlugin(plugin);
- } //ref!=null
- } //for
- }
-
- } catch (IOException e) {
- throw Utilities.newCoreException(Policy.bind("SiteFileFactory.ErrorAccessing", refString), e);
- //$NON-NLS-1$
- } catch (SAXException e) {
- throw Utilities.newCoreException(Policy.bind("SiteFileFactory.ErrorParsingFile", refString), e);
- //$NON-NLS-1$
- }
- }
-
- /**
- *
- */
- private IFeature createFeature(URL url, String type) throws CoreException {
- // InternalFeatureReference
- SiteFeatureReference ref = new SiteFeatureReference();
- ref.setSite(site);
- ref.setURL(url);
- ref.setType(type);
- return ref.getFeature();
- }
-
- /*
- * @see SiteModelFactory#createSiteMapModel()
- */
- public SiteModel createSiteMapModel() {
- return new SiteFile();
- }
-
- /*
- * @see SiteModelFactory#canParseSiteType(String)
- */
- public boolean canParseSiteType(String type) {
- return (super.canParseSiteType(type) || SiteFileContentProvider.SITE_TYPE.equalsIgnoreCase(type));
- }
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileNonPluginContentConsumer.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileNonPluginContentConsumer.java
deleted file mode 100644
index b775092..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileNonPluginContentConsumer.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.eclipse.update.internal.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-import java.io.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.core.*;
-
-/**
- * Plugin Content Consumer on a Site
- */
-public class SiteFileNonPluginContentConsumer extends ContentConsumer {
-
- private String path;
- private boolean closed = false;
-
- /*
- * Constructor
- */
- public SiteFileNonPluginContentConsumer(String featurePath){
- this.path = featurePath;
- }
-
- /*
- * @see ISiteContentConsumer#store(ContentReference, IProgressMonitor)
- */
- public void store(ContentReference contentReference, IProgressMonitor monitor) throws CoreException {
-
- if (closed){
- UpdateManagerPlugin.warn("Attempt to store in a closed SiteFileNonPluginContentConsumer",new Exception());
- return;
- }
-
- InputStream inStream = null;
- String featurePath = path;
- String contentKey = contentReference.getIdentifier();
- featurePath += contentKey ;
- try {
- inStream = contentReference.getInputStream();
- UpdateManagerUtils.copyToLocal(inStream, featurePath, null);
- UpdateManagerUtils.checkPermissions(contentReference,featurePath); // 20305
- } catch (IOException e) {
- throw Utilities.newCoreException(Policy.bind("GlobalConsumer.ErrorCreatingFile", featurePath), e); //$NON-NLS-1$
- } finally {
- try {
- // close stream
- inStream.close();
- } catch (Exception e) {}
- }
-
- }
-
- /*
- * @see ISiteContentConsumer#close()
- */
- public void close() {
- if (closed){
- UpdateManagerPlugin.warn("Attempt to close a closed SiteFileNonPluginContentConsumer",new Exception());
- return;
- }
- closed = true;
- }
-
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFilePluginContentConsumer.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFilePluginContentConsumer.java
deleted file mode 100644
index fed2856..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFilePluginContentConsumer.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package org.eclipse.update.internal.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-import java.io.*;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.*;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.update.core.*;
-
-/**
- * Plugin Content Consumer on a Site
- */
-public class SiteFilePluginContentConsumer extends ContentConsumer {
-
- private IPluginEntry pluginEntry;
- private ISite site;
- private boolean closed = false;
-
- // recovery
- private String oldPath;
- private String newPath;
-
- // for abort
- private List /*of path as String */
- installedFiles;
-
- /*
- * Constructor
- */
- public SiteFilePluginContentConsumer(
- IPluginEntry pluginEntry,
- ISite site) {
- this.pluginEntry = pluginEntry;
- this.site = site;
- installedFiles = new ArrayList();
- }
-
- /*
- * @see ISiteContentConsumer#store(ContentReference, IProgressMonitor)
- */
- public void store(
- ContentReference contentReference,
- IProgressMonitor monitor)
- throws CoreException {
- InputStream inStream = null;
- String pluginPath = null;
-
- if (closed) {
- UpdateManagerPlugin.warn("Attempt to store in a closed SiteFilePluginContentConsumer",new Exception());
- return;
- }
-
- try {
- URL newURL =
- new URL(
- site.getURL(),
- Site.DEFAULT_PLUGIN_PATH
- + pluginEntry.getVersionedIdentifier().toString());
- pluginPath = newURL.getFile();
- String contentKey = contentReference.getIdentifier();
- inStream = contentReference.getInputStream();
- pluginPath += pluginPath.endsWith(File.separator)
- ? contentKey
- : File.separator + contentKey;
-
- // error recovery
- if (pluginPath.endsWith("plugin.xml")) {
- oldPath = pluginPath.replace(File.separatorChar, '/');
- File localFile = new File(oldPath);
- if (localFile.exists()) {
- throw Utilities.newCoreException(
- Policy.bind(
- "UpdateManagerUtils.FileAlreadyExists",
- new Object[] { localFile }),
- null);
- }
- pluginPath =
- ErrorRecoveryLog.getLocalRandomIdentifier(pluginPath);
- newPath = pluginPath;
- ErrorRecoveryLog.getLog().appendPath(
- ErrorRecoveryLog.PLUGIN_ENTRY,
- pluginPath);
- }
- if (pluginPath.endsWith("fragment.xml")) {
- oldPath = pluginPath.replace(File.separatorChar, '/');
- File localFile = new File(oldPath);
- if (localFile.exists()) {
- throw Utilities.newCoreException(
- Policy.bind(
- "UpdateManagerUtils.FileAlreadyExists",
- new Object[] { localFile }),
- null);
- }
- pluginPath =
- ErrorRecoveryLog.getLocalRandomIdentifier(pluginPath);
- newPath = pluginPath;
- ErrorRecoveryLog.getLog().appendPath(
- ErrorRecoveryLog.FRAGMENT_ENTRY,
- pluginPath);
- }
- UpdateManagerUtils.copyToLocal(inStream, pluginPath, null);
- UpdateManagerUtils.checkPermissions(contentReference,pluginPath); // 20305
- installedFiles.add(pluginPath);
- } catch (IOException e) {
- throw Utilities.newCoreException(
- Policy.bind("GlobalConsumer.ErrorCreatingFile", pluginPath),
- e);
- //$NON-NLS-1$
- } finally {
- try {
- // close stream
- inStream.close();
- } catch (Exception e) {
- }
- }
- }
-
- /*
- * @see ISiteContentConsumer#close()
- */
- public void close() throws CoreException {
-
- if (closed) {
- UpdateManagerPlugin.warn("Attempt to close a closed SiteFilePluginContentConsumer",new Exception());
- return;
- }
-
- if (newPath != null) {
- // rename file
- ErrorRecoveryLog.getLog().appendPath(
- ErrorRecoveryLog.RENAME_ENTRY,
- newPath);
- File fileToRename = new File(newPath);
- boolean sucess = false;
- if (fileToRename.exists()) {
- File renamedFile = new File(oldPath);
- sucess = fileToRename.renameTo(renamedFile);
- }
- if (!sucess) {
- String msg =
- Policy.bind(
- "ContentConsumer.UnableToRename",
- newPath,
- oldPath);
- throw Utilities.newCoreException(msg, new Exception(msg));
- }
- }
-
- if (site instanceof SiteFile)
- ((SiteFile) site).addPluginEntry(pluginEntry);
- closed = true;
- }
-
- /*
- *
- */
- public void abort() throws CoreException {
-
- if (closed) {
- UpdateManagerPlugin.warn("Attempt to abort a closed SiteFilePluginContentConsumer",new Exception());
- return;
- }
-
- boolean sucess = true;
-
- // delete plugin.xml first
- if (oldPath != null) {
- ErrorRecoveryLog.getLog().appendPath(
- ErrorRecoveryLog.DELETE_ENTRY,
- oldPath);
- File fileToRemove = new File(oldPath);
-
- if (fileToRemove.exists()) {
- sucess = fileToRemove.delete();
- }
- }
-
- if(!sucess){
- String msg = Policy.bind("Unable to delete",oldPath);
- UpdateManagerPlugin.log(msg,null);
- } else {
- // remove the plugin files;
- Iterator iter = installedFiles.iterator();
- File featureFile = null;
- while (iter.hasNext()) {
- String path = (String) iter.next();
- featureFile = new File(path);
- UpdateManagerUtils.removeFromFileSystem(featureFile);
- }
-
- // remove the plugin directory if empty
- try {
- URL newURL =
- new URL(
- site.getURL(),
- Site.DEFAULT_PLUGIN_PATH
- + pluginEntry.getVersionedIdentifier().toString());
- String pluginPath = newURL.getFile();
- UpdateManagerUtils.removeEmptyDirectoriesFromFileSystem(
- new File(pluginPath));
- } catch (MalformedURLException e) {
- throw Utilities.newCoreException(e.getMessage(), e);
- }
- }
- closed = true;
- }
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteLocal.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteLocal.java
deleted file mode 100644
index 9201c27..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteLocal.java
+++ /dev/null
@@ -1,791 +0,0 @@
-package org.eclipse.update.internal.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-import java.io.*;
-import java.net.*;
-import java.util.*;
-
-import org.eclipse.core.boot.BootLoader;
-import org.eclipse.core.boot.IPlatformConfiguration;
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.IFeature;
-import org.eclipse.update.core.Utilities;
-import org.eclipse.update.internal.model.*;
-import org.xml.sax.SAXException;
-
-/**
- * This class manages the configurations.
- */
-
-public class SiteLocal extends SiteLocalModel implements ILocalSite, IWritable {
-
- private ListenersList listeners = new ListenersList();
- private SiteReconciler reconciler;
- private SiteStatusAnalyzer siteStatusAnalyzer;
- private boolean isTransient = false;
-
- private static final String UPDATE_STATE_SUFFIX = ".metadata";
-
- /*
- * Have new features been found during reconciliation
- */
- public static boolean newFeaturesFound = false;
-
- /*
- * initialize the configurations from the persistent model.
- * Set the reconciliation as non optimistic
- */
- public static ILocalSite getLocalSite() throws CoreException {
- return internalGetLocalSite(false);
- }
-
- /*
- *Internal call is reconciliation needs to be optimistic
- */
- public static ILocalSite internalGetLocalSite(boolean isOptimistic) throws CoreException {
-
- SiteLocal localSite = new SiteLocal();
-
- // obtain platform configuration
- IPlatformConfiguration currentPlatformConfiguration = BootLoader.getCurrentPlatformConfiguration();
- localSite.isTransient(currentPlatformConfiguration.isTransient());
-
- try {
- // obtain LocalSite.xml location
- URL location;
- try {
- location = getUpdateStateLocation(currentPlatformConfiguration);
- } catch (IOException exception) {
- throw Utilities.newCoreException(Policy.bind(Policy.bind("SiteLocal.UnableToRetrieveRWArea")),
- //$NON-NLS-1$
- exception);
- }
- URL configXML = UpdateManagerUtils.getURL(location, SITE_LOCAL_FILE, null);
- localSite.setLocationURLString(configXML.toExternalForm());
- localSite.resolve(configXML, null);
-
- // Attempt to read previous state
- // if reconcile or recover happens (erro reading state), it returns false
- boolean hasRecoveredState = parseLocalSiteFile(localSite, configXML);
-
- if (hasRecoveredState) {
- // check if we have to reconcile, if the timestamp has changed
- long bootStamp = currentPlatformConfiguration.getChangeStamp();
- if (localSite.getStamp() != bootStamp) {
- UpdateManagerPlugin.warn("Reconcile platform stamp:" + bootStamp + " is different from LocalSite stamp:" + localSite.getStamp()); //$NON-NLS-1$ //$NON-NLS-2$
- newFeaturesFound = localSite.reconcile(isOptimistic);
- } else {
- // no reconciliation, preserve the list of plugins from the platform anyway
- localSite.preserveRuntimePluginPath();
- }
- } else {
- // If we are coming up without any state
- // force optimistic reconciliation to recover working state
- newFeaturesFound = localSite.reconcile(true);
- }
- } catch (MalformedURLException exception) {
- throw Utilities.newCoreException(Policy.bind("SiteLocal.UnableToCreateURLFor", localSite.getLocationURLString() + " & " + SITE_LOCAL_FILE), exception); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- return localSite;
- }
-
- /**
- * Create the localSite object either by parsing, recovering from the file system, or reconciling with the platform configuration
- * returns true if we successfully recovered our state.
- * If we haven't, the caller will force a full optimistic reconciliation
- */
- private static boolean parseLocalSiteFile(SiteLocal localSite, URL configXML) throws CoreException, MalformedURLException {
-
- //attempt to parse the LocalSite.xml
- URL resolvedURL = URLEncoder.encode(configXML);
- try {
- InputStream in = UpdateManagerPlugin.getPlugin().get(resolvedURL).getInputStream();;
- new SiteLocalParser(in, localSite);
- } catch (FileNotFoundException exception) {
- // file SITE_LOCAL_FILE doesn't exist, ok, log it
- // and reconcile with platform configuration
- UpdateManagerPlugin.warn(localSite.getLocationURLString() + " does not exist, there is no previous state or install history we can recover from, we shall use default from platform configuration.", null);
- //$NON-NLS-1$
- return false;
- } catch (SAXException exception) {
- UpdateManagerPlugin.warn(Policy.bind("SiteLocal.ErrorParsingSavedState", localSite.getLocationURLString()), exception);
- //$NON-NLS-1$
- recoverSiteLocal(resolvedURL, localSite);
- return false;
- } catch (IOException exception) {
- UpdateManagerPlugin.warn(Policy.bind("SiteLocal.UnableToAccessFile", configXML.toExternalForm()), exception);
- //$NON-NLS-1$
- recoverSiteLocal(resolvedURL, localSite);
- return false;
- }
-
- return true;
- }
-
- /**
- *
- */
- private SiteLocal() {
- }
-
- /**
- * adds a new configuration to the LocalSite
- * the newly added configuration is teh current one
- */
- public void addConfiguration(IInstallConfiguration config) {
- if (config != null) {
- addConfigurationModel((InstallConfigurationModel) config);
-
- trimHistoryToCapacity();
-
- // set configuration as current
- if (getCurrentConfigurationModel() != null)
- getCurrentConfigurationModel().setCurrent(false);
- if (config instanceof InstallConfiguration)
- ((InstallConfiguration) config).setCurrent(true);
-
- setCurrentConfigurationModel((InstallConfigurationModel) config);
- ((InstallConfigurationModel) config).markReadOnly();
-
- // notify listeners
- Object[] siteLocalListeners = listeners.getListeners();
- for (int i = 0; i < siteLocalListeners.length; i++) {
- ((ILocalSiteChangedListener) siteLocalListeners[i]).currentInstallConfigurationChanged(config);
- }
- }
-
- }
-
- /*
- *
- */
- private void trimHistoryToCapacity() {
- // check if we have to remove a configuration
- // the first added is #0
- while (getConfigurationHistory().length > getMaximumHistoryCount()) {
- InstallConfigurationModel removedConfig = getConfigurationHistoryModel()[0];
- if (removeConfigurationModel(removedConfig)) {
-
- // DEBUG:
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_CONFIGURATION) {
- UpdateManagerPlugin.debug("Removed configuration :" + removedConfig.getLabel());
- //$NON-NLS-1$
- }
-
- // notify listeners
- Object[] siteLocalListeners = listeners.getListeners();
- for (int i = 0; i < siteLocalListeners.length; i++) {
- ((ILocalSiteChangedListener) siteLocalListeners[i]).installConfigurationRemoved((IInstallConfiguration) removedConfig);
- }
-
- //remove files
- URL url = removedConfig.getURL();
- UpdateManagerUtils.removeFromFileSystem(new File(url.getFile()));
- }
- }
- }
- /*
- * @see ILocalSite#addLocalSiteChangedListener(ILocalSiteChangedListener)
- */
- public void addLocalSiteChangedListener(ILocalSiteChangedListener listener) {
- synchronized (listeners) {
- listeners.add(listener);
- }
- }
-
- /*
- * @see ILocalSite#removeLocalSiteChangedListener(ILocalSiteChangedListener)
- */
- public void removeLocalSiteChangedListener(ILocalSiteChangedListener listener) {
- synchronized (listeners) {
- listeners.add(listener);
- }
- }
-
- /**
- * Saves the site into the config file
- */
- public void save() throws CoreException {
-
- // Save the current configuration as
- // the other are already saved
- // and set runtim info for next startup
- ((InstallConfiguration) getCurrentConfiguration()).save(isTransient());
-
- // save the local site
- if ("file".equalsIgnoreCase(getLocationURL().getProtocol())) { //$NON-NLS-1$
- File file = null;
- try {
- URL newURL = UpdateManagerUtils.getURL(getLocationURL(), SITE_LOCAL_FILE, null);
- file = new File(newURL.getFile());
- if (isTransient())
- file.deleteOnExit();
- Writer writer = new Writer(file, "UTF8");
- writer.write(this);
- } catch (FileNotFoundException e) {
- throw Utilities.newCoreException(Policy.bind("SiteLocal.UnableToSaveStateIn", file.getAbsolutePath()), e);
- //$NON-NLS-1$
- } catch (UnsupportedEncodingException e) {
- throw Utilities.newCoreException(Policy.bind("SiteLocal.UnableToEncodeConfiguration", file.getAbsolutePath()), e);
- //$NON-NLS-1$
- } catch (MalformedURLException e) {
- throw Utilities.newCoreException(Policy.bind("SiteLocal.UnableToCreateURLFor") + getLocationURL().toExternalForm() + " : " + SITE_LOCAL_FILE, e);
- //$NON-NLS-2$ //$NON-NLS-1$
- }
- }
- }
- /*
- * @see IWritable#write(int, PrintWriter)
- */
- public void write(int indent, PrintWriter w) {
-
- // force the recalculation to avoid reconciliation
- IPlatformConfiguration platformConfig = BootLoader.getCurrentPlatformConfiguration();
- platformConfig.refresh();
- long changeStamp = platformConfig.getChangeStamp();
- this.setStamp(changeStamp);
-
- String gap = ""; //$NON-NLS-1$
- for (int i = 0; i < indent; i++)
- gap += " "; //$NON-NLS-1$
- String increment = ""; //$NON-NLS-1$
- for (int i = 0; i < IWritable.INDENT; i++)
- increment += " "; //$NON-NLS-1$
-
- // SITE
- w.print(gap + "<" + SiteLocalParser.SITE + " "); //$NON-NLS-1$ //$NON-NLS-2$
- if (getLabel() != null) {
- w.print(gap + "label=\"" + Writer.xmlSafe(getLabel()) + "\" ");
- //$NON-NLS-1$ //$NON-NLS-2$
- }
- w.print(gap + "history=\"" + getMaximumHistoryCount() + "\" ");
- //$NON-NLS-1$ //$NON-NLS-2$
- w.print(gap + "stamp=\"" + changeStamp + "\" >"); //$NON-NLS-1$ //$NON-NLS-2$
- w.println(""); //$NON-NLS-1$
-
- // CONFIGURATIONS
- // the last one is the current configuration
- InstallConfigurationModel[] configurations = getConfigurationHistoryModel();
- for (int index = 0; index < configurations.length; index++) {
- InstallConfigurationModel element = configurations[index];
- if (!element.isCurrent()) {
- writeConfig(gap + increment, w, element);
- }
- }
- // write current configuration last
- writeConfig(gap + increment, w, (InstallConfigurationModel) getCurrentConfiguration());
- w.println(""); //$NON-NLS-1$
-
- // PRESERVED CONFIGURATIONS
- if (getPreservedConfigurations() != null && getPreservedConfigurations().length != 0) {
- // write preserved configurations
- w.println(gap + increment + "<" + SiteLocalParser.PRESERVED_CONFIGURATIONS + ">");
- //$NON-NLS-1$ //$NON-NLS-2$
-
- InstallConfigurationModel[] preservedConfig = getPreservedConfigurationsModel();
- for (int index = 0; index < preservedConfig.length; index++) {
- InstallConfigurationModel element = preservedConfig[index];
- writeConfig(gap + increment + increment, w, element);
- }
- w.println(gap + increment + "</" + SiteLocalParser.PRESERVED_CONFIGURATIONS + ">");
- //$NON-NLS-1$ //$NON-NLS-2$
- }
- // end
- w.println(gap + "</" + SiteLocalParser.SITE + ">"); //$NON-NLS-1$ //$NON-NLS-2$
-
- UpdateManagerPlugin.warn("Saved change stamp:" + changeStamp); //$NON-NLS-1$
- }
-
- /**
- * @since 2.0
- */
- private void writeConfig(String gap, PrintWriter w, InstallConfigurationModel config) {
- w.print(gap + "<" + SiteLocalParser.CONFIG + " "); //$NON-NLS-1$ //$NON-NLS-2$
-
- // need to get parent as location points to XML file and not directory
- URL locationAsDirectory = UpdateManagerUtils.getParent(getLocationURL());
- String URLInfoString = UpdateManagerUtils.getURLAsString(locationAsDirectory, config.getURL());
-
- w.print("url=\"" + Writer.xmlSafe(URLInfoString) + "\" ");
- //$NON-NLS-1$ //$NON-NLS-2$
-
- if (config.getLabel() != null) {
- w.print("label=\"" + Writer.xmlSafe(config.getLabel()) + "\"");
- //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- w.println("/>"); //$NON-NLS-1$
- }
-
- /**
- * Method createNewInstallConfiguration.
- * @return IInstallConfiguration
- */
- public IInstallConfiguration createNewInstallConfiguration() throws CoreException {
- InstallConfiguration newInstallConfig = createConfigurationSite(null);
- newInstallConfig.setTimeline(newInstallConfig.getCreationDate().getTime());
- return newInstallConfig;
- }
-
- /*
- * creates a new InstallConfiguration or clone an installConfiguration
- * @since 2.0
- */
- private InstallConfiguration createConfigurationSite(IInstallConfiguration installConfig) throws CoreException {
-
- // save previous current configuration
- if (getCurrentConfiguration() != null)
- ((InstallConfiguration) getCurrentConfiguration()).saveConfigurationFile(isTransient());
-
- InstallConfiguration result = null;
- Date currentDate = new Date();
- String newFileName = UpdateManagerUtils.getLocalRandomIdentifier(DEFAULT_CONFIG_FILE, currentDate);
- try {
- URL newFile = UpdateManagerUtils.getURL(getLocationURL(), newFileName, null);
- // pass the date onto the name
- String name = Utilities.format(currentDate);
- result = new InstallConfiguration(installConfig, newFile, name);
- // set the same date in the installConfig
- result.setCreationDate(currentDate);
- } catch (MalformedURLException e) {
- throw Utilities.newCoreException(Policy.bind("SiteLocal.UnableToCreateURLFor") + newFileName, e);
- //$NON-NLS-1$
- }
- return result;
- }
-
- /**
- * @since 2.0
- */
- public IInstallConfiguration cloneCurrentConfiguration() throws CoreException {
- IInstallConfiguration currentConfiguration = getCurrentConfiguration();
- InstallConfiguration clonedConfiguration = createConfigurationSite(currentConfiguration);
- clonedConfiguration.setTimeline(currentConfiguration.getTimeline());
- return clonedConfiguration;
- }
-
- /**
- * @since 2.0
- */
- public void revertTo(IInstallConfiguration configuration, IProgressMonitor monitor, IProblemHandler handler) throws CoreException {
-
- // create the activity
- //Start UOW ?
- ConfigurationActivity activity = new ConfigurationActivity(IActivity.ACTION_REVERT);
- activity.setLabel(configuration.getLabel());
- activity.setDate(new Date());
- IInstallConfiguration newConfiguration = null;
-
- try {
- // create a configuration
- newConfiguration = cloneCurrentConfiguration();
- newConfiguration.setLabel(configuration.getLabel());
-
- // add to the stack which will set up as current
- addConfiguration(newConfiguration);
-
- // process delta
- // the Configured featuresConfigured are the same as the old configuration
- // the unconfigured featuresConfigured are the rest...
- ((InstallConfiguration) newConfiguration).revertTo(configuration, monitor, handler);
-
- // everything done ok
- activity.setStatus(IActivity.STATUS_OK);
- } catch (CoreException e) {
- // error
- activity.setStatus(IActivity.STATUS_NOK);
- throw e;
- } catch (InterruptedException e) {
- //user decided not to revert, do nothing
- // because we didn't add the configuration to the history
- } finally {
- if (newConfiguration != null)
- ((InstallConfiguration) newConfiguration).addActivity(activity);
- }
-
- }
-
- /**
- * @since 2.0
- */
- public IInstallConfiguration addToPreservedConfigurations(IInstallConfiguration configuration) throws CoreException {
- InstallConfiguration newConfiguration = null;
- if (configuration != null) {
-
- // create new configuration based on the one to preserve
- String newFileName = UpdateManagerUtils.getLocalRandomIdentifier(DEFAULT_PRESERVED_CONFIG_FILE, new Date());
- try {
- URL newFile = UpdateManagerUtils.getURL(getLocationURL(), newFileName, null);
- // pass the date onto teh name
- Date currentDate = configuration.getCreationDate();
- String name = configuration.getLabel();
- newConfiguration = new InstallConfiguration(configuration, newFile, name);
- // set the same date in the installConfig
- newConfiguration.setCreationDate(currentDate);
- newConfiguration.setTimeline(configuration.getTimeline());
- } catch (MalformedURLException e) {
- throw Utilities.newCoreException(Policy.bind("SiteLocal.UnableToCreateURLFor") + newFileName, e);
- //$NON-NLS-1$
- }
-
- // activity
- ConfigurationActivity activity = new ConfigurationActivity(IActivity.ACTION_ADD_PRESERVED);
- activity.setLabel(configuration.getLabel());
- activity.setDate(new Date());
- activity.setStatus(IActivity.STATUS_OK);
- ((InstallConfiguration) newConfiguration).addActivity(activity);
- ((InstallConfiguration) newConfiguration).saveConfigurationFile(isTransient());
-
- // add to the list
- addPreservedInstallConfigurationModel((InstallConfigurationModel) newConfiguration);
- }
- return newConfiguration;
- }
-
- /*
- * @see ILocalSite#getPreservedConfigurationFor(IInstallConfiguration)
- */
- public IInstallConfiguration findPreservedConfigurationFor(IInstallConfiguration configuration) {
-
- // based on time stamp for now
- InstallConfigurationModel preservedConfig = null;
- if (configuration != null) {
- InstallConfigurationModel[] preservedConfigurations = getPreservedConfigurationsModel();
- if (preservedConfigurations != null) {
- for (int indexPreserved = 0; indexPreserved < preservedConfigurations.length; indexPreserved++) {
- if (configuration.getCreationDate().equals(preservedConfigurations[indexPreserved].getCreationDate())) {
- preservedConfig = preservedConfigurations[indexPreserved];
- break;
- }
- }
- }
- }
-
- return (IInstallConfiguration) preservedConfig;
- }
-
- /*
- * @see ILocalSite#getCurrentConfiguration()
- * LocalSiteModel#getCurrentConfigurationModel() may return null if
- * we just parsed LocalSite.xml
- */
- public IInstallConfiguration getCurrentConfiguration() {
- if (getCurrentConfigurationModel() == null) {
- int index = 0;
- if ((index = getConfigurationHistoryModel().length) == 0) {
- return null;
- } else {
- InstallConfigurationModel config = getConfigurationHistoryModel()[index - 1];
- config.setCurrent(true);
- setCurrentConfigurationModel(config);
- }
- }
- return (IInstallConfiguration) getCurrentConfigurationModel();
- }
-
- /*
- * @see ILocalSite#getPreservedConfigurations()
- */
- public IInstallConfiguration[] getPreservedConfigurations() {
- if (getPreservedConfigurationsModel().length == 0)
- return new IInstallConfiguration[0];
- return (IInstallConfiguration[]) getPreservedConfigurationsModel();
- }
-
- /*
- * @see ILocalSite#removeFromPreservedConfigurations(IInstallConfiguration)
- */
- public void removeFromPreservedConfigurations(IInstallConfiguration configuration) {
- if (removePreservedConfigurationModel((InstallConfigurationModel) configuration))
- ((InstallConfiguration) configuration).remove();
- }
-
- /**
- * Add the list of plugins the platform found for each site. This list will be preserved in
- * a transient way.
- *
- * We do not lose explicitly set plugins found in platform.cfg.
- */
- private void preserveRuntimePluginPath() throws CoreException {
-
- IPlatformConfiguration platformConfig = BootLoader.getCurrentPlatformConfiguration();
- IPlatformConfiguration.ISiteEntry[] siteEntries = platformConfig.getConfiguredSites();
-
- // sites from the current configuration
- IConfiguredSite[] configured = new IConfiguredSite[0];
- if (this.getCurrentConfiguration() != null)
- configured = this.getCurrentConfiguration().getConfiguredSites();
-
- // sites from the platform
- for (int siteIndex = 0; siteIndex < siteEntries.length; siteIndex++) {
- URL resolvedURL = getReconciler().resolveSiteEntry(siteEntries[siteIndex]);
-
- boolean found = false;
- for (int index = 0; index < configured.length && !found; index++) {
-
- // the array may have hole as we set found site to null
- if (configured[index] != null) {
- if (UpdateManagerUtils.sameURL(configured[index].getSite().getURL(), resolvedURL)) {
- found = true;
- String[] listOfPlugins = siteEntries[siteIndex].getSitePolicy().getList();
- ((ConfiguredSite) configured[index]).setPreviousPluginPath(listOfPlugins);
- configured[index] = null;
- }
- }
- }
- }
-
- }
-
- /*
- * @see ILocalSite#getConfigurationHistory()
- */
- public IInstallConfiguration[] getConfigurationHistory() {
- if (getConfigurationHistoryModel().length == 0)
- return new IInstallConfiguration[0];
- return (IInstallConfiguration[]) getConfigurationHistoryModel();
- }
-
- /*
- * Reconciliation is the comparison between the old preserved state and the new one from platform.cfg
- *
- * If the old state contained sites that are not in the new state, the old sites are not added to the state
- * If the new state contains sites that were not in the old state, configure the site and configure all the found features
- * If the sites are in both states, verify the features
- * if the old site contained features that are not in the new site, the features are not added to the site
- * if the new site contains feature that were not in the old site, configure the new feature
- * if the feature is in both site (old and new), use old feature state
- *
- * When adding a feature to a site, we will check if the feature is broken or not.
- * A feature is broken when at least one of its plugin is not installed on the site.
- *
- * At the end, go over all the site, get the configured features and make sure that if we find duplicates
- * only one feature is configured
- *
- * returns true if new features have been found during a pessimistic reconcile
- * otherwise returns false
- */
- public boolean reconcile(boolean isOptimistic) throws CoreException {
- return getReconciler().reconcile(isOptimistic);
- }
-
- /*
- *
- */
- private SiteReconciler getReconciler() {
- if (reconciler == null)
- reconciler = new SiteReconciler(this);
- return reconciler;
- }
- /*
- * Get update state location relative to platform configuration
- */
- private static URL getUpdateStateLocation(IPlatformConfiguration config) throws IOException {
- // Create a directory location for update state files. This
- // directory name is constructed by adding a well-known suffix
- // to the name of the corresponding platform configuration. This
- // way, we can have multiple platform configuration files in
- // the same directory without ending up with update state conflicts.
- // For example: platform configuration file:C:/platform.cfg results
- // in update state location file:C:/platform.cfg.update/
- URL configLocation = Platform.resolve(config.getConfigurationLocation());
- String temp = configLocation.toExternalForm();
- temp += UPDATE_STATE_SUFFIX + "/";
- URL updateLocation = new URL(temp);
- if ("file".equalsIgnoreCase(updateLocation.getProtocol())) {
- // ensure path exists. Handle transient configurations
- ArrayList list = new ArrayList();
- File path = new File(updateLocation.getFile());
- while (path != null) { // walk up to first dir that exists
- if (!path.exists()) {
- list.add(path);
- path = path.getParentFile();
- } else
- path = null;
- }
- for (int i = list.size() - 1; i >= 0; i--) { // walk down to create missing dirs
- path = (File) list.get(i);
- path.mkdir();
- if (config.isTransient())
- path.deleteOnExit();
- }
- }
- return updateLocation;
- }
-
- /**
- * Gets the isTransient.
- * @return Returns a boolean
- */
- public boolean isTransient() {
- return isTransient;
- }
-
- /**
- * Sets the isTransient.
- * @param isTransient The isTransient to set
- */
- private void isTransient(boolean isTransient) {
- this.isTransient = isTransient;
- }
-
- /**
- * if we are unable to parse the SiteLocal.xml
- * we will attempt to parse the file system
- */
- private static void recoverSiteLocal(URL url, SiteLocal site) throws CoreException, MalformedURLException {
-
- if (url == null)
- throw Utilities.newCoreException(Policy.bind("SiteLocal.SiteUrlIsNull"),
- //$NON-NLS-1$
- null);
-
- // parse site information
- site.setLabel(url.toExternalForm());
-
- //stamp
- long stamp = 0L;
- site.setStamp(stamp);
-
- // retrieve XML files
- File localXml = new File(url.getFile());
- if (localXml.exists()) {
- try {
- UpdateManagerUtils.removeFromFileSystem(localXml);
- UpdateManagerPlugin.warn("Removed bad LocalSite.xml file:" + localXml);
- } catch (Exception e) {
- UpdateManagerPlugin.warn("Unable to remove bad LocalSite.xml file:" + localXml, e);
- }
- }
-
- File dir = localXml.getParentFile();
- File[] configFiles = dir.listFiles(new FilenameFilter() {
- public boolean accept(File dir, String name) {
- return (name.startsWith("Config") && name.endsWith("xml"));
- }
- });
- if (configFiles == null)
- configFiles = new File[0];
-
- File[] preservedFiles = dir.listFiles(new FilenameFilter() {
- public boolean accept(File dir, String name) {
- return (name.startsWith("PreservedConfig") && name.endsWith("xml"));
- }
- });
- if (preservedFiles == null)
- preservedFiles = new File[0];
-
- // history
- int history = 0;
- if (configFiles.length > 0) {
- history = configFiles.length;
- };
-
- if (SiteLocalModel.DEFAULT_HISTORY > history)
- history = SiteLocalModel.DEFAULT_HISTORY;
- site.setMaximumHistoryCount(history);
-
- // parse configuration information
- List validConfig = new ArrayList();
- for (int i = 0; i < configFiles.length; i++) {
- URL configURL = configFiles[i].toURL();
- InstallConfigurationModel config = new BaseSiteLocalFactory().createInstallConfigurationModel();
- String relativeURL = UpdateManagerUtils.getURLAsString(url, configURL);
- config.setLocationURLString(relativeURL);
- config.resolve(configURL, getResourceBundle(url));
- try {
- config.initialize();
- config.setLabel(Utilities.format(config.getCreationDate()));
- validConfig.add(config);
- } catch (CoreException e) {
- UpdateManagerPlugin.warn(null, e);
- }
- }
-
- // add the currentConfig last
- // based on creation date
- if (validConfig.size() > 0) {
- Iterator iter = validConfig.iterator();
- InstallConfigurationModel currentConfig = (InstallConfigurationModel) iter.next();
- while (iter.hasNext()) {
- InstallConfigurationModel element = (InstallConfigurationModel) iter.next();
- Date currentConfigDate = currentConfig.getCreationDate();
- Date elementDate = element.getCreationDate();
- if (elementDate != null && elementDate.after(currentConfigDate)) {
- site.addConfigurationModel(currentConfig);
- currentConfig = element;
- } else {
- site.addConfigurationModel(element);
- }
- }
- site.addConfigurationModel(currentConfig);
- }
-
- // parse preserved configuration information
- for (int i = 0; i < preservedFiles.length; i++) {
- URL configURL = configFiles[i].toURL();
- InstallConfigurationModel config = new BaseSiteLocalFactory().createInstallConfigurationModel();
- String relativeURL = UpdateManagerUtils.getURLAsString(url, configURL);
- config.setLocationURLString(relativeURL);
- config.resolve(configURL, getResourceBundle(url));
- try {
- config.initialize();
- config.setLabel(Utilities.format(config.getCreationDate()));
- site.addPreservedInstallConfigurationModel(config);
- } catch (CoreException e) {
- UpdateManagerPlugin.warn(null, e);
- }
- }
- }
-
- /**
- * return the appropriate resource bundle for this sitelocal
- */
- private static ResourceBundle getResourceBundle(URL url) throws CoreException {
- ResourceBundle bundle = null;
- try {
- url = UpdateManagerUtils.asDirectoryURL(url);
- ClassLoader l = new URLClassLoader(new URL[] { url }, null);
- bundle = ResourceBundle.getBundle(SiteLocalModel.SITE_LOCAL_FILE, Locale.getDefault(), l);
- } catch (MissingResourceException e) {
- UpdateManagerPlugin.warn(e.getLocalizedMessage() + ":" + url.toExternalForm());
- //$NON-NLS-1$
- } catch (MalformedURLException e) {
- UpdateManagerPlugin.warn(e.getLocalizedMessage());
- //$NON-NLS-1$
- }
- return bundle;
- }
-
- /*
- *
- */
- private SiteStatusAnalyzer getSiteStatusAnalyzer() {
- if (siteStatusAnalyzer == null)
- siteStatusAnalyzer = new SiteStatusAnalyzer(this);
- return siteStatusAnalyzer;
- }
-
- /*
- * check if the Plugins of the feature are on the plugin path
- * If all the plugins are on the plugin path, and the version match and there is no other version -> HAPPY
- * If all the plugins are on the plugin path, and the version match and there is other version -> AMBIGUOUS
- * If some of the plugins are on the plugin path, but not all -> UNHAPPY
- * Check on all ConfiguredSites
- */
- public IStatus getFeatureStatus(IFeature feature) throws CoreException {
- return getSiteStatusAnalyzer().getFeatureStatus(feature);
- }
- /**
- * @see org.eclipse.update.internal.model.SiteLocalModel#setMaximumHistoryCount(int)
- */
- public void setMaximumHistoryCount(int history) {
- super.setMaximumHistoryCount(history);
- trimHistoryToCapacity();
- }
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteReconciler.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteReconciler.java
deleted file mode 100644
index 25d534b..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteReconciler.java
+++ /dev/null
@@ -1,846 +0,0 @@
-package org.eclipse.update.internal.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-import java.io.*;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.*;
-
-import org.eclipse.core.boot.BootLoader;
-import org.eclipse.core.boot.IPlatformConfiguration;
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.core.model.*;
-import org.eclipse.update.internal.model.ConfigurationActivityModel;
-import org.eclipse.update.internal.model.InstallChangeParser;
-
-/**
- * This class manages the reconciliation.
- */
-
-public class SiteReconciler extends ModelObject implements IWritable {
-
- private SiteLocal siteLocal;
- private List newFoundFeatures;
- private Date date;
- private static final String DEFAULT_INSTALL_CHANGE_NAME = "delta.xml";
- //$NON-NLS-1$
-
- /**
- *
- */
- public SiteReconciler(SiteLocal siteLocal) {
- this.siteLocal = siteLocal;
- }
-
- /*
- * Reconciliation is the comparison between the old preserved state and the new one from platform.cfg
- *
- * If the old state contained sites that are not in the new state, the old sites are not added to the state
- * If the new state contains sites that were not in the old state, configure the site and configure all the found features
- * If the sites are in both states, verify the features
- * if the old site contained features that are not in the new site, the features are not added to the site
- * if the new site contains feature that were not in the old site, configure the new feature
- * if the feature is in both site (old and new), use old feature state
- *
- * When adding a feature to a site, we will check if the feature is broken or not.
- * A feature is broken when at least one of its plugin is not installed on the site.
- *
- * At the end, go over all the site, get the configured features and make sure that if we find duplicates
- * only one feature is configured
- *
- * returns true if new features have been found during a pessimistic reconcile
- * otherwise returns false
- */
- public boolean reconcile(boolean isOptimistic) throws CoreException {
-
- IPlatformConfiguration platformConfig = BootLoader.getCurrentPlatformConfiguration();
- IPlatformConfiguration.ISiteEntry[] newSiteEntries = platformConfig.getConfiguredSites();
- IInstallConfiguration newInstallConfiguration = siteLocal.createNewInstallConfiguration();
-
- IInstallConfiguration oldInstallConfiguration = siteLocal.getCurrentConfiguration();
- IConfiguredSite[] oldConfiguredSites = new IConfiguredSite[0];
- newFoundFeatures = new ArrayList();
-
- // sites from the current configuration
- if (oldInstallConfiguration != null) {
- oldConfiguredSites = oldInstallConfiguration.getConfiguredSites();
-
- // TRACE
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_RECONCILER) {
- for (int i = 0; i < oldConfiguredSites.length; i++) {
- UpdateManagerPlugin.debug("Old Site :" + oldConfiguredSites[i].getSite().getURL());
- }
- }
- }
-
- // 16215
- // 22913, if already optimistic, do not check
- if (!isOptimistic)
- isOptimistic = platformBaseChanged(oldConfiguredSites);
-
- // check if sites from the platform are new sites or modified sites
- // if they are new add them, if they are modified, compare them with the old
- // one and add them
- for (int siteIndex = 0; siteIndex < newSiteEntries.length; siteIndex++) {
-
- IPlatformConfiguration.ISiteEntry currentSiteEntry = newSiteEntries[siteIndex];
- URL resolvedURL = resolveSiteEntry(currentSiteEntry);
- boolean found = false;
- IConfiguredSite currentConfigurationSite = null;
-
- // TRACE
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_RECONCILER) {
- UpdateManagerPlugin.debug("Checking if:" + resolvedURL + " is a new site or a site to reconcile.");
- }
-
- // check if SiteEntry has been possibly modified
- // if it was part of the previously known configuredSite; reconcile
- for (int index = 0; index < oldConfiguredSites.length && !found; index++) {
- currentConfigurationSite = oldConfiguredSites[index];
- URL currentConfigURL = currentConfigurationSite.getSite().getURL();
-
- if (UpdateManagerUtils.sameURL(resolvedURL, currentConfigURL)) {
- found = true;
- ConfiguredSite reconciledConfiguredSite = reconcile(currentConfigurationSite, isOptimistic);
- reconciledConfiguredSite.setPreviousPluginPath(currentSiteEntry.getSitePolicy().getList());
- newInstallConfiguration.addConfiguredSite(reconciledConfiguredSite);
- }
- }
-
- // old site not found, this is a new site, create it
- if (!found) {
- // TRACE
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_RECONCILER) {
- UpdateManagerPlugin.debug("Site not found in previous configurations.Create new Configured Site:" + resolvedURL);
- }
- ISite site = SiteManager.getSite(resolvedURL);
-
- //site policy
- IPlatformConfiguration.ISitePolicy sitePolicy = currentSiteEntry.getSitePolicy();
- ConfiguredSite configSite = (ConfiguredSite) new BaseSiteLocalFactory().createConfigurationSiteModel((SiteModel) site, sitePolicy.getType());
- configSite.setPlatformURLString(currentSiteEntry.getURL().toExternalForm());
- configSite.setPreviousPluginPath(currentSiteEntry.getSitePolicy().getList());
-
- // Add the features to the list of new found features
- // and configure it based on reconciliation type
- ISiteFeatureReference[] newFeaturesRef = site.getFeatureReferences();
- for (int i = 0; i < newFeaturesRef.length; i++) {
- // TRACE
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_RECONCILER) {
- String reconciliationType = isOptimistic ? "enable (optimistic)" : "disable (pessimistic)";
- UpdateManagerPlugin.debug("New Site Found:New Feature to create: " + newFeaturesRef[i].getURL() + " as " + reconciliationType);
- }
-
- if (isOptimistic) {
- configSite.getConfigurationPolicy().configure(newFeaturesRef[i], true, false);
- } else {
- configSite.getConfigurationPolicy().unconfigure(newFeaturesRef[i], true, false);
- newFoundFeatures.add(newFeaturesRef[i]);
- }
- }
- newInstallConfiguration.addConfiguredSite(configSite);
- }
- }
-
- // verify we do not have 2 features with different version that
- // are configured
- checkConfiguredFeatures(newInstallConfiguration);
-
- // add Activity reconciliation
- BaseSiteLocalFactory siteLocalFactory = new BaseSiteLocalFactory();
- ConfigurationActivityModel activity = siteLocalFactory.createConfigurationActivityModel();
- activity.setAction(IActivity.ACTION_RECONCILIATION);
- activity.setDate(new Date());
- activity.setLabel(siteLocal.getLocationURLString());
- ((InstallConfiguration) newInstallConfiguration).addActivityModel(activity);
-
- // [22993] set the timeline to the previous InstallConfiguration
- // if the reconciliation is not optimistic (if the world hasn't changed)
- if (!isOptimistic) {
- if (oldInstallConfiguration != null) {
- if (newInstallConfiguration instanceof InstallConfiguration) {
- ((InstallConfiguration) newInstallConfiguration).setTimeline(oldInstallConfiguration.getTimeline());
- }
- }
- }
-
- // add the configuration as the currentConfig
- siteLocal.addConfiguration(newInstallConfiguration);
- siteLocal.save();
-
- return saveNewFeatures();
- }
-
- /**
- *
- */
- /*package */
- URL resolveSiteEntry(IPlatformConfiguration.ISiteEntry newSiteEntry) throws CoreException {
- URL resolvedURL = null;
- try {
- resolvedURL = Platform.resolve(newSiteEntry.getURL());
- } catch (IOException e) {
- throw Utilities.newCoreException(Policy.bind("SiteLocal.UnableToResolve", newSiteEntry.getURL().toExternalForm()), e);
- //$NON-NLS-1$
- }
- return resolvedURL;
- }
-
- /**
- * Compare the old state of ConfiguredSite with
- * the 'real' features we found in Site
- *
- * getSite of ConfiguredSite contains the real features found
- *
- * So if ConfiguredSite.getPolicy has feature A and D as configured and C as unconfigured
- * And if the Site contains features A,B and C
- * We have to remove D and Configure B
- *
- * We copy the oldConfig without the Features
- * Then we loop through the features we found on teh real site
- * If they didn't exist before we add them as configured
- * Otherwise we use the old policy and add them to teh new configuration site
- */
- private ConfiguredSite reconcile(IConfiguredSite oldConfiguredSite, boolean isOptimistic) throws CoreException {
-
- // TRACE
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_RECONCILER) {
- UpdateManagerPlugin.debug("Configured Site to reconfigure:" + oldConfiguredSite.getSite().getURL() + (isOptimistic ? " OPTIMISTIC" : " PESSIMISTIC"));
- }
-
- ConfiguredSite newConfiguredSite = createNewConfigSite(oldConfiguredSite);
- ConfigurationPolicy newSitePolicy = newConfiguredSite.getConfigurationPolicy();
- ConfigurationPolicy oldSitePolicy = ((ConfiguredSite) oldConfiguredSite).getConfigurationPolicy();
-
- // check the Features that are still on the new version of the Config Site
- // and the new one. Add the new Features as Configured
- List toCheck = new ArrayList();
- ISite site = oldConfiguredSite.getSite();
- ISiteFeatureReference[] foundFeatures = site.getFeatureReferences();
- IFeatureReference[] oldConfiguredFeaturesRef = oldConfiguredSite.getFeatureReferences();
-
- // TRACE
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_RECONCILER) {
- for (int i = 0; i < oldConfiguredFeaturesRef.length; i++) {
- UpdateManagerPlugin.debug("Old feature :" + oldConfiguredFeaturesRef[i].getURL());
- }
- }
-
- for (int i = 0; i < foundFeatures.length; i++) {
- boolean newFeatureFound = true;
-
- // TRACE
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_RECONCILER) {
- UpdateManagerPlugin.debug("Is this feature new? :" + foundFeatures[i].getURL());
- }
-
- // if it is an old feature, add it to the list of features to check
- for (int j = 0; j < oldConfiguredFeaturesRef.length; j++) {
- IFeatureReference oldFeatureRef = oldConfiguredFeaturesRef[j];
- if (oldFeatureRef != null && oldFeatureRef.equals(foundFeatures[i])) {
- toCheck.add(oldFeatureRef);
- newFeatureFound = false;
- }
- }
-
- // new feature found: add as configured if the policy is optimistic
- // or [2.0.1] if the feature is optional by all the parents AND one exact parent
- // (pointing to same version) is enable
- if (newFeatureFound) {
- configureNewFoundFeature(isOptimistic, newSitePolicy, oldSitePolicy, foundFeatures[i], oldConfiguredFeaturesRef);
- }
- }
-
- // if a feature has been found in new and old state
- // use old state (configured/unconfigured)
- // pessimistic or optimistic
- // do not call install handler as the configure/unconfigure already happened
- Iterator featureIter = toCheck.iterator();
- while (featureIter.hasNext()) {
- IFeatureReference oldFeatureRef = (IFeatureReference) featureIter.next();
- if (oldSitePolicy.isConfigured(oldFeatureRef)) {
- newSitePolicy.configure(oldFeatureRef, false, false);
- } else {
- newSitePolicy.unconfigure(oldFeatureRef, false, false);
- }
- }
-
- return newConfiguredSite;
- }
-
- /*
- * Enable feature if:
- * This is an optimistic reconciliation OR
- * The feature is considered optional by ALL its parents AND at least one of them is enable
- * Otherwise disable the feature.
- *
- * If all its parent consider the feature as optional but none are enable,
- * do not add in the list of new found features. Just disable it.
- */
- private void configureNewFoundFeature(boolean isOptimistic, ConfigurationPolicy newSitePolicy, ConfigurationPolicy oldSitePolicy, IFeatureReference foundFeature, IFeatureReference[] possibleParents) throws CoreException {
-
- // TRACE
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_RECONCILER) {
- String reconciliationType = isOptimistic ? "enable (optimistic)" : "disable (pessimistic)";
- UpdateManagerPlugin.debug("This feature is new: " + foundFeature.getURL() + " reconciled as " + reconciliationType);
- }
-
- if (isOptimistic) {
- newSitePolicy.configure(foundFeature, true, false);
- return;
- }
-
- IFeatureReference[] allOptionalParents = UpdateManagerUtils.getParentFeatures(foundFeature, possibleParents, true);
- IFeatureReference[] allParents = UpdateManagerUtils.getParentFeatures(foundFeature, possibleParents, false);
-
- // none of my parents consider me as optional OR I have no parents,
- // consider as root feature
- if (allOptionalParents.length == 0) {
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_RECONCILER) {
- UpdateManagerPlugin.debug("There are no features who consider the feature as optional. Treat as root feature.");
- }
- newSitePolicy.unconfigure(foundFeature, true, false);
- newFoundFeatures.add(foundFeature);
- return;
-
- }
-
- //At least one of my parent considers me non optional
- // consider root feature
- if (allParents.length > allOptionalParents.length) {
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_RECONCILER) {
- UpdateManagerPlugin.debug("At least one parent considers the feature as NON optional. Treat as root feature.");
- }
- newSitePolicy.unconfigure(foundFeature, true, false);
- newFoundFeatures.add(foundFeature);
- return;
- }
-
- for (int i = 0; i < allOptionalParents.length; i++) {
- // one parent that consider me optional is enable, enable feature
- if (oldSitePolicy.isConfigured(allOptionalParents[i])) {
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_RECONCILER) {
- UpdateManagerPlugin.debug("Found parent feature:" + allOptionalParents[i] + " as enable: Enable optional child feature:" + foundFeature);
- }
- newSitePolicy.configure(foundFeature, true, false);
- return;
- }
- }
-
- // found parent that consider me optional but they are all disable
- // unconfigure feature without adding it to the list fo new found features
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_RECONCILER) {
- UpdateManagerPlugin.debug("No parents are enable. Disable feature.");
- }
- newSitePolicy.unconfigure(foundFeature, true, false);
-
- }
-
- /**
- * Validate we have only one configured feature per site
- * even if we found multiples
- *
- * If we find 2 features, the one with a higher version is configured
- * If they have the same version, the first feature is configured
- *
- * DO NOT check across sites [17980]
- * If Feature1 is installed natively on Site A
- * If Feature1 is installed on Site B
- * If Feature1 from SiteA is removed...
- */
- private void checkConfiguredFeatures(IInstallConfiguration newDefaultConfiguration) throws CoreException {
-
- IConfiguredSite[] configuredSites = newDefaultConfiguration.getConfiguredSites();
-
- // each configured site
- for (int indexConfiguredSites = 0; indexConfiguredSites < configuredSites.length; indexConfiguredSites++) {
- checkConfiguredFeatures(configuredSites[indexConfiguredSites]);
- }
- }
-
- /**
- * Validate we have only one configured feature of a specific id
- * per configured site
- */
- public static void checkConfiguredFeaturesOld(IConfiguredSite configuredSite) throws CoreException {
-
- // NOT USED
-
- ConfiguredSite cSite = (ConfiguredSite) configuredSite;
- IFeatureReference[] configuredFeatures = cSite.getConfiguredFeatures();
- ConfigurationPolicy cPolicy = cSite.getConfigurationPolicy();
-
- // TRACE
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_RECONCILER) {
- UpdateManagerPlugin.debug("Compare features within :" + configuredSite.getSite().getURL());
- }
-
- for (int indexConfiguredFeatures = 0; indexConfiguredFeatures < configuredFeatures.length - 1; indexConfiguredFeatures++) {
-
- IFeatureReference featureToCompare = configuredFeatures[indexConfiguredFeatures];
-
- // within the configured site
- // compare with the other configured features of this site
- for (int restOfConfiguredFeatures = indexConfiguredFeatures + 1; restOfConfiguredFeatures < configuredFeatures.length; restOfConfiguredFeatures++) {
- int result = compare(featureToCompare, configuredFeatures[restOfConfiguredFeatures]);
- if (result != 0) {
- if (result == 1) {
- cPolicy.unconfigure(configuredFeatures[restOfConfiguredFeatures], true, false);
- };
- if (result == 2) {
- cPolicy.unconfigure(featureToCompare, true, false);
- }
- }
- }
- }
- }
-
- /**
- * compare two feature references
- * returns 0 if the feature are different
- * returns 1 if the version of feature 1 is greater than the version of feature 2
- * returns 2 if opposite
- */
- private static int compare(IFeatureReference featureRef1, IFeatureReference featureRef2) throws CoreException {
-
- // TRACE
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_RECONCILER) {
- UpdateManagerPlugin.debug("Compare: " + featureRef1 + " && " + featureRef2);
- }
-
- if (featureRef1 == null)
- return 0;
-
- IFeature feature1 = null;
- IFeature feature2 = null;
- try {
- feature1 = featureRef1.getFeature();
- feature2 = featureRef2.getFeature();
- } catch (CoreException e) {
- UpdateManagerPlugin.warn(null, e);
- return 0;
- }
-
- if (feature1 == null || feature2 == null) {
- return 0;
- }
-
- VersionedIdentifier id1 = feature1.getVersionedIdentifier();
- VersionedIdentifier id2 = feature2.getVersionedIdentifier();
-
- if (id1 == null || id2 == null) {
- return 0;
- }
-
- if (id1.getIdentifier() != null && id1.getIdentifier().equals(id2.getIdentifier())) {
- PluginVersionIdentifier version1 = id1.getVersion();
- PluginVersionIdentifier version2 = id2.getVersion();
- if (version1 != null) {
- if (version1.isGreaterThan(version2)) {
- return 1;
- } else {
- return 2;
- }
- } else {
- return 2;
- }
- }
- return 0;
- };
-
- /*
- *
- */
- private ConfiguredSite createNewConfigSite(IConfiguredSite oldConfiguredSiteToReconcile) throws CoreException {
- // create a copy of the ConfigSite based on old ConfigSite
- // this is not a clone, do not copy any features
- ConfiguredSite cSiteToReconcile = (ConfiguredSite) oldConfiguredSiteToReconcile;
- SiteModel siteModel = cSiteToReconcile.getSiteModel();
- int policy = cSiteToReconcile.getConfigurationPolicy().getPolicy();
-
- // copy values of the old ConfigSite that should be preserved except Features
- ConfiguredSite newConfigurationSite = (ConfiguredSite) new BaseSiteLocalFactory().createConfigurationSiteModel(siteModel, policy);
- newConfigurationSite.isUpdatable(cSiteToReconcile.isUpdatable());
- newConfigurationSite.setPlatformURLString(cSiteToReconcile.getPlatformURLString());
-
- return newConfigurationSite;
- }
-
- /*
- *
- */
- private IFeatureReference[] getFeatureReferences() {
- if (newFoundFeatures == null || newFoundFeatures.size() == 0)
- return new IFeatureReference[0];
-
- return (IFeatureReference[]) newFoundFeatures.toArray(arrayTypeFor(newFoundFeatures));
- }
-
- /*
- *
- */
- private boolean saveNewFeatures() throws CoreException {
-
- if (getFeatureReferences().length == 0) {
- UpdateManagerPlugin.warn("No new features found");
- return false;
- }
-
- // recompute list of new features to only keep root features [16496]
- IFeatureReference[] refs = getFeatureReferences();
- newFoundFeatures = new ArrayList();
- for (int i = 0; i < refs.length; i++) {
- IFeatureReference[] parents = UpdateManagerUtils.getParentFeatures(refs[i], refs, false);
- if (parents.length == 0)
- newFoundFeatures.add(refs[i]);
- }
-
- if (getFeatureReferences().length == 0) {
- UpdateManagerPlugin.warn("No root feature found when saving new features");
- return false;
- }
-
- date = new Date();
- String fileName = UpdateManagerUtils.getLocalRandomIdentifier(DEFAULT_INSTALL_CHANGE_NAME, date);
- IPath path = UpdateManagerPlugin.getPlugin().getStateLocation();
- IPath filePath = path.append(fileName);
- File file = filePath.toFile();
- // persist list of new features
- try {
- Writer writer = new Writer(file, "UTF8");
- writer.write(this);
- return true;
- } catch (UnsupportedEncodingException e) {
- throw Utilities.newCoreException(Policy.bind("SiteReconciler.UnableToEncodeConfiguration", file.getAbsolutePath()), e);
- //$NON-NLS-1$
- } catch (FileNotFoundException e) {
- throw Utilities.newCoreException(Policy.bind("SiteReconciler.UnableToSaveStateIn", file.getAbsolutePath()), e);
- //$NON-NLS-1$
- }
- }
-
- /*
- * @see IWritable#write(int, PrintWriter)
- */
- public void write(int indent, PrintWriter w) {
- String gap = ""; //$NON-NLS-1$
- for (int i = 0; i < indent; i++)
- gap += " "; //$NON-NLS-1$
- String increment = ""; //$NON-NLS-1$
- for (int i = 0; i < IWritable.INDENT; i++)
- increment += " "; //$NON-NLS-1$
-
- // CHANGE tag
- w.print(gap + "<" + InstallChangeParser.CHANGE + " ");
- //$NON-NLS-1$ //$NON-NLS-2$
- long time = (date != null) ? date.getTime() : 0L;
- w.println("date=\"" + time + "\" >"); //$NON-NLS-1$ //$NON-NLS-2$
-
- // NEW FEATURE
- w.println(gap + increment + "<" + InstallChangeParser.NEW_FEATURE + " >");
-
- // FEATURE REF
- IFeatureReference[] references = getFeatureReferences();
- String URLFeatureString = null;
- if (references != null) {
- for (int index = 0; index < references.length; index++) {
- IFeatureReference ref = references[index];
- if (ref.getURL() != null) {
- ISite featureSite = ref.getSite();
- URLFeatureString = UpdateManagerUtils.getURLAsString(featureSite.getURL(), ref.getURL());
-
- w.print(gap + increment + increment + "<" + InstallChangeParser.REFERENCE + " ");
- //$NON-NLS-1$
- w.println("siteURL = \"" + Writer.xmlSafe(getURLSiteString(featureSite)) + "\" ");
- //$NON-NLS-1$ //$NON-NLS-2$
- w.println(gap + increment + increment + increment + "featureURL=\"" + Writer.xmlSafe(URLFeatureString) + "\" />");
- //$NON-NLS-1$ //$NON-NLS-2$
- }
- w.println(""); //$NON-NLS-1$
- }
- }
-
- // END NEW FEATURE
- w.println(gap + increment + "</" + InstallChangeParser.NEW_FEATURE + " >");
-
- // end
- w.println(gap + "</" + InstallChangeParser.CHANGE + ">");
- //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /*
- * Returns the Site URL, attempting to replace it by platform: URL if needed
- */
- private String getURLSiteString(ISite site) {
- // since 2.0.2 ISite.getConfiguredSite();
- ConfiguredSite cSite = (ConfiguredSite) site.getCurrentConfiguredSite();
- if (cSite != null)
- return cSite.getPlatformURLString();
- return site.getURL().toExternalForm();
- }
-
- /*
- * return true if the platformBase URL is not the same
- * we thought it is. In this case we should reconcile in an optimistic way
- */
- private boolean platformBaseChanged(IConfiguredSite[] oldConfiguredSites) {
-
- if (oldConfiguredSites == null) {
- UpdateManagerPlugin.warn("No previous configured sites. Optimistic reconciliation.");
- return true;
- }
-
- String platformString = "platform:/base/";
- URL platformURL = null;
- try {
- platformURL = new URL(platformString);
- } catch (MalformedURLException e) {
- UpdateManagerPlugin.warn("Unable to resolve platform:/base/. Check you are running a Platform", e);
- return true;
- }
- URL resolvedCurrentBaseURL = null;
- try {
- resolvedCurrentBaseURL = Platform.resolve(platformURL);
- } catch (IOException e) {
- UpdateManagerPlugin.warn("Error while resolving platform:/base/. Check you are running a Platform", e);
- return true;
- }
-
- // find the 'platform:/base/' configuredSite
- int index = 0;
- boolean found = false;
- ConfiguredSite cSite = null;
- while (!found && index < oldConfiguredSites.length) {
- if (oldConfiguredSites[index] instanceof ConfiguredSite) {
- cSite = (ConfiguredSite) oldConfiguredSites[index];
- if (platformString.equalsIgnoreCase(cSite.getPlatformURLString())) {
- found = true;
- }
- }
- index++;
- }
-
- if (!found) {
- UpdateManagerPlugin.warn("Unable to find an old consifured site with platform:/base/ as a platform URL");
- return true;
- }
-
- if (cSite == null) {
- UpdateManagerPlugin.warn("The configuredSite that contains the platform is null");
- return true;
- }
-
- if (UpdateManagerUtils.sameURL(resolvedCurrentBaseURL, cSite.getSite().getURL())) {
- UpdateManagerPlugin.warn("Platform URL found are the same:" + resolvedCurrentBaseURL + " : " + cSite.getSite().getURL());
- return false;
- }
-
- UpdateManagerPlugin.warn("Platform URL found is different than the one previously saved. Reconcile optimistically:" + resolvedCurrentBaseURL + " : " + cSite.getSite().getURL());
- return true;
- }
-
- /**
- * Validate the list of configured features eliminating extra
- * entries (if possible). Make sure we do not leave configured
- * nested features with "holes" (ie. unconfigured children)
- */
- public static void checkConfiguredFeatures(IConfiguredSite configuredSite) {
-
- // Note: if we hit errors in the various computation
- // methods and throw a CoreException, we will not catch it
- // in this method. Consequently we will not attempt to
- // unconfigure any "extra" features because we would
- // likely get it wrong. The platform will run with extra features
- // configured. The runtime will eliminate extra plugins based
- // on runtime binding rules.
-
- // determine "proposed" list of configured features
- ConfiguredSite cSite = (ConfiguredSite) configuredSite;
- // debug
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_RECONCILER) {
- UpdateManagerPlugin.debug("Validate configuration of site " + cSite.getSite().getURL());
- }
- IFeatureReference[] configuredRefs = cSite.getConfiguredFeatures();
- ArrayList allPossibleConfiguredFeatures = new ArrayList();
- for (int i = 0; i < configuredRefs.length; i++) {
- try {
- IFeature feature = configuredRefs[i].getFeature();
- allPossibleConfiguredFeatures.add(feature);
- // debug
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_RECONCILER) {
- UpdateManagerPlugin.debug(" configured feature " + feature.getVersionedIdentifier().toString());
- }
- } catch (CoreException e) {
- UpdateManagerPlugin.warn("", e);
- }
- }
-
- // find "unique" top level features (latest version)
- ArrayList topFeatures = computeTopFeatures(allPossibleConfiguredFeatures);
-
- // expand features (compute full nesting structures).
- ArrayList configuredFeatures = expandFeatures(topFeatures);
-
- // compute extra features
- ArrayList extras = diff(allPossibleConfiguredFeatures, configuredFeatures);
-
- // unconfigure extra features
- ConfigurationPolicy cPolicy = cSite.getConfigurationPolicy();
- for (int i = 0; i < extras.size(); i++) {
- IFeature feature = (IFeature) extras.get(i);
- IFeatureReference ref = cSite.getSite().getFeatureReference(feature);
- try {
- cPolicy.unconfigure(ref, true, false);
- // debug
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_RECONCILER) {
- UpdateManagerPlugin.debug("Unconfiguring \"extra\" feature " + feature.getVersionedIdentifier().toString());
- }
- } catch (CoreException e) {
- UpdateManagerPlugin.warn("", e);
- }
- }
- }
-
- /*
- *
- */
- private static ArrayList computeTopFeatures(ArrayList features) {
-
- // start with the features passed in
- ArrayList result = new ArrayList();
- result.addAll(features);
- IFeature[] list = (IFeature[]) result.toArray(new IFeature[0]);
-
- // remove all features that nest in some other feature
- for (int i = 0; i < list.length; i++) {
- IIncludedFeatureReference[] children = null;
- try {
- children = list[i].getIncludedFeatureReferences();
- } catch (CoreException e) {
- UpdateManagerPlugin.warn("", e);
- }
-
- if (children != null) {
- for (int j = 0; j < children.length; j++) {
- IFeature child = null;
- try {
- //remove best match and exact feature
- child = children[j].getFeature(false, null);
- result.remove(child);
- child = children[j].getFeature(true, null);
- result.remove(child);
- } catch (CoreException e) {
- // if optional, it may not exist, do not throw error for that
- if (!children[j].isOptional()) {
- UpdateManagerPlugin.warn(null, e);
- }
- }
- }
- }
- }
-
- // debug
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_RECONCILER) {
- UpdateManagerPlugin.debug("Computed top-level features");
- for (int i = 0; i < result.size(); i++) {
- UpdateManagerPlugin.debug(" " + ((IFeature) result.get(i)).getVersionedIdentifier().toString());
- }
- }
-
- // eliminate duplicate versions (keep latest)
- list = (IFeature[]) result.toArray(new IFeature[0]);
- for (int i = 0; i < list.length - 1; i++) {
- IFeature left = list[i];
- VersionedIdentifier leftVid = left.getVersionedIdentifier();
- for (int j = i + 1; j < list.length; j++) {
- IFeature right = list[j];
- VersionedIdentifier rightVid = right.getVersionedIdentifier();
- if (leftVid.getIdentifier().equals(rightVid.getIdentifier())) {
- // duplicate versions ... keep latest
- if (rightVid.getVersion().isGreaterOrEqualTo(leftVid.getVersion())) {
- result.remove(left);
- // debug
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_RECONCILER) {
- UpdateManagerPlugin.debug("Removing \"duplicate\" " + left.getVersionedIdentifier().toString());
- }
- break;
- }
- }
- }
- }
-
- // return resulting top level features
- return result;
- }
-
- /*
- *
- */
- private static ArrayList expandFeatures(ArrayList features){
- ArrayList result = new ArrayList();
-
- // expand all top level features
- for (int i = 0; i < features.size(); i++) {
- expandFeature((IFeature) features.get(i), result);
- }
-
- return result;
- }
-
- /*
- *
- */
- private static void expandFeature(IFeature feature, ArrayList features) {
-
- // add feature
- if (!features.contains(feature)) {
- features.add(feature);
- // debug
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_RECONCILER) {
- UpdateManagerPlugin.debug("Retaining configured feature " + feature.getVersionedIdentifier().toString());
- }
- }
-
- // add nested children to the list
- IFeatureReference[] children = null;
- try {
- children = feature.getIncludedFeatureReferences();
- } catch(CoreException e){
- UpdateManagerPlugin.warn("",e);
- return;
- }
-
- for (int j = 0; j < children.length; j++) {
- IFeature child = null;
- try {
- child = children[j].getFeature();
- } catch (CoreException e) {
- if (!UpdateManagerUtils.isOptional(children[j]))
- UpdateManagerPlugin.warn("", e);
- // 25202 do not return right now, the peer children may be ok
- }
- if (child != null)
- expandFeature(child, features);
- }
- }
-
- /*
- *
- */
- private static ArrayList diff(ArrayList left, ArrayList right) {
- ArrayList result = new ArrayList();
-
- // determine difference (left "minus" right)
- for (int i = 0; i < left.size(); i++) {
- IFeature feature = (IFeature) left.get(i);
- if (!right.contains(feature))
- result.add(feature);
- }
- return result;
- }
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteStatusAnalyzer.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteStatusAnalyzer.java
deleted file mode 100644
index 7bd0ff6..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteStatusAnalyzer.java
+++ /dev/null
@@ -1,445 +0,0 @@
-package org.eclipse.update.internal.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.model.PluginDescriptorModel;
-import org.eclipse.core.runtime.model.PluginFragmentModel;
-import org.eclipse.update.configuration.IConfiguredSite;
-import org.eclipse.update.core.*;
-
-/**
- * This class manages the configurations.
- */
-
-public class SiteStatusAnalyzer {
-
- //
- private static List allRunningPlugins; /*VersionedIdentifier */
- private static List allConfiguredFeatures; /*VersionedIdentifier */
-
- private SiteLocal siteLocal;
-
- /**
- *
- */
- public SiteStatusAnalyzer(SiteLocal siteLocal) {
- this.siteLocal = siteLocal;
- }
-
- /**
- * manages the versionedIdentifier and location of parsed plugins
- */
- public class PluginIdentifier {
- private VersionedIdentifier id;
- private String label;
- private boolean isFragment = false;
-
- public PluginIdentifier(VersionedIdentifier id, String label, boolean fragment) {
- this.id = id;
- this.label = label;
- this.isFragment = fragment;
- }
-
- public VersionedIdentifier getVersionedIdentifier() {
- return id;
- }
-
- public boolean isFragment() {
- return isFragment;
- }
-
- public String getLabel() {
- return label;
- }
- }
- /**
- * compare two feature references
- * returns 0 if the feature are different
- * returns 1 if the version of feature 1 is greater than version of feature 2
- * returns 2 if opposite
- */
- private int compare(IFeatureReference featureRef1, IFeatureReference featureRef2) throws CoreException {
- if (featureRef1 == null)
- return 0;
-
- IFeature feature1 = null;
- IFeature feature2 = null;
- try {
- feature1 = featureRef1.getFeature();
- feature2 = featureRef2.getFeature();
- } catch (CoreException e) {
- UpdateManagerPlugin.warn(null, e);
- return 0;
- }
-
- if (feature1 == null || feature2 == null) {
- return 0;
- }
-
- VersionedIdentifier id1 = feature1.getVersionedIdentifier();
- VersionedIdentifier id2 = feature2.getVersionedIdentifier();
-
- if (id1 == null || id2 == null) {
- return 0;
- }
-
- if (id1.getIdentifier() != null && id1.getIdentifier().equals(id2.getIdentifier())) {
- PluginVersionIdentifier version1 = id1.getVersion();
- PluginVersionIdentifier version2 = id2.getVersion();
- if (version1 != null) {
- boolean greaterOrEqual = (version1.isGreaterOrEqualTo(version2));
- if (greaterOrEqual) {
- return 1;
- } else {
- return 2;
- }
- } else {
- return 2;
- }
- }
- return 0;
- }
-
- /*
- * check if the Plugins of the feature are on the plugin path
- * If all the plugins are on the plugin path, and the version match and there is no other version -> HAPPY
- * If all the plugins are on the plugin path, and the version match and there is other version -> AMBIGUOUS
- * If some of the plugins are on the plugin path, but not all -> UNHAPPY
- * Check on all ConfiguredSites
- */
- private IStatus getStatus(IFeature feature) {
-
- // validate site
- ISite featureSite = feature.getSite();
- if (featureSite == null) {
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_CONFIGURATION)
- UpdateManagerPlugin.debug("Cannot determine status of feature:" + feature.getLabel() + ". Site is NULL.");
- String msg = Policy.bind("SiteLocal.UnableToDetermineFeatureStatusSiteNull", new Object[] { feature.getURL()});
- return createStatus(IStatus.ERROR, IFeature.STATUS_AMBIGUOUS, msg, null);
- }
-
- // validate configured site
- ConfiguredSite cSite = (ConfiguredSite) featureSite.getCurrentConfiguredSite();
- if (cSite == null) {
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_CONFIGURATION)
- UpdateManagerPlugin.warn("Cannot determine status of feature: " + feature.getLabel() + ". Configured Site is NULL.");
- String msg = Policy.bind("SiteLocal.UnableToDetermineFeatureStatusConfiguredSiteNull", new Object[] { feature.getURL()});
- return createStatus(IStatus.ERROR, IFeature.STATUS_AMBIGUOUS, msg, null);
- }
-
- // check if disable, if so return
- IFeatureReference ref = cSite.getSite().getFeatureReference(feature);
- if (ref != null) {
- if (!cSite.getConfigurationPolicy().isConfigured(ref))
- return createStatus(IStatus.OK, IFeature.STATUS_DISABLED, "", null);
- } else {
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_CONFIGURATION)
- UpdateManagerPlugin.warn("Unable to find reference for feature " + feature + " in site " + cSite.getSite().getURL());
- }
-
- // check if broken
- IStatus status = cSite.getBrokenStatus(feature);
- if (status.getSeverity() != IStatus.OK) {
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_CONFIGURATION)
- UpdateManagerPlugin.debug("Feature broken:" + feature.getLabel() + ".Site:" + cSite.toString());
- return status;
- }
-
- // check ambiguous against registry [17015]
- IPluginEntry[] featuresEntries = feature.getPluginEntries();
- return status(featuresEntries);
- }
-
- /*
- * check if the Plugins of the feature are on the plugin path
- * If all the plugins are on the plugin path, and the version match and there is no other version -> HAPPY
- * If all the plugins are on the plugin path, and the version match and there is other version -> AMBIGUOUS
- * If some of the plugins are on the plugin path, but not all -> UNHAPPY
- * Check on all ConfiguredSites
- */
- public IStatus getFeatureStatus(IFeature feature) throws CoreException {
-
- IFeature childFeature = null;
- IStatus childStatus;
-
- IFeatureReference[] children = feature.getIncludedFeatureReferences();
-
- // consider disable
- // check the current feature
- String msg = Policy.bind("SiteLocal.FeatureDisable");
- int code = IFeature.STATUS_DISABLED;
- IStatus featureStatus = getStatus(feature);
- MultiStatus multiTemp = new MultiStatus(featureStatus.getPlugin(), code, msg, null);
- if (featureStatus.getSeverity() == IStatus.ERROR) {
- if (featureStatus.isMultiStatus()) {
- multiTemp.addAll(featureStatus);
- } else {
- multiTemp.add(featureStatus);
- }
- }
- // preserve the worse code through the method (self assesment + children assessment)
- if (featureStatus.getCode() > code)
- code = featureStatus.getCode();
-
- // do not check children if feature is disable
- if (!(code == IFeature.STATUS_DISABLED)) {
- for (int i = 0; i < children.length; i++) {
- if (!UpdateManagerUtils.isOptional(children[i])) {
- try {
- childFeature = children[i].getFeature();
- } catch (CoreException e) {
- if (!UpdateManagerUtils.isOptional(children[i]))
- UpdateManagerPlugin.warn("Error retrieving feature:" + children[i]);
- }
-
- if (childFeature == null) {
- UpdateManagerPlugin.warn("getFeatureStatus: Feature is null for:" + children[i]);
- // Unable to find children feature, broken
- Object featureAsPrintableObject = children[i].getURL();
- try {
- featureAsPrintableObject = children[i].getVersionedIdentifier();
- } catch (CoreException e){}//may fail
- String msg1 = Policy.bind("SiteLocal.NestedFeatureUnavailable", new Object[] { featureAsPrintableObject });
- multiTemp.add(createStatus(IStatus.ERROR, IFeature.STATUS_UNHAPPY, msg1, null));
- if (IFeature.STATUS_UNHAPPY > code)
- code = IFeature.STATUS_UNHAPPY;
- } else {
- childStatus = getFeatureStatus(childFeature);
- // do not add the status, add the children status as getFeatureStatus
- // returns a multiStatus
- if (childStatus.getCode() == IFeature.STATUS_DISABLED) {
- VersionedIdentifier versionID = childFeature.getVersionedIdentifier();
- String featureVer = (versionID == null) ? "" : versionID.getVersion().toString();
- String msg1 = Policy.bind("SiteLocal.NestedFeatureDisable", childFeature.getLabel(), featureVer);
- multiTemp.add(createStatus(IStatus.ERROR, childStatus.getCode(), msg1, null));
- if (IFeature.STATUS_UNHAPPY > code)
- code = IFeature.STATUS_UNHAPPY;
- }
- if (childStatus.getSeverity() != IStatus.OK) {
- VersionedIdentifier versionID = childFeature.getVersionedIdentifier();
- String featureVer = (versionID == null) ? "" : versionID.getVersion().toString();
- String msg1 = Policy.bind("SiteLocal.NestedFeatureUnHappy", childFeature.getLabel(), featureVer);
- multiTemp.add(createStatus(IStatus.ERROR, childStatus.getCode(), msg1, null));
- if (childStatus.getCode() > code)
- code = childStatus.getCode();
- }
- }
- }
- }
- }
-
- // set message
- switch (code) {
- case IFeature.STATUS_HAPPY :
- msg = Policy.bind("SiteLocal.FeatureHappy");
- break;
- case IFeature.STATUS_UNHAPPY :
- msg = Policy.bind("SiteLocal.FeatureUnHappy");
- break;
- case IFeature.STATUS_AMBIGUOUS :
- msg = Policy.bind("SiteLocal.FeatureAmbiguous");
- break;
- case IFeature.STATUS_DISABLED :
- msg = Policy.bind("SiteLocal.FeatureDisable");
- break;
- default :
- msg = Policy.bind("SiteLocal.FeatureStatusUnknown");
- break;
- }
- MultiStatus multi = new MultiStatus(featureStatus.getPlugin(), code, msg, null);
- multi.addAll(multiTemp);
- return multi;
- }
-
- /*
- * compute the status based on getStatus() rules
- */
- private IStatus status(IPluginEntry[] featurePlugins) {
- VersionedIdentifier featureID;
- VersionedIdentifier compareID;
- String pluginName;
-
- String happyMSG = Policy.bind("SiteLocal.FeatureHappy");
- String ambiguousMSG = Policy.bind("SiteLocal.FeatureAmbiguous");
- IStatus featureStatus = createStatus(IStatus.OK, IFeature.STATUS_HAPPY, "", null);
- MultiStatus multi = new MultiStatus(featureStatus.getPlugin(), IFeature.STATUS_AMBIGUOUS, ambiguousMSG, null);
-
- PluginIdentifier[] ids = getAllRunningPlugins();
-
- // is Ambigous if we find a plugin from the feature
- // with a different version and not the one we are looking
- for (int i = 0; i < featurePlugins.length; i++) {
- MultiStatus tempmulti = new MultiStatus(featureStatus.getPlugin(), IFeature.STATUS_AMBIGUOUS, ambiguousMSG, null);
- featureID = featurePlugins[i].getVersionedIdentifier();
- boolean found = false;
- for (int k = 0; k < ids.length && !found; k++) {
- compareID = ids[k].getVersionedIdentifier();
- pluginName = null;
- if (featureID.getIdentifier().equals(compareID.getIdentifier())) {
- pluginName = ids[k].getLabel();
- if (featureID.getVersion().isPerfect(compareID.getVersion())) {
- found = true;
- } else {
- // there is a plugin with a different version on the path
- // log it
- IFeature feature = getFeatureForId(compareID);
-
- String msg = null;
- if (feature == null) {
- Object[] values = new Object[] { pluginName, featureID.getVersion(), compareID.getVersion()};
- msg = Policy.bind("SiteLocal.TwoVersionSamePlugin1", values);
- } else {
- String label = feature.getLabel();
- String version = feature.getVersionedIdentifier().getVersion().toString();
- Object[] values = new Object[] { pluginName, featureID.getVersion(), compareID.getVersion(), label, version };
- msg = Policy.bind("SiteLocal.TwoVersionSamePlugin2", values);
- }
-
- UpdateManagerPlugin.warn("Found another version of the same plugin on the path:" + compareID.toString());
- tempmulti.add(createStatus(IStatus.ERROR, IFeature.STATUS_AMBIGUOUS, msg, null));
- }
- }
- }
-
- // if we haven't found the exact plugin, add the children
- // of tempMulti (i,e the other we found)
- // if we have no children, we have a problem as a required plugin is not there at all
- if (!found) {
- if (tempmulti.getChildren().length > 0) {
- multi.addAll(tempmulti);
- } else {
- if (multi.getCode() != IFeature.STATUS_UNHAPPY) {
- String unhappyMSG = Policy.bind("SiteLocal.FeatureUnHappy");
- MultiStatus newMulti = new MultiStatus(featureStatus.getPlugin(), IFeature.STATUS_UNHAPPY, unhappyMSG, null);
- newMulti.addAll(multi);
- multi = newMulti;
- }
- String msg = Policy.bind("SiteLocal.NoPluginVersion", featureID.getIdentifier());
- multi.add(createStatus(IStatus.ERROR, IFeature.STATUS_UNHAPPY, msg, null));
- }
- }
- }
-
- if (!multi.isOK())
- return multi;
-
- // we return happy as we consider the isBroken verification has been done
- return createStatus(IStatus.OK, IFeature.STATUS_HAPPY, happyMSG, null);
- }
- /*
- * creates a Status
- */
- private IStatus createStatus(int statusSeverity, int statusCode, String msg, Exception e) {
- String id = UpdateManagerPlugin.getPlugin().getDescriptor().getUniqueIdentifier();
-
- StringBuffer completeString = new StringBuffer("");
- if (msg != null)
- completeString.append(msg);
- if (e != null) {
- completeString.append("\r\n[");
- completeString.append(e.toString());
- completeString.append("]\r\n");
- }
- return new Status(statusSeverity, id, statusCode, completeString.toString(), e);
- }
-
- /*
- * returns all the configured plugins from the registry
- */
- private PluginIdentifier[] getAllRunningPlugins() {
- if (allRunningPlugins == null) {
- PluginIdentifier pluginIdentifier;
- allRunningPlugins = new ArrayList();
- IPluginRegistry reg = Platform.getPluginRegistry();
- IPluginDescriptor[] desc = reg.getPluginDescriptors();
- for (int i = 0; i < desc.length; i++) {
- String id = desc[i].getUniqueIdentifier();
- String ver = desc[i].getVersionIdentifier().toString();
- VersionedIdentifier versionID = new VersionedIdentifier(id, ver);
- pluginIdentifier = new PluginIdentifier(versionID, desc[i].getLabel(), false);
- allRunningPlugins.add(pluginIdentifier);
- // check fragments
- if (desc[i] instanceof PluginDescriptorModel) {
- PluginDescriptorModel descModel = (PluginDescriptorModel) desc[i];
- PluginFragmentModel[] frags = descModel.getFragments();
- if (frags != null) {
- for (int j = 0; j < frags.length; j++) {
- String fragID = frags[j].getId();
- String fragVER = frags[j].getVersion();
- VersionedIdentifier fragVersionID = new VersionedIdentifier(fragID, fragVER);
- pluginIdentifier = new PluginIdentifier(fragVersionID, frags[j].getName(), true);
- allRunningPlugins.add(pluginIdentifier);
- }
- }
- }
- }
- }
-
- PluginIdentifier[] ids = new PluginIdentifier[allRunningPlugins.size()];
- if (allRunningPlugins.size() > 0) {
- allRunningPlugins.toArray(ids);
- }
- return ids;
- }
-
- /*
- * returns all the configured fetaures
- */
- private IFeature[] getAllConfiguredFeatures() {
- if (allConfiguredFeatures == null) {
-
- allConfiguredFeatures = new ArrayList();
- IConfiguredSite[] allConfiguredSites = siteLocal.getCurrentConfiguration().getConfiguredSites();
-
- for (int i = 0; i < allConfiguredSites.length; i++) {
- IFeatureReference[] refs = allConfiguredSites[i].getConfiguredFeatures();
- IFeature feature = null;
- for (int j = 0; j < refs.length; j++) {
- feature = null;
- try {
- feature = refs[j].getFeature();
- } catch (CoreException e) {
- }
- if (feature != null) {
- allConfiguredFeatures.add(feature);
- }
- }
- }
- }
-
- IFeature[] features = new IFeature[allConfiguredFeatures.size()];
- if (allConfiguredFeatures.size() > 0) {
- allConfiguredFeatures.toArray(features);
- }
- return features;
- }
-
- /*
- * returns the Feature that declares this versionedIdentifier or null if none found
- */
- private IFeature getFeatureForId(VersionedIdentifier id) {
-
- if (id == null)
- return null;
-
- IFeature[] allFeatures = getAllConfiguredFeatures();
- IFeature currentFeature = null;
- IPluginEntry[] allPlugins = null;
- IPluginEntry currentPlugin = null;
- for (int i = 0; i < allFeatures.length; i++) {
- currentFeature = allFeatures[i];
- allPlugins = currentFeature.getPluginEntries();
- for (int j = 0; j < allPlugins.length; j++) {
- currentPlugin = allPlugins[j];
- if (id.equals(currentPlugin.getVersionedIdentifier()))
- return currentFeature;
- }
- }
- return null;
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteTypeFactory.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteTypeFactory.java
deleted file mode 100644
index 2cef9ce..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteTypeFactory.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package org.eclipse.update.internal.core;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.core.ISiteFactory;
-import org.eclipse.update.core.Utilities;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-/**
- *
- */
-public final class SiteTypeFactory {
-
-
- /**
- * extension point ID
- */
- public static final String SIMPLE_EXTENSION_ID = "siteTypes"; //$NON-NLS-1$
-
-
- private static SiteTypeFactory inst;
-
- private Map factories;
-
- /**
- * hide ctr
- */
- private SiteTypeFactory() {
- }
-
- public static SiteTypeFactory getInstance() {
- if (inst == null)
- inst = new SiteTypeFactory();
- return inst;
- }
-
-
- /**
- * return the factory for the type
- */
- public ISiteFactory getFactory(String type) throws CoreException {
- //
- Object instance = getFactories().get(type);
- if (instance==null) {
- instance = createFactoryFor(type);
- getFactories().put(type,instance);
- }
- return (ISiteFactory) instance;
- }
-
- /**
- *
- */
- private ISiteFactory createFactoryFor(String type) throws CoreException {
- ISiteFactory result = null;
-
- String pluginID = UpdateManagerPlugin.getPlugin().getDescriptor().getUniqueIdentifier();
- IPluginRegistry pluginRegistry = Platform.getPluginRegistry();
- IConfigurationElement[] elements = pluginRegistry.getConfigurationElementsFor(pluginID,SIMPLE_EXTENSION_ID,type);
- if (elements==null || elements.length==0){
- throw Utilities.newCoreException(Policy.bind("SiteTypeFactory.UnableToFindSiteFactory",type),null); //$NON-NLS-1$
- } else {
- IConfigurationElement element = elements[0];
- result = (ISiteFactory)element.createExecutableExtension("class"); //$NON-NLS-1$
- }
- return result;
- }
-
- /**
- * Gets the actories.
- * @return Returns a Map
- */
- private Map getFactories() {
- if (factories==null) factories = new HashMap();
- return factories;
- }
-
- /**
- * Sets the actories.
- * @param actories The actories to set
- */
- private void setFactories(Map factories) {
- factories = factories;
- }
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteURLContentProvider.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteURLContentProvider.java
deleted file mode 100644
index b550006..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteURLContentProvider.java
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteURLFactory.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteURLFactory.java
deleted file mode 100644
index aa60d75..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteURLFactory.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.eclipse.update.internal.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.*;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.update.core.*;
-import org.eclipse.update.core.model.InvalidSiteTypeException;
-import org.eclipse.update.core.model.SiteModelFactory;
-
-public class SiteURLFactory extends BaseSiteFactory {
-
- /*
- * @see ISiteFactory#createSite(URL, boolean)
- *
- * the URL can be of the following form
- * 1 protocol://...../
- * 2 protocol://.....
- * 3 protocol://..../site.xml
- *
- * 1 If the file of the file of teh url ends with '/', attempt to open the stream.
- * if it fails, add site.xml and attempt to open the stream
- *
- * 2 attempt to open the stream
- * fail
- * add '/site.xml' and attempt to open the stream
- * sucess
- * attempt to parse, if it fails, add '/site.xml' and attempt to open teh stream
- *
- * 3 open the stream
- */
- public ISite createSite(URL url) throws CoreException, InvalidSiteTypeException {
- Site site = null;
- InputStream siteStream = null;
-
- try {
- SiteURLContentProvider contentProvider = new SiteURLContentProvider(url);
-
- URL resolvedURL = URLEncoder.encode(url);
- Response response = UpdateManagerPlugin.getPlugin().get(resolvedURL);
- UpdateManagerUtils.checkConnectionResult(response,resolvedURL);
- siteStream = response.getInputStream();
-
- SiteModelFactory factory = (SiteModelFactory) this;
- site = (Site) factory.parseSite(siteStream);
-
- site.setSiteContentProvider(contentProvider);
- contentProvider.setSite(site);
- site.resolve(url, getResourceBundle(url));
- site.markReadOnly();
- } catch (MalformedURLException e) {
- throw Utilities.newCoreException(Policy.bind("SiteURLFactory.UnableToCreateURL", url == null ? "" : url.toExternalForm()), e);
- //$NON-NLS-1$
- } catch (IOException e) {
- throw Utilities.newCoreException(Policy.bind("SiteURLFactory.UnableToAccessSiteStream", url == null ? "" : url.toExternalForm()), ISite.SITE_ACCESS_EXCEPTION, e);
- //$NON-NLS-1$
- } finally {
- try {
- siteStream.close();
- } catch (Exception e) {
- }
- }
- return site;
- }
-
- /*
- * @see SiteModelFactory#canParseSiteType(String)
- */
- public boolean canParseSiteType(String type) {
- return (super.canParseSiteType(type) || SiteURLContentProvider.SITE_TYPE.equalsIgnoreCase(type));
- }
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/TargetFeature.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/TargetFeature.java
deleted file mode 100644
index 5fa732e..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/TargetFeature.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.eclipse.update.internal.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.update.core.*;
-
-/**
- *
- */
-public class TargetFeature extends Feature {
-
-
- /**
- * The content consumer of the DefaultFeature
- */
- private IFeatureContentConsumer contentConsumer;
-
-
- /**
- * Constructor for TargetFeature.
- */
- public TargetFeature() {
- super();
- }
-
- /**
- * Sets the content Consumer
- */
- public void setContentConsumer(IFeatureContentConsumer contentConsumer) {
- this.contentConsumer = contentConsumer;
- contentConsumer.setFeature(this);
- }
-
- /*
- * @see IFeature#getFeatureContentConsumer()
- */
- public IFeatureContentConsumer getFeatureContentConsumer() throws CoreException {
- if (this.contentConsumer == null) {
- throw Utilities.newCoreException( Policy.bind("Feature.NoFeatureContentConsumer", getURL().toExternalForm()), null); //$NON-NLS-1$
- }
- return contentConsumer;
- }
-
-}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/URLEncoder.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/URLEncoder.java
deleted file mode 100644
index 82e5ccf..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/URLEncoder.java
+++ /dev/null
@@ -1,157 +0,0 @@
-package org.eclipse.update.internal.core;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import java.io.UnsupportedEncodingException;
-
-import java.net.URL;
-import java.net.MalformedURLException;
-
-import java.util.StringTokenizer;
-
-/**
- * Encodes a <code>URL</code> into an <code>ASCII</code> readable
- * <code>URL</code> that is safe for transport. Encoded
- * <code>URL</code>s can be decoded using the <code>URLDecoder</code>.
- *
- * @see URLDecoder
- */
-public final class URLEncoder {
- /**
- * Prevents instances from being created.
- */
- private URLEncoder() {
- }
- /**
- * Encodes the given <code>URL</code> into an <code>ASCII</code>
- * readable <code>URL</code> that is safe for transport. Returns the
- * result.
- *
- * @return the result of encoding the given <code>URL</code> into an
- * <code>ASCII</code> readable <code>URL</code> that is safe for
- * transport
- */
- public static String encode(String url) {
- try {
- return encode(new URL(url)).toString();
- } catch (MalformedURLException e) {
- }
-
- String file;
- String ref = null;
-
- int lastSlashIndex = url.lastIndexOf('/');
- int lastHashIndex = url.lastIndexOf('#');
- if ((lastHashIndex - lastSlashIndex > 1) && lastHashIndex < url.length() - 1) {
- file = url.substring(0, lastHashIndex);
- ref = url.substring(lastHashIndex + 1, url.length());
- } else {
- file = url;
- }
-
- return encode(file, ref);
- }
- /**
- * Encodes the given file and reference parts of a <code>URL</code> into
- * an <code>ASCII</code> readable <code>String</code> that is safe for
- * transport. Returns the result.
- *
- * @return the result of encoding the given file and reference parts of
- * a <code>URL</code> into an <code>ASCII</code> readable
- * <code>String</code> that is safe for transport
- */
- public static String encode(String file, String ref) {
- StringBuffer buf = new StringBuffer();
- StringTokenizer tokenizer = new StringTokenizer(file, "/", true); //$NON-NLS-1$
-
- while (tokenizer.hasMoreTokens()) {
- String token = tokenizer.nextToken();
- if (token.equals("/")) { //$NON-NLS-1$
- buf.append(token);
- } else {
- buf.append(encodeSegment(token));
- }
- }
-
- if (ref != null) {
- buf.append('#');
- buf.append(encodeSegment(ref));
- }
-
- return buf.toString();
- }
- /**
- * Encodes the given <code>URL</code> into an <code>ASCII</code>
- * readable <code>URL</code> that is safe for transport. Returns the
- * result.
- *
- * @return the result of encoding the given <code>URL</code> into an
- * <code>ASCII</code> readable <code>URL</code> that is safe for
- * transport
- */
- public static URL encode(URL url) throws MalformedURLException {
- String file = url.getFile();
- String ref = url.getRef();
-
- URL result = new URL(url.getProtocol(), url.getHost(), url.getPort(), encode(file, ref));
- return result;
- }
- private static String encodeSegment(String segment) {
-
- // if we find a '%' in the string, consider the URL to be already encoded
- if (segment.indexOf('%')!=-1) return segment;
-
- StringBuffer result = new StringBuffer(segment.length());
-
- for (int i = 0; i < segment.length(); ++i) {
- char c = segment.charAt(i);
- if (mustEncode(c)) {
- byte[] bytes = null;
- try {
- bytes = new Character(c).toString().getBytes("UTF8"); //$NON-NLS-1$
- } catch (UnsupportedEncodingException e) {
- Assert.isTrue(false, e.getMessage());
- }
- for (int j = 0; j < bytes.length; ++j) {
- result.append('%');
- result.append(Integer.toHexString((bytes[j] >> 4) & 0x0F));
- result.append(Integer.toHexString(bytes[j] & 0x0F));
- }
- } else {
- result.append(c);
- }
- }
-
- return result.toString();
- }
- private static boolean mustEncode(char c) {
- if (c >= 'a' && c <= 'z') {
- return false;
- }
-
- if (c >= 'A' && c <= 'Z') {
- return false;
- }
-
- if (c >= '0' && c <= '9') {
- return false;
- }
-
- if (c >= '\'' && c <= '.') {
- return false;
- }
-
- if (c == '!' || c == '$' || c == '_') {
- return false;
- }
-
- // needed otherwise file:///c:/file/ becomes file:///C%3a/file/
- if (c ==':'){
- return false;
- }
- return true;
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateManagerLogWriter.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateManagerLogWriter.java
deleted file mode 100644
index e9ced55..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateManagerLogWriter.java
+++ /dev/null
@@ -1,298 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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 v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.update.internal.core;
-
-import java.io.*;
-import java.io.Writer;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import org.eclipse.update.configuration.IActivity;
-import org.eclipse.update.configuration.IInstallConfiguration;
-/**
- * A log writer that writes update manager log entries.
- */
-public class UpdateManagerLogWriter {
- private File logFile = null;
- private Writer log = null;
-
- private static final String CONFIGURATION = "!CONFIGURATION"; //$NON-NLS-1$
- private static final String ACTIVITY = "!ACTIVITY"; //$NON-NLS-1$
-
- private static final String SUCCESS = "success"; //$NON-NLS-1$
- private static final String FAILURE = "failure"; //$NON-NLS-1$
-
- private static final String FEATURE_INSTALL = "feature-install"; //$NON-NLS-1$
- private static final String FEATURE_REMOVE = "feature-remove"; //$NON-NLS-1$
- private static final String SITE_INSTALL = "site-install"; //$NON-NLS-1$
- private static final String SITE_REMOVE = "site-remove"; //$NON-NLS-1$
- private static final String UNCONFIGURE = "feature-disable"; //$NON-NLS-1$
- private static final String CONFIGURE = "feature-enable"; //$NON-NLS-1$
- private static final String REVERT = "revert"; //$NON-NLS-1$
- private static final String RECONCILIATION = "reconciliation"; //$NON-NLS-1$
- private static final String PRESERVED = "preserve-configuration"; //$NON-NLS-1$
- private static final String UNKNOWN = "unknown"; //$NON-NLS-1$
-
- private static final String LINE_SEPARATOR;
- private static final String TAB_STRING = "\t"; //$NON-NLS-1$
-
- static {
- String s = System.getProperty("line.separator"); //$NON-NLS-1$
- LINE_SEPARATOR = s == null ? "\n" : s; //$NON-NLS-1$
- }
-
- /*
- *
- */
- public UpdateManagerLogWriter(File file) {
- this.logFile = file;
- UpdateManagerPlugin.warn("UPDATE MANAGER LOG Location: "+file.getAbsolutePath());
- }
-
- /*
- *
- */
- private void closeLogFile() throws IOException {
- try {
- if (log != null) {
- log.flush();
- log.close();
- }
- } finally {
- log = null;
- }
- }
-
- /*
- *
- */
- public synchronized void log(IInstallConfiguration installConfig) {
- // thread safety: (Concurrency003)
- if (logFile != null)
- openLogFile();
- if (log == null)
- log = logForStream(System.err);
- try {
- try {
- write(installConfig);
- } finally {
- if (logFile != null)
- closeLogFile();
- else
- log.flush();
- }
- } catch (Exception e) {
- System.err.println("An exception occurred while writing to the update manager log:"); //$NON-NLS-1$
- e.printStackTrace(System.err);
- System.err.println("Logging to the console instead."); //$NON-NLS-1$
- //we failed to write, so dump log entry to console instead
- try {
- log = logForStream(System.err);
- write(installConfig);
- 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;
- }
- }
-
- /*
- *
- */
- private synchronized void log(IActivity activity) {
- // thread safety: (Concurrency003)
- if (logFile != null)
- openLogFile();
- if (log == null)
- log = logForStream(System.err);
- try {
- try {
- write(activity);
- } finally {
- if (logFile != null)
- closeLogFile();
- else
- log.flush();
- }
- } catch (Exception e) {
- System.err.println("An exception occurred while writing to the update manager log:"); //$NON-NLS-1$
- e.printStackTrace(System.err);
- System.err.println("Logging to the console instead."); //$NON-NLS-1$
- //we failed to write, so dump log entry to console instead
- try {
- log = logForStream(System.err);
- write(activity);
- 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;
- }
- }
-
- /*
- *
- */
- private void openLogFile() {
- try {
- log = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(logFile.getAbsolutePath(), true), "UTF-8")); //$NON-NLS-1$
- } catch (IOException e) {
- // there was a problem opening the log file so log to the console
- log = logForStream(System.err);
- }
- }
-
- /*
- *
- */
- private String getFormattedDate(Date date) {
- try {
- DateFormat formatter = new SimpleDateFormat("MMM dd, yyyy kk:mm:ss.SS"); //$NON-NLS-1$
- return formatter.format(date);
- } catch (Exception e) {
- // If there were problems writing out the date, ignore and
- // continue since that shouldn't stop us from losing the rest
- // of the information
- }
- return Long.toString(System.currentTimeMillis());
- }
-
- /*
- *
- */
- private Writer logForStream(OutputStream output) {
- try {
- return new BufferedWriter(new OutputStreamWriter(output, "UTF-8")); //$NON-NLS-1$
- } catch (UnsupportedEncodingException e) {
- return new BufferedWriter(new OutputStreamWriter(output));
- }
- }
-
- /*
- * Writes the given string to the log, followed by the line terminator string.
- */
- private void writeln(String s) throws IOException {
- write(s);
- writeln();
- }
-
- /*
- * Shuts down the update manager log.
- */
- public synchronized void shutdown() {
- try {
- if (logFile != null) {
- closeLogFile();
- logFile = null;
- } else {
- if (log != null) {
- Writer old = log;
- log = null;
- old.flush();
- old.close();
- }
- }
- } catch (Exception e) {
- //we've shutdown the log, so not much else we can do!
- e.printStackTrace();
- }
- }
-
-
- /*
- * !CONFIGURATION <label>
- */
- private void write(IInstallConfiguration installConfig) throws IOException {
- writeln();
- write(CONFIGURATION);
- writeSpace();
- write(installConfig.getLabel());
- writeln();
- IActivity[] activities = installConfig.getActivities();
- for (int i = 0; i < activities.length; i++) {
- write(activities[i]);
- }
- }
-
- /*
- * !ACTIVITY <date> <target> <action> <status>
- */
- private void write(IActivity activity) throws IOException {
- write(ACTIVITY);
- writeSpace();
- write(getFormattedDate(activity.getDate()));
- writeSpace();
- write(activity.getLabel());
- writeSpace();
- write(getAction(activity.getAction()));
- writeSpace();
- write((activity.getStatus()==IActivity.STATUS_OK)?SUCCESS:FAILURE);
- writeln();
- }
-
- /*
- *
- */
- private String getAction(int i) {
- switch (i) {
- case IActivity.ACTION_FEATURE_INSTALL :
- return FEATURE_INSTALL;
- case IActivity.ACTION_FEATURE_REMOVE :
- return FEATURE_REMOVE;
- case IActivity.ACTION_SITE_INSTALL :
- return SITE_INSTALL;
- case IActivity.ACTION_SITE_REMOVE :
- return SITE_REMOVE;
- case IActivity.ACTION_UNCONFIGURE :
- return UNCONFIGURE;
- case IActivity.ACTION_CONFIGURE :
- return CONFIGURE;
- case IActivity.ACTION_REVERT :
- return REVERT;
- case IActivity.ACTION_RECONCILIATION :
- return RECONCILIATION;
- case IActivity.ACTION_ADD_PRESERVED :
- return PRESERVED;
-
- default :
- return UNKNOWN+" ["+i+"]";
- }
- }
-
-
- /*
- *
- */
- private void writeln() throws IOException {
- write(LINE_SEPARATOR);
- }
-
- /*
- *
- */
- private void write(String message) throws IOException {
- if (message != null)
- log.write(message);
- }
-
- /*
- *
- */
- private void writeSpace() throws IOException {
- write(" "); //$NON-NLS-1$
- }
-}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateManagerPlugin.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateManagerPlugin.java
deleted file mode 100644
index fc1eb76..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateManagerPlugin.java
+++ /dev/null
@@ -1,295 +0,0 @@
-package org.eclipse.update.internal.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import java.io.File;
-import java.io.IOException;
-import java.net.Authenticator;
-import java.net.URL;
-import java.util.ArrayList;
-
-import org.eclipse.core.boot.BootLoader;
-import org.eclipse.core.boot.IPlatformConfiguration;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.configuration.IInstallConfiguration;
-import org.eclipse.update.core.JarContentReference;
-import org.eclipse.update.core.Utilities;
-
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class UpdateManagerPlugin extends Plugin {
-
- // debug options
- public static boolean DEBUG = false;
- public static boolean DEBUG_SHOW_INSTALL = false;
- public static boolean DEBUG_SHOW_PARSING = false;
- public static boolean DEBUG_SHOW_WARNINGS = false;
- public static boolean DEBUG_SHOW_CONFIGURATION = false;
- public static boolean DEBUG_SHOW_TYPE = false;
- public static boolean DEBUG_SHOW_WEB = false;
- public static boolean DEBUG_SHOW_IHANDLER = false;
- public static boolean DEBUG_SHOW_RECONCILER = false;
-
- //The shared instance.
- private static UpdateManagerPlugin plugin;
-
- //log
- private static UpdateManagerLogWriter log;
- private static final String LOG_FILE=".install-log";
-
- // web install
- private static String appServerHost =null;
- private static int appServerPort = 0;
-
- private HttpClient client;
-
- /**
- * The constructor.
- */
- public UpdateManagerPlugin(IPluginDescriptor descriptor) {
- super(descriptor);
- plugin = this;
- }
-
- /**
- * Returns the shared instance.
- */
- public static UpdateManagerPlugin getPlugin() {
- return plugin;
- }
-
- /**
- * Returns the host identifier for the web app server
- */
- public static String getWebAppServerHost() {
- return appServerHost;
- }
-
- /**
- * Returns the port identifier for the web app server
- */
- public static int getWebAppServerPort() {
- return appServerPort;
- }
-
- /**
- * @see Plugin#startup()
- */
- public void startup() throws CoreException {
- super.startup();
-
- Policy.localize("org.eclipse.update.internal.core.messages"); //$NON-NLS-1$
- DEBUG = getBooleanDebugOption("org.eclipse.update.core/debug", false); //$NON-NLS-1$
-
- if (DEBUG) {
- DEBUG_SHOW_WARNINGS = getBooleanDebugOption("org.eclipse.update.core/debug/warning", false); //$NON-NLS-1$
- DEBUG_SHOW_PARSING = getBooleanDebugOption("org.eclipse.update.core/debug/parsing", false); //$NON-NLS-1$
- DEBUG_SHOW_INSTALL = getBooleanDebugOption("org.eclipse.update.core/debug/install", false); //$NON-NLS-1$
- DEBUG_SHOW_CONFIGURATION = getBooleanDebugOption("org.eclipse.update.core/debug/configuration", false); //$NON-NLS-1$
- DEBUG_SHOW_TYPE = getBooleanDebugOption("org.eclipse.update.core/debug/type", false); //$NON-NLS-1$
- DEBUG_SHOW_WEB = getBooleanDebugOption("org.eclipse.update.core/debug/web", false); //$NON-NLS-1$
- DEBUG_SHOW_IHANDLER = getBooleanDebugOption("org.eclipse.update.core/debug/installhandler", false); //$NON-NLS-1$
- DEBUG_SHOW_RECONCILER = getBooleanDebugOption("org.eclipse.update.core/debug/reconciler", false); //$NON-NLS-1$
- }
-
- //
- try {
- File logFile = getUpdateStateLocation();
- if (logFile!=null)
- log = new UpdateManagerLogWriter(logFile);
- } catch (IOException e){
- warn("",e);
- }
-
- client = new HttpClient();
- }
-
- /**
- * @see Plugin#shutdown()
- */
- public void shutdown() throws CoreException {
- super.shutdown();
-
- JarContentReference.shutdown(); // make sure we are not leaving jars open
- Utilities.shutdown(); // cleanup temp area
- if (log!=null)
- log.shutdown();
-
- if (client!=null) client.close();
- }
-
- private boolean getBooleanDebugOption(String flag, boolean dflt) {
- String result = Platform.getDebugOption(flag);
- if (result == null)
- return dflt;
- else
- return result.trim().equalsIgnoreCase("true"); //$NON-NLS-1$
- }
-
- /**
- * dumps a String in the trace
- */
- public static void debug(String s) {
- StringBuffer msg = new StringBuffer();
- msg.append(getPlugin().toString());
- msg.append("^");
- msg.append(Integer.toHexString(Thread.currentThread().hashCode()));
- msg.append(" ");
- msg.append(s);
- System.out.println(msg.toString());
- }
-
- /**
- * Dumps a String in the log if WARNING is set to true
- */
- public static void warn(String s) {
- if (DEBUG && DEBUG_SHOW_WARNINGS) {
- if (s!=null){
- s="WARNING: "+s;
- }
- log(s, null);
- }
- }
-
- /**
- * Dumps an exception in the log if WARNING is set to true
- *
- * @param s log string
- * @param e exception to be logged
- * @since 2.0
- */
- public static void warn(String s, Throwable e) {
- if (DEBUG && DEBUG_SHOW_WARNINGS){
- if (s!=null){
- s="UPDATE MANAGER INFO: "+s;
- }
- log(s,e);
- }
- }
-
- /**
- * Logs a status
- */
- public static void log(IStatus status){
- UpdateManagerPlugin.getPlugin().getLog().log(status);
- }
-
- /**
- * Logs an error
- */
- public static void log(Throwable e){
- log("",e);
- }
-
- /**
- * Logs a string and an error
- */
- public static void log(String msg, Throwable e){
- IStatus status = null;
- if (e instanceof CoreException)
- status = ((CoreException)e).getStatus();
- else
- status = Utilities.newCoreException(msg,e).getStatus();
- if (status!=null)
- log(status);
- }
- /*
- * Method log.
- * @param newConfiguration
- */
- public static void log(IInstallConfiguration newConfiguration) {
- if (log!=null)
- log.log(newConfiguration);
- }
-
- /*
- * Get update log location relative to platform configuration
- */
- private static File getUpdateStateLocation() throws IOException {
-
- IPlatformConfiguration config = BootLoader.getCurrentPlatformConfiguration();
- URL configurationLocation = config.getConfigurationLocation();
- if (configurationLocation==null){
- warn("Unable to retrieve location for update manager log file");
- return null;
- }
- URL configLocation = Platform.resolve(configurationLocation);
- File updateStateLocation = null;
-
- if ("file".equalsIgnoreCase(configLocation.getProtocol())) {
- // ensure path exists. Handle transient configurations
- ArrayList list = new ArrayList();
- File path = new File(configLocation.getFile());
- updateStateLocation = new File(path.getParentFile(),LOG_FILE);
- while (path != null) { // walk up to first dir that exists
- if (!path.exists()) {
- list.add(path);
- path = path.getParentFile();
- } else
- path = null;
- }
- for (int i = list.size() - 1; i >= 0; i--) { // walk down to create missing dirs
- path = (File) list.get(i);
- path.mkdir();
- if (config.isTransient())
- path.deleteOnExit();
- }
- }
- return updateStateLocation;
- }
-
- /**
- * Sends the GET request to the server and returns the server's
- * response.
- *
- * @param url the URL to open on the server
- * @return the server's response
- * @throws IOException if an I/O error occurs. Reasons include:
- * <ul>
- * <li>The client is closed.
- * <li>The client could not connect to the server
- * <li>An I/O error occurs while communicating with the server
- * <ul>
- */
- public Response get(URL url) throws IOException {
- //Request request = null;
- Response response = null;
-
- if ("file".equals(url.getProtocol())){
- response = new FileResponse(url.openStream());
- } else {
- response = new HttpResponse(url);
- }
-
- /*else {
- try {
- request = new Request("GET", url, null);
- response = client.invoke(request);
- } finally {
- if (request != null) {
- try {
- request.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- }
- }*/
- return response;
- }
-
- /**
- * Method setDefaultAuthenticator.
- * @param authenticator
- */
- public void setDefaultAuthenticator(Authenticator authenticator) {
- if (client!=null)
- client.setAuthenticator(authenticator);
- }
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateManagerReconciler.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateManagerReconciler.java
deleted file mode 100644
index 7f61154..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateManagerReconciler.java
+++ /dev/null
@@ -1,270 +0,0 @@
-package org.eclipse.update.internal.core;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import java.io.*;
-import java.net.URL;
-import java.util.Date;
-import java.util.HashMap;
-
-import org.eclipse.core.boot.*;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Platform;
-
-/**
- * Update manager reconciler application.
- * This application is invoked by the platform startup support
- * whenever changes are detected in the installation that require
- * the update state to be reconciled. Typically, this will be as
- * a result of installation actions that were done directly
- * in the file system bypassing the Update Manager.
- * When triggered, this application performs the following:
- * <ul>
- * <li>call update manager reconciler
- * <li>if plugin path changed as a result of this call, trigger
- * restart ("exit code 23")
- * <li>if plugin path has not changed as a result of this call,
- * start this original application
- * </ul>
- */
-
-public class UpdateManagerReconciler implements IPlatformRunnable {
-
- // NOTE: originalApplication is set to a dummy string to prevent "silent"
- // failures in case of internal errors
- private String originalApplication = "org.eclipse.update.UNKNOWN"; //$NON-NLS-1$
- private boolean initialize = false;
- private boolean firstUse = false;
- private boolean optimistic = false;
- private boolean DEBUG = false;
-
- private static final String RECONCILER_APP = "org.eclipse.update.core.reconciler";
- private static final String APPLICATION = "-application"; //$NON-NLS-1$
- private static final String INITIALIZE = "-initialize"; //$NON-NLS-1$
- private static final String FIRSTUSE = "-firstuse"; //$NON-NLS-1$
- private static final String NEWUPDATES = "-newUpdates"; //$NON-NLS-1$
- private static final String CHANGES_MARKER = ".newupdates"; //$NON-NLS-1$
-
- /**
- * @see IPlatformRunnable#run(Object)
- */
- public Object run(Object args) throws Exception {
-
- // get debug setting and process command line arguments
- DEBUG = UpdateManagerPlugin.DEBUG_SHOW_RECONCILER;
- processCommandLine((String[])args);
-
- // obtain current platform configuration and save stamps
- IPlatformConfiguration cfg = BootLoader.getCurrentPlatformConfiguration();
- // URL[] originalPluginPath = cfg.getPluginPath();
-
- // perform reconciliation
- long start = 0;
- if (DEBUG) {
- start = new Date().getTime();
- debug("begin"); //$NON-NLS-1$
- }
-
- if (initialize || firstUse)
- optimistic = true; // initialize and first-time startup ... optimistic
- // (changes are auto-configured)
- else
- optimistic = false; // all other ... pessimistic (changes are
- // reflected in state but not configured)
-
- boolean changes = reconcile(cfg);
-
- if (DEBUG) {
- long delta = (new Date().getTime()) - start;
- debug("end [" + delta + "ms]"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- // if we are completing post-install initialization (-initialize)
- // just exit
- if (initialize) {
- Platform.endSplash();
- return EXIT_OK;
- }
-
- // if the reconciler app was explicitly invoked, mark changes and
- // just exit
- if (RECONCILER_APP.equals(originalApplication)) {
- Platform.endSplash();
- if (changes)
- markChanges(cfg);
- return EXIT_OK; // just exit if original app was reconciler
- }
-
- // see if plugins have changed
-// if (pluginPathChanged(cfg, originalPluginPath)) {
- // plugins lineup changed ... need to restart
- Platform.endSplash();
- if (changes)
- markChanges(cfg);
- if (DEBUG)
- debug("restarting ..."); //$NON-NLS-1$
- return EXIT_RESTART;
-// } else {
-// // plugins lineup did not change ... no need to restart,
-// // just continue starting up the original app. Original
-// // app will take down splash
-// IPlatformRunnable originalRunnable = getRunnable(originalApplication);
-// if (originalRunnable == null)
-// throw new IllegalArgumentException(Policy.bind("Reconciler.appNotFound",originalApplication)); //$NON-NLS-1$
-// if (DEBUG)
-// debug("invoking " + originalApplication + " ..."); //$NON-NLS-1$ //$NON-NLS-2$
-// // indicate we have new updates (-newUpdates)
-// if (changes)
-// appArgs = markChanges(appArgs);
-// return originalRunnable.run(appArgs);
-// }
- }
-
- private boolean reconcile(IPlatformConfiguration cfg) {
-
- boolean changes = true;
-
- // do the reconciliation
- try {
- if (DEBUG)
- debug("mode: " + (optimistic ? "optimistic" : "pessimistic")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- changes = InternalSiteManager.reconcile(optimistic);
- if (DEBUG)
- debug(changes ? "changes detected" :"no changes detected"); //$NON-NLS-1$ //$NON-NLS-2$
- } catch (CoreException e){
- UpdateManagerPlugin.warn(null,e);
- } catch (Exception e) {
- UpdateManagerPlugin.warn(null,e);
- }
- cfg.refresh(); // recompute stamps and plugin path
-
- return changes;
- }
-
- private boolean pluginPathChanged(IPlatformConfiguration cfg, URL[] originalPluginPath) {
- URL[] currentPluginPath = cfg.getPluginPath();
- HashMap originalMap = new HashMap();
- HashMap currentMap = new HashMap();
-
- // populate maps
- for (int i=0; i< originalPluginPath.length; i++) {
- originalMap.put(originalPluginPath[i].toExternalForm(), null);
- }
- for (int i=0; i< currentPluginPath.length; i++) {
- currentMap.put(currentPluginPath[i].toExternalForm(), null);
- }
-
- // check for deletions
- for (int i=0; i<originalPluginPath.length; i++) {
- String key = originalPluginPath[i].toExternalForm();
- if (!currentMap.containsKey(key))
- return true;
- }
-
- // check for additions
- for (int i=0; i<currentPluginPath.length; i++) {
- String key = currentPluginPath[i].toExternalForm();
- if (!originalMap.containsKey(key))
- return true;
- }
-
- return false;
- }
-
- private void markChanges(IPlatformConfiguration cfg) {
- // indicate we have changes in restart scenario ... converted to -newUpdates on restart
- FileOutputStream fos = null;
- try {
- URL markerLocation = new URL(cfg.getConfigurationLocation(),CHANGES_MARKER);
- fos = new FileOutputStream(new File(markerLocation.getFile()));
- fos.write(0);
- fos.close();
- } catch(IOException e) {
- if (fos != null) try { fos.close(); } catch(IOException e2) {}
- }
- }
-
- private String[] markChanges(String[] args) {
- // indicate we have changes in continue-startup scenario ... adds -newUpdate
- String[] newArgs = new String[args.length+1];
- newArgs[0] = NEWUPDATES;
- System.arraycopy(args,0,newArgs,1,args.length);
- return newArgs;
- }
-
- private String[] processCommandLine(String[] args) {
- 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)
-
- // look for the initialization flag
- if (args[i].equalsIgnoreCase(INITIALIZE)) {
- initialize = true;
- found = true;
- }
-
- // look for first use flag
- if (args[i].equalsIgnoreCase(FIRSTUSE)) {
- firstUse = true;
- 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("-")) { //$NON-NLS-1$
- continue;
- }
- String arg = args[++i];
-
- // look for the application argument
- if (args[i - 1].equalsIgnoreCase(APPLICATION)) {
- found = true;
- originalApplication = 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;
- }
-
- private IPlatformRunnable getRunnable(String application) {
- // NOTE: we need to get the runnable for the original application.
- // We can either lookup the application extension point (duplicate
- // the InternalPlatform logic here), or make the internal call
- return InternalPlatform.loaderGetRunnable(application);
- }
-
- private void debug(String s) {
- UpdateManagerPlugin.debug(this.getClass().getName()+": "+s); //$NON-NLS-1$
- }
-}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateManagerUtils.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateManagerUtils.java
deleted file mode 100644
index 329c7f5..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateManagerUtils.java
+++ /dev/null
@@ -1,601 +0,0 @@
-package org.eclipse.update.internal.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-import java.io.*;
-import java.net.*;
-import java.util.*;
-
-import org.eclipse.core.boot.BootLoader;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.update.core.*;
-import org.eclipse.update.core.model.InstallAbortedException;
-
-/**
- *
- */
-public class UpdateManagerUtils {
-
- private static boolean OS_UNIX = BootLoader.OS_HPUX.equals(BootLoader.getOS()) || BootLoader.OS_AIX.equals(BootLoader.getOS()) || BootLoader.OS_LINUX.equals(BootLoader.getOS()) || BootLoader.OS_SOLARIS.equals(BootLoader.getOS());
-
- private static Map table;
- static {
- table = new HashMap();
- table.put("compatible", new Integer(IImport.RULE_COMPATIBLE)); //$NON-NLS-1$
- table.put("perfect", new Integer(IImport.RULE_PERFECT)); //$NON-NLS-1$
- table.put("equivalent", new Integer(IImport.RULE_EQUIVALENT)); //$NON-NLS-1$
- table.put("greaterOrEqual", new Integer(IImport.RULE_GREATER_OR_EQUAL)); //$NON-NLS-1$
- }
-
- /**
- * return the urlString if it is a absolute URL
- * otherwise, return the default URL if the urlString is null
- * The defaultURL may point ot a file, create a file URL then
- * if the urlString or the default URL are relatives, prepend the rootURL to it
- */
- public static URL getURL(URL rootURL, String urlString, String defaultURL) throws MalformedURLException {
- URL url = null;
-
- // if no URL , provide Default
- if (urlString == null || urlString.trim().equals("")) { //$NON-NLS-1$
-
- // no URL, no default, return right now...
- if (defaultURL == null || defaultURL.trim().equals("")) //$NON-NLS-1$
- return null;
- else
- urlString = defaultURL;
- }
-
- // URL can be relative or absolute
- if (urlString.startsWith("/") && urlString.length() > 1) //$NON-NLS-1$
- urlString = urlString.substring(1);
- try {
- url = new URL(urlString);
- } catch (MalformedURLException e) {
- // the url is not an absolute URL
- // try relative
- url = new URL(rootURL, urlString);
- }
-
- return url;
- }
-
- /**
- * return a relative String to rootURL
- * if url contains rootURL so
- * new URL(rootURL, resultString) == url
- *
- */
- public static String getURLAsString(URL rootURL, URL url) {
- String result = null;
-
- if (rootURL == null) {
- return (url == null) ? null : url.toString();
- }
-
- // if no URL , return null
- if (url != null) {
-
- result = url.toExternalForm();
-
- if (rootURL.getHost() != null && !rootURL.getHost().equals(url.getHost()))
- return result;
-
- if (rootURL.getProtocol() != null && !rootURL.getProtocol().equals(url.getProtocol()))
- return result;
-
- if (rootURL.getPort() != url.getPort())
- return result;
-
- String rootURLFileString = rootURL.getFile();
- rootURLFileString.replace(File.separatorChar, '/');
- if (!rootURLFileString.endsWith("/")) {
- int index = rootURLFileString.lastIndexOf('/');
- if (index != -1) {
- rootURLFileString = rootURLFileString.substring(0, index);
- }
- }
- String urlFileString = url.getFile();
-
- if (urlFileString.startsWith(rootURLFileString)) {
- result = urlFileString.substring(rootURLFileString.length());
- result.replace(File.separatorChar, '/');
- } else {
- // we need to check the following
- // file:/C:/ and file:C:/
- if ("file".equalsIgnoreCase(url.getProtocol())) {
- File rootFile = new File(rootURLFileString);
- File urlFile = new File(urlFileString);
-
- File relativePath = urlFile;
- while (relativePath != null && !rootFile.equals(relativePath.getParentFile())) {
- relativePath = relativePath.getParentFile();
- }
-
- if (relativePath == null) {
- UpdateManagerPlugin.warn("Cannot calculate relative path");
- return url.toString();
- } else {
- String relativeRootString = relativePath.getParentFile().getAbsolutePath();
- String fullString = urlFile.getAbsolutePath();
- if (!fullString.startsWith(relativeRootString)) {
- UpdateManagerPlugin.warn("Full path:" + fullString + " does not start with " + relativeRootString);
- return url.toString();
- } else {
- String returnString = fullString.substring(relativeRootString.length() + 1);
- if (urlFile.isDirectory())
- returnString += File.separator;
- // we lost the last slash when tranforming in File
- returnString = returnString.replace(File.separatorChar, '/');
- return returnString;
- }
-
- }
-
- } else {
- result = url.toString();
- }
- }
- }
-
- return result;
- }
-
- /**
- * returns a translated String
- */
- public static String getResourceString(String infoURL, ResourceBundle bundle) {
- String result = null;
- if (infoURL != null) {
- result = UpdateManagerPlugin.getPlugin().getDescriptor().getResourceString(infoURL, bundle);
- }
- return result;
- };
-
- /**
- *
- */
- public static URL copyToLocal(InputStream sourceContentReferenceStream, String localName, InstallMonitor monitor) throws MalformedURLException, IOException, InstallAbortedException {
- URL result = null;
- // create the Dir if they do not exist
- // get the path from the File to resolve File.separator..
- // do not use the String as it may contain URL like separator
- File localFile = new File(localName);
- int index = localFile.getPath().lastIndexOf(File.separator);
- if (index != -1) {
- File dir = new File(localFile.getPath().substring(0, index));
- if (!dir.exists())
- dir.mkdirs();
- }
-
- // transfer the content of the File
- if (!localFile.isDirectory()) {
- OutputStream localContentReferenceStream = new FileOutputStream(localFile);
- try {
- Utilities.copy(sourceContentReferenceStream, localContentReferenceStream, monitor);
- } finally {
- try {
- localContentReferenceStream.close();
- } catch (IOException e){}
- }
- }
- result = localFile.toURL();
- return result;
- }
-
- /*
- * [20305] need to slam permissions for executable libs on some
- * platforms. This is a temporary fix
- */
- public static void checkPermissions(ContentReference ref, String filePath) {
-
- if (ref.getPermission() != 0) {
- UpdateManagerPlugin.warn("Change permission for " + filePath + " to " + ref.getPermission());
- // FIXME
- }
-
- if (filePath != null && OS_UNIX && ref.getPermission() != 0) {
- // add execute permission on shared libraries 20305
- // do not remove write permission 20896
- // chmod a+x *.sl
- try {
- Process pr = Runtime.getRuntime().exec(new String[] { "chmod", "a+x", filePath });
- Thread chmodOutput = new StreamConsumer(pr.getInputStream());
- chmodOutput.setName("chmod output reader");
- chmodOutput.start();
- Thread chmodError = new StreamConsumer(pr.getErrorStream());
- chmodError.setName("chmod error reader");
- chmodError.start();
- } catch (IOException ioe) {
- }
-
- }
- }
-
- /**
- * Returns a random file name for the local system
- * attempt to conserve the extension if there is a '.' in the path
- * and no File.Seperator after the '.'
- *
- * \a\b\c.txt -> c987659385.txt
- * c.txt -> c3854763.txt
- * c -> c953867549
- */
- public static String getLocalRandomIdentifier(String remotePath, Date date) {
- int dotIndex = remotePath.lastIndexOf(".");
- //$NON-NLS-1$
- int fileIndex = remotePath.lastIndexOf(File.separator);
- // if there is a separator after the dot
- // do not consider it as an extension
- String ext = (dotIndex != -1 && fileIndex < dotIndex) ? remotePath.substring(dotIndex) : "";
- //$NON-NLS-1$
- // the name is the string between the separator and the dot
- // if there is no separator, it is the string up to the dot
- // if there is no dot, go to the end of the string
- if (fileIndex == -1)
- fileIndex = 0;
- if (dotIndex == -1)
- dotIndex = remotePath.length();
- // if I have a separator and no dot: /a/b/c -> c
- // if my separator is the last /a/b/c/, fileIndex and dotIndex are the same, so it will return the default temp name
- String name = (fileIndex < dotIndex) ? remotePath.substring(fileIndex, dotIndex) : "Eclipse_Update_TMP_";
- //$NON-NLS-1$
- String result = name + date.getTime() + ext;
- return result;
- }
-
- /**
- * remove a file or directory from the file system.
- * used to clean up install
- */
- public static void removeFromFileSystem(File file) {
- if (!file.exists())
- return;
-
- if (file.isDirectory()) {
- String[] files = file.list();
- if (files != null) // be careful since file.list() can return null
- for (int i = 0; i < files.length; ++i)
- removeFromFileSystem(new File(file, files[i]));
- }
-
- if (!file.delete()) {
- String msg = Policy.bind("UpdateManagerUtils.UnableToRemoveFile", file.getAbsolutePath());
- //$NON-NLS-1$ //$NON-NLS-2$
- UpdateManagerPlugin.log(msg, new Exception());
- }
- }
-
- /**
- * remove all the empty directories recursively
- * used to clean up install
- */
- public static void removeEmptyDirectoriesFromFileSystem(File file) {
- if (!file.isDirectory())
- return;
-
- String[] files = file.list();
- if (files != null) { // be careful since file.list() can return null
- for (int i = 0; i < files.length; ++i) {
- removeEmptyDirectoriesFromFileSystem(new File(file, files[i]));
- }
- }
- if (!file.delete()) {
- String msg = Policy.bind("UpdateManagerUtils.UnableToRemoveFile", file.getAbsolutePath());
- //$NON-NLS-1$ //$NON-NLS-2$
- UpdateManagerPlugin.log(msg, new Exception());
- }
- }
-
- /**
- * Returns the plugin entries that are in source array and
- * not in target array
- */
- public static IPluginEntry[] diff(IPluginEntry[] sourceArray, IPluginEntry[] targetArray) { // No pluginEntry to Install, return Nothing to instal
- if (sourceArray == null || sourceArray.length == 0) {
- return new IPluginEntry[0];
- } // No pluginEntry installed, Install them all
- if (targetArray == null || targetArray.length == 0) {
- return sourceArray;
- } // if a IPluginEntry from sourceArray is NOT in
- // targetArray, add it to the list
- List list1 = Arrays.asList(targetArray);
- List result = new ArrayList(0);
- for (int i = 0; i < sourceArray.length; i++) {
- if (!list1.contains(sourceArray[i]))
- result.add(sourceArray[i]);
- }
-
- IPluginEntry[] resultEntry = new IPluginEntry[result.size()];
- if (result.size() > 0)
- result.toArray(resultEntry);
- return resultEntry;
- }
-
- /**
- * Returns the parent URL of the given URL, or <code>null</code> if the
- * given URL is the root.
- * <table>
- * <caption>Example</caption>
- * <tr>
- * <th>Given URL</th>
- * <th>Parent URL</th>
- * <tr>
- * <td>"http://hostname/"</td>
- * <td>null</td>
- * <tr>
- * <td>"http://hostname/folder/file</td>
- * <td>"http://hostname/folder/</td>
- * </table>
- *
- * @param url a URL
- * @return the parent of the given URL
- */
- public static URL getParent(URL url) {
- String file = url.getFile();
- int len = file.length();
- if (len == 0 || len == 1 && file.charAt(0) == '/')
- return null;
- int lastSlashIndex = -1;
- for (int i = len - 2; lastSlashIndex == -1 && i >= 0; --i) {
- if (file.charAt(i) == '/')
- lastSlashIndex = i;
- }
- if (lastSlashIndex == -1)
- file = "";
- else
- file = file.substring(0, lastSlashIndex + 1);
- try {
- url = new URL(url.getProtocol(), url.getHost(), url.getPort(), file);
- } catch (MalformedURLException e) {
- Assert.isTrue(false, e.getMessage());
- }
- return url;
- }
-
- /**
- *
- */
- public static URL asDirectoryURL(URL url) throws MalformedURLException {
- //url = URLEncoder.encode(url);
- String path = url.getFile();
- if (!path.endsWith("/")) {
- int index = path.lastIndexOf('/');
- if (index != -1)
- path = path.substring(0, index + 1);
- // ignore any ref in original URL
- url = new URL(url.getProtocol(), url.getHost(), url.getPort(), path);
- }
- return url;
- }
-
- /*
- * Compares two URL for equality
- * Return false if one of them is null
- */
- public static boolean sameURL(URL url1, URL url2) {
-
- if (url1 == null)
- return false;
- if (url1.equals(url2))
- return true;
-
- // check if URL are file: URL as we may
- // have 2 URL pointing to the same featureReference
- // but with different representation
- // (i.e. file:/C;/ and file:C:/)
- if (!"file".equalsIgnoreCase(url1.getProtocol()))
- return false;
- if (!"file".equalsIgnoreCase(url2.getProtocol()))
- return false;
-
- File file1 = new File(url1.getFile());
- File file2 = new File(url2.getFile());
-
- if (file1 == null)
- return false;
-
- return (file1.equals(file2));
- }
-
- /*
- * returns the list of FeatureReference that are parent of
- * the Feature or an empty array if no parent found.
- * @param onlyOptional if set to <code>true</code> only return parents that consider the feature optional
- * @param child
- * @param possiblesParent
- */
- public static IFeatureReference[] getParentFeatures(IFeature childFeature, IFeatureReference[] possiblesParent, boolean onlyOptional) throws CoreException {
-
- if (childFeature == null)
- return new IFeatureReference[0];
-
- List parentList = new ArrayList();
- IFeatureReference[] children = null;
- IFeature compareFeature = null;
- for (int i = 0; i < possiblesParent.length; i++) {
- try {
- IFeature possibleParentFeature = possiblesParent[i].getFeature();
- if (possibleParentFeature != null) {
- children = possibleParentFeature.getIncludedFeatureReferences();
- for (int j = 0; j < children.length; j++) {
- try {
- compareFeature = children[j].getFeature();
- } catch (CoreException e) {
- UpdateManagerPlugin.warn("", e);
- };
- if (childFeature.equals(compareFeature)) {
- if (onlyOptional) {
- if (UpdateManagerUtils.isOptional(children[j])) {
- parentList.add(possiblesParent[i]);
- } else {
- UpdateManagerPlugin.warn("Feature :" + children[j] + " not optional. Not included in parents list.");
- }
- } else {
- parentList.add(possiblesParent[i]);
- }
- }
- }
- }
- } catch (CoreException e) {
- UpdateManagerPlugin.warn("", e);
- };
- }
-
- IFeatureReference[] parents = new IFeatureReference[0];
- if (parentList.size() > 0) {
- parents = new IFeatureReference[parentList.size()];
- parentList.toArray(parents);
- }
- return parents;
- }
-
- /*
- * returns the list of Features that are parent of
- * the Feature or an empty array if no parent found
- * @param onlyOptional if set to <code>true</code> only return parents that consider the feature optional
- * @param child
- * @param possiblesParent
- */
- public static IFeatureReference[] getParentFeatures(IFeatureReference child, IFeatureReference[] possiblesParent, boolean onlyOptional) throws CoreException {
-
- if (child == null)
- return new IFeatureReference[0];
-
- IFeature childFeature = null;
- try {
- childFeature = child.getFeature();
- } catch (CoreException e) {
- UpdateManagerPlugin.warn(null, e);
- }
-
- if (childFeature == null)
- return new IFeatureReference[0];
-
- return getParentFeatures(childFeature, possiblesParent, onlyOptional);
- }
-
- /*
- * If the return code of the HTTP connection is not 200 (OK)
- * thow an IO exception
- *
- */
- public static void checkConnectionResult(Response response,URL url) throws IOException {
- // did the server return an error code ?
- int result = response.getStatusCode();
-
- if (result != IStatusCodes.HTTP_OK) {
- String serverMsg = response.getStatusMessage();
- throw new IOException(Policy.bind("ContentReference.HttpNok", new Object[] { new Integer(result), serverMsg, url })); //$NON-NLS-1$
- }
- }
-
- public static class StreamConsumer extends Thread {
- InputStream is;
- byte[] buf;
- public StreamConsumer(InputStream inputStream) {
- super();
- this.setDaemon(true);
- this.is = inputStream;
- buf = new byte[512];
- }
- public void run() {
- try {
- int n = 0;
- while (n >= 0)
- n = is.read(buf);
- } catch (IOException ioe) {
- }
- }
- }
-
- /**
- * Return the optional children to install
- * The optional features to install may not all be direct children
- * of the feature.
- * Also include non-optional features
- *
- * @param children all the nested features
- * @param optionalfeatures optional features to install
- * @return IFeatureReference[]
- */
- public static IFeatureReference[] optionalChildrenToInstall(IFeatureReference[] children, IFeatureReference[] optionalfeatures) {
-
- List optionalChildrenToInstall = new ArrayList();
- for (int i = 0; i < children.length; i++) {
- IFeatureReference optionalFeature = children[i];
- if (!UpdateManagerUtils.isOptional(optionalFeature)) {
- optionalChildrenToInstall.add(optionalFeature);
- } else {
- for (int j = 0; j < optionalfeatures.length; j++) {
- if (optionalFeature.equals(optionalfeatures[j])) {
- optionalChildrenToInstall.add(optionalFeature);
- break;
- }
- }
- }
- }
-
- IFeatureReference[] result = new IFeatureReference[optionalChildrenToInstall.size()];
- if (optionalChildrenToInstall.size() > 0) {
- optionalChildrenToInstall.toArray(result);
- }
-
- return result;
- }
-
- /**
- * returns the mapping of matching rules
- * the default returns perfect
- *
- * @since 2.0.2
- */
- public static int getMatchingRule(String rule) {
- if (rule == null)
- return IImport.RULE_PERFECT;
- int ruleInt = ((Integer) table.get(rule)).intValue();
- if (ruleInt == IImport.RULE_NONE)
- return IImport.RULE_PERFECT;
- return ruleInt;
- }
-
- /**
- * Method isOptional.
- * @param featureReference
- * @return boolean
- */
- public static boolean isOptional(IFeatureReference featureReference) {
- if (featureReference==null) return false;
- if (featureReference instanceof IIncludedFeatureReference){
- return ((IIncludedFeatureReference)featureReference).isOptional();
- }
- return false;
- }
-
- /**
- *
- */
- public static boolean isValidEnvironment(IPlatformEnvironment candidate) {
- String os = candidate.getOS();
- String ws = candidate.getWS();
- String arch = candidate.getOSArch();
- if (os!=null && isMatching(os, BootLoader.getOS())==false) return false;
- if (ws!=null && isMatching(ws, BootLoader.getWS())==false) return false;
- if (arch!=null && isMatching(arch, BootLoader.getOSArch())==false) return false;
- return true;
- }
-
- /**
- *
- */
- private static boolean isMatching(String values, String current) {
- StringTokenizer stok = new StringTokenizer(values, ",");
- while (stok.hasMoreTokens()) {
- String token = stok.nextToken();
- if (token.equalsIgnoreCase(current)) return true;
- }
- return false;
- }
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Volume.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Volume.java
deleted file mode 100644
index d559452..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Volume.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.eclipse.update.internal.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-import java.io.File;
-
-import org.eclipse.update.configuration.IVolume;
-import org.eclipse.update.core.model.ModelObject;
-
-/**
- * Default implementation of a IVolume
- */
-public class Volume extends ModelObject implements IVolume {
-
- private long size;
- private int type;
- private String label;
- private File root;
-
- /**
- * Constructor for Volume.
- */
- public Volume(File root,String label,int type,long size) {
- super();
- this.root = root;
- this.label = label;
- this.type = type;
- this.size = size;
- }
-
- /**
- * @see IVolume#getFreeSpace()
- */
- public long getFreeSpace() {
- return size;
- }
-
- /**
- * @see IVolume#getLabel()
- */
- public String getLabel() {
- return label;
- }
-
- /**
- * @see IVolume#getType()
- */
- public int getType() {
- return type;
- }
-
- /**
- * @see IVolume#getFile()
- */
- public File getFile() {
- return root;
- }
-
- /**
- * @see IAdaptable#getAdapter(Class)
- */
- public Object getAdapter(Class arg0) {
- return null;
- }
-
-}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Writer.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Writer.java
deleted file mode 100644
index 9962520..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Writer.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package org.eclipse.update.internal.core;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import java.io.*;
-
-/**
- * write XML file
- */
-public class Writer {
-
- private PrintWriter w;
-
- /*
- *
- */
- public Writer(File file, String encoding) throws FileNotFoundException, UnsupportedEncodingException{
- super();
-
- OutputStream out = new FileOutputStream(file);
- OutputStreamWriter outWriter = new OutputStreamWriter(out, "UTF8"); //$NON-NLS-1$
- BufferedWriter buffWriter = new BufferedWriter(outWriter);
- w = new PrintWriter(buffWriter);
- }
-
- /*
- *
- */
- public Writer(File file) throws FileNotFoundException{
- super();
-
- OutputStream out = new FileOutputStream(file);
- OutputStreamWriter outWriter = new OutputStreamWriter(out);
- BufferedWriter buffWriter = new BufferedWriter(outWriter);
- w = new PrintWriter(buffWriter);
- }
-
- /*
- *
- */
- public void write(IWritable element) {
- w.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"); //$NON-NLS-1$
- w.println(""); //$NON-NLS-1$
- w.println("<!-- File written by Update manager 2.0 -->"); //$NON-NLS-1$
- w.println("<!-- comments in this file are not preserved -->"); //$NON-NLS-1$
- w.println(""); //$NON-NLS-1$
- ((IWritable) element).write(0, w);
- close();
- }
-
- /*
- *
- */
- public void close(){
- try{
- w.close();
- } catch (Exception e){}
- }
-
- /*
- *
- */
- private static void appendEscapedChar(StringBuffer buffer, char c) {
- String replacement = getReplacement(c);
- if (replacement != null) {
- buffer.append('&');
- buffer.append(replacement);
- buffer.append(';');
- } else {
- if ((c >= ' ' && c <= 0x7E) || c == '\n' || c == '\r' || c == '\t') {
- buffer.append(c);
- } else {
- buffer.append("&#"); //$NON-NLS-1$
- buffer.append(Integer.toString(c));
- buffer.append(';');
- }
- }
- }
-
- /*
- *
- */
- public static String xmlSafe(String s) {
- StringBuffer result = new StringBuffer(s.length() + 10);
- for (int i = 0; i < s.length(); ++i)
- appendEscapedChar(result, s.charAt(i));
- return result.toString();
- }
-
- /*
- *
- */
- private static String getReplacement(char c) {
- // Encode special XML characters into the equivalent character references.
- // These five are defined by default for all XML documents.
- switch (c) {
- case '<' :
- return "lt"; //$NON-NLS-1$
- case '>' :
- return "gt"; //$NON-NLS-1$
- case '"' :
- return "quot"; //$NON-NLS-1$
- case '\'' :
- return "apos"; //$NON-NLS-1$
- case '&' :
- return "amp"; //$NON-NLS-1$
- }
- return null;
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/messages.properties b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/messages.properties
deleted file mode 100644
index 41d85a1..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/messages.properties
+++ /dev/null
@@ -1,253 +0,0 @@
-# Install Update Core Properties File
-#
-
-BaseSiteFactory.CannotRetriveParentDirectory=Unable to retrieve parent directory for URL \"{0}\".
-BaseSiteFactory.CannotEncodeURL= Unable to encode URL \"{0}\".
-
-ContentReference.UnableToCreateInputStream= Unable to create an input stream for the reference \"{0}\".
-ContentReference.UnableToReturnReferenceAsFile= Unable to return reference \"{0}\" as File.
-ContentReference.UnableToReturnReferenceAsURL= Unable to return reference \"{0}\" as URL.
-ContentReference.HttpNok= Server returned HTTP response code: \"{0} {1}\" for URL: {2}.
-ContentReference.FileDoesNotExist=The file \"{0}\" does not exist on the filesystem.
-
-Feature.SiteAlreadySet= Internal Error: Site already set for the feature \"{0}\".
-Feature.TaskInstallFeatureFiles= Installing feature files:
-Feature.TaskInstallPluginFiles= Installing plug-in \"{0}\" files:
-Feature.TaskInstallNonPluginsFiles= Installing non-plug-in files:
-Feature.NoContentProvider= Internal Error. The feature \"{0}\" does not have a content provider.
-Feature.NoFeatureContentConsumer= Internal Error. The Feature \"{0}\" does not have a content consumer.
-Feature.NoURL= Unknown URL.
-Feature.FeatureVersionToString= Feature: \"{0}\" Version: \"{1}\".
-Feature.InstallationCancelled= Installation has been cancelled by the User.
-Feature.UnableToInitializeFeatureReference= Unable to initialize feature reference for versioned identifier \"{0}\".
-
-FeatureContentProvider.Downloading= Downloading:
-FeatureContentProvider.UnableToRetrieve= Unable to retrieve remote reference \"{0}\".
-FeatureContentProvider.UnableToCreate= Unable to create local file \"{0}\".
-
-InstallHandler.unableToCreateHandler = Unable to create custom install handler for feature \"{0}\".
-InstallHandler.notFound = Custom install handler required by feature \"{0}\" was not found.
-InstallHandler.invalidHandler = Feature \"{0}\" contains invalid custom install handler.
-InstallHandler.callException = Error reported by custom install handler for feature \"{0}\".
-InstallHandler.deactivated = Custom install handler for feature \"{0}\" deactivated due to errors.
-InstallHandler.error = Unable to complete action for feature \"{0}\" due to errors.
-
-InstallMonitor.DownloadSize = ({0}K bytes)
-InstallMonitor.DownloadSizeLong = ({0}K of {1}K bytes)
-
-Reconciler.appNotFound = Application \"{0}\" not found.
-
-JarContentReference.Unpacking= Unpacking:
-
-Site.CannotSaveSiteInto= Cannot save Site information into the File: \"{0}\".
-Site.CannotFindCategory= Unable to find category: \"{0}\" in Site: \"{1}\".
-Site.NoCategories= The Site does not contain any categories.
-Site.NoContentProvider= Internal Error. Content Provider not set for Site: \"{0}\".
-
-VersionedIdentifier.IdOrVersionNull= Internal Error. Unable to create an Identifier. The unique identifier or the version is null or empty: unique identifier=\"{0}\" version=\"{1}\".
-
-SiteFile.CannotRemovePlugin= Unable to remove plugin: \"{0}\" from Site: \"{1}\".
-SiteFile.CannotRemoveFeature= Unable to remove feature: \"{0}\" from Site: \"{1}\".
-SiteFile.UnableToCreateURL= Unable to create URL for location \"{0}\".
-SiteFile.Removing= Removing:
-
-SiteFileFactory.UnableToCreateURL= Internal Error. Unable to create URL from \"{0}\".
-SiteFileFactory.UnableToAccessSite= Unable to access Site stream.
-SiteFileFactory.DirectoryDoesNotExist=The directory \"{0}\" does not exist on the file system.
-
-DefaultFeatureParser.NoFeatureTag= Error parsing feature stream. Unable to find root element \"feature\" in the stream.
-DefaultFeatureParser.WrongParsingStack= Internal Error parsing feature stream. Unexpected Parsing Stack: \"{0}\"
-DefaultFeatureParser.UnknownElement= Error parsing feature stream. Unknown element \"{0}\" in parsing state \"{1}\". Check the validity of the XML file.
-DefaultFeatureParser.TooManyURLtag= Error parsing feature stream. There is more than one \"URL\" element in the XML stream. There should be only one.
-DefaultFeatureParser.UnknownStartState= Internal Error parsing feature stream. Unknown start state \"{0}\".
-DefaultFeatureParser.IdOrVersionInvalid= Error parsing feature stream. The unique identifier or the version is null or empty for the State: \"{2}\": unique identifier=\"{0}\" version=\"{1}\".
-DefaultFeatureParser.MissingId= Error parsing feature stream. The \"id\" tag of the element \"{0}\" is null or empty. Value is required.
-DefaultFeatureParser.ParsingStackBackToInitialState= Internal Error parsing feature stream. Parsing stack back to Initial State.
-DefaultFeatureParser.ElementAlreadySet= Error parsing feature stream. Element: \"{0}\" already set for the feature.
-DefaultFeatureParser.StateIncludeWrongElement= Error parsing feature stream. State: \"{0}\" should not include Element \"{1}\".
-DefaultFeatureParser.RequireStateWithoutImportElement=Error parsing feature stream. State: \"require\" must include at least an \"import\" element.
-DefaultFeatureParser.MissingPatchVersion=Error parsing feature stream. Attribute "version" of the element "import" must be set when "patch" is set to "true".
-DefaultFeatureParser.wrongMatchForPatch=Error parsing feature stream. When attribute "patch" of the element "import" is set to "true", the only valid value for the "match" attribute is "perfect".
-DefaultFeatureParser.patchWithPlugin=Error parsing feature stream. Attribute "patch" can only be used for features.
-DefaultFeatureParser.MultiplePatchImports=Error parsing feature stream. State: "require" must not contain more than one "import" element with the attribute "patch" set to "true".
-DefaultFeatureParser.UnknownEndState= Internal Error parsing feature stream. Unknown end state \"{0}\".
-DefaultFeatureParser.ErrorParsing= Error Parsing feature stream. Error: \"{0}\"
-DefaultFeatureParser.ErrorlineColumnMessage= Error Parsing feature stream. Element \"{0}\" line: \"{1}\" column:\"{2}\". Error: \"{3}\".
-DefaultFeatureParser.ErrorParsingFeature= Error Parsing feature stream.
-DefaultFeatureParser.UnknownState= Unknown State \"{0}\".
-DefaultFeatureParser.NoLicenseText= Error parsing feature stream. State: \"license\" must include some text.
-
-# 2.0.2
-DefaultFeatureParser.PluginAndFeatureId=One Import statement is incorrect: Both feature and plugin ID are either null or specified.
-
-SiteContentProvider.ErrorCreatingURLForArchiveID= Internal Error. Unable to create URL for Archive Identifier \"{0}\" on Site \"{1}\".
-
-DefaultSiteParser.NoSiteTag= Error parsing site stream. Unable to find root element \"site\" in the stream.
-DefaultSiteParser.WrongParsingStack= Internal Error parsing site stream. Unexpected Parsing Stack: \"{0}\"
-DefaultSiteParser.UnknownElement= Error parsing site stream. Unknown element \"{0}\" in parsing state \"{1}\". Check the validity of the XML file.
-DefaultSiteParser.UnknownStartState= Internal Error parsing site stream. Unknown start state \"{0}\".
-DefaultSiteParser.Missing= Error parsing site stream. The \"{0}\" tag of the element \"{1}\" is null or empty. Value is required.
-DefaultSiteParser.ParsingStackBackToInitialState= Internal Error parsing site stream. Parsing stack back to Initial State.
-DefaultSiteParser.ElementAlreadySet= Error parsing site stream. Element: \"{0}\" already set for the Site.
-DefaultSiteParser.CategoryAlreadySet= Error parsing site stream. Element: \"{0}\": \"{1}\" already set for the Site.
-DefaultSiteParser.UnknownEndState= Internal Error parsing site stream. Unknown end state \"{0}\".
-DefaultSiteParser.ErrorParsing= Error Parsing site stream. Error: \"{0}\"
-DefaultSiteParser.ErrorlineColumnMessage= Error Parsing site stream. Element \"{0}\" line: \"{1}\" column:\"{2}\". Error: \"{3}\".
-DefaultSiteParser.ErrorParsingSite= Error Parsing site stream.
-DefaultSiteParser.UnknownState= Unknown State \"{0}\".
-DefaultSiteParser.InvalidXMLStream= The XML stream is not a valid default site.xml file. The root tag is not site.
-
-ModelObject.ModelReadOnly= Internal Error. The Model Object is read-only.
-
-SiteModelObject.ErrorParsingSiteStream= Error parsing site stream.
-SiteModelObject.ErrorAccessingSiteStream= Error accessing site stream.
-
-InstallConfiguration.ParsingErrorDuringCreation= Internal Error parsing \"{0}\": \"{1}\".
-InstallConfiguration.ErrorDuringFileAccess= Error accessing file: \"{0}\".
-
-Parser.UnableToCreateURL= Internal Error parsing stream. Check the validity of the URLs.
-Parser.InternalError= Error Parsing Stream. An internal error occurred. \"{0}\".
-Parser.UnableToResolveURL= Internal Error parsing stream. Unable to resolve URL \"{0}\".
-
-InstallConfigurationParser.FeatureReferenceNoURL= Error Parsing Stream. A feature reference element does not have a URL tag. Value is required.
-
-FeatureExecutableContentProvider.FileDoesNotExist= The file \"{0}\" does not exist.
-FeatureExecutableContentProvider.InvalidDirectory= The path \"{0}\" is not a valid directory.
-FeatureExecutableContentProvider.UnableToCreateURLFor=Unable to create a URL for \"{0}\".
-FeatureExecutableContentProvider.UnableToRetrieveArchive=Error retrieving the archive entry: \"{0}\".
-FeatureExecutableContentProvider.UnableToRetrieveNonPluginEntry=Error retrieving the non-plugin entry: \"{0}\".
-FeatureExecutableContentProvider.UnableToRetrieveFeatureEntry=Error retrieving feature entry content reference: \"{0}\".
-FeatureExecutableContentProvider.UnableToRetrievePluginEntry =Error retrieving the plugin entry: \"{0}\".
-
-ConfiguredSite.NonInstallableSite= You cannot install in the site \"{0}\". It is considered non updatable.
-ConfiguredSite.NullFeatureToInstall= Internal Error. The feature to be installed is null.
-ConfiguredSite.NonUninstallableSite= You cannot uninstall from the site \"{0}\". It is considered non updatable.
-ConfiguredSite.NoSite= No Site
-ConfiguredSite.CannotFindFeatureToUnconfigure= Internal Error. Unable to disable feature \"{0}\" on site \"{1}\". Cannot find feature.
-ConfiguredSite.CannotFindFeatureToConfigure= Internal Error. Unable to enable feature \"{0}\". Cannot find feature.
-ConfiguredSite.CannotFindPluginEntry= Unable to retrieve Plugin Entry \"{0}\" on site \"{1}\". Cannot find plugin entry. Continue ?
-ConfiguredSite.MissingPluginsBrokenFeature= Plugin \"{0}\" version \"{1}\" referenced by this feature is missing.
-ConfiguredSite.UnableToRemoveConfiguredFeature= Unable to remove a enabled feature: \"{0}\" You must disable the feature first.
-ConfiguredSite.UnableToFindFeature= Unable to Find the feature \"{0}\" on this site.
-ConfiguredSite.SiteURLNull=The Site url is null.
-ConfiguredSite.NonLocalSite=The Site is not on the local file system. Cannot validate.
-ConfiguredSite.NotSameProductId=The site cannot be modifed by this product. It is already associated with product: \"{0}\".
-ConfiguredSite.ContainedInAnotherSite=This site is contained in another site: \"{0}\".
-ConfiguredSite.ReadOnlySite=The site is marked as read only.
-ConfiguredSite.UnableResolveURL= InternalError. Unable to resolve url \"{0}\".
-ConfiguredSite.UnableToAccessSite= InternalError. Unable to access platform site \"{0}\".
-
-FeatureFactory.CreatingError= Error creating feature \"{0}\".
-FeatureModelFactory.ErrorAccesingFeatureStream= Error accessing feature stream.
-
-FeatureExecutableFactory.NullURL= Error creating feature. The URL used to create the feature is null.
-FeatureExecutableFactory.CannotCreateURL= Error creating feature. Unable to create URL for \"{0}\".
-
-FeaturePackagedContentProvider.NoManifestFile= Unable to retrieve \"{0}\" in feature located at \"{1}\".
-FeaturePackagedContentProvider.NoFeature= No feature
-FeaturePackagedContentProvider.FileDoesNotExist= The File \"{0}\" does not exist.
-FeaturePackagedContentProvider.InvalidDirectory= The directory \"{0}\" is not a valid directory.
-FeaturePackagedContentProvider.ErrorRetrieving= Error retrieving \"{0}\".
-FeaturePackagedContentProvider.ContentReferenceString= from \"{0}\"
-FeaturePackagedContentProvider.URLString= located at \"{0}\"
-
-FeatureReference.UnableToResolveURL= Internal Error: Unable to resolve model using URL: \"{0}\".
-
-FeatureTypeFactory.UnableToFindFeatureFactory= Unable to find a feature factory for the extension id \"{0}\".
-
-InstallConfiguration.UnableToSaveConfiguration= Unable to save configuration in \"{0}\".
-InstallConfiguration.UnableToEncodeConfiguration= Unable to encode configuration in \"{0}\".
-InstallConfiguration.UnableToCreateURL= Unable to create URL from \"{0}\".
-InstallConfiguration.UnableToCast= Internal Error. The Configuration Site object is not a subclass of ConfiguredSiteModel
-InstallConfiguration.UnableToSavePlatformConfiguration=Unable to save platform configuration in \"{0}\".
-InstallConfiguration.AlreadyNativelyLinked=The site is already linked.
-InstallConfiguration.NotAnExtensionSite=The site cannot be linked to. It is not an extension site.
-
-InternalSiteManager.UnableToCreateSiteWithType= Extension Error. The Site Factory of type \"{0}\" cannot access the Site \"{1}\".
-InternalSiteManager.UnableToAccessURL= Unable to access \"{0}\".
-InternalSiteManager.UnableToCreateURL= Unable to create URL from \"{0}\".
-InternalSiteManager.UnableToParseURL= Unable to parse the stream \"{0}\".
-InternalSiteManager.FailedRetryAccessingSite= Failed retry accessing site using default installed format instead of default packaged format.
-
-SiteReconciler.UnableToFindInstallDeltaFactory= Internal Error: Unable to find factory to display changes. Open the Update Manager manually.
-
-Policy.NoMessageAvailable= No message available.
-Policy.MissingMessage= Missing message: \"{0}\".
-Policy.Missing= missing \"{0}\".
-
-GlobalConsumer.ErrorCreatingFile= Unable to create file \"{0}\".
-
-SiteFileContentConsumer.UnableToCreateURL= Unable to create URL from \"{0}\".
-SiteFileContentConsumer.UnableToCreateURLForFile= Unable to create URL for the file \"{0}\".
-
-ContentConsumer.UnableToRename = Internal Error. Unable to rename \"{0}\" to \"{1}\".
-
-SiteFileFactory.UnableToRetriveSite= Unable retrieve this Site from a directory. The URL should point to a file instead.
-SiteFileFactory.UnableToObtainParentDirectory= Unable obtain the parent directory from the file \"{0}\".
-SiteFileFactory.FileDoesNotExist= Unable to access site \"{0}\". The directory does not exist.
-SiteFileFactory.UnableToCreateURLForFile= Unable to create URL from \"{0}\".
-SiteFileFactory.ErrorParsingFile= Unable to parse file \"{0}\".
-SiteFileFactory.ErrorAccessing= Unable to access file \"{0}\".
-
-SiteTypeFactory.UnableToFindSiteFactory= Unable to find a site factory for the extension id \"{0}\".
-
-UpdateManagerUtils.UnableToRemoveFile= Unable to remove \"{0}\" from the file system.
-UpdateManagerUtils.FileAlreadyExists= Unable to create \"{0}\" on the file system. File already exists.
-
-SiteLocal.ErrorParsingSavedState= Error during parsing of the configuration saved state \"{0}\".
-SiteLocal.UnableToCreateURLFor= Unable to create URL from \"{0}\".
-SiteLocal.UnableToAccessFile= Unable to access file \"{0}\".
-SiteLocal.UnableToSaveStateIn= Unable to persist configurations into \"{0}\".
-SiteLocal.UnableToEncodeConfiguration= Unable to encode configurations into \"{0}\".
-SiteLocal.UnableToResolve= Internal Error. Unable to resolve \"{0}\".
-SiteLocal.UnableToRetrieveRWArea= Internal Error. Unable to retrieve location to write metadata.
-SiteLocal.SiteUrlIsNull= Internal Error: URL of local site is null.
-SiteLocal.UnableToDetermineFeatureStatusSiteNull=Unable to determine status of feature\"{0}\" The site is NULL.
-SiteLocal.TwoVersionSamePlugin1=Plugin: \"{0}\" version: \"{1}\" referenced by this feature is not included at runtime. Runtime includes plugin version \"{2}\".
-SiteLocal.TwoVersionSamePlugin2=Plugin: \"{0}\" version: \"{1}\" referenced by this feature is not included at runtime. Runtime includes plugin version \"{2}\" supplied by feature \"{3}\" version \"{4}\".
-SiteLocal.FeatureUnHappy=The feature is not configured properly.
-SiteLocal.FeatureHappy=The feature is configured properly.
-SiteLocal.FeatureAmbiguous=The feature may not be configured properly.
-SiteLocal.NestedFeatureUnHappy=Included feature \"{0}\" version \"{1}\" contains problems.
-SiteLocal.NestedFeatureUnavailable=Included feature \"{0}\" is missing.
-SiteLocal.NoPluginVersion=No plugin: \"{0}\" included at runtime.
-
-#202
-SiteLocal.UnableToDetermineFeatureStatusConfiguredSiteNull=Unable to determine status of feature\"{0}\" The Configured Site is NULL.
-SiteLocal.FeatureDisable=The feature is disabled.
-SiteLocal.FeatureStatusUnknown=Unknown state.
-SiteLocal.NestedFeatureDisable=Included feature \"{0}\" version \"{1}\" is disabled.
-SiteLocal.NullFeature=The feature is null.
-SiteLocal.WrongURL=A URL of an Originating site is not valid.
-
-SiteReconciler.UnableToSaveStateIn= Unable to persist delta change into \"{0}\".
-SiteReconciler.UnableToEncodeConfiguration= Unable to encode delta change into \"{0}\".
-
-SiteURLFactory.UnableToCreateURL= Internal Error. Unable to create a URL from \"{0}\".
-SiteURLFactory.UnableToAccessSiteStream= Unable to access Site stream: \"{0}\"
-
-JarVerifier.Verify= Verifying: \"{0}\"
-JarVerifier.UnableToFindEncryption= Unable to find algorithm to verify integrity of KeyStore \"{0}\".
-JarVerifier.UnableToLoadCertificate= Unable to load one or multiples certificates in the KeyStore \"{0}\".
-JarVerifier.UnableToFindProviderForKeystore= Unable to find provider for the KeyStore type \"{0}\".
-JarVerifier.KeyStoreNotLoaded= Internal Error. KeyStore not Initialized/Loaded.
-JarVerifier.UnableToAccessJar= Unable to access JAR file \"{0}\".
-JarVerifier.InvalidFile= The File \"{0}\" is not a valid JAR file. It does not contain a Manifest.
-JarVerifier.InvalidJar= The File \"{0}\" is not a valid JAR file.
-
-JarVerificationResult.ValidBetween= Valid between \"{0}\" and \"{1}\".
-JarVerificationResult.ExpiredCertificate= * EXPIRED CERTIFICATE *
-JarVerificationResult.CertificateNotYetValid= * CERTIFICATE NOT YET VALID *
-JarVerificationResult.CertificateValid= Valid certificate.
-
-JarVerificationService.UnsucessfulVerification=Verification of feature unsuccessful. Installation cancelled.
-JarVerificationService.CancelInstall=Installation cancelled.
-
-UpdateManagerUtils.UnableToLog=Unable to access error recovery log file: \"{0}\".
-
-SessionDelta.EnableFeatures=Enabling selected features...
-
-ConfigurationPolicy.UnableToDisable= Unable to disable feature \"{0}\".
-ConfigurationPolicy.ParentIsEnable= The parent feature: \"{0}\" is enable.
-
-
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/ConfigurationActivityModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/ConfigurationActivityModel.java
deleted file mode 100644
index 7ef374d..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/ConfigurationActivityModel.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package org.eclipse.update.internal.model;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import java.util.Date;
-
-import org.eclipse.update.core.model.ModelObject;
-
-public class ConfigurationActivityModel extends ModelObject{
-
- private String label;
- private int action;
- private Date date;
- private int status;
- private InstallConfigurationModel installConfiguration;
-
-
- /**
- * Constructor for ConfigurationActivityModel.
- */
- public ConfigurationActivityModel() {
- super();
- }
-
- /**
- * @since 2.0
- */
- public int getAction() {
- return action;
- }
-
- /**
- * @since 2.0
- */
- public Date getDate() {
- return date;
- }
-
- /**
- * @since 2.0
- */
- public int getStatus() {
- return status;
- }
-
- /**
- * Sets the date.
- * @param date The date to set
- */
- public void setDate(Date date) {
- assertIsWriteable();
- this.date = date;
- }
-
- /**
- * Sets the status.
- * @param status The status to set
- */
- public void setStatus(int status) {
- assertIsWriteable();
- this.status = status;
- }
-
- /**
- * @since 2.0
- */
- public String getLabel() {
- return label;
- }
-
- /**
- * Sets the label.
- * @param label The label to set
- */
- public void setLabel(String label) {
- assertIsWriteable();
- this.label = label;
- }
-
- /**
- * Sets the action.
- * @param action The action to set
- */
- public void setAction(int action) {
- assertIsWriteable();
- this.action = action;
- }
-
- /**
- * Gets the installConfiguration.
- * @return Returns a InstallConfigurationModel
- */
- public InstallConfigurationModel getInstallConfigurationModel() {
- return installConfiguration;
- }
-
- /**
- * Sets the installConfiguration.
- * @param installConfiguration The installConfiguration to set
- */
- public void setInstallConfigurationModel(InstallConfigurationModel installConfiguration) {
- assertIsWriteable();
- this.installConfiguration = installConfiguration;
- }
-
-}
-
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/ConfigurationPolicyModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/ConfigurationPolicyModel.java
deleted file mode 100644
index ff8646d..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/ConfigurationPolicyModel.java
+++ /dev/null
@@ -1,227 +0,0 @@
-package org.eclipse.update.internal.model;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import java.net.URL;
-import java.util.*;
-
-import org.eclipse.update.core.IFeatureReference;
-import org.eclipse.update.core.model.FeatureReferenceModel;
-import org.eclipse.update.core.model.ModelObject;
-import org.eclipse.update.internal.core.UpdateManagerPlugin;
-import org.eclipse.update.internal.core.UpdateManagerUtils;
-
-/**
- *
- */
-public class ConfigurationPolicyModel extends ModelObject {
-
-
-
-
- private int policy;
- private List /* of FeatureReferenceModel */configuredFeatureReferences;
- private List /* of FeatureReferenceModel */unconfiguredFeatureReferences;
-
- // since 2.0.2
- private ConfiguredSiteModel configuredSiteModel;
-
- /**
- * Constructor for ConfigurationPolicyModel.
- */
- public ConfigurationPolicyModel() {
- super();
- configuredFeatureReferences = new ArrayList();
- unconfiguredFeatureReferences = new ArrayList();
- }
-
- /**
- * @since 2.0
- */
- public int getPolicy() {
- return policy;
- }
-
- /**
- * Sets the policy.
- * @param policy The policy to set
- */
- public void setPolicy(int policy) {
- assertIsWriteable();
- this.policy = policy;
- }
-
- /**
- * @since 2.0
- */
- public FeatureReferenceModel[] getConfiguredFeaturesModel() {
- if (configuredFeatureReferences==null || configuredFeatureReferences.isEmpty())
- return new FeatureReferenceModel[0];
- return (FeatureReferenceModel[]) configuredFeatureReferences.toArray(arrayTypeFor(configuredFeatureReferences));
- }
-
- /**
- * @since 2.0
- */
- public FeatureReferenceModel[] getUnconfiguredFeaturesModel() {
- if (unconfiguredFeatureReferences==null || unconfiguredFeatureReferences.isEmpty())
- return new FeatureReferenceModel[0];
- return (FeatureReferenceModel[]) unconfiguredFeatureReferences.toArray(arrayTypeFor(unconfiguredFeatureReferences));
- }
-
- /**
- * Gets the configuredSiteModel.
- * @return Returns a ConfiguredSiteModel
- * @since 2.0.2
- */
- public ConfiguredSiteModel getConfiguredSiteModel() {
- return configuredSiteModel;
- }
-
- /**
- * Sets the configuredSiteModel.
- * @param configuredSiteModel The configuredSiteModel to set
- * @since 2.0.2
- */
- public void setConfiguredSiteModel(ConfiguredSiteModel configuredSiteModel) {
- this.configuredSiteModel = configuredSiteModel;
- }
-
- /**
- *
- */
- private boolean remove(FeatureReferenceModel feature, List list) {
- URL featureURL = feature.getURL();
- boolean found = false;
- Iterator iter = list.iterator();
- while (iter.hasNext() && !found) {
- FeatureReferenceModel element = (FeatureReferenceModel) iter.next();
- if (UpdateManagerUtils.sameURL(element.getURL(),featureURL)) {
- list.remove(element);
- found = true;
- }
- }
- return found;
- }
-
- /**
- * returns an array of string corresponding to plugins file
- */
- /*package*/
-
-
- /**
- *
- */
- private void add(FeatureReferenceModel feature, List list) {
- URL featureURL = feature.getURL();
- boolean found = false;
- Iterator iter = list.iterator();
- while (iter.hasNext() && !found) {
- FeatureReferenceModel element = (FeatureReferenceModel) iter.next();
- if (UpdateManagerUtils.sameURL(element.getURL(),featureURL)) {
- found = true;
- }
- }
-
- if (!found) {
- list.add(feature);
- } else {
- UpdateManagerPlugin.warn("Feature Reference :"+feature+" already part of the list.");
- }
- }
-
- /**
- * adds a feature in the configuredReference list
- * also used by the parser to avoid creating another activity
- */
- public void addConfiguredFeatureReference(FeatureReferenceModel feature) {
- assertIsWriteable();
-
- if (configuredFeatureReferences == null)
- this.configuredFeatureReferences = new ArrayList();
- if (!configuredFeatureReferences.contains(feature)){
- //DEBUG:
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_CONFIGURATION){
- UpdateManagerPlugin.debug("Configuring "+feature.getURLString());
- }
- this.add(feature, configuredFeatureReferences);
- }
-
- // when user configure a feature,
- // we have to remove it from unconfigured feature if it exists
- // because the user doesn't know...
- if (unconfiguredFeatureReferences != null) {
- boolean success = remove(feature, unconfiguredFeatureReferences);
- if (!success)
- UpdateManagerPlugin.warn("Feature not part of Unconfigured list: "+feature.getURLString());
- }
-
- }
-
- /**
- * adds a feature in the list
- * also used by the parser to avoid creating another activity
- */
- public void addUnconfiguredFeatureReference(FeatureReferenceModel feature) {
- assertIsWriteable();
- if (unconfiguredFeatureReferences == null)
- this.unconfiguredFeatureReferences = new ArrayList();
- if (!unconfiguredFeatureReferences.contains(feature)){
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_CONFIGURATION){
- UpdateManagerPlugin.debug("Unconfiguring "+feature.getURLString());
- }
- this.add(feature, unconfiguredFeatureReferences);
- }
-
- // an unconfigured feature is always from a configured one no ?
- // unless it was parsed right ?
- if (configuredFeatureReferences != null) {
- boolean success = remove(feature, configuredFeatureReferences);
- if (!success)
- UpdateManagerPlugin.warn("Feature not part of Configured list: "+feature.getURLString());
- }
- }
-
- /**
- * removes a feature from any list
- */
- public void removeFeatureReference(FeatureReferenceModel feature) {
- assertIsWriteable();
- if (unconfiguredFeatureReferences!=null){
- boolean success = remove(feature, unconfiguredFeatureReferences);
- if (!success)
- UpdateManagerPlugin.warn(feature.getURLString()+" not part of unconfigured list.");
- }
-
- if (configuredFeatureReferences != null) {
- boolean success = remove(feature, configuredFeatureReferences);
- if (!success)
- UpdateManagerPlugin.warn(feature.getURLString()+" not part of configured list.");
- }
- }
-
- /**
- * Sets the unconfiguredFeatureReferences.
- * @param unconfiguredFeatureReferences The unconfiguredFeatureReferences to set
- */
- protected void setUnconfiguredFeatureReferences(IFeatureReference[] featureReferences) {
- unconfiguredFeatureReferences = new ArrayList();
- unconfiguredFeatureReferences.addAll(Arrays.asList(featureReferences));
- }
-
-
- /**
- * Sets the configuredFeatureReferences.
- * @param configuredFeatureReferences The configuredFeatureReferences to set
- */
- protected void setConfiguredFeatureReferences(IFeatureReference[] featureReferences) {
- configuredFeatureReferences = new ArrayList();
- configuredFeatureReferences.addAll(Arrays.asList(featureReferences));
-
- }
-
-
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/ConfiguredSiteModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/ConfiguredSiteModel.java
deleted file mode 100644
index 6146dcb..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/ConfiguredSiteModel.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package org.eclipse.update.internal.model;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.update.core.model.ModelObject;
-import org.eclipse.update.core.model.SiteModel;
-import org.eclipse.update.internal.core.UpdateManagerPlugin;
-
-/**
- *
- */
-public class ConfiguredSiteModel extends ModelObject {
- private String[] previousPluginPath;
-
- private SiteModel site;
- private String platformURLString;
- private ConfigurationPolicyModel policy;
- private InstallConfigurationModel installConfiguration;
- private boolean installable = false;
-
- /**
- * Constructor
- */
- public ConfiguredSiteModel() {
- super();
- }
-
- /**
- * returns the site
- * @return The ISite
- * @since 2.0
- */
- public SiteModel getSiteModel() {
- return site;
- }
-
- /**
- * Sets the site.
- * @param site The site to set
- */
- public void setSiteModel(SiteModel site) {
- assertIsWriteable();
- this.site = site;
- }
-
- /**
- * returns the policy
- */
- public ConfigurationPolicyModel getConfigurationPolicyModel() {
- return policy;
- }
-
- /**
- *
- * @since 2.0
- */
- public void setConfigurationPolicyModel(ConfigurationPolicyModel policy) {
- assertIsWriteable();
- this.policy = policy;
- policy.setConfiguredSiteModel(this);
- }
-
- /**
- * @since
- */
- public boolean isUpdatable() {
- return installable;
- }
-
- /**
- * @since 2.0
- */
- public void isUpdatable(boolean installable) {
- assertIsWriteable();
- this.installable = installable;
- }
-
- /**
- * Gets the installConfiguration.
- * @return Returns a InstallConfigurationModel
- */
- public InstallConfigurationModel getInstallConfigurationModel() {
- return installConfiguration;
- }
-
- /**
- * Sets the installConfiguration.
- * @param installConfiguration The installConfiguration to set
- */
- public void setInstallConfigurationModel(InstallConfigurationModel installConfiguration) {
- assertIsWriteable();
- this.installConfiguration = installConfiguration;
- }
-
- /**
- * Gets the platformURLString.
- * @return Returns a String
- */
- public String getPlatformURLString() {
- return platformURLString;
- }
-
- /**
- * Sets the platformURLString.
- * @param platformURLString The platformURLString to set
- */
- public void setPlatformURLString(String platformURLString) {
- this.platformURLString = platformURLString;
- }
-
-
- /**
- * Gets the previousPluginPath. The list of plugins the platform had.
- * @return Returns a String[]
- */
- public String[] getPreviousPluginPath() {
- if (previousPluginPath == null)
- previousPluginPath = new String[0];
- return previousPluginPath;
- }
-
- /**
- * Sets the previousPluginPath.
- * @param previousPluginPath The previousPluginPath to set
- */
- public void setPreviousPluginPath(String[] previousPluginPath) {
- this.previousPluginPath = new String[previousPluginPath.length];
- System.arraycopy(previousPluginPath, 0, this.previousPluginPath, 0, previousPluginPath.length);
- }
-
- /*
- * creates a Status
- */
- protected IStatus createStatus(int statusType, String msg, Exception e){
- if (statusType!=IStatus.OK) statusType = IStatus.ERROR;
- return createStatus(statusType,IStatus.OK, msg.toString(), e);
- }
-
- /*
- * creates a Status
- */
- protected IStatus createStatus(int statusSeverity, int statusCode, String msg, Exception e){
- String id =
- UpdateManagerPlugin.getPlugin().getDescriptor().getUniqueIdentifier();
-
- StringBuffer completeString = new StringBuffer("");
- if (msg!=null)
- completeString.append(msg);
- if (e!=null){
- completeString.append("\r\n[");
- completeString.append(e.toString());
- completeString.append("]\r\n");
- }
- return new Status(statusSeverity, id, statusCode, completeString.toString(), e);
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/DefaultPluginParser.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/DefaultPluginParser.java
deleted file mode 100644
index 2fab950..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/DefaultPluginParser.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package org.eclipse.update.internal.model;
-
-/*
- * (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.eclipse.update.core.PluginEntry;
-import org.eclipse.update.core.VersionedIdentifier;
-import org.xml.sax.*;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * Parse default feature.xml
- */
-
-public class DefaultPluginParser extends DefaultHandler {
-
- private SAXParser parser;
- private String id = null;
- private String version = null;
- private PluginEntry pluginEntry;
-
- private static final String PLUGIN = "plugin"; //$NON-NLS-1$
- private static final String FRAGMENT = "fragment"; //$NON-NLS-1$
- private static final String ID = "id"; //$NON-NLS-1$
- private static final String VERSION = "version"; //$NON-NLS-1$
-
- private class ParseCompleteException extends SAXException {
- public ParseCompleteException(String arg0) {
- super(arg0);
- }
- }
-
- /**
- * Constructor for DefaultFeatureParser
- */
- public DefaultPluginParser() {
- super();
- this.parser = new SAXParser();
- this.parser.setContentHandler(this);
- }
-
- /**
- * @since 2.0
- */
- public synchronized PluginEntry parse(InputStream in) throws SAXException, IOException {
- try {
- pluginEntry = new PluginEntry();
- parser.parse(new InputSource(in));
- } catch (ParseCompleteException e) {
- // expected, we stopped the parsing when we have the information we need
- /// no need to pursue the parsing
- }
-
- pluginEntry.setVersionedIdentifier(new VersionedIdentifier(id, version));
- return pluginEntry;
- }
-
- /**
- * @see DefaultHandler#startElement(String, String, String, Attributes)
- */
- public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
-
- String tag = localName.trim();
-
- if (tag.equalsIgnoreCase(PLUGIN)) {
- pluginEntry.isFragment(false);
- processPlugin(attributes);
- return;
- }
-
- if (tag.equalsIgnoreCase(FRAGMENT)) {
- pluginEntry.isFragment(true);
- processPlugin(attributes);
- return;
- }
- }
-
- /**
- * process plugin entry info
- */
- private void processPlugin(Attributes attributes) throws ParseCompleteException {
- id = attributes.getValue("id"); //$NON-NLS-1$
- version = attributes.getValue("version"); //$NON-NLS-1$
- throw new ParseCompleteException(""); //$NON-NLS-1$
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/InstallChangeParser.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/InstallChangeParser.java
deleted file mode 100644
index 708a065..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/InstallChangeParser.java
+++ /dev/null
@@ -1,205 +0,0 @@
-package org.eclipse.update.internal.model;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-import java.io.*;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Date;
-import java.util.ResourceBundle;
-
-import org.apache.xerces.parsers.SAXParser;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.update.configuration.ISessionDelta;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.core.*;
-import org.xml.sax.*;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * parse the default site.xml
- */
-
-public class InstallChangeParser extends DefaultHandler {
-
- private SAXParser parser;
- private SessionDelta change;
- private File file;
-
- public static final String CHANGE = "change"; //$NON-NLS-1$
- public static final String NEW_FEATURE = "newFeatures"; //$NON-NLS-1$
- public static final String REFERENCE = "reference"; //$NON-NLS-1$
-
- private ResourceBundle bundle;
-
- /**
- * Constructor for InstallChangeParser
- */
- public InstallChangeParser(File file)
- throws IOException, SAXException, CoreException {
- super();
- parser = new SAXParser();
- parser.setContentHandler(this);
-
- InputStream changeStream = new FileInputStream(file);
- this.file = file;
-
- // DEBUG:
- if (UpdateManagerPlugin.DEBUG
- && UpdateManagerPlugin.DEBUG_SHOW_RECONCILER) {
- UpdateManagerPlugin.debug(
- "Start parsing Install Change:");
- //$NON-NLS-1$
- }
-
- InputSource source = new InputSource(changeStream);
- parser.parse(source);
-
- // 16366
- if (change!=null) change.setFile(file);
- }
-
- /*
- * returns the parsed InstallChanged
- */
- public ISessionDelta getInstallChange() {
- return change;
- }
-
- /*
- * @see DefaultHandler#startElement(String, String, String, Attributes)
- */
- public void startElement(
- String uri,
- String localName,
- String qName,
- Attributes attributes)
- throws SAXException {
-
- // DEBUG:
- if (UpdateManagerPlugin.DEBUG
- && UpdateManagerPlugin.DEBUG_SHOW_RECONCILER) {
- UpdateManagerPlugin.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(CHANGE)) {
- processChange(attributes);
- return;
- }
-
- if (tag.equalsIgnoreCase(NEW_FEATURE)) {
- processNewFeature(attributes);
- return;
- }
-
- if (tag.equalsIgnoreCase(REFERENCE)) {
- processFeatureReference(attributes);
- return;
- }
- } catch (MalformedURLException e) {
- throw new SAXException(
- Policy.bind("Parser.UnableToCreateURL", e.getMessage()),
- e);
- //$NON-NLS-1$
- } catch (CoreException e) {
- throw new SAXException(
- Policy.bind("Parser.InternalError", e.toString()),
- e);
- //$NON-NLS-1$
- }
- }
-
- /*
- *
- */
- private void processFeatureReference(Attributes attributes)
- throws MalformedURLException, CoreException {
-
- //site url
- String siteUrlPath = attributes.getValue("siteURL"); //$NON-NLS-1$
- URL siteURL = new URL(siteUrlPath);
- try {
- siteURL = Platform.resolve(siteURL);
- } catch (IOException e) {
- throw Utilities.newCoreException(
- Policy.bind("Parser.UnableToResolveURL", new Object[]{siteURL}),
- e);
- //$NON-NLS-1$
- }
- ISite currentSite = SiteManager.getSite(siteURL);
-
- // feature url
- String featureUrlPath = attributes.getValue("featureURL"); //$NON-NLS-1$
- URL featureURL = new URL(siteURL, featureUrlPath);
-
- if (featureURL != null) {
- SiteFeatureReference ref = new SiteFeatureReference();
- ref.setSite(currentSite);
- ref.setURL(featureURL);
- change.addReference(ref);
-
- // DEBUG:
- if (UpdateManagerPlugin.DEBUG
- && UpdateManagerPlugin.DEBUG_SHOW_RECONCILER) {
- UpdateManagerPlugin.debug(
- "End Processing Feature Reference: url:"
- + featureURL.toExternalForm());
- //$NON-NLS-1$
- }
- } else {
- String msg=
- Policy.bind(
- "InstallConfigurationParser.FeatureReferenceNoURL");
- //$NON-NLS-1$
- UpdateManagerPlugin.log(msg,new Exception());
- }
- }
-
- /*
- *
- */
- private void processNewFeature(Attributes attributes) {
-
- // DEBUG:
- if (UpdateManagerPlugin.DEBUG
- && UpdateManagerPlugin.DEBUG_SHOW_RECONCILER) {
- UpdateManagerPlugin.debug(
- "End Processing New Features:");
- //$NON-NLS-1$
- }
- }
-
- /*
- *
- */
- private void processChange(Attributes attributes) {
-
- change = new SessionDelta();
-
- // date
- long date = Long.parseLong(attributes.getValue("date")); //$NON-NLS-1$
- change.setCreationDate(new Date(date));
-
- // DEBUG:
- if (UpdateManagerPlugin.DEBUG
- && UpdateManagerPlugin.DEBUG_SHOW_PARSING) {
- UpdateManagerPlugin.debug(
- "End Processing Change: date:" + date);
- //$NON-NLS-1$
- }
-
- }
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/InstallConfigurationModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/InstallConfigurationModel.java
deleted file mode 100644
index d7f6e59..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/InstallConfigurationModel.java
+++ /dev/null
@@ -1,237 +0,0 @@
-package org.eclipse.update.internal.model;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-import java.io.*;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.*;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.update.core.Utilities;
-import org.eclipse.update.core.model.ModelObject;
-import org.eclipse.update.internal.core.*;
-import org.xml.sax.SAXException;
-
-/**
- * An InstallConfigurationModel is
- *
- */
-
-public class InstallConfigurationModel extends ModelObject {
- /**
- * initialize the configurations from the persistent model.
- */
- public void initialize() throws CoreException {
- try {
- URL resolvedURL = URLEncoder.encode(getURL());
- InputStream in = UpdateManagerPlugin.getPlugin().get(resolvedURL).getInputStream();
- new InstallConfigurationParser(in, this);
- } catch (FileNotFoundException exception) {
- UpdateManagerPlugin.warn(getLocationURLString() + " does not exist, The local site is not in synch with the file system and is pointing to a file that doesn't exist.",exception); //$NON-NLS-1$
- throw Utilities.newCoreException(Policy.bind("InstallConfiguration.ErrorDuringFileAccess",getLocationURLString()), exception); //$NON-NLS-1$
- } catch (SAXException exception) {
- throw Utilities.newCoreException(Policy.bind("InstallConfiguration.ParsingErrorDuringCreation", getLocationURLString(),"\r\n"+exception.toString()), exception); //$NON-NLS-1$ //$NON-NLS-2$
- } catch (IOException exception) {
- throw Utilities.newCoreException(Policy.bind("InstallConfiguration.ErrorDuringFileAccess",getLocationURLString()), exception); //$NON-NLS-1$
- }
- }
-
- private boolean isCurrent;
- private URL locationURL;
- private String locationURLString;
- private Date date;
- private String label;
- private List /* of ConfiguretionActivityModel */activities;
- private List /* of configurationSiteModel */ configurationSites;
-
- private long timeline;
-
- /**
- * default constructor. Create
- */
- public InstallConfigurationModel(){
- }
-
- /**
- * @since 2.0
- */
- public ConfiguredSiteModel[] getConfigurationSitesModel() {
- if (configurationSites == null)
- return new ConfiguredSiteModel[0];
-
- return (ConfiguredSiteModel[]) configurationSites.toArray(arrayTypeFor(configurationSites));
- }
-
- /**
- * Adds the configuration to the list
- * is called when adding a Site or parsing the XML file
- * in this case we do not want to create a new activity, so we do not want t call
- * addConfigurationSite()
- */
- public void addConfigurationSiteModel(ConfiguredSiteModel site) {
- if (configurationSites == null) {
- configurationSites = new ArrayList();
- }
- if (!configurationSites.contains(site)){
- configurationSites.add(site);
- }
- }
-
-
- public void setConfigurationSiteModel(ConfiguredSiteModel[] sites) {
- configurationSites=null;
- for (int i = 0; i < sites.length; i++) {
- addConfigurationSiteModel(sites[i]);
- }
- }
-
- /**
- * @since 2.0
- */
- public boolean removeConfigurationSiteModel(ConfiguredSiteModel site) {
- if (!isCurrent)
- return false;
-
- if (configurationSites != null) {
- return configurationSites.remove(site);
- }
-
- return false;
- }
-
- /**
- * @since 2.0
- */
- public boolean isCurrent() {
- return isCurrent;
- }
-
- /**
- * @since 2.0
- */
- public void setCurrent(boolean isCurrent) {
- // do not check if writable as we may
- // set an install config as Not current
- this.isCurrent = isCurrent;
- }
-
-
-
- /**
- * @since 2.0
- */
- public ConfigurationActivityModel[] getActivityModel() {
- if (activities==null)
- return new ConfigurationActivityModel[0];
- return (ConfigurationActivityModel[]) activities.toArray(arrayTypeFor(activities));
- }
-
- /**
- * @since 2.0
- */
- public void addActivityModel(ConfigurationActivityModel activity) {
- if (activities == null)
- activities = new ArrayList();
- if (!activities.contains(activity)){
- activities.add(activity);
- activity.setInstallConfigurationModel(this);
- }
- }
- /**
- *
- */
- public Date getCreationDate() {
- return date;
- }
- /**
- * Sets the date.
- * @param date The date to set
- */
- public void setCreationDate(Date date) {
- assertIsWriteable();
- this.date = date;
- }
- /**
- * @since 2.0
- */
- public URL getURL() {
- return locationURL;
- }
-
- /**
- * @since 2.0
- */
- public String getLabel() {
- return label;
- }
-
- /**
- * @since 2.0.2
- */
-
- public String toString() {
- return getLabel();
- }
-
- /**
- * Sets the label.
- * @param label The label to set
- */
- public void setLabel(String label) {
- assertIsWriteable();
- this.label = label;
- }
-
- /**
- * Gets the locationURLString.
- * @return Returns a String
- */
- public String getLocationURLString() {
- return locationURLString;
- }
-
- /**
- * Sets the locationURLString.
- * @param locationURLString The locationURLString to set
- */
- public void setLocationURLString(String locationURLString) {
- assertIsWriteable();
- this.locationURLString = locationURLString;
- this.locationURL = null;
- }
-
-
- /*
- * @see ModelObject#resolve(URL, ResourceBundle)
- */
- public void resolve(URL base, ResourceBundle bundle)
- throws MalformedURLException {
- // local
- locationURL = resolveURL(base,bundle,locationURLString);
-
- // delagate
- resolveListReference(getActivityModel(),base,bundle);
- resolveListReference(getConfigurationSitesModel(),base,bundle);
- }
-
- /**
- * Returns the timeline.
- * @return long
- */
- public long getTimeline() {
- return timeline;
- }
-
- /**
- * Sets the timeline.
- * @param timeline The timeline to set
- */
- public void setTimeline(long timeline) {
- this.timeline = timeline;
- }
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/InstallConfigurationParser.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/InstallConfigurationParser.java
deleted file mode 100644
index d8104c9..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/InstallConfigurationParser.java
+++ /dev/null
@@ -1,288 +0,0 @@
-package org.eclipse.update.internal.model;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.*;
-import java.util.*;
-
-import org.apache.xerces.parsers.SAXParser;
-import org.eclipse.core.boot.BootLoader;
-import org.eclipse.core.boot.IPlatformConfiguration;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.update.core.*;
-import org.eclipse.update.core.model.FeatureReferenceModel;
-import org.eclipse.update.core.model.SiteModel;
-import org.eclipse.update.internal.core.*;
-import org.xml.sax.*;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * parse the default site.xml
- */
-
-public class InstallConfigurationParser extends DefaultHandler {
-
- private SAXParser parser;
- private InputStream siteStream;
- private URL siteURL;
- private InstallConfigurationModel config;
- private ConfiguredSiteModel configSite;
- public static final String CONFIGURATION = "configuration"; //$NON-NLS-1$
- public static final String CONFIGURATION_SITE = "site"; //$NON-NLS-1$
- public static final String FEATURE = "feature"; //$NON-NLS-1$
- public static final String ACTIVITY = "activity"; //$NON-NLS-1$
-
- // optimization: cache Site
- private Map sites = new HashMap();
-
- private ResourceBundle bundle;
-
- /**
- * Constructor for DefaultSiteParser
- */
- public InstallConfigurationParser(
- InputStream siteStream,
- InstallConfigurationModel config)
- throws IOException, SAXException, CoreException {
- super();
- parser = new SAXParser();
- parser.setContentHandler(this);
-
- this.siteStream = siteStream;
- Assert.isTrue(config instanceof InstallConfigurationModel);
- this.config = (InstallConfigurationModel) config;
-
- // DEBUG:
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_PARSING) {
- UpdateManagerPlugin.debug("Start parsing Configuration:" + (config).getURL().toExternalForm()); //$NON-NLS-1$
- }
-
- bundle = getResourceBundle();
-
- parser.parse(new InputSource(this.siteStream));
- }
-
- /**
- * return the appropriate resource bundle for this sitelocal
- */
- private ResourceBundle getResourceBundle() throws IOException, CoreException {
- ResourceBundle bundle = null;
- URL url = null;
- try {
- url = UpdateManagerUtils.asDirectoryURL(config.getURL());
- ClassLoader l = new URLClassLoader(new URL[] { url }, null);
- bundle =
- ResourceBundle.getBundle(
- SiteLocalModel.SITE_LOCAL_FILE,
- Locale.getDefault(),
- l);
- } catch (MissingResourceException e) {
- UpdateManagerPlugin.warn(e.getLocalizedMessage() + ":" + url.toExternalForm()); //$NON-NLS-1$
- } catch (MalformedURLException e) {
- UpdateManagerPlugin.warn(e.getLocalizedMessage()); //$NON-NLS-1$
- }
- return bundle;
- }
-
- /**
- * @see DefaultHandler#startElement(String, String, String, Attributes)
- */
- public void startElement(
- String uri,
- String localName,
- String qName,
- Attributes attributes)
- throws SAXException {
-
- // DEBUG:
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_PARSING) {
- UpdateManagerPlugin.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(CONFIGURATION)) {
- processConfig(attributes);
- return;
- }
-
- if (tag.equalsIgnoreCase(CONFIGURATION_SITE)) {
- processSite(attributes);
- return;
- }
-
- if (tag.equalsIgnoreCase(FEATURE)) {
- processFeature(attributes);
- return;
- }
-
- if (tag.equalsIgnoreCase(ACTIVITY)) {
- processActivity(attributes);
- return;
- }
-
- } catch (MalformedURLException e) {
- throw new SAXException(Policy.bind("Parser.UnableToCreateURL", e.getMessage()), e); //$NON-NLS-1$
- } catch (CoreException e) {
- throw new SAXException(Policy.bind("Parser.InternalError", e.toString()), e); //$NON-NLS-1$
- }
-
- }
-
- /**
- * process the Site info
- */
- private void processSite(Attributes attributes)
- throws MalformedURLException, CoreException {
-
- //site url
- String urlString = attributes.getValue("url"); //$NON-NLS-1$
- siteURL = new URL(urlString);
- ISite site = SiteManager.getSite(siteURL);
- sites.put(urlString,site);
-
- // policy
- String policyString = attributes.getValue("policy"); //$NON-NLS-1$
- int policy = Integer.parseInt(policyString);
-
- // configuration site
- BaseSiteLocalFactory factory = new BaseSiteLocalFactory();
- configSite = factory.createConfigurationSiteModel((SiteModel) site, policy);
-
- //platform url
- String platformURLString = attributes.getValue("platformURL"); //$NON-NLS-1$
- configSite.setPlatformURLString(platformURLString);
-
- // check if the site exists and is updatable
- // update configSite
- URL urlToCheck = new URL(configSite.getPlatformURLString());
- IPlatformConfiguration runtimeConfig = BootLoader.getCurrentPlatformConfiguration();
- IPlatformConfiguration.ISiteEntry entry = runtimeConfig.findConfiguredSite(urlToCheck);
- if (entry!=null){
- configSite.isUpdatable(entry.isUpdateable());
- } else {
- UpdateManagerPlugin.warn("Unable to retrieve site:" +platformURLString+" from platform.");
- }
- String updatable = configSite.isUpdatable()?"true":"false";
-
- // add to install configuration
- config.addConfigurationSiteModel(configSite);
-
- // DEBUG:
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_PARSING) {
- UpdateManagerPlugin.debug("End process config site url:" + urlString + " policy:" + policyString + " updatable:"+updatable ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
-
- }
-
- /**
- * process the DefaultFeature info
- */
- private void processFeature(Attributes attributes)
- throws MalformedURLException, CoreException {
-
- // url
- String path = attributes.getValue("url"); //$NON-NLS-1$
- URL url = UpdateManagerUtils.getURL(siteURL, path, null);
-
- // configured ?
- String configuredString = attributes.getValue("configured"); //$NON-NLS-1$
- boolean configured = configuredString.trim().equalsIgnoreCase("true") ? true : false; //$NON-NLS-1$
-
- if (url != null) {
- SiteFeatureReference ref = new SiteFeatureReference();
- ref.setSite((ISite) configSite.getSiteModel());
- ref.setURL(url);
- if (ref != null)
- if (configured) {
- (configSite.getConfigurationPolicyModel()).addConfiguredFeatureReference(
- (FeatureReferenceModel) ref);
- } else
- (configSite.getConfigurationPolicyModel()).addUnconfiguredFeatureReference(
- (FeatureReferenceModel) ref);
-
- //updateURL
- String updateURLString = attributes.getValue("updateURL"); //$NON-NLS-1$
- URLEntry entry = new URLEntry();
- entry.setURLString(updateURLString);
- entry.resolve(siteURL, null);
-
- // DEBUG:
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_PARSING) {
- UpdateManagerPlugin.debug("End Processing DefaultFeature Tag: url:" + url.toExternalForm()); //$NON-NLS-1$
- }
-
- } else {
- UpdateManagerPlugin.log( Policy.bind("InstallConfigurationParser.FeatureReferenceNoURL"), new Exception());
- }
-
- }
-
- /**
- * process the Activity info
- */
- private void processActivity(Attributes attributes) {
-
- // action
- String actionString = attributes.getValue("action"); //$NON-NLS-1$
- int action = Integer.parseInt(actionString);
-
- // create
- ConfigurationActivityModel activity =
- new BaseSiteLocalFactory().createConfigurationActivityModel();
- activity.setAction(action);
-
- // label
- String label = attributes.getValue("label"); //$NON-NLS-1$
- if (label != null)
- activity.setLabel(label);
-
- // date
- String dateString = attributes.getValue("date"); //$NON-NLS-1$
- Date date = new Date(Long.parseLong(dateString));
- activity.setDate(date);
-
- // status
- String statusString = attributes.getValue("status"); //$NON-NLS-1$
- int status = Integer.parseInt(statusString);
- activity.setStatus(status);
-
- config.addActivityModel(activity);
-
- // DEBUG:
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_PARSING) {
- UpdateManagerPlugin.debug("End Processing Activity: action:" + actionString + " label: " + label + " date:" + dateString + " status" + statusString); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- }
-
- }
-
- /**
- * process the Config info
- */
- private void processConfig(Attributes attributes) {
-
- // date
- long date = Long.parseLong(attributes.getValue("date")); //$NON-NLS-1$
- config.setCreationDate(new Date(date));
-
- //timeline
- String timelineString = attributes.getValue("timeline"); //$NON-NLS-1$
- long timeline = 0;
- if (timelineString!=null) {
- timeline = Long.parseLong(timelineString);
- } else {
- timeline = config.getCreationDate().getTime();
- }
- config.setTimeline(timeline);
-
- // DEBUG:
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_PARSING) {
- UpdateManagerPlugin.debug("End Processing Config Tag: date:" + date+" timeline:"+ timeline); //$NON-NLS-1$
- }
-
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/SiteLocalModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/SiteLocalModel.java
deleted file mode 100644
index e3f737d..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/SiteLocalModel.java
+++ /dev/null
@@ -1,217 +0,0 @@
-package org.eclipse.update.internal.model;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.*;
-
-import org.eclipse.update.core.model.ModelObject;
-
-/**
- * This class manages the configurations.
- */
-
-public class SiteLocalModel extends ModelObject {
-
-
- public static final String SITE_LOCAL_FILE = "LocalSite.xml"; //$NON-NLS-1$
- public static final String DEFAULT_CONFIG_FILE = "Config.xml"; //$NON-NLS-1$
- public static final String DEFAULT_PRESERVED_CONFIG_FILE = "PreservedConfig.xml"; //$NON-NLS-1$
- public static int DEFAULT_HISTORY = Integer.MAX_VALUE;
-
-
- private long stamp;
- private String label;
- private URL location;
- private String locationURLString;
- private int history = DEFAULT_HISTORY;
- private List /* of InstallConfigurationModel */configurations;
- private List /* of InstallConfigurationModel */preservedConfigurations;
- private InstallConfigurationModel currentConfiguration;
-
- /**
- * Constructor for LocalSite
- */
- public SiteLocalModel(){
- super();
- }
-
- /**
- * @since 2.0
- */
- public InstallConfigurationModel getCurrentConfigurationModel() {
- return currentConfiguration;
- }
-
- /**
- * @since 2.0
- */
- public InstallConfigurationModel[] getConfigurationHistoryModel() {
- if (configurations==null) return new InstallConfigurationModel[0];
- return (InstallConfigurationModel[])configurations.toArray(arrayTypeFor(configurations));
- }
-
- /**
- * adds a new configuration to the LocalSite
- * the newly added configuration is teh current one
- */
- public void addConfigurationModel(InstallConfigurationModel config) {
- if (config != null) {
- if (configurations == null)
- configurations = new ArrayList();
- if (!configurations.contains(config))
- configurations.add(config);
- }
- }
-
- /**
- * adds a new configuration to the LocalSite
- * the newly added configuration is teh current one
- */
- public boolean removeConfigurationModel(InstallConfigurationModel config) {
- if (config != null) {
- return configurations.remove(config);
- }
- return false;
- }
- /**
- * Gets the location of the local site.
- * @return Returns a URL
- */
- public URL getLocationURL() {
- return location;
- }
-
- /**
- * Gets the locationURLString.
- * @return Returns a String
- */
- public String getLocationURLString() {
- return locationURLString;
- }
-
-
- /**
- * Sets the locationURLString.
- * @param locationURLString The locationURLString to set
- */
- public void setLocationURLString(String locationURLString) {
- assertIsWriteable();
- this.locationURLString = locationURLString;
- this.location=null;
- }
-
-
- /**
- * @since 2.0
- */
- public String getLabel() {
- return label;
- }
-
- /**
- * Sets the label.
- * @param label The label to set
- */
- public void setLabel(String label) {
- assertIsWriteable();
- this.label = label;
- }
-
-
- /**
- * @since 2.0
- */
- public int getMaximumHistoryCount() {
- return history;
- }
-
- /**
- * @since 2.0
- */
- public void setMaximumHistoryCount(int history) {
- assertIsWriteable();
- this.history = history;
- }
-
-
- /**
- * Adds a preserved configuration into teh collection
- * do not save the configuration
- * @since 2.0
- */
- public void addPreservedInstallConfigurationModel(InstallConfigurationModel configuration) {
- if (preservedConfigurations == null)
- preservedConfigurations = new ArrayList();
-
- preservedConfigurations.add(configuration);
- }
-
- /**
- * @since 2.0
- */
- public boolean removePreservedConfigurationModel(InstallConfigurationModel configuration) {
- if (preservedConfigurations != null) {
- return preservedConfigurations.remove(configuration);
- }
- return false;
- }
-
- /**
- * @since 2.0
- */
- public InstallConfigurationModel[] getPreservedConfigurationsModel() {
- if (preservedConfigurations==null || preservedConfigurations.isEmpty())
- return new InstallConfigurationModel[0];
- return (InstallConfigurationModel[])preservedConfigurations.toArray(arrayTypeFor(preservedConfigurations));
- }
-
-
- /**
- * Sets the currentConfiguration.
- * @param currentConfiguration The currentConfiguration to set
- */
- public void setCurrentConfigurationModel(InstallConfigurationModel currentConfiguration) {
- assertIsWriteable();
- this.currentConfiguration = currentConfiguration;
-
- //2.0.2 set the configuredSite of sites
- ConfiguredSiteModel[] confSites = currentConfiguration.getConfigurationSitesModel();
- for (int i = 0; i < confSites.length; i++) {
- confSites[i].getSiteModel().setConfiguredSiteModel(confSites[i]);
- }
- }
-
- /*
- * @see ModelObject#resolve(URL, ResourceBundle)
- */
- public void resolve(URL base, ResourceBundle bundle) throws MalformedURLException {
- // local
- location = resolveURL(base,bundle,getLocationURLString());
-
- // delegate
- resolveListReference(getConfigurationHistoryModel(),base,bundle);
- resolveListReference(getPreservedConfigurationsModel(),base,bundle);
- resolveReference(getCurrentConfigurationModel(),base,bundle);
- }
-
-
- /**
- * Gets the stamp.
- * @return Returns a long
- */
- public long getStamp() {
- return stamp;
- }
-
- /**
- * Sets the stamp.
- * @param stamp The stamp to set
- */
- public void setStamp(long stamp) {
- this.stamp = stamp;
- }
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/SiteLocalParser.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/SiteLocalParser.java
deleted file mode 100644
index 7e49a58..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/SiteLocalParser.java
+++ /dev/null
@@ -1,195 +0,0 @@
-package org.eclipse.update.internal.model;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.*;
-import java.util.*;
-
-import org.apache.xerces.parsers.SAXParser;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.update.configuration.ILocalSite;
-import org.eclipse.update.core.IFeatureReference;
-import org.eclipse.update.internal.core.*;
-import org.xml.sax.*;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * parse the default site.xml
- */
-
-public class SiteLocalParser extends DefaultHandler {
-
- private SAXParser parser;
- private InputStream siteStream;
- private SiteLocalModel site;
- private String text;
- public static final String SITE = "localsite"; //$NON-NLS-1$
- public static final String CONFIG = "config"; //$NON-NLS-1$
- public static final String PRESERVED_CONFIGURATIONS = "preservedConfigurations"; //$NON-NLS-1$
-
- private ResourceBundle bundle;
-
- private IFeatureReference feature;
-
- // trus if we are now parsing preserved config
- private boolean preserved = false;
-
- /**
- * Constructor for DefaultSiteParser
- */
- public SiteLocalParser(InputStream siteStream, ILocalSite site) throws IOException, SAXException, CoreException {
- super();
- parser = new SAXParser();
- parser.setContentHandler(this);
-
- this.siteStream = siteStream;
- Assert.isTrue(site instanceof SiteLocalModel);
- this.site = (SiteLocalModel) site;
-
- // DEBUG:
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_PARSING) {
- UpdateManagerPlugin.getPlugin().debug("Start parsing localsite:" + ((SiteLocalModel) site).getLocationURLString()); //$NON-NLS-1$
- }
-
- bundle = getResourceBundle();
-
- parser.parse(new InputSource(this.siteStream));
- }
-
- /**
- * return the appropriate resource bundle for this sitelocal
- */
- private ResourceBundle getResourceBundle() throws CoreException {
- ResourceBundle bundle = null;
- URL url = null;
- try {
- url = UpdateManagerUtils.asDirectoryURL(site.getLocationURL());
- ClassLoader l = new URLClassLoader(new URL[] { url }, null);
- bundle = ResourceBundle.getBundle(SiteLocalModel.SITE_LOCAL_FILE, Locale.getDefault(), l);
- } catch (MissingResourceException e) {
- UpdateManagerPlugin.warn(e.getLocalizedMessage() + ":" + url.toExternalForm()); //$NON-NLS-1$
- } catch (MalformedURLException e) {
- UpdateManagerPlugin.warn(e.getLocalizedMessage()); //$NON-NLS-1$
- }
- return bundle;
- }
-
- /**
- * @see DefaultHandler#startElement(String, String, String, Attributes)
- */
- public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
-
- // DEBUG:
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_PARSING) {
- UpdateManagerPlugin.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(SITE)) {
- processSite(attributes);
- return;
- }
-
- if (tag.equalsIgnoreCase(CONFIG)) {
- processConfig(attributes);
- return;
- }
-
- if (tag.equalsIgnoreCase(PRESERVED_CONFIGURATIONS)) {
- preserved = true;
- return;
- }
-
- } catch (MalformedURLException e) {
- throw new SAXException(Policy.bind("Parser.UnableToCreateURL",e.getMessage()), e); //$NON-NLS-1$
- } catch (CoreException e) {
- throw new SAXException(Policy.bind("Parser.InternalError",e.toString()), e); //$NON-NLS-1$
- }
-
- }
-
- /**
- * process the Site info
- */
- private void processSite(Attributes attributes) throws MalformedURLException {
- //
- String info = attributes.getValue("label"); //$NON-NLS-1$
- info = UpdateManagerUtils.getResourceString(info, bundle);
- site.setLabel(info);
-
- // history
- String historyString = attributes.getValue("history"); //$NON-NLS-1$
- int history;
- if (historyString == null || historyString.equals("")) { //$NON-NLS-1$
- history = SiteLocalModel.DEFAULT_HISTORY;
- } else {
- history = Integer.parseInt(historyString);
- }
- site.setMaximumHistoryCount(history);
-
- //stamp
- String stampString = attributes.getValue("stamp"); //$NON-NLS-1$
- long stamp = Long.parseLong(stampString);
- site.setStamp(stamp);
-
- // DEBUG:
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_PARSING) {
- UpdateManagerPlugin.debug("End process Site label:" + info); //$NON-NLS-1$
- }
-
- }
-
- /**
- * process the Config info
- */
- private void processConfig(Attributes attributes) throws MalformedURLException, CoreException {
- // url
- URL url = UpdateManagerUtils.getURL(site.getLocationURL(), attributes.getValue("url"), null); //$NON-NLS-1$
- String label = attributes.getValue("label"); //$NON-NLS-1$
- label = UpdateManagerUtils.getResourceString(label, bundle);
-
- InstallConfigurationModel config = new BaseSiteLocalFactory().createInstallConfigurationModel();
- config.setLocationURLString(url.toExternalForm());
- config.setLabel(label);
- config.resolve(url,getResourceBundle());
- try {
- config.initialize();
- // add the config
- if (preserved) {
- site.addPreservedInstallConfigurationModel(config);
- } else {
- site.addConfigurationModel(config);
- }
- } catch (CoreException e){
- UpdateManagerPlugin.warn("Error processing configuration history:"+url.toExternalForm(),e);
- }
- // DEBUG:
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_PARSING) {
- UpdateManagerPlugin.debug("End Processing Config Tag: url:" + url.toExternalForm()); //$NON-NLS-1$
- }
- }
-
- /*
- * @see ContentHandler#endElement(String, String, String)
- */
- public void endElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
- // DEBUG:
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_PARSING) {
- UpdateManagerPlugin.debug("End Element: uri:" + uri + " local Name:" + localName + " qName:" + qName); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
-
- String tag = localName.trim();
-
- if (tag.equalsIgnoreCase(PRESERVED_CONFIGURATIONS)) {
- preserved = false;
- return;
- }
-
- }
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/CertificatePair.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/CertificatePair.java
deleted file mode 100644
index f81b249..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/CertificatePair.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-package org.eclipse.update.internal.security;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
- import java.security.cert.Certificate;
-
-/**
- *
- */
-public class CertificatePair {
- private Certificate root;
- private Certificate issuer;
-
-
-
- /**
- * Gets the root.
- * @return Returns a Certificate
- */
- public Certificate getRoot() {
- return root;
- }
-
- /**
- * Sets the root.
- * @param root The root to set
- */
- public void setRoot(Certificate root) {
- this.root = root;
- }
-
- /**
- * Gets the issuer.
- * @return Returns a Certificate
- */
- public Certificate getIssuer() {
- return issuer;
- }
-
- /**
- * Sets the issuer.
- * @param issuer The issuer to set
- */
- public void setIssuer(Certificate issuer) {
- this.issuer = issuer;
- }
-
- /*
- * @see Object#equals(Object)
- */
- public boolean equals(Object obj) {
-
- if (obj==null) return false;
-
- if (!(obj instanceof CertificatePair)) return false;
-
- if (root==null || issuer==null) return false;
-
- CertificatePair pair = (CertificatePair)obj;
-
- return (root.equals(pair.getRoot()) && issuer.equals(pair.getIssuer()));
- }
-
-}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/JarVerificationResult.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/JarVerificationResult.java
deleted file mode 100644
index 32fe0c0..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/JarVerificationResult.java
+++ /dev/null
@@ -1,334 +0,0 @@
-package org.eclipse.update.internal.security;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import java.security.Principal;
-import java.security.cert.*;
-import java.text.DateFormat;
-import java.util.*;
-
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.core.Policy;
-
-/**
- * Result of the service
- */
-public class JarVerificationResult implements IVerificationResult {
-
-
- private int resultCode;
- private int verificationCode;
- private Exception resultException;
- private List /*of Certificates[] */
- certificates;
- private CertificatePair[] rootCertificates;
- private CertificatePair foundCertificate; // certificate found in one keystore
-
- private String signerInfo;
- private String verifierInfo;
- private ContentReference contentReference;
- private String text;
- private IFeature feature;
- private boolean featureVerification;
- private boolean alreadySeen;
-
- /*
- *
- */
- public int getResultCode() {
- return resultCode;
- }
-
- /*
- *
- */
- public Exception getVerificationException() {
- return resultException;
- }
-
- /*
- *
- */
- public void setResultCode(int newResultCode) {
- resultCode = newResultCode;
- }
-
- /*
- *
- */
- public void setResultException(Exception newResultException) {
- resultException = newResultException;
- }
-
- /*
- *
- */
- public int getVerificationCode() {
- return verificationCode;
- }
-
- /*
- *
- */
- public void setVerificationCode(int verificationCode) {
- this.verificationCode = verificationCode;
- }
-
- /*
- * adds an array of Certificates to the list
- * force recomputation of root cert
- */
- public void addCertificates(Certificate[] certs) {
- if (certificates == null)
- certificates = new ArrayList();
- certificates.add(certs);
- rootCertificates = null;
- }
-
- /*
- *
- */
- private List getCertificates() {
- return certificates;
- }
-
- /*
- * Returns the list of root certificates
- * The list of certificates we received is an array of certificates
- * we have to determine
- * 1) how many chain do we have (a chain stops when verifier of a cert is
- * not the signer of the next cert in the list
- * 2) build a cert with the leaf signer and the root verifier for each chain
- */
- public CertificatePair[] getRootCertificates() {
- if (rootCertificates == null) {
- rootCertificates = new CertificatePair[0];
- List rootCertificatesList = new ArrayList();
- if (certificates != null && certificates.size() > 0) {
- Iterator iter = certificates.iterator();
- while (iter.hasNext()) {
-
- Certificate[] certs = (Certificate[]) iter.next();
- if (certs != null && certs.length > 0) {
-
- CertificatePair pair = new CertificatePair();
- pair.setIssuer(certs[0]);
-
- for (int i = 0; i < certs.length - 1; i++) {
- X509Certificate x509certRoot = (X509Certificate) certs[i];
- X509Certificate x509certIssuer = (X509Certificate) certs[i+1];
- if (!x509certRoot.getIssuerDN().equals(x509certIssuer.getSubjectDN())) {
- pair.setRoot(x509certRoot);
- if (!rootCertificatesList.contains(pair)) {
- rootCertificatesList.add(pair);
- }
- pair = new CertificatePair();
- pair.setIssuer(x509certIssuer);
- }
- }
-
- // add the latest one
- if (pair != null) {
- pair.setRoot(certs[certs.length - 1]);
- if (!rootCertificatesList.contains(pair)) {
- rootCertificatesList.add(pair);
- }
- }
- }
- }
-
- }
-
- if (rootCertificatesList.size() > 0) {
- rootCertificates = new CertificatePair[rootCertificatesList.size()];
- rootCertificatesList.toArray(rootCertificates);
- }
- }
- return rootCertificates;
- }
-
- /*
- *
- */
- private CertificatePair getFoundCertificate() {
- return foundCertificate;
- }
-
- /*
- *
- */
- public void setFoundCertificate(CertificatePair foundCertificate) {
- this.foundCertificate = foundCertificate;
- }
-
-
- /*
- * Initializes the signerInfo and the VerifierInfo from the Certificate Pair
- */
- private void initializeCertificates(){
- X509Certificate certRoot = null;
- X509Certificate certIssuer = null;
- CertificatePair trustedCertificate;
- if (getFoundCertificate() == null) {
- CertificatePair[] certs = getRootCertificates();
- if (certs.length == 0)
- return;
- trustedCertificate = (CertificatePair) certs[0];
- } else {
- trustedCertificate = (CertificatePair) getFoundCertificate();
- }
- certRoot = (X509Certificate) trustedCertificate.getRoot();
- certIssuer = (X509Certificate) trustedCertificate.getIssuer();
-
- StringBuffer strb = new StringBuffer();
- strb.append(issuerString(certIssuer.getSubjectDN()));
- strb.append("\r\n"); //$NON-NLS-1$
- strb.append(Policy.bind("JarVerificationResult.ValidBetween", dateString(certIssuer.getNotBefore()), dateString(certIssuer.getNotAfter()))); //$NON-NLS-1$
- strb.append(checkValidity(certIssuer));
- signerInfo = strb.toString();
- if (certIssuer != null && !certIssuer.equals(certRoot)) {
- strb = new StringBuffer();
- strb.append(issuerString(certIssuer.getIssuerDN()));
- strb.append("\r\n"); //$NON-NLS-1$
- strb.append(Policy.bind("JarVerificationResult.ValidBetween", dateString(certRoot.getNotBefore()), dateString(certRoot.getNotAfter()))); //$NON-NLS-1$
- strb.append(checkValidity(certRoot));
- verifierInfo = strb.toString();
- }
-
- }
-
- /*
- * Returns a String to show if the certificate is valid
- */
- private String checkValidity(X509Certificate cert) {
-
- try {
- cert.checkValidity();
- } catch (CertificateExpiredException e) {
- return ("\r\n" + Policy.bind("JarVerificationResult.ExpiredCertificate")); //$NON-NLS-1$
- } catch (CertificateNotYetValidException e) {
- return ("\r\n" + Policy.bind("JarVerificationResult.CertificateNotYetValid")); //$NON-NLS-1$
- }
- return ("\r\n" + Policy.bind("JarVerificationResult.CertificateValid")); //$NON-NLS-1$
- }
-
- /*
- * Returns the label String from a X50name
- */
- private String issuerString(Principal principal) {
-// 19902
-// try {
-// if (principal instanceof X500Name) {
-// StringBuffer buf = new StringBuffer();
-// X500Name name = (X500Name) principal;
-// buf.append((name.getDNQualifier() != null) ? name.getDNQualifier() + ", " : "");
-// buf.append(name.getCommonName());
-// buf.append((name.getOrganizationalUnit() != null) ? ", " + name.getOrganizationalUnit() : "");
-// buf.append((name.getOrganization() != null) ? ", " + name.getOrganization() : "");
-// buf.append((name.getLocality() != null) ? ", " + name.getLocality() : "");
-// buf.append((name.getCountry() != null) ? ", " + name.getCountry() : "");
-// return new String(buf);
-// }
-// } catch (Exception e) {
-// UpdateManagerPlugin.warn("Error parsing X500 Certificate",e);
-// }
- return principal.toString();
- }
-
- /*
- *
- */
- private String dateString(Date date) {
- return DateFormat.getDateInstance().format(date);
- }
-
- /*
- *
- */
- public String getSignerInfo() {
- if (signerInfo==null) initializeCertificates();
- return signerInfo;
- }
-
- /*
- *
- */
- public String getVerifierInfo() {
- if (signerInfo==null) initializeCertificates();
- return verifierInfo;
- }
-
- /*
- *
- */
- public ContentReference getContentReference() {
- return contentReference;
- }
-
- /*
- *
- */
- public void setContentReference(ContentReference ref) {
- this.contentReference = ref;
- }
-
-
- /*
- *
- */
- public IFeature getFeature() {
- return feature;
- }
-
- /*
- *
- */
- public void setFeature(IFeature feature) {
- this.feature = feature;
- }
-
- /*
- *
- */
- public String getText() {
- return null;
- }
-
- /*
- *
- */
- public void setText(String text) {
- this.text = text;
- }
-
- /*
- *
- */
- public boolean isFeatureVerification() {
- return featureVerification;
- }
-
- /*
- *
- */
- public void isFeatureVerification(boolean featureVerification) {
- this.featureVerification = featureVerification;
- }
-
- /*
- *
- */
- public boolean alreadySeen() {
- return alreadySeen;
- }
-
- /*
- *
- */
- public boolean alreadySeen(boolean seen) {
- return this.alreadySeen = seen;
- }
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/JarVerifier.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/JarVerifier.java
deleted file mode 100644
index e8b8722..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/JarVerifier.java
+++ /dev/null
@@ -1,423 +0,0 @@
-package org.eclipse.update.internal.security;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import java.io.*;
-import java.security.*;
-import java.security.cert.Certificate;
-import java.security.cert.CertificateException;
-import java.util.*;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
-import java.util.zip.ZipException;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.core.Policy;
-import org.eclipse.update.internal.core.UpdateManagerPlugin;
-
-/**
- * The JarVerifier will check the integrity of the JAR.
- * If the Jar is signed and the integrity is validated,
- * it will check if one of the certificate of each file
- * is in one of the keystore.
- *
- */
-
-public class JarVerifier extends Verifier {
-
- private static final String MANIFEST = "META-INF"; //$NON-NLS-1$
-
- private JarVerificationResult result;
- private List /*of CertificatePair*/
- trustedCertificates;
- private boolean acceptUnsignedFiles;
- private List /* of KeyStore */
- listOfKeystores;
- private int entries;
- private IProgressMonitor monitor;
- private String jarFileName;
- private File jarFile;
-
- /*
- * Default Constructor
- */
- public JarVerifier() {
- initialize();
- }
-
- /*
- * Returns the list of the keystores.
- */
- private List getKeyStores() throws CoreException {
- if (listOfKeystores == null) {
- listOfKeystores = new ArrayList(0);
- KeyStores listOfKeystoreHandles = new KeyStores();
- InputStream in = null;
- KeyStore keystore = null;
- KeystoreHandle handle = null;
- while (listOfKeystoreHandles.hasNext()) {
- try {
- handle = listOfKeystoreHandles.next();
- in = UpdateManagerPlugin.getPlugin().get(handle.getLocation()).getInputStream();;
- try {
- keystore = KeyStore.getInstance(handle.getType());
- keystore.load(in, null); // no password
- } catch (NoSuchAlgorithmException e) {
- throw Utilities.newCoreException(Policy.bind("JarVerifier.UnableToFindEncryption", handle.getLocation().toExternalForm()), e); //$NON-NLS-1$
- } catch (CertificateException e) {
- throw Utilities.newCoreException(Policy.bind("JarVerifier.UnableToLoadCertificate", handle.getLocation().toExternalForm()), e); //$NON-NLS-1$
- } catch (KeyStoreException e) {
- throw Utilities.newCoreException(Policy.bind("JarVerifier.UnableToFindProviderForKeystore", handle.getType()), e); //$NON-NLS-1$
- } finally {
- if (in != null) {
- try {
- in.close();
- } catch (IOException e) {
- } // nothing
- }
- } // try loading a keyStore
-
- // keystore was loaded
- listOfKeystores.add(keystore);
- } catch (IOException e) {
- // nothing... if the keystore doesn't exist, continue
- }
-
- } // while all key stores
-
- }
-
- return listOfKeystores;
- }
-
- /*
- *
- */
- private void initialize() {
- result = null;
- trustedCertificates = null;
- acceptUnsignedFiles = false;
- listOfKeystores = null;
- }
-
- /*
- * init
- */
- private void init(IFeature feature, ContentReference contentRef) throws CoreException {
- jarFile = null;
- if (contentRef instanceof JarContentReference) {
- JarContentReference jarReference = (JarContentReference) contentRef;
- try {
- jarFile = jarReference.asFile();
- if (UpdateManagerPlugin.DEBUG && UpdateManagerPlugin.DEBUG_SHOW_INSTALL)
- UpdateManagerPlugin.debug("Attempting to read JAR file:"+jarFile);
-
- // # of entries
- if (!jarFile.exists()) throw new IOException();
- JarFile jar = new JarFile(jarFile);
- entries = jar.size();
- try {
- jar.close();
- } catch (IOException ex) {
- // unchecked
- }
- jarFileName = jarFile.getName();
- } catch (ZipException e){
- throw Utilities.newCoreException(Policy.bind("JarVerifier.InvalidJar", jarReference.toString()), e); //$NON-NLS-1$
- } catch (IOException e) {
- throw Utilities.newCoreException(Policy.bind("JarVerifier.UnableToAccessJar", jarReference.toString()), e); //$NON-NLS-1$
- }
- }
-
- result = new JarVerificationResult();
- result.setVerificationCode(IVerificationResult.UNKNOWN_ERROR);
- result.setResultException(null);
- result.setFeature(feature);
- result.setContentReference(contentRef);
- }
-
- /*
- * Returns true if one of the certificate exists in the keystore
- */
- private boolean existsInKeystore(Certificate cert) throws CoreException {
- try {
- List keyStores = getKeyStores();
- if (!keyStores.isEmpty()) {
- Iterator listOfKeystores = keyStores.iterator();
- while (listOfKeystores.hasNext()) {
- KeyStore keystore = (KeyStore) listOfKeystores.next();
-
- if (keystore.getCertificateAlias(cert) != null) {
- return true;
- }
- }
- }
- } catch (KeyStoreException e) {
- throw Utilities.newCoreException(Policy.bind("JarVerifier.KeyStoreNotLoaded"), e); //$NON-NLS-1$
- }
- return false;
- }
-
- /*
- *
- */
- private List readJarFile(JarFile jarFile)
- throws IOException, InterruptedException {
- List list = new ArrayList();
- byte[] buffer = new byte[4096];
- Enumeration entries = jarFile.entries();
- JarEntry currentEntry = null;
- InputStream in = null;
- if (monitor != null)
- monitor.setTaskName(Policy.bind("JarVerifier.Verify", jarFile.getName())); //$NON-NLS-1$
-
- try {
- while (entries.hasMoreElements()) {
- currentEntry = (JarEntry) entries.nextElement();
- list.add(currentEntry);
- in = jarFile.getInputStream(currentEntry);
- while ((in.read(buffer, 0, buffer.length)) != -1) {
- // Security error thrown if tempered
- }
- in.close();
- }
- } catch (IOException e) {
- result.setVerificationCode(IVerificationResult.UNKNOWN_ERROR);
- result.setResultException(e);
- }
-
- return list;
- }
-
- /*
- * @param newMonitor org.eclipse.core.runtime.IProgressMonitor
- */
- public void setMonitor(IProgressMonitor newMonitor) {
- monitor = newMonitor;
- }
-
- /*
- * @see IVerifier#verify(IFeature,ContentReference,boolean, InstallMonitor)
- */
- public IVerificationResult verify(
- IFeature feature,
- ContentReference reference,
- boolean isFeatureVerification,
- InstallMonitor monitor)
- throws CoreException {
-
- if (reference == null)
- return result;
-
- // if parent knows how to verify, ask the parent first
- if (getParent() != null) {
- IVerificationResult vr =
- getParent().verify(feature, reference, isFeatureVerification, monitor);
- if (vr.getVerificationCode() != IVerificationResult.TYPE_ENTRY_UNRECOGNIZED)
- return vr;
- }
-
- // the parent couldn't verify
- setMonitor(monitor);
- init(feature, reference);
- result.isFeatureVerification(isFeatureVerification);
-
- if (jarFile!=null) {
- result = verify(jarFile.getAbsolutePath());
- } else {
- result.setVerificationCode(IVerificationResult.TYPE_ENTRY_UNRECOGNIZED);
- }
-
- return result;
- }
-
- /*
- *
- */
- private JarVerificationResult verify(String file) {
-
- try {
-
- // verify integrity
- verifyIntegrity(file);
-
- // do not close input stream
- // as verifyIntegrity already did it
-
- //if user already said yes
- result.alreadySeen(alreadyValidated());
-
- // verify source certificate
- if (result.getVerificationCode()
- == IVerificationResult.TYPE_ENTRY_SIGNED_UNRECOGNIZED) {
- verifyAuthentication();
- }
-
- // save the fact the file is not signed, so the user will not be prompted again
- if (result.getVerificationCode()
- == IVerificationResult.TYPE_ENTRY_NOT_SIGNED) {
- acceptUnsignedFiles = true;
- }
-
- } catch (Exception e) {
- result.setVerificationCode(IVerificationResult.UNKNOWN_ERROR);
- result.setResultException(e);
- }
-
- if (monitor != null) {
- monitor.worked(1);
- if (monitor.isCanceled()) {
- result.setVerificationCode(IVerificationResult.VERIFICATION_CANCELLED);
- }
- }
-
- return result;
- }
-
- /*
- * Verifies that each file has at least one certificate
- * valid in the keystore
- *
- * At least one certificate from each Certificate Array
- * of the Jar file must be found in the known Certificates
- */
- private void verifyAuthentication() throws CoreException {
-
- CertificatePair[] entries = result.getRootCertificates();
- boolean certificateFound = false;
-
- // If all the certificate of an entry are
- // not found in the list of known certifcate
- // the certificate is not trusted by any keystore.
- for (int i = 0; i < entries.length; i++) {
- certificateFound = existsInKeystore(entries[i].getRoot());
- if (certificateFound) {
- result.setVerificationCode(IVerificationResult.TYPE_ENTRY_SIGNED_RECOGNIZED);
- result.setFoundCertificate(entries[i]);
- return;
- }
- }
- }
-
- /*
- * Verifies the integrity of the JAR
- */
- private void verifyIntegrity(String file) {
-
- JarFile jarFile = null;
-
- try {
- // If the JAR is signed and not valid
- // a security exception will be thrown
- // while reading it
- jarFile = new JarFile(file, true);
- List filesInJar = readJarFile(jarFile);
- jarFile.close();
-
- // you have to read all the files once
- // before getting the certificates
- if (jarFile.getManifest() != null) {
- Iterator iter = filesInJar.iterator();
- boolean certificateFound = false;
- while (iter.hasNext()) {
- JarEntry currentJarEntry = (JarEntry) iter.next();
- Certificate[] certs = currentJarEntry.getCertificates();
- if ((certs != null) && (certs.length != 0)) {
- certificateFound = true;
- result.addCertificates(certs);
- } else {
- String jarEntryName = currentJarEntry.getName();
- if (!jarEntryName.toUpperCase().startsWith(MANIFEST)
- && !currentJarEntry.isDirectory()) {
- // if the jarEntry is not in MANIFEST, consider the whole file unsigned
- break;
- }
-
- }
- }
-
- if (certificateFound)
- result.setVerificationCode(IVerificationResult.TYPE_ENTRY_SIGNED_UNRECOGNIZED);
- else
- result.setVerificationCode(IVerificationResult.TYPE_ENTRY_NOT_SIGNED);
- } else {
- Exception e = new Exception(Policy.bind("JarVerifier.InvalidFile", file)); //$NON-NLS-1$
- result.setResultException(e);
- result.setVerificationCode(IVerificationResult.TYPE_ENTRY_NOT_SIGNED);
- UpdateManagerPlugin.warn(null,e);
- }
- } catch (SecurityException e) {
- // Jar file is signed
- // but content has changed since signed
- result.setVerificationCode(IVerificationResult.TYPE_ENTRY_CORRUPTED);
- } catch (InterruptedException e) {
- result.setVerificationCode(IVerificationResult.VERIFICATION_CANCELLED);
- } catch (Exception e) {
- result.setVerificationCode(IVerificationResult.UNKNOWN_ERROR);
- result.setResultException(e);
- }
-
- }
-
- /*
- *
- */
- private boolean alreadyValidated() {
-
- if (result.getVerificationCode() == IVerificationResult.TYPE_ENTRY_NOT_SIGNED)
- return (acceptUnsignedFiles);
-
- if (getTrustedCertificates() != null) {
- Iterator iter = getTrustedCertificates().iterator();
- CertificatePair[] jarPairs = result.getRootCertificates();
-
- // check if this is not a user accepted certificate for this feature
- while (iter.hasNext()) {
- CertificatePair trustedCertificate = (CertificatePair) iter.next();
- for (int i = 0; i < jarPairs.length; i++) {
- if (trustedCertificate.equals(jarPairs[i])) {
- return true;
- }
- }
- }
-
- // if certificate pair not found in trusted add it for next time
- for (int i = 0; i < jarPairs.length; i++) {
- addTrustedCertificate(jarPairs[i]);
- }
- }
-
- return false;
- }
-
- /*
- *
- */
- private void addTrustedCertificate(CertificatePair pair) {
- if (trustedCertificates == null)
- trustedCertificates = new ArrayList();
- if (pair != null)
- trustedCertificates.add(pair);
- }
-
- /*
- *
- */
- private List getTrustedCertificates() {
- if (trustedCertificates == null)
- trustedCertificates = new ArrayList();
- return trustedCertificates;
- }
-
- /**
- * @see IVerifier#setParent(IVerifier)
- */
- public void setParent(IVerifier parentVerifier) {
- super.setParent(parentVerifier);
- initialize();
- }
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/KeyStores.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/KeyStores.java
deleted file mode 100644
index dcf5097..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/KeyStores.java
+++ /dev/null
@@ -1,202 +0,0 @@
-package org.eclipse.update.internal.security;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import java.io.*;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.security.Security;
-import java.util.*;
-
-import org.eclipse.update.internal.core.UpdateManagerPlugin;
-/**
- * Class to manage the different KeyStores we should
- * check for certificates of Signed JAR
- */
-public class KeyStores {
-
-
- /**
- * java.policy files properties of the java.security file
- */
- private static final String JAVA_POLICY_URL = "policy.url."; //$NON-NLS-1$
-
- /**
- * Default keystore type in java.security file
- */
- private static final String DEFAULT_KEYSTORE_TYPE = "keystore.type"; //$NON-NLS-1$
-
- /**
- * List of KeystoreHandle pointing of valid KeyStores
- * the URL of the KeystoreHandle is not tested yet...
- */
- private List /* of KeystoreHandle */ listOfKeyStores;
-
- /**
- * Iterator
- */
- private Iterator iterator;
- /**
- * KeyStores constructor comment.
- */
- public KeyStores() {
- super();
- initializeDefaultKeyStores();
- }
- /**
- *
- */
- private Iterator getIterator() {
- if (iterator == null)
- iterator = listOfKeyStores.iterator();
- return iterator;
- }
- /**
- * returns trus if there is more Keystores in the list
- */
- public boolean hasNext() {
- return getIterator().hasNext();
- }
- /**
- * populate the list of Keystores
- * should be done with Dialog with Cancel/Skip button if
- * the connection to the URL is down...
- */
- private void initializeDefaultKeyStores() {
-
- listOfKeyStores = new ArrayList(5);
-
- // get JRE cacerts
- try {
- URL url = new URL("file", null, 0, System.getProperty("java.home") + File.separator + "lib" + File.separator + "security" + File.separator + "cacerts"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
- listOfKeyStores.add(new KeystoreHandle(url,Security.getProperty(DEFAULT_KEYSTORE_TYPE)));
- }
- catch (MalformedURLException e) {
- // should not happen, hardcoded...
- }
-
- // get java.home .keystore
- try {
- URL url = new URL("file", null, 0, System.getProperty("user.home") + File.separator + ".keystore"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- listOfKeyStores.add(new KeystoreHandle(url,Security.getProperty(DEFAULT_KEYSTORE_TYPE)));
- }
- catch (MalformedURLException e) {
- // should not happen, hardcoded...
- }
-
- // get KeyStores from policy files...
- int index = 1;
- String java_policy = Security.getProperty(JAVA_POLICY_URL+index);
- while (java_policy!=null){
- // retrieve keystore url from java.policy
- // also retrieve keystore type
- KeystoreHandle keystore = getKeystoreFromLocation(java_policy);
- if (keystore!=null){
- listOfKeyStores.add(keystore);
- }
- index++;
- java_policy = Security.getProperty(JAVA_POLICY_URL+index);
- }
-
- }
- /**
- * returns the URL for the Next KeystoreHandle
- */
- public KeystoreHandle next() {
- return (KeystoreHandle) getIterator().next();
- }
-
- /**
- * retrieve the keystore from java.policy file
- */
- private KeystoreHandle getKeystoreFromLocation(String location){
-
- InputStream in = null;
- char[] buff = new char[4096];
-
-
- int indexOf$ = location.indexOf("${"); //$NON-NLS-1$
- int indexOfCurly = location.indexOf('}',indexOf$);
- if (indexOf$!=-1 && indexOfCurly!=-1){
- String prop = System.getProperty(location.substring(indexOf$+2,indexOfCurly));
- String location2 = location.substring(0,indexOf$);
- location2 += prop;
- location2 += location.substring(indexOfCurly+1);
- location = location2;
- }
-
-
- try {
- URL url = new URL(location);
- in = UpdateManagerPlugin.getPlugin().get(url).getInputStream();;
- Reader reader = new InputStreamReader(in);
- int result = reader.read(buff);
- StringBuffer contentBuff = new StringBuffer();
- while (result!=-1){
- contentBuff.append(buff,0,result);
- result = reader.read(buff);
- }
-
- if (contentBuff.length()>0){
- String content = new String(contentBuff);
- int indexOfKeystore = content.indexOf("keystore"); //$NON-NLS-1$
- if (indexOfKeystore != -1){
- int indexOfSemiColumn = content.indexOf(';',indexOfKeystore);
- return getKeystoreFromString(content.substring(indexOfKeystore,indexOfSemiColumn),url);
- }
- }
- } catch (MalformedURLException e){
- log(e);
- } catch (IOException e){
- // url.openStream, reader.read (x2)
- // only log, the keystore may not exist
- log(e);
- } finally {
- try { in.close();} catch (Exception e){}
- }
- return null;
- }
-
- /**
- * retrieve the keystore from java.policy file
- */
- private KeystoreHandle getKeystoreFromString(String content,URL rootURL){
- KeystoreHandle handle = null;
- String keyStoreType = Security.getProperty(DEFAULT_KEYSTORE_TYPE);
-
-
- int indexOfSpace = content.indexOf(' ');
- if (indexOfSpace==-1) return null;
-
- int secondSpace = content.lastIndexOf(',');
- if (secondSpace==-1) {
- secondSpace = content.length();
- } else {
- keyStoreType = content.substring(secondSpace+1,content.length()).trim();
- }
-
- URL url = null;
- try {
- url = new URL(content.substring(indexOfSpace,secondSpace));
- } catch (MalformedURLException e){
- log(e);
- // the url maybe relative
- try {
- url = new URL(rootURL,content.substring(indexOfSpace,secondSpace));
- } catch (MalformedURLException e1){
- log(e1);
- }
- }
-
- if (url!=null)
- handle = new KeystoreHandle(url,keyStoreType);
-
- return handle;
- }
-
- private void log(Exception e){
- UpdateManagerPlugin.warn("Cannot retrieve a KeyStore",e);
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/KeystoreHandle.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/KeystoreHandle.java
deleted file mode 100644
index 117c554..0000000
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/KeystoreHandle.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.eclipse.update.internal.security;
-
-import java.net.URL;
-
-
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-/**
- * Manages a handle to a keystore
- */
-public class KeystoreHandle {
-
- private URL location;
- private String type;
-
- public KeystoreHandle(URL url, String type){
- this.location = url;
- this.type = type;
- }
-
- /**
- * Gets the location.
- * @return Returns a URL
- */
- public URL getLocation() {
- return location;
- }
-
- /**
- * Sets the location.
- * @param location The location to set
- */
- public void setLocation(URL location) {
- this.location = location;
- }
-
- /**
- * Gets the type.
- * @return Returns a String
- */
- public String getType() {
- return type;
- }
-
- /**
- * Sets the type.
- * @param type The type to set
- */
- public void setType(String type) {
- this.type = type;
- }
-
-}
diff --git a/update/org.eclipse.update.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/Red Dot Site Install Handler/features/com.reddot.reddot_1.0.0.jar b/update/org.eclipse.update.examples/Red Dot Site Install Handler/features/com.reddot.reddot_1.0.0.jar
deleted file mode 100644
index 1553872..0000000
--- a/update/org.eclipse.update.examples/Red Dot Site Install Handler/features/com.reddot.reddot_1.0.0.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.examples/Red Dot Site Install Handler/features/com.reddot.reddot_1.0.0/data.jar b/update/org.eclipse.update.examples/Red Dot Site Install Handler/features/com.reddot.reddot_1.0.0/data.jar
deleted file mode 100644
index 039b7fc..0000000
--- a/update/org.eclipse.update.examples/Red Dot Site Install Handler/features/com.reddot.reddot_1.0.0/data.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.examples/Red Dot Site Install Handler/features/com.reddot.reddot_1.0.0/extra.txt b/update/org.eclipse.update.examples/Red Dot Site Install Handler/features/com.reddot.reddot_1.0.0/extra.txt
deleted file mode 100644
index 7954f37..0000000
--- a/update/org.eclipse.update.examples/Red Dot Site Install Handler/features/com.reddot.reddot_1.0.0/extra.txt
+++ /dev/null
@@ -1 +0,0 @@
-Some extra text to install
\ No newline at end of file
diff --git a/update/org.eclipse.update.examples/Red Dot Site Install Handler/features/com.reddot.reddot_2.0.0.jar b/update/org.eclipse.update.examples/Red Dot Site Install Handler/features/com.reddot.reddot_2.0.0.jar
deleted file mode 100644
index 041a1cb..0000000
--- a/update/org.eclipse.update.examples/Red Dot Site Install Handler/features/com.reddot.reddot_2.0.0.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.examples/Red Dot Site Install Handler/features/com.reddot.reddot_2.0.0/data.jar b/update/org.eclipse.update.examples/Red Dot Site Install Handler/features/com.reddot.reddot_2.0.0/data.jar
deleted file mode 100644
index 039b7fc..0000000
--- a/update/org.eclipse.update.examples/Red Dot Site Install Handler/features/com.reddot.reddot_2.0.0/data.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.examples/Red Dot Site Install Handler/features/com.reddot.reddot_2.0.0/extra.txt b/update/org.eclipse.update.examples/Red Dot Site Install Handler/features/com.reddot.reddot_2.0.0/extra.txt
deleted file mode 100644
index 7954f37..0000000
--- a/update/org.eclipse.update.examples/Red Dot Site Install Handler/features/com.reddot.reddot_2.0.0/extra.txt
+++ /dev/null
@@ -1 +0,0 @@
-Some extra text to install
\ No newline at end of file
diff --git a/update/org.eclipse.update.examples/Red Dot Site Install Handler/info/images/redDot.jpg b/update/org.eclipse.update.examples/Red Dot Site Install Handler/info/images/redDot.jpg
deleted file mode 100644
index f0fb5c3..0000000
--- a/update/org.eclipse.update.examples/Red Dot Site Install Handler/info/images/redDot.jpg
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.examples/Red Dot Site Install Handler/info/siteInfo.html b/update/org.eclipse.update.examples/Red Dot Site Install Handler/info/siteInfo.html
deleted file mode 100644
index ceca97d..0000000
--- a/update/org.eclipse.update.examples/Red Dot Site Install Handler/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/Red Dot Site Install Handler/plugins/com.reddot.reddot_1.0.0.jar b/update/org.eclipse.update.examples/Red Dot Site Install Handler/plugins/com.reddot.reddot_1.0.0.jar
deleted file mode 100644
index c88b793..0000000
--- a/update/org.eclipse.update.examples/Red Dot Site Install Handler/plugins/com.reddot.reddot_1.0.0.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.examples/Red Dot Site Install Handler/plugins/com.reddot.reddot_2.0.0.jar b/update/org.eclipse.update.examples/Red Dot Site Install Handler/plugins/com.reddot.reddot_2.0.0.jar
deleted file mode 100644
index da31ad3..0000000
--- a/update/org.eclipse.update.examples/Red Dot Site Install Handler/plugins/com.reddot.reddot_2.0.0.jar
+++ /dev/null
Binary files differ
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 db55e4d..0000000
--- a/update/org.eclipse.update.examples/src/org/eclipse/update/examples/buildzip/BuildZipConverter.java
+++ /dev/null
@@ -1,158 +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;
-import org.eclipse.update.internal.core.UpdateManagerUtils;
-
-/**
- * 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 834b9c2..0000000
--- a/update/org.eclipse.update.examples/src/org/eclipse/update/examples/buildzip/BuildZipFeatureContentProvider.java
+++ /dev/null
@@ -1,244 +0,0 @@
-package org.eclipse.update.examples.buildzip;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import java.io.*;
-import java.net.URL;
-import java.util.jar.JarEntry;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.update.core.*;
-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 df11a78..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.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.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)
- */
- public IFeature createFeature(URL url, ISite site) 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 f81e490..0000000
--- a/update/org.eclipse.update.examples/src/org/eclipse/update/examples/buildzip/BuildZipFeatureParser.java
+++ /dev/null
@@ -1,204 +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.NonPluginEntryModel;
-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 2bb681d..0000000
--- a/update/org.eclipse.update.examples/src/org/eclipse/update/examples/buildzip/BuildZipSiteFactory.java
+++ /dev/null
@@ -1,88 +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.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-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.FeatureReferenceModel;
-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 dde07a3..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 = openStream(url);
- site = (Site) parseSite(is);
-
- URLEntryModel realSiteRef = site.getDescriptionModel();
- if (realSiteRef == null)
- throw Utilities.newCoreException(
- "Unable to obtain update site reference",
- null);
- String siteURLString = realSiteRef.getURLString();
- if (siteURLString == null)
- throw Utilities.newCoreException(
- "Unable to obtain update site reference",
- null);
- URL siteURL = new URL(siteURLString);
- FreeFormSiteContentProvider contentProvider =
- new FreeFormSiteContentProvider(siteURL);
- site.setSiteContentProvider(contentProvider);
- site.resolve(siteURL, null); // resolve any URLs relative to the site
-
- } catch (MalformedURLException e){
- throw Utilities.newCoreException("Unable to create URL",e);
- } catch (IOException e){
- throw Utilities.newCoreException("Unable to access URL",e);
- } finally {
- if (is != null)
- try {
- is.close();
- } catch (IOException e) {
- }
- }
-
- return site;
- }
-
- /*
- * @see SiteModelFactory#canParseSiteType(String)
- */
- public boolean canParseSiteType(String type) {
- return type != null
- && type.equals("org.eclipse.update.examples.site.freeform");
- }
-
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/.classpath b/update/org.eclipse.update.tests.core/.classpath
deleted file mode 100644
index 98c6705..0000000
--- a/update/org.eclipse.update.tests.core/.classpath
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/"/>
- <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
- <classpathentry kind="src" path="/org.junit"/>
- <classpathentry kind="src" path="/org.apache.xerces"/>
- <classpathentry kind="src" path="/org.eclipse.core.resources"/>
- <classpathentry kind="src" path="/org.eclipse.update.core"/>
- <classpathentry kind="src" path="/org.eclipse.help"/>
- <classpathentry kind="src" path="/org.eclipse.core.boot"/>
- <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/update/org.eclipse.update.tests.core/.cvsignore b/update/org.eclipse.update.tests.core/.cvsignore
deleted file mode 100644
index c5e82d7..0000000
--- a/update/org.eclipse.update.tests.core/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/.project b/update/org.eclipse.update.tests.core/.project
deleted file mode 100644
index 8881919..0000000
--- a/update/org.eclipse.update.tests.core/.project
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.update.tests.core</name>
- <comment></comment>
- <projects>
- <project>org.apache.xerces</project>
- <project>org.eclipse.core.boot</project>
- <project>org.eclipse.core.resources</project>
- <project>org.eclipse.core.runtime</project>
- <project>org.eclipse.help</project>
- <project>org.eclipse.update.core</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 a403b4b..0000000
--- a/update/org.eclipse.update.tests.core/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-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 767dae9..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,LINUX,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 c2df671..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/">
- <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 7832ef8..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" 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/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 e8d004d..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 e8d004d..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 e8d004d..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/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 12ee4ba..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 899bdda..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 12ee4ba..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 899bdda..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 830f9e9..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.0.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 04a9dd5..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.0.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 73d8b31..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.0.0"
- label="Eclipse Platform"
- provider-name="www.eclipse.org"
- image="splash/splash_full.bmp"
- >
-
- <description>
- Eclipse platform feature.
- </description>
-
- <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 98ab366..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.0.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 b0d81e7..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.0.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/reddot.xml b/update/org.eclipse.update.tests.core/data/parsertests/reddot.xml
deleted file mode 100644
index b2e943f..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.0.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.0.0" url="plugins/com.reddot.reddot_2.0.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 63fc6d9..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.0.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.0.0" url="plugins/com.reddot.reddot_2.0.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 211986b..0000000
--- a/update/org.eclipse.update.tests.core/data/parsertests/site.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-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 14d785f..0000000
--- a/update/org.eclipse.update.tests.core/data/parsertests/site4.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="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.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 9c707ff..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.0.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 63efcee..0000000
--- a/update/org.eclipse.update.tests.core/data/resources.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-HTTP_PATH_1=/org.eclipse.update.tests.core.updatetests/UpdateManager2/
-HTTP_PATH_2=/org.eclipse.update.tests.core.updatetests/UpdateManager/
-HTTP_PATH_3=/org.eclipse.update.tests.core.updatetests/Site with space/
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/site.xml b/update/org.eclipse.update.tests.core/data/site.xml
deleted file mode 100644
index 3fc60c7..0000000
--- a/update/org.eclipse.update.tests.core/data/site.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site type="org.eclipse.update.core.file">
-<description url="info/siteInfo.html"/>
- <feature url="testAPI/features/feature3">
- <category name="eclipse/UML"/>
- </feature>
- <feature url="http://www.eclipse.org/feature2">
- <category name="eclipse/J2EE"/>
- </feature>
- <feature url="http://www.eclipse.org/feature1">
- <category name="eclipse/J2EE"/>
- </feature>
- <archive path="plugins/org.eclipse.update.plugin1_1.1.1.jar" url="plugins/org.eclipse.update.plugin1_1.1.1"/>
- <category-def label="J2EE tools" name="eclipse/J2EE"/>
- <category-def label="EJB Tools" name="eclipse/J2EE/EJB"/>
- <category-def label="UML tools" name="eclipse/UML"/>
- <category-def label="Messaging Tools" name="B2B"/>
- <category-def label="Eclipse Tools" name="eclipse"/>
-</site>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/site2/site.xml b/update/org.eclipse.update.tests.core/data/site2/site.xml
deleted file mode 100644
index 39d1c11..0000000
--- a/update/org.eclipse.update.tests.core/data/site2/site.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site url="Info.html" type="org.eclipse.update.core.file">
- <feature url="features/feature1"/>
- <archive path="org.eclipse.update.plugin1" url="plugins/plugin1"/>
- <archive path="org.eclipse.update.archive2" url="plugins/plugin2"/>
-</site>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/siteTestLocalSite/plugins/feature1_plugin2_5.0.0/plugin.xml b/update/org.eclipse.update.tests.core/data/siteTestLocalSite/plugins/feature1_plugin2_5.0.0/plugin.xml
deleted file mode 100644
index 7f81c46..0000000
--- a/update/org.eclipse.update.tests.core/data/siteTestLocalSite/plugins/feature1_plugin2_5.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin name="JUnit Test Framework" id="org.eclipse.update.core.tests.feature1.plugin2" version="5.0.0" vendor-name="junit.org">
- <runtime>
- <library name="junit.jar">
- <export name="*"/>
- </library>
- </runtime>
-</plugin>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/siteTestLocalSite/plugins/feature1_plugin2_5.0.0/src.jar b/update/org.eclipse.update.tests.core/data/siteTestLocalSite/plugins/feature1_plugin2_5.0.0/src.jar
deleted file mode 100644
index 2d4d609..0000000
--- a/update/org.eclipse.update.tests.core/data/siteTestLocalSite/plugins/feature1_plugin2_5.0.0/src.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/siteTestLocalSite/plugins/feature1_plugin2_5.0.1/plugin.xml b/update/org.eclipse.update.tests.core/data/siteTestLocalSite/plugins/feature1_plugin2_5.0.1/plugin.xml
deleted file mode 100644
index efb3c26..0000000
--- a/update/org.eclipse.update.tests.core/data/siteTestLocalSite/plugins/feature1_plugin2_5.0.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin name="JUnit Test Framework" id="org.eclipse.update.core.tests.feature1.plugin2" version="5.0.1" vendor-name="junit.org">
- <runtime>
- <library name="junit.jar">
- <export name="*"/>
- </library>
- </runtime>
-</plugin>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/siteTestLocalSite/plugins/feature1_plugin2_5.0.1/src.jar b/update/org.eclipse.update.tests.core/data/siteTestLocalSite/plugins/feature1_plugin2_5.0.1/src.jar
deleted file mode 100644
index 2d4d609..0000000
--- a/update/org.eclipse.update.tests.core/data/siteTestLocalSite/plugins/feature1_plugin2_5.0.1/src.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/testAPI/features/feature3/feature.xml b/update/org.eclipse.update.tests.core/data/testAPI/features/feature3/feature.xml
deleted file mode 100644
index f878d60..0000000
--- a/update/org.eclipse.update.tests.core/data/testAPI/features/feature3/feature.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.eclipse.update.core.tests.feature3" image="feature1.gif" label="Third Feature" provider-name="Smart Company" version="1.0.0" >
- <description>Description</description>
- <copyright>copyright</copyright>
- <license>license</license>
- <url>
- <update label="URL to update the feature" url="http://www.eclipse.org/"/>
- <discovery label="Discovery 1" url="http://www.eclipse.org"/>
- <discovery label="Discovery 2" url="http://www.eclipse.org"/>
- </url>
- <plugin download-size="1500" id="org.eclipse.update.plugin1" install-size="1000" fragment="false" nl="us" os="WIN32,LINUX" version="1.1.1"/>
-</feature>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/testAPI/plugins/org.eclipse.update.plugin1_1.1.1/plugin.xml b/update/org.eclipse.update.tests.core/data/testAPI/plugins/org.eclipse.update.plugin1_1.1.1/plugin.xml
deleted file mode 100644
index e01846c..0000000
--- a/update/org.eclipse.update.tests.core/data/testAPI/plugins/org.eclipse.update.plugin1_1.1.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin name="JUnit Test Framework" id="org.eclipse.update.core.tests.feature1.plugin1" version="3.5.6" vendor-name="junit.org">
- <runtime>
- <library name="junit.jar">
- <export name="*"/>
- </library>
- </runtime>
-</plugin>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/testAPI/plugins/org.eclipse.update.plugin1_1.1.1/src.jar b/update/org.eclipse.update.tests.core/data/testAPI/plugins/org.eclipse.update.plugin1_1.1.1/src.jar
deleted file mode 100644
index 2d4d609..0000000
--- a/update/org.eclipse.update.tests.core/data/testAPI/plugins/org.eclipse.update.plugin1_1.1.1/src.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/testAPI/site.xml b/update/org.eclipse.update.tests.core/data/testAPI/site.xml
deleted file mode 100644
index 4c15d43..0000000
--- a/update/org.eclipse.update.tests.core/data/testAPI/site.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site type="org.eclipse.update.core.file">
-<description url="info/siteInfo.html"/>
- <feature url="features/feature3">
- <category name="eclipse/UML"/>
- </feature>
- <feature url="http://www.eclipse.org/feature2">
- <category name="eclipse/J2EE"/>
- </feature>
- <feature url="http://www.eclipse.org/feature1">
- <category name="eclipse/J2EE"/>
- </feature>
- <archive path="plugins/org.eclipse.update.plugin1_1.1.1.jar" url="plugins/org.eclipse.update.plugin1_1.1.1"/>
- <category-def label="J2EE tools" name="eclipse/J2EE"/>
- <category-def label="EJB Tools" name="eclipse/J2EE/EJB"/>
- <category-def label="UML tools" name="eclipse/UML"/>
- <category-def label="Messaging Tools" name="B2B"/>
- <category-def label="Eclipse Tools" name="eclipse"/>
-</site>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/validation/site2/.eclipseproduct b/update/org.eclipse.update.tests.core/data/validation/site2/.eclipseproduct
deleted file mode 100644
index 8b829aa..0000000
--- a/update/org.eclipse.update.tests.core/data/validation/site2/.eclipseproduct
+++ /dev/null
@@ -1,3 +0,0 @@
-id=another.product.id
-name=Name of the product
-ver=1.2.4
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/validation/site3/.eclipseextension b/update/org.eclipse.update.tests.core/data/validation/site3/.eclipseextension
deleted file mode 100644
index 6d72df7..0000000
--- a/update/org.eclipse.update.tests.core/data/validation/site3/.eclipseextension
+++ /dev/null
@@ -1 +0,0 @@
-id=id.of.extended.product
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/validation/site4/.eclipseUM b/update/org.eclipse.update.tests.core/data/validation/site4/.eclipseUM
deleted file mode 100644
index acc84e9..0000000
--- a/update/org.eclipse.update.tests.core/data/validation/site4/.eclipseUM
+++ /dev/null
@@ -1 +0,0 @@
-id=different.product.id
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/validation/site5/.eclipseUM b/update/org.eclipse.update.tests.core/data/validation/site5/.eclipseUM
deleted file mode 100644
index 196c522..0000000
--- a/update/org.eclipse.update.tests.core/data/validation/site5/.eclipseUM
+++ /dev/null
@@ -1,3 +0,0 @@
-id=org.eclipse.platform
-name=a Product
-version=3.5.6
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/validation/site6/.eclipseUM b/update/org.eclipse.update.tests.core/data/validation/site6/.eclipseUM
deleted file mode 100644
index 597f9f8..0000000
--- a/update/org.eclipse.update.tests.core/data/validation/site6/.eclipseUM
+++ /dev/null
@@ -1 +0,0 @@
-id=org.eclipse.sdk
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/xmls/apitests/org.eclipse.test.feature_1.0.0/feature.xml b/update/org.eclipse.update.tests.core/data/xmls/apitests/org.eclipse.test.feature_1.0.0/feature.xml
deleted file mode 100644
index 1511800..0000000
--- a/update/org.eclipse.update.tests.core/data/xmls/apitests/org.eclipse.test.feature_1.0.0/feature.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.test1.ident1" label="Feature One" nl="en_us,fr,de" os="OS_WIN32,OS_LINUX" provider-name="Object Technology International" version="1.0.0" ws="WS_WIN32,WS_MOTIF,WS_GTK">
- <description>Test feature for testIdentifier test</description>
- <copyright>Copyright (c) the company</copyright>
- <license>Do you accept the license ?</license>
- <url>
- <update label="URL to update teh feature" url="http://www.eclipse.org"/>
- <discovery label="Discovery 1" url="http://www.eclipse.org"/>
- <discovery label="Discovery 2" url="http://www.eclipse.org"/>
- </url>
- <plugin download-size="1500" id="org.eclipse.update.core.tests.feature1.plugin1" install-size="1000" fragment="false" nl="us" os="OS_WIN32" version="3.5.6" ws="WS_WIN32"/>
- <plugin download-size="1200" id="org.eclipse.update.core.tests.feature1.plugin2" install-size="978" fragment="false" version="5.0.0"/>
-</feature>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/xmls/apitests/org.eclipse_test_feature/feature.xml b/update/org.eclipse.update.tests.core/data/xmls/apitests/org.eclipse_test_feature/feature.xml
deleted file mode 100644
index 9f05cda..0000000
--- a/update/org.eclipse.update.tests.core/data/xmls/apitests/org.eclipse_test_feature/feature.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.test1.ident2" label="Feature One" nl="en_us,fr,de" os="OS_WIN32,OS_LINUX" provider-name="Object Technology International" version="1.0.0" ws="WS_WIN32,WS_MOTIF,WS_GTK">
- <description>Test feature for testIdentifier test</description>
- <copyright>Copyright (c) the company</copyright>
- <license>Do you accept the license ?</license>
- <url>
- <update label="URL to update teh feature" url="http://www.eclipse.org"/>
- <discovery label="Discovery 1" url="http://www.eclipse.org"/>
- <discovery label="Discovery 2" url="http://www.eclipse.org"/>
- </url>
- <plugin download-size="1500" url="org.eclipse.update.core.tests.feature1.plugin1" id="org.eclipse.update.core.tests.feature1.plugin1" install-size="1000" fragment="false" nl="us" os="OS_WIN32" version="3.5.6" ws="WS_WIN32"/>
- <plugin download-size="1200" id="org.eclipse.update.core.tests.feature1.plugin2" install-size="978" fragment="false" version="5.0.0"/>
-</feature>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/xmls/feature_1.0.0/feature.xml b/update/org.eclipse.update.tests.core/data/xmls/feature_1.0.0/feature.xml
deleted file mode 100644
index c4ee139..0000000
--- a/update/org.eclipse.update.tests.core/data/xmls/feature_1.0.0/feature.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.eclipse.update.core.tests.feature1" image="feature1.gif" label="Feature One" nl="en,fr,de" os="OS_WIN32,OS_LINUX" provider-name="Object Technology International" version="1.0.4" ws="WS_WIN32,WS_MOTIF,WS_GTK">
- <description>I believe this is the description of feature 1, well, feature 1 is an exceptional feature that you should install right NOW on your machine... try it.</description>
- <copyright>Ok, now, this is a very very complex Copyright not prepared by a lawyer Copyright (c) the company</copyright>
- <license>#1 Do you accept it #2 you do nto accept it ...Do you accpt it ?</license>
- <url>
- <update label="URL to update the feature" url="http://www.eclipse.org/path/feature1/"/>
- <discovery label="Discovery 1" url="http://www.eclipse.org"/>
- <discovery label="Discovery 2" url="http://www.eclipse.org"/>
- </url>
- <plugin download-size="1500" id="org.eclipse.update.core.tests.feature1.plugin1" install-size="1000" fragment="false" nl="us" os="OS_WIN32" version="3.5.6" ws="WS_WIN32"/>
- <plugin download-size="1200" id="org.eclipse.update.core.tests.feature1.plugin2" install-size="978" fragment="false" version="5.0.0"/>
-</feature>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/xmls/feature_1.0.0/feature1.gif b/update/org.eclipse.update.tests.core/data/xmls/feature_1.0.0/feature1.gif
deleted file mode 100644
index 03e30a2..0000000
--- a/update/org.eclipse.update.tests.core/data/xmls/feature_1.0.0/feature1.gif
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/xmls/site1/site.xml b/update/org.eclipse.update.tests.core/data/xmls/site1/site.xml
deleted file mode 100644
index 62c8a65..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/siteInfo.html" 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 9746c6d..0000000
--- a/update/org.eclipse.update.tests.core/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-
-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 713ba77..0000000
--- a/update/org.eclipse.update.tests.core/plugin.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
- id="org.eclipse.update.tests.core"
- name="%name"
- version="2.0.1"
- provider-name="%provider-name"
- class="org.eclipse.update.tests.UpdateTestsPlugin">
-
- <runtime>
- <library name="updatetests.jar">
- <export name="*"/>
- </library>
- </runtime>
- <requires>
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.junit"/>
- <import plugin="org.apache.xerces"/>
- <import plugin="org.eclipse.core.resources"/>
- <import plugin="org.eclipse.update.core"/>
- <import plugin="org.eclipse.help"/>
- </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 bd4a9bc..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/AllTests.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.eclipse.update.tests;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.eclipse.update.tests.api.AllAPITests;
-import org.eclipse.update.tests.configurations.AllConfigurationsTests;
-import org.eclipse.update.tests.core.boot.AllPlatformConfigurationTests;
-import org.eclipse.update.tests.model.AllModelTests;
-import org.eclipse.update.tests.nestedfeatures.AllNestedTests;
-import org.eclipse.update.tests.parser.AllParserTests;
-import org.eclipse.update.tests.reconciliation.AllReconciliationTests;
-import org.eclipse.update.tests.regularInstall.AllRegularInstallTests;
-import org.eclipse.update.tests.regularRemove.AllRegularRemoveTests;
-import org.eclipse.update.tests.sitevalidation.AllSiteValidationTests;
-import org.eclipse.update.tests.types.AllTypesTests;
-import org.eclipse.update.tests.uivalues.AllCoreUITests;
-
-public class AllTests extends TestSuite {
- public AllTests(String name) {
- super(name);
- }
- public static Test suite() throws Exception {
- TestSuite suite = new TestSuite();
- suite.setName("All Update Manager Tests");
- suite.addTest(AllSiteValidationTests.suite());
- suite.addTest(AllPlatformConfigurationTests.suite());
- suite.addTest(AllRegularInstallTests.suite());
- suite.addTest(AllAPITests.suite());
- suite.addTest(AllParserTests.suite());
- suite.addTest(AllCoreUITests.suite());
- suite.addTest(AllConfigurationsTests.suite());
- suite.addTest(AllTypesTests.suite());
- suite.addTest(AllRegularRemoveTests.suite());
- suite.addTest(AllNestedTests.suite());
- suite.addTest(AllReconciliationTests.suite());
- suite.addTest(AllModelTests.suite());
- return suite;
- }
-}
\ No newline at end of file
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 1a476b2..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/UpdateManagerTestCase.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package org.eclipse.update.tests;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-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.UpdateManagerPlugin;
-import org.eclipse.update.internal.core.UpdateManagerUtils;
-/**
- * All Help System Test cases must subclass this base Testcase.
- * See SampleTestCase.java for a template.
- */
-
-public abstract class UpdateManagerTestCase extends TestCase {
-
- protected static ResourceBundle bundle;
- protected static String dataPath;
-
- protected static URL SOURCE_FILE_SITE;
- protected static URL SOURCE_FILE_SITE_INSTALLED;
- protected static URL SOURCE_HTTP_SITE;
- protected static URL TARGET_FILE_SITE;
-
- private static final String DATA_PATH = "data/";
-
- /**
- * Default Constructor
- */
- public UpdateManagerTestCase(String name) {
- super(name);
- try {
- init();
- } catch (Exception e) {
- fail(e.toString());
- e.printStackTrace();
- }
- }
-
- protected static void init() throws MissingResourceException, IOException, MalformedURLException {
-
- IPluginDescriptor dataDesc = Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.update.tests.core");
- URL resolvedURL = Platform.resolve(dataDesc.getInstallURL());
- URL dataURL = new URL(resolvedURL,DATA_PATH);
- dataPath = dataURL.getFile();
- String homePath = (System.getProperty("user.home")).replace(File.separatorChar,'/');
-
- if (bundle == null) {
- ClassLoader l = new URLClassLoader(new URL[] { dataURL }, null);
- bundle = ResourceBundle.getBundle("resources", Locale.getDefault(), l);
- }
-
- try {
- SOURCE_FILE_SITE = new File(dataPath).toURL();
- SOURCE_FILE_SITE_INSTALLED = new File(dataPath+"testAPI/").toURL();
- SOURCE_HTTP_SITE = new URL("http", getHttpHost(),getHttpPort(), bundle.getString("HTTP_PATH_1"));
- TARGET_FILE_SITE = new URL("file",null, homePath +"/target/");
- } catch (Exception e) {
- fail(e.toString());
- e.printStackTrace();
- }
-
- //cleanup target
- File target = new File(homePath + "/target/");
- UpdateManagerUtils.removeFromFileSystem(target);
-
- // setup cache site to false
- InternalSiteManager.globalUseCache = false;
- }
-
- /**
- * Simple implementation of setUp. Subclasses are prevented
- * from overriding this method to maintain logging consistency.
- * umSetUp() should be overriden instead.
- */
- protected final void setUp() throws Exception {
- System.out.println("----- " + this.getName());
- System.out.println(this.getName() + ": setUp...");
- umSetUp();
- }
-
- /**
- * Sets up the fixture, for example, open a network connection.
- * This method is called before a test is executed.
- */
- protected void umSetUp() throws Exception {
- // do nothing.
- }
-
- /**
- * Simple implementation of tearDown. Subclasses are prevented
- * from overriding this method to maintain logging consistency.
- * umTearDown() should be overriden instead.
- */
- protected final void tearDown() throws Exception {
- System.out.println(this.getName() + ": tearDown...\n");
- umTearDown();
- }
-
- /**
- * Tears down the fixture, for example, close a network connection.
- * This method is called after a test is executed.
- */
- protected void umTearDown() throws Exception {
- // do nothing.
- }
-
- protected static String getHttpHost(){
- return UpdateTestsPlugin.getWebAppServerHost();
- }
-
- protected static int getHttpPort(){
- return UpdateTestsPlugin.getWebAppServerPort();
- }
-
- protected void remove(IFeature feature, IConfiguredSite configSite) throws CoreException{
- ISite site = configSite.getSite();
- remove(feature,site);
- }
-
- protected void remove(IFeature feature, ISite site) throws CoreException{
- IFeatureReference ref = 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);
- }
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/UpdateTestsPlugin.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/UpdateTestsPlugin.java
deleted file mode 100644
index 08dea26..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/UpdateTestsPlugin.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package org.eclipse.update.tests;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.core.runtime.*;
-import org.eclipse.help.AppServer;
-import org.eclipse.help.IAppServer;
-import org.eclipse.update.internal.core.UpdateManagerPlugin;
-
-/**
- * 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;
-
- public UpdateTestsPlugin(IPluginDescriptor descriptor) {
- super(descriptor);
- plugin = this;
- }
-
- public static UpdateTestsPlugin getPlugin(){
- return plugin;
- }
-
- /**
- * Called by Platform after loading the plugin
- */
- public void startup() throws CoreException {
- boolean result = AppServer.add("org.eclipse.update.tests.core.updatetests", "org.eclipse.update.tests.core", "webserver");
- appServerHost = AppServer.getHost();
- appServerPort = AppServer.getPort();
-
- String text = "The webServer ";
- text += (result)?"did":"didn't";
- text+= " start ip:"+getWebAppServerHost()+":"+getWebAppServerPort();
-
- System.out.println(text);
- if (!result) {
- IStatus status = new Status(IStatus.ERROR,"org.eclipse.update.tests.core",IStatus.OK,"WebServer not started. Update Tests results are invalid",null);
- throw new CoreException(status);
- }
- }
-
- /**
- * Shuts down this plug-in and discards all plug-in state.
- * @exception CoreException if this method fails to shut down
- * this plug-in
- */
- public void shutdown() throws CoreException {
- AppServer.remove("updatetests", "org.eclipse.update.tests.core");
- super.shutdown();
- }
-
- /**
- * Returns the host identifier for the web app server
- */
- public static String getWebAppServerHost() {
- return appServerHost;
- }
-
- /**
- * Returns the port identifier for the web app server
- */
- public static int getWebAppServerPort() {
- return appServerPort;
- }
-
-}
\ No newline at end of file
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 4a1b96e..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/AllAPITests.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.eclipse.update.tests.api;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.update.core.SiteManager;
-import org.eclipse.update.internal.core.UpdateManagerUtils;
-import org.eclipse.update.tests.UpdateManagerTestCase;
-import java.io.File;
-import junit.framework.*;
-
-/**
- * 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;
- }
-}
\ No newline at end of file
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 51c26d5..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/DefaultFeature.java
+++ /dev/null
@@ -1,165 +0,0 @@
-package org.eclipse.update.tests.api;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-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) {
- 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 3b6de73..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/MyURLEntry.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.eclipse.update.tests.api;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-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 8ddd809..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestDefaultExecutableFeatureAPI.java
+++ /dev/null
@@ -1,202 +0,0 @@
-package org.eclipse.update.tests.api;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.update.core.*;
-import org.eclipse.update.core.FeatureReference;
-import org.eclipse.update.internal.core.UpdateManagerUtils;
-import org.eclipse.update.tests.UpdateManagerTestCase;
-
-
-
-public class TestDefaultExecutableFeatureAPI extends UpdateManagerTestCase {
-
- private DefaultFeature remoteFeature=null;
-
- /**
- * Test the testFeatures()
- */
- public TestDefaultExecutableFeatureAPI(String arg0) {
- super(arg0);
- }
-
- /**
- * the feature to test
- */
- private DefaultFeature getFeature() throws MalformedURLException, CoreException {
- if (remoteFeature == null){
-
- ISite site = SiteManager.getSite(SOURCE_FILE_SITE);
- URL url = UpdateManagerUtils.getURL(site.getURL(),"testAPI/"+Site.DEFAULT_INSTALLED_FEATURE_PATH+"feature3/",null);
- SiteFeatureReference ref = new SiteFeatureReference();
- ref.setSite(site);
- ref.setURL(url);
- IFeature feature = ref.getFeature();
- remoteFeature = new DefaultFeature(feature,site);
-
- }
- return remoteFeature;
- }
-
- /**
- * @see IFeature#testIdentifier()
- */
- public void testIdentifier() throws CoreException, MalformedURLException {
- String id1 = "xmls/apitests/org.eclipse.test.feature_1.0.0/";
- String id2 = "xmls/apitests/org.eclipse_test_feature";
- VersionedIdentifier ident1 = new VersionedIdentifier("org.test1.ident1","1.0.0");
- VersionedIdentifier ident2 = new VersionedIdentifier("org.test1.ident2","1.0.0");
-
-
- ISite site = SiteManager.getSite(SOURCE_FILE_SITE);
-
- URL url1 = UpdateManagerUtils.getURL(site.getURL(),id1,null);
- remoteFeature = new DefaultFeature(site);
- remoteFeature.setURL(url1);
- remoteFeature.setIdentifier(ident1);
- assertEquals(ident1.toString(),remoteFeature.getVersionedIdentifier().toString());
-
- URL url2 = UpdateManagerUtils.getURL(site.getURL(),id2,null);
- remoteFeature = new DefaultFeature(site);
- remoteFeature.setURL(url2);
- remoteFeature.setIdentifier(ident2);
- assertEquals(ident2.toString(),remoteFeature.getVersionedIdentifier().toString());
-
-
- }
-
-
- /**
- * @see IFeature#testSite()
- */
- public void testSite() throws MalformedURLException, CoreException{
- String ident1 = Site.DEFAULT_INSTALLED_FEATURE_PATH+"feature3/";
-
- ISite site = SiteManager.getSite(SOURCE_FILE_SITE);
-
- URL id = UpdateManagerUtils.getURL(site.getURL(),ident1,null);
- remoteFeature = new DefaultFeature(site);
- remoteFeature.setURL(id);
- assertEquals(site,remoteFeature.getSite());
-
- }
-
-
- /**
- * @see IFeature#testLabel()
- */
- public void testLabel() throws CoreException,MalformedURLException {
- String label = "dummy label";
- Feature feature = getFeature();
- feature.setLabel(label);
- assertEquals(label,feature.getLabel());
- }
-
-
- /**
- * @see IFeature#testUpdateURL()
- */
- public void testUpdateURL() throws CoreException,MalformedURLException {
- URL url = null;
- String label = "OTI Site";
- try {
- url = new URL("http://www.oti.com/");
-
- } catch (java.net.MalformedURLException e){} // impossible eh !
- DefaultFeature feature = getFeature();
- feature.setUpdateSiteEntry(new MyURLEntry(label, url));
- assertEquals(url,feature.getUpdateSiteEntry().getURL());
- assertEquals(label,feature.getUpdateSiteEntry().getAnnotation());
-
- }
-
-
-
- /**
- * @see IFeature#testDiscoveryURLs()
- */
- public void testDiscoveryURLs() throws CoreException,MalformedURLException {
- IURLEntry[] urlInfo = new MyURLEntry[2];
- URL[] url = new URL[2];
- String[] label = new String[2];
- try {
- url[0] = new URL("http://www.oti.com/");
- url[1] = new URL("http://eclipse.org/");
- label[0] = "OTI Site";
- label[1] = "Eclipse Site";
- } catch (java.net.MalformedURLException e){} // impossible eh !
- DefaultFeature feature = getFeature();
- for (int i=0;i<2;i++){
- urlInfo[i] = new MyURLEntry(label[i],url[i]);
- }
- feature.setDiscoverySiteEntries(urlInfo);
- for (int i=0; i<feature.getDiscoverySiteEntries().length;i++){
- assertEquals(urlInfo[i],feature.getDiscoverySiteEntries()[i]);
- }
-
- }
-
-
- /**
- * @see IFeature#testProvider()
- */
- public void testProvider() throws CoreException,MalformedURLException {
- String provider = "not so dummy provider";
- IFeature feature = getFeature();
- ((Feature)feature).setProvider(provider);
- assertEquals(provider,feature.getProvider());
- }
-
-
- /**
- * @see IFeature#testDescription()
- */
- public void testDescription() throws CoreException,MalformedURLException {
- String desc = "pretty long description as a string with \r\n and \t and \n";
- IURLEntry info = new MyURLEntry(desc,null);
- DefaultFeature feature = getFeature();
- feature.setDescription(info);
- assertEquals(desc,feature.getDescription().getAnnotation());
- }
-
- /**
- * @see IFeature#testDescription()
- */
- public void testDescription1() throws CoreException, MalformedURLException {
- URL url = null;
- try {
- url = new URL("http://www.oti.com");
- } catch (MalformedURLException e){/*pretty impossible*/}
- IURLEntry info = new MyURLEntry(null,url);
- DefaultFeature feature = getFeature();
- feature.setDescription(info);
- assertEquals(url,feature.getDescription().getURL());
- }
-
- /**
- * @see IFeature#testDescription()
- */
- public void testDescription2() throws CoreException, MalformedURLException {
-
- URL url = null;
- try {
- url = new URL("http://www.oti.com");
- } catch (MalformedURLException e){/*pretty impossible*/}
- String desc = "pretty long description as a string with \r\n and \t and \n";
- IURLEntry info = new MyURLEntry(desc,url);
- DefaultFeature feature = getFeature();
- feature.setDescription(info);
- String result = feature.getDescription().getAnnotation();
- assertEquals(desc,result);
- assertEquals(url,feature.getDescription().getURL());
- }
-
-
-
-}
-
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestDefaultPackageFeatureAPI.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestDefaultPackageFeatureAPI.java
deleted file mode 100644
index 214f28d..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestDefaultPackageFeatureAPI.java
+++ /dev/null
@@ -1,195 +0,0 @@
-package org.eclipse.update.tests.api;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.core.UpdateManagerUtils;
-import org.eclipse.update.tests.UpdateManagerTestCase;
-
-
-
-public class TestDefaultPackageFeatureAPI extends UpdateManagerTestCase {
-
- private DefaultFeature remoteFeature=null;
-
- /**
- * Test the testFeatures()
- */
- public TestDefaultPackageFeatureAPI(String arg0) {
- super(arg0);
- }
-
- /**
- * the feature to test
- */
- private DefaultFeature getFeature() throws MalformedURLException, CoreException {
- if (remoteFeature == null){
- ISite site = SiteManager.getSite(SOURCE_FILE_SITE);
- URL id = UpdateManagerUtils.getURL(site.getURL(),"org.eclipse.update.core.feature1_1.0.0.jar",null);
- remoteFeature = new DefaultFeature(site);
- remoteFeature.setURL(id);
- }
- return remoteFeature;
- }
-
- /**
- * @see IFeature#testIdentifier()
- */
- public void testIdentifier() throws CoreException, MalformedURLException {
-
- String id1 = "features/org.eclipse.test.feature_1.0.0.jar";
- String id2 = "features/org.eclipse_test_feature.jar";
- VersionedIdentifier ident1 = new VersionedIdentifier("org.test1.ident1","1.0.0");
- VersionedIdentifier ident2 = new VersionedIdentifier("org.test1.ident2","1.0.0");
-
-
- ISite site = SiteManager.getSite(SOURCE_FILE_SITE);
-
- URL url1 = UpdateManagerUtils.getURL(site.getURL(),id1,null);
- remoteFeature = new DefaultFeature(site);
- remoteFeature.setURL(url1);
- remoteFeature.setIdentifier(ident1);
- assertEquals(ident1.toString(),remoteFeature.getVersionedIdentifier().toString());
-
- URL url2 = UpdateManagerUtils.getURL(site.getURL(),id2,null);
- remoteFeature = new DefaultFeature(site);
- remoteFeature.setURL(url2);
- remoteFeature.setIdentifier(ident2);
- assertEquals(ident2.toString(),remoteFeature.getVersionedIdentifier().toString());
- }
-
-
- /**
- * @see IFeature#testSite()
- */
- public void testSite() throws MalformedURLException, CoreException {
- String ident1 = "org.eclipse.test.feature_1.0.0.jar";
-
- ISite site = SiteManager.getSite(SOURCE_FILE_SITE);
-
- URL id = UpdateManagerUtils.getURL(site.getURL(),ident1,null);
- remoteFeature = new DefaultFeature(site);
- remoteFeature.setURL(id);
- assertEquals(site,remoteFeature.getSite());
-
- }
-
-
- /**
- * @see IFeature#testLabel()
- */
- public void testLabel() throws CoreException, MalformedURLException {
- String label = "dummy label";
- Feature feature = getFeature();
- feature.setLabel(label);
- assertEquals(label,feature.getLabel());
- }
-
-
- /**
- * @see IFeature#testUpdateURL()
- */
- public void testUpdateURL() throws CoreException, MalformedURLException {
- URL url = null;
- String label = "OTI Site";
- try {
- url = new URL("http://www.oti.com/");
-
- } catch (java.net.MalformedURLException e){} // impossible eh !
- DefaultFeature feature = getFeature();
- feature.setUpdateSiteEntry(new MyURLEntry(label, url));
- assertEquals(url,feature.getUpdateSiteEntry().getURL());
- assertEquals(label,feature.getUpdateSiteEntry().getAnnotation());
-
- }
-
-
-
- /**
- * @see IFeature#testDiscoveryURLs()
- */
- public void testDiscoveryURLs() throws CoreException, MalformedURLException {
- IURLEntry[] urlInfo = new URLEntry[2];
- URL[] url = new URL[2];
- String[] label = new String[2];
- try {
- url[0] = new URL("http://www.oti.com/");
- url[1] = new URL("http://eclipse.org/");
- label[0] = "OTI Site";
- label[1] = "Eclipse Site";
- } catch (java.net.MalformedURLException e){} // impossible eh !
- DefaultFeature feature = getFeature();
- for (int i=0;i<2;i++){
- urlInfo[i] = new MyURLEntry(label[i],url[i]);
- }
- feature.setDiscoverySiteEntries(urlInfo);
- for (int i=0; i<feature.getDiscoverySiteEntries().length;i++){
- assertEquals(urlInfo[i],feature.getDiscoverySiteEntries()[i]);
- }
-
-
- }
-
-
- /**
- * @see IFeature#testProvider()
- */
- public void testProvider() throws CoreException, MalformedURLException {
- String provider = "not so dummy provider";
- Feature feature = getFeature();
- feature.setProvider(provider);
- assertEquals(provider,feature.getProvider());
- }
-
-
- /**
- * @see IFeature#testDescription()
- */
- public void testDescription() throws CoreException, MalformedURLException {
- String desc = "pretty long description as a string with \r\n and \t and \n";
- IURLEntry info = new MyURLEntry(desc,null);
- DefaultFeature feature = getFeature();
- feature.setDescription(info);
- assertEquals(desc,feature.getDescription().getAnnotation());
- }
-
- /**
- * @see IFeature#testDescription()
- */
- public void testDescription1() throws CoreException, MalformedURLException {
- URL url = null;
- try {
- url = new URL("http://www.oti.com");
- } catch (MalformedURLException e){/*pretty impossible*/}
- IURLEntry info = new MyURLEntry(null,url);
- DefaultFeature feature = getFeature();
- feature.setDescription(info);
- assertEquals(url,feature.getDescription().getURL());
- }
-
- /**
- * @see IFeature#testDescription()
- */
- public void testDescription2() throws CoreException, MalformedURLException {
-
- URL url = null;
- try {
- url = new URL("http://www.oti.com");
- } catch (MalformedURLException e){/*pretty impossible*/}
- String desc = "pretty long description as a string with \r\n and \t and \n";
- IURLEntry info = new MyURLEntry(desc,url);
- DefaultFeature feature = getFeature();
- feature.setDescription(info);
- assertEquals(desc,feature.getDescription().getAnnotation());
- assertEquals(url,feature.getDescription().getURL());
- }
-
-
-
-}
-
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestFeatureContentProvider_FileFilterAPI.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestFeatureContentProvider_FileFilterAPI.java
deleted file mode 100644
index 83d0a82..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestFeatureContentProvider_FileFilterAPI.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package org.eclipse.update.tests.api;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.update.core.*;
-import org.eclipse.update.core.FeatureReference;
-import org.eclipse.update.internal.core.FeatureExecutableContentProvider;
-import org.eclipse.update.internal.core.UpdateManagerUtils;
-import org.eclipse.update.tests.UpdateManagerTestCase;
-
-
-
-public class TestFeatureContentProvider_FileFilterAPI extends UpdateManagerTestCase {
-
- private DefaultFeature remoteFeature=null;
-
- /**
- * Test the testFeatures()
- */
- public TestFeatureContentProvider_FileFilterAPI(String arg0) {
- super(arg0);
- }
-
- public void testFileFilter(){
-
- String p1 = "/p1/p2/a.*";
- String p2 = "p1/p2/b.*";
- String p3 = "/p1/p2/a.txt";
- String p4 = "/p1/p2/*.txt";
-
- String name1 = "/p1/p2/a.txt";
- String name2 = "/p1/p2/b.txt";
- String name3 = "/p3/p2/a.txt";
- String name4 = "p1/p2/a.txt";
- String name5 = "/p1/p2/b.txt";
- String name6 = "/p1/p2/c.txt";
- String name7 = "/p1/p2/p3/a.txt";
-
-
- FeatureContentProvider cp = new FeatureExecutableContentProvider(null);
-
- FeatureContentProvider.FileFilter filter1 = cp.new FileFilter(p1);
- FeatureContentProvider.FileFilter filter2 = cp.new FileFilter(p2);
- FeatureContentProvider.FileFilter filter3 = cp.new FileFilter(p3);
- FeatureContentProvider.FileFilter filter4 = cp.new FileFilter(p4);
-
- assertTrue("1.1",filter1.accept(name1));
- assertTrue("1.2",!filter1.accept(name2));
- assertTrue("1.3",!filter1.accept(name3));
- assertTrue("1.4",!filter1.accept(name4));
- assertTrue("1.5",!filter1.accept(name5));
- assertTrue("1.6",!filter1.accept(name6));
- assertTrue("1.7",!filter1.accept(name7));
-
- assertTrue("2.1",!filter2.accept(name1));
- assertTrue("2.2",!filter2.accept(name2));
- assertTrue("2.3",!filter2.accept(name3));
- assertTrue("2.4",!filter2.accept(name4));
- assertTrue("2.5",!filter2.accept(name5));
- assertTrue("2.6",!filter2.accept(name6));
- assertTrue("2.7",!filter2.accept(name7));
-
- assertTrue("3.1",filter3.accept(name1));
- assertTrue("3.2",!filter3.accept(name2));
- assertTrue("3.3",!filter3.accept(name3));
- assertTrue("3.4",!filter3.accept(name4));
- assertTrue("3.5",!filter3.accept(name5));
- assertTrue("3.6",!filter3.accept(name6));
- assertTrue("3.7",!filter3.accept(name7));
-
- assertTrue("4.1",filter4.accept(name1));
- assertTrue("4.2",filter4.accept(name2));
- assertTrue("4.3",!filter4.accept(name3));
- assertTrue("4.4",!filter4.accept(name4));
- assertTrue("4.5",filter4.accept(name5));
- assertTrue("4.6",filter4.accept(name6));
- assertTrue("4.7",!filter4.accept(name7));
-
- }
-}
-
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestLocalSiteAPI.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestLocalSiteAPI.java
deleted file mode 100644
index 2eb8bb2..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestLocalSiteAPI.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package org.eclipse.update.tests.api;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import java.net.URL;
-
-import org.eclipse.update.core.*;
-import org.eclipse.update.core.ICategory;
-import org.eclipse.update.core.Category;
-import org.eclipse.update.core.model.CategoryModel;
-import org.eclipse.update.core.model.SiteModel;
-import org.eclipse.update.core.model.*;
-import org.eclipse.update.core.FeatureReference;
-import org.eclipse.update.tests.UpdateManagerTestCase;
-
-public class TestLocalSiteAPI extends UpdateManagerTestCase {
-
- /**
- * Test the getFeatures()
- */
- public TestLocalSiteAPI(String arg0) {
- super(arg0);
- }
-
- public void testFileParsing() throws Exception {
-
- ISite site = SiteManager.getSite(new URL(SOURCE_FILE_SITE,"siteTestLocalSite/"));
- IArchiveReference[] info = site.getArchives();
-
- if (info.length<=0){
- fail("no plugins in site: "+site.getURL().toExternalForm());
- }
-
- boolean found1 = false;
- boolean found2 = false;
- String name1= "plugins/org.eclipse.update.core.tests.feature1.plugin2_5.0.0.jar";
- String name2 = "plugins/org.eclipse.update.core.tests.feature1.plugin2_5.0.1.jar";
-
- for (int i =0; i<info.length; i++){
- if (info[i].getPath().equals(name1)) found1 = true;
- if (info[i].getPath().equals(name2)) found2 = true;
- }
-
- if (!found1 || !found2){
- fail("Cannot find plugin : org.eclipse.update.core.tests.feature1.plugin2 version 5.0.0 and 5.0.1 on the site, by parsing file system");
- }
-
-
- }
-
-
- public void testCategories() throws Exception {
-
- ISite site = SiteManager.getSite(SOURCE_FILE_SITE);
-
- ICategory category = new Category("category","Label of category");
-
- ((SiteModel)site).addCategoryModel((CategoryModel)category);
-
- ICategory[] categories = site.getCategories();
- boolean found = false;
- for (int index = 0; index < categories.length; index++) {
- ICategory element = categories[index];
- if (element.getName().equals("category")) found = true;
- }
- if (!found) fail("cannot find category 'category' in site");
-
- ISiteFeatureReference ref = new SiteFeatureReference();
- ref.setSite(site);
- ref.addCategory(category);
- categories = ref.getCategories();
- found = false;
- for (int index = 0; index < categories.length; index++) {
- ICategory element = categories[index];
- if (element.getName().equals("category")) found = true;
- }
- if (!found) fail("cannot find category 'category' in feature");
-
- }
-
-}
-
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestNestedFeatureAPI.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestNestedFeatureAPI.java
deleted file mode 100644
index 653743a..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestNestedFeatureAPI.java
+++ /dev/null
@@ -1,192 +0,0 @@
-package org.eclipse.update.tests.api;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.update.core.*;
-import org.eclipse.update.core.FeatureReference;
-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/"));
- URL url =
- UpdateManagerUtils.getURL(
- site.getURL(),
- Site.DEFAULT_INSTALLED_FEATURE_PATH
- + "rootfeature.jar",
- null);
- SiteFeatureReference ref = new SiteFeatureReference();
- ref.setSite(site);
- ref.setURL(url);
- ref.setType(ISite.DEFAULT_PACKAGED_FEATURE_TYPE);
- IFeature feature = ref.getFeature();
- return feature;
- }
-
- /**
- * the feature to test
- */
- private IFeature getChildFeature()
- throws MalformedURLException, CoreException {
-
- ISite site = SiteManager.getSite(new URL(SOURCE_FILE_SITE,"nestedFeatureSiteTest/"));
- URL url =
- UpdateManagerUtils.getURL(
- site.getURL(),
- Site.DEFAULT_INSTALLED_FEATURE_PATH
- + "org.eclipse.update.core.tests.childrenfeature_2.0.0.jar",
- null);
- SiteFeatureReference ref = new SiteFeatureReference();
- ref.setSite(site);
- ref.setURL(url);
- ref.setType(ISite.DEFAULT_PACKAGED_FEATURE_TYPE);
- IFeature feature = ref.getFeature();
- return feature;
- }
-
- /*
- *
- */
- public void testNested() throws Exception {
-
- IFeature rootFeature = getRootFeature();
- IFeatureReference[] ref = rootFeature.getIncludedFeatureReferences();
- IFeature childFeature = getChildFeature();
- assertEquals(
- "Children feature are not equal",
- childFeature,
- ref[0].getFeature());
- }
-
-
-
- /**
- * the feature to test
- */
- private IFeature getRootFeature2() throws MalformedURLException, CoreException {
- ISite site = SiteManager.getSite(new URL(SOURCE_FILE_SITE,"nestedFeatureSiteTest2/"));
- URL url =
- UpdateManagerUtils.getURL(
- site.getURL(),
- Site.DEFAULT_INSTALLED_FEATURE_PATH
- + "rootfeature.jar",
- null);
- SiteFeatureReference ref = new SiteFeatureReference();
- ref.setSite(site);
- ref.setURL(url);
- ref.setType(ISite.DEFAULT_PACKAGED_FEATURE_TYPE);
- IFeature feature = ref.getFeature();
- return feature;
- }
-
- /**
- * the feature to test
- */
- private IFeature getChildFeature2()
- throws MalformedURLException, CoreException {
-
- ISite site = SiteManager.getSite(new URL(SOURCE_FILE_SITE,"nestedFeatureSiteTest2/"));
- URL url =
- UpdateManagerUtils.getURL(
- site.getURL(),
- Site.DEFAULT_INSTALLED_FEATURE_PATH
- + "childrenfeature.jar",
- null);
- SiteFeatureReference ref = new SiteFeatureReference();
- ref.setSite(site);
- ref.setURL(url);
- ref.setType(ISite.DEFAULT_PACKAGED_FEATURE_TYPE);
- IFeature feature = ref.getFeature();
- return feature;
- }
-
-
- /*
- *
- */
- public void testNested2() throws Exception {
-
- IFeature rootFeature = getRootFeature2();
- IFeatureReference[] ref = rootFeature.getIncludedFeatureReferences();
- IFeature childFeature = getChildFeature2();
- assertEquals(
- "Children feature are not equal",
- childFeature,
- ref[0].getFeature());
- }
-
-
- /**
- * the feature to test
- */
- private IFeature getRootFeature3() throws MalformedURLException, CoreException {
- ISite site = SiteManager.getSite(new URL(SOURCE_FILE_SITE,"nestedFeatureSiteTest3/"));
- URL url =
- UpdateManagerUtils.getURL(
- site.getURL(),
- Site.DEFAULT_INSTALLED_FEATURE_PATH
- + "rootfeature.jar",
- null);
- SiteFeatureReference ref = new SiteFeatureReference();
- ref.setSite(site);
- ref.setURL(url);
- ref.setType(ISite.DEFAULT_PACKAGED_FEATURE_TYPE);
- IFeature feature = ref.getFeature();
- return feature;
- }
-
- /**
- * the feature to test
- */
- private IFeature getChildFeature3()
- throws MalformedURLException, CoreException {
-
- ISite site = SiteManager.getSite(new URL(SOURCE_FILE_SITE,"nestedFeatureSiteTest3/"));
- URL url =
- UpdateManagerUtils.getURL(
- site.getURL(),
- Site.DEFAULT_INSTALLED_FEATURE_PATH
- + "childrenfeature.jar",
- null);
- SiteFeatureReference ref = new SiteFeatureReference();
- ref.setSite(site);
- ref.setURL(url);
- ref.setType(ISite.DEFAULT_PACKAGED_FEATURE_TYPE);
- IFeature feature = ref.getFeature();
- return feature;
- }
-
-
- /*
- *
- */
- public void testNested3() throws Exception {
-
- IFeature rootFeature = getRootFeature3();
- IFeatureReference[] ref = rootFeature.getIncludedFeatureReferences();
- IFeature childFeature = getChildFeature3();
- assertEquals(
- "Children feature are not equal",
- childFeature,
- ref[0].getFeature());
- }
-
-
-}
\ No newline at end of file
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 97a697c..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestPluginContainerAPI.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.eclipse.update.tests.api;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.core.UpdateManagerUtils;
-import org.eclipse.update.tests.UpdateManagerTestCase;
-
-public class TestPluginContainerAPI extends UpdateManagerTestCase {
-
- private Site site;
- private DefaultFeature feature;
-
- /**
- * the Site to test
- */
- private Site getSite() throws CoreException, MalformedURLException {
- if (site == null) {
-
- site = (Site)SiteManager.getSite(new URL(SOURCE_FILE_SITE,"testAPI/"));
-
- }
- return site;
- }
-
- /**
- * the feature to test
- */
- private DefaultFeature getFeature() throws MalformedURLException, CoreException {
- if (feature == null) {
- ISite site = getSite();
- URL id = UpdateManagerUtils.getURL(site.getURL(),"org.eclipse.update.core.feature1_1.0.0.jar",null);
- feature = new DefaultFeature(site);
- feature.setURL(id);
- }
- return feature;
- }
-
- /**
- * Test the getFeatures()
- */
- public TestPluginContainerAPI(String arg0) throws CoreException {
- super(arg0);
- }
-
- public void testAbstractFeature() throws CoreException, MalformedURLException {
- PluginEntry pluginEntry = new PluginEntry();
- pluginEntry.setVersionedIdentifier(new VersionedIdentifier("id", "6"));
- Feature _feature = getFeature();
- ((DefaultFeature)_feature).addPluginEntry(pluginEntry);
- assertEquals(_feature.getPluginEntryCount(), 1);
- assertEquals(_feature.getPluginEntries()[0], pluginEntry);
-
- }
-
- public void testAbstactSite() throws CoreException, MalformedURLException {
- PluginEntry pluginEntry = new PluginEntry();
- pluginEntry.setVersionedIdentifier(new VersionedIdentifier("id", "6"));
- Site _site = getSite();
- _site.addPluginEntry(pluginEntry);
- assertEquals(_site.getPluginEntryCount(), 1);
- assertEquals(_site.getPluginEntries()[0], pluginEntry);
-
- }
-
-}
\ No newline at end of file
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 b37a9be..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestSiteAPI.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.eclipse.update.tests.api;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import java.io.File;
-import java.net.URL;
-
-import org.eclipse.update.core.ISite;
-import org.eclipse.update.core.SiteManager;
-import org.eclipse.update.tests.UpdateManagerTestCase;
-
-public class TestSiteAPI extends UpdateManagerTestCase {
-
- /**
- * Test the getFeatures()
- */
- public TestSiteAPI(String arg0) {
- super(arg0);
- }
-
- public void testURL() throws Exception {
-
- ISite site = SiteManager.getSite(SOURCE_FILE_SITE);
- assertEquals(new File(site.getURL().getFile()),new File(SOURCE_FILE_SITE.getFile()));
-
- ISite site2 = SiteManager.getSite(SOURCE_HTTP_SITE);
- assertEquals(site2.getURL(),new URL("http", getHttpHost(),getHttpPort(), bundle.getString("HTTP_PATH_1")+"site.xml"));
-
- }
-
-}
-
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestSiteManagerAPI.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestSiteManagerAPI.java
deleted file mode 100644
index 0a41260..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestSiteManagerAPI.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.eclipse.update.tests.api;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import java.io.File;
-import java.net.URL;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.update.core.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.internal.core.*;
-import org.eclipse.update.tests.UpdateManagerTestCase;
-
-public class TestSiteManagerAPI extends UpdateManagerTestCase {
-
- /**
- * Test the getFeatures()
- */
- public TestSiteManagerAPI(String arg0) {
- super(arg0);
- }
-
- public void testFile() throws Exception {
- ISite fileSite = SiteManager.getSite(TARGET_FILE_SITE);
- String site = fileSite.getURL().toExternalForm();
- assertEquals(TARGET_FILE_SITE.toExternalForm(), site);
- }
-
- public void testUnknown() throws Exception {
- URL url = new URL("ftp://255.255.255.255/");
- try {
- SiteManager.getSite(url);
- fail("Connected to ftp://255.255.255.255/, should not happen");
- } catch (CoreException e){
- // expected
- } catch (IllegalArgumentException e){
- // expected as the version of the WebDav HTTP Connection returns so
- }
- }
-
- public void testLocalSite() throws Exception {
-
- ILocalSite site = SiteManager.getLocalSite();
- IConfiguredSite[] instSites = site.getCurrentConfiguration().getConfiguredSites();
- assertTrue(instSites.length>0);
- System.out.println("Local Site:"+instSites[0].getSite().getURL().toExternalForm());
-
- ISite remoteSite = SiteManager.getSite(SOURCE_FILE_SITE_INSTALLED);
- IFeature remoteFeature = remoteSite.getFeatureReferences()[0].getFeature();
- remove(remoteFeature,instSites[0].getSite());
- instSites[0].getSite().install(remoteFeature,null,null);
-
- IFeatureReference[] features = site.getCurrentConfiguration().getConfiguredSites()[0].getSite().getFeatureReferences();
- assertTrue(features.length>0);
-
- //cleanup
- assertNotNull(remoteFeature);
- File file = new File(instSites[0].getSite().getURL().getFile()+File.separator+Site.DEFAULT_INSTALLED_FEATURE_PATH+remoteFeature.getVersionedIdentifier());
- UpdateManagerUtils.removeFromFileSystem(file);
- file = new File(instSites[0].getSite().getURL().getFile()+File.separator+Site.DEFAULT_PLUGIN_PATH+"org.eclipse.update.plugin1_1.1.1");
- UpdateManagerUtils.removeFromFileSystem(file);
- File localFile = new File(new URL(((SiteLocal)SiteManager.getLocalSite()).getLocationURL(),SiteLocal.SITE_LOCAL_FILE).getFile());
- UpdateManagerUtils.removeFromFileSystem(localFile);
- UpdateManagerUtils.removeFromFileSystem(new File(((InstallConfiguration)site.getCurrentConfiguration()).getURL().getFile()));
-
-
- }
-
-
-}
-
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestUpdateManagerUtilsAPI.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestUpdateManagerUtilsAPI.java
deleted file mode 100644
index ade0fcd..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestUpdateManagerUtilsAPI.java
+++ /dev/null
@@ -1,227 +0,0 @@
-package org.eclipse.update.tests.api;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import java.io.File;
-import java.net.URL;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.update.core.ISite;
-import org.eclipse.update.core.SiteManager;
-import org.eclipse.update.internal.core.UpdateManagerUtils;
-import org.eclipse.update.tests.UpdateManagerTestCase;
-
-public class TestUpdateManagerUtilsAPI extends UpdateManagerTestCase {
-
- /**
- * Test the getFeatures()
- */
- public TestUpdateManagerUtilsAPI(String arg0) {
- super(arg0);
- }
-
- public void testgetURL() throws Exception {
- URL url1 = new URL("http://www.eclipse.org");
- URL url2 = new URL("file://c:/hello");
- URL url3 = new URL("file:/home/eclipse/");
- URL url4 = new URL("ftp:/host:8080/path/");
- URL url5 = new URL("jar:file:/tmp/100100!/");
-
- String default1 = "default1/default";
- String default2 = "/default2/";
-
- String str1 = "http://dev.eclipse.org";
- String str2 = "relative1/path/";
- String str3 = "/relative2/path";
-
- String result1=null;
- String result2=null;
-
- //****************************************************************************************
- // 1.0
- result1 = UpdateManagerUtils.getURL(url1,str1,default1).toExternalForm();
- result2 = "http://dev.eclipse.org";
- assertEquals("1.0",result2,result1);
-
- // 1.1
- result1 = UpdateManagerUtils.getURL(null,str1,null).toExternalForm();
- result2 = "http://dev.eclipse.org";
- assertEquals("1.1",result2,result1);
-
- // 1.2
- result1 = UpdateManagerUtils.getURL(url1,str1,null).toExternalForm();
- result2 = "http://dev.eclipse.org";
- assertEquals("1.2",result2,result1);
-
- // 1.3
- result1 = UpdateManagerUtils.getURL(url1,str2,default1).toExternalForm();
- result2 = "http://www.eclipse.org/relative1/path/";
- assertEquals("1.3",result2,result1);
-
- // 1.4
- result1 = UpdateManagerUtils.getURL(url1,str3,default1).toExternalForm();
- result2 = "http://www.eclipse.org/relative2/path";
- assertEquals("1.4",result2,result1);
-
- // 1.5
- result1 = UpdateManagerUtils.getURL(url1,null,default1).toExternalForm();
- result2 = "http://www.eclipse.org/default1/default";
- assertEquals("1.5",result2,result1);
-
- // 1.6
- result1 = UpdateManagerUtils.getURL(url1,null,default2).toExternalForm();
- result2 = "http://www.eclipse.org/default2/";
- assertEquals("1.6",result2,result1);
-
- //****************************************************************************************
- // 2.0
- result1 = UpdateManagerUtils.getURL(url2,str1,default1).toExternalForm();
- result2 = "http://dev.eclipse.org";
- assertEquals("2.0",result2,result1);
-
- // 2.1
- result1 = UpdateManagerUtils.getURL(null,str1,null).toExternalForm();
- result2 = "http://dev.eclipse.org";
- assertEquals("2.1",result2,result1);
-
- // 2.2
- result1 = UpdateManagerUtils.getURL(url2,str1,null).toExternalForm();
- result2 = "http://dev.eclipse.org";
- assertEquals("2.2",result2,result1);
-
- // 2.3
- result1 = UpdateManagerUtils.getURL(url2,str2,default1).toExternalForm();
- result2 = "file://c:/relative1/path/";
- assertEquals("2.3",result2,result1);
-
- // 2.4
- result1 = UpdateManagerUtils.getURL(url2,str3,default1).toExternalForm();
- result2 = "file://c:/relative2/path";
- assertEquals("2.4",result2,result1);
-
- // 2.5
- result1 = UpdateManagerUtils.getURL(url2,null,default1).toExternalForm();
- result2 = "file://c:/default1/default";
- assertEquals("2.5",result2,result1);
-
- // 2.6
- result1 = UpdateManagerUtils.getURL(url2,null,default2).toExternalForm();
- result2 = "file://c:/default2/";
- assertEquals("2.6",result2,result1);
-
-
- //****************************************************************************************
- // 3.0
- result1 = UpdateManagerUtils.getURL(url3,str1,default1).toExternalForm();
- result2 = "http://dev.eclipse.org";
- assertEquals("3.0",result2,result1);
-
- // 3.1
- result1 = UpdateManagerUtils.getURL(null,str1,null).toExternalForm();
- result2 = "http://dev.eclipse.org";
- assertEquals("3.1",result2,result1);
-
- // 3.2
- result1 = UpdateManagerUtils.getURL(url3,str1,null).toExternalForm();
- result2 = "http://dev.eclipse.org";
- assertEquals("3.2",result2,result1);
-
- // 3.3
- result1 = UpdateManagerUtils.getURL(url3,str2,default1).toExternalForm();
- result2 = "file:/home/eclipse/relative1/path/";
- assertEquals("3.3",result2,result1);
-
- // 3.4
- result1 = UpdateManagerUtils.getURL(url3,str3,default1).toExternalForm();
- result2 = "file:/home/eclipse/relative2/path";
- assertEquals("3.4",result2,result1);
-
- // 3.5
- result1 = UpdateManagerUtils.getURL(url3,null,default1).toExternalForm();
- result2 = "file:/home/eclipse/default1/default";
- assertEquals("3.5",result2,result1);
-
- // 3.6
- result1 = UpdateManagerUtils.getURL(url3,null,default2).toExternalForm();
- result2 = "file:/home/eclipse/default2/";
- assertEquals("3.6",result2,result1);
-
- //****************************************************************************************
- // 4.0
- result1 = UpdateManagerUtils.getURL(url4,str1,default1).toExternalForm();
- result2 = "http://dev.eclipse.org";
- assertEquals("4.0",result2,result1);
-
- // 4.1
- result1 = UpdateManagerUtils.getURL(null,str1,null).toExternalForm();
- result2 = "http://dev.eclipse.org";
- assertEquals("4.1",result2,result1);
-
- // 4.2
- result1 = UpdateManagerUtils.getURL(url4,str1,null).toExternalForm();
- result2 = "http://dev.eclipse.org";
- assertEquals("4.2",result2,result1);
-
- // 4.3
- result1 = UpdateManagerUtils.getURL(url4,str2,default1).toExternalForm();
- result2 = "ftp:/host:8080/path/relative1/path/";
- assertEquals("4.3",result2,result1);
-
- // 4.4
- result1 = UpdateManagerUtils.getURL(url4,str3,default1).toExternalForm();
- result2 = "ftp:/host:8080/path/relative2/path";
- assertEquals("4.4",result2,result1);
-
- // 4.5
- result1 = UpdateManagerUtils.getURL(url4,null,default1).toExternalForm();
- result2 = "ftp:/host:8080/path/default1/default";
- assertEquals("4.5",result2,result1);
-
- // 4.6
- result1 = UpdateManagerUtils.getURL(url4,null,default2).toExternalForm();
- result2 = "ftp:/host:8080/path/default2/";
- assertEquals("4.6",result2,result1);
-
- //****************************************************************************************
- // 5.0
- result1 = UpdateManagerUtils.getURL(url5,str1,default1).toExternalForm();
- result2 = "http://dev.eclipse.org";
- assertEquals("5.0",result2,result1);
-
- // 5.1
- result1 = UpdateManagerUtils.getURL(null,str1,null).toExternalForm();
- result2 = "http://dev.eclipse.org";
- assertEquals("5.1",result2,result1);
-
- // 5.2
- result1 = UpdateManagerUtils.getURL(url5,str1,null).toExternalForm();
- result2 = "http://dev.eclipse.org";
- assertEquals("5.2",result2,result1);
-
- // 5.3
- result1 = UpdateManagerUtils.getURL(url5,str2,default1).toExternalForm();
- result2 = "jar:file:/tmp/100100!/relative1/path/";
- assertEquals("5.3",result2,result1);
-
- // 5.4
- result1 = UpdateManagerUtils.getURL(url5,str3,default1).toExternalForm();
- result2 = "jar:file:/tmp/100100!/relative2/path";
- assertEquals("5.4",result2,result1);
-
- // 5.5
- result1 = UpdateManagerUtils.getURL(url5,null,default1).toExternalForm();
- result2 = "jar:file:/tmp/100100!/default1/default";
- assertEquals("5.5",result2,result1);
-
- // 5.6
- result1 = UpdateManagerUtils.getURL(url5,null,default2).toExternalForm();
- result2 = "jar:file:/tmp/100100!/default2/";
- assertEquals("5.6",result2,result1);
-
- }
-
-
-
-}
-
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/configurations/AllConfigurationsTests.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/configurations/AllConfigurationsTests.java
deleted file mode 100644
index e24d856..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/configurations/AllConfigurationsTests.java
+++ /dev/null
Binary files differ
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 185783a..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/configurations/TestBackward.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.eclipse.update.tests.configurations;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import java.io.File;
-import java.net.URL;
-
-import org.eclipse.core.boot.IPlatformConfiguration;
-import org.eclipse.update.core.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.model.*;
-import org.eclipse.update.internal.core.*;
-import org.eclipse.update.internal.core.ConfigurationPolicy;
-import org.eclipse.update.internal.core.InternalSiteManager;
-import org.eclipse.update.internal.core.SiteLocal;
-import org.eclipse.update.internal.core.UpdateManagerUtils;
-import org.eclipse.update.internal.model.*;
-import org.eclipse.update.internal.model.ConfiguredSiteModel;
-import org.eclipse.update.internal.model.InstallConfigurationModel;
-import org.eclipse.update.tests.UpdateManagerTestCase;
-import org.eclipse.update.tests.regularInstall.*;
-
-public class TestBackward extends UpdateManagerTestCase {
-
- /**
- * Test the getFeatures()
- */
- public TestBackward(String arg0) {
- super(arg0);
- }
-
- public void testSimpleBackward() throws Exception {
-
- // cleanup
- SiteLocal siteLocal = ((SiteLocal)SiteManager.getLocalSite());
- File localFile = new File(new URL(siteLocal.getLocationURL(),SiteLocal.SITE_LOCAL_FILE).getFile());
- UpdateManagerUtils.removeFromFileSystem(localFile);
- UpdateManagerUtils.removeFromFileSystem(new File(((InstallConfiguration)siteLocal.getCurrentConfiguration()).getURL().getFile()));
- InternalSiteManager.localSite=null;
-
- ILocalSite site = SiteManager.getLocalSite();
- ISite remoteSite = SiteManager.getSite(SOURCE_HTTP_SITE);
- IFeatureReference featureRef = remoteSite.getFeatureReferences()[0];
-
- IInstallConfiguration oldInstallConfig = site.getCurrentConfiguration();
- IConfiguredSite oldConfigSite = oldInstallConfig.getConfiguredSites()[0];
-
- ((ConfiguredSite)oldConfigSite).isUpdatable(true);
- assertNotNull("Reference is null",featureRef);
- remove(featureRef.getFeature(),oldConfigSite);
- oldConfigSite.install(featureRef.getFeature(),null,null);
- site.save();
-
-
- // Activity -> InstallConfig
- IInstallConfiguration current = site.getCurrentConfiguration();
- IActivity activity = current.getActivities()[0];
- assertTrue(activity.getInstallConfiguration().equals(current));
-
- // ConfigSite->InstallConfig
- IConfiguredSite newConfigSite = current.getConfiguredSites()[0];
- assertTrue(newConfigSite.getInstallConfiguration().equals(current));
-
- // cleanup
- localFile = new File(new URL(((SiteLocal)SiteManager.getLocalSite()).getLocationURL(),SiteLocal.SITE_LOCAL_FILE).getFile());
- UpdateManagerUtils.removeFromFileSystem(localFile);
- localFile = new File(new URL(((SiteLocal)SiteManager.getLocalSite()).getLocationURL(),SiteLocal.DEFAULT_CONFIG_FILE).getFile());
- UpdateManagerUtils.removeFromFileSystem(localFile);
-
- }
-
-}
-
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/configurations/TestRevert.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/configurations/TestRevert.java
deleted file mode 100644
index 0620509..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/configurations/TestRevert.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package org.eclipse.update.tests.configurations;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import java.io.File;
-import java.net.URL;
-
-import org.eclipse.core.boot.IPlatformConfiguration;
-import org.eclipse.update.core.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.model.*;
-import org.eclipse.update.internal.core.*;
-import org.eclipse.update.internal.core.ConfigurationPolicy;
-import org.eclipse.update.internal.core.InternalSiteManager;
-import org.eclipse.update.internal.core.SiteLocal;
-import org.eclipse.update.internal.core.UpdateManagerUtils;
-import org.eclipse.update.internal.model.*;
-import org.eclipse.update.internal.model.ConfiguredSiteModel;
-import org.eclipse.update.internal.model.InstallConfigurationModel;
-import org.eclipse.update.tests.UpdateManagerTestCase;
-import org.eclipse.update.tests.regularInstall.*;
-
-public class TestRevert extends UpdateManagerTestCase {
-
- /**
- * Test the getFeatures()
- */
- public TestRevert(String arg0) {
- super(arg0);
- }
-
- public void testSimpleRevertInstall() throws Exception {
-
- // cleanup
- SiteLocal siteLocal = ((SiteLocal)SiteManager.getLocalSite());
- File localFile = new File(new URL(siteLocal.getLocationURL(),SiteLocal.SITE_LOCAL_FILE).getFile());
- UpdateManagerUtils.removeFromFileSystem(localFile);
- UpdateManagerUtils.removeFromFileSystem(new File(((InstallConfiguration)siteLocal.getCurrentConfiguration()).getURL().getFile()));
- InternalSiteManager.localSite=null;
-
- ILocalSite site = SiteManager.getLocalSite();
- ISite remoteSite = SiteManager.getSite(SOURCE_HTTP_SITE);
- IFeatureReference featureRef = remoteSite.getFeatureReferences()[0];
- IFeatureReference featureRef2 = remoteSite.getFeatureReferences()[1];
- IFeature feature = featureRef.getFeature();
-
- // old config, no features installed
- IInstallConfiguration old = site.getCurrentConfiguration();
- ConfigurationPolicy excludepolicy = new ConfigurationPolicy();
- excludepolicy.setPolicy(IPlatformConfiguration.ISitePolicy.USER_EXCLUDE);
- IConfiguredSite oldConfigSite = old.getConfiguredSites()[0];
- excludepolicy.setConfiguredSiteModel((ConfiguredSiteModel)oldConfigSite);
- ((ConfiguredSiteModel)oldConfigSite).setConfigurationPolicyModel((ConfigurationPolicyModel)excludepolicy);
-
- // install one feature
- IInstallConfiguration newConfig = site.cloneCurrentConfiguration();
- IConfiguredSite configSite = newConfig.getConfiguredSites()[0];
- if (!configSite.getSite().equals(oldConfigSite.getSite())) fail("Config sites are not equals");
- site.addConfiguration(newConfig);
-
- ((ConfiguredSite)configSite).isUpdatable(true);
- IFeatureReference installedFeature = configSite.install(feature,null,null);
- site.save();
-
- // unconfigure it
- configSite.unconfigure(installedFeature.getFeature());
-
- // install another feature
- IFeature feature2 = featureRef2.getFeature();
- IInstallConfiguration newConfig2 = site.cloneCurrentConfiguration();
- IConfiguredSite anotherConfigSite = newConfig2.getConfiguredSites()[0];
- if (!anotherConfigSite.getSite().equals(oldConfigSite.getSite())) fail("Config sites are not equals");
- site.addConfiguration(newConfig2);
- anotherConfigSite.install(feature2,null,null);
- site.save();
-
- // revert to old state where no feature where configured
- site.revertTo(old,null,null);
- site.save();
-
- // check
- String time = ""+site.getCurrentConfiguration().getCreationDate().getTime();
- File file = new File(new URL(((SiteLocal)SiteManager.getLocalSite()).getLocationURL(),"Config"+time+".xml").getFile());
- assertTrue("new configuration does not exist", file.exists());
-
-
- //find configured site
- IConfiguredSite newConfigSite = null;
- IConfiguredSite[] sites = site.getCurrentConfiguration().getConfiguredSites();
- for (int i = 0; i < sites.length; i++) {
- if (sites[i].getSite().equals(oldConfigSite.getSite())){
- newConfigSite = sites[i];
- break;
- }
- }
- if (newConfigSite==null) fail("Cannot find configuration site");
-
- int oldNumber = oldConfigSite.getConfiguredFeatures().length;
- int newNumber = newConfigSite.getConfiguredFeatures().length;
-
- //
- IFeatureReference[] configFeatures = newConfigSite.getConfiguredFeatures();
- for (int i = 0; i < configFeatures.length; i++) {
- System.out.println(configFeatures[i]);
- }
- assertTrue("Wrong number of configured features old:"+oldNumber+" new:"+newNumber,oldNumber==newNumber);
-
- // test only 2 install config in local site
- int newNumberUnconfiguredFeatures = ((ConfiguredSite)newConfigSite).getConfigurationPolicy().getUnconfiguredFeatures().length;
- int oldNumberUnconfiguredFeatures = ((ConfiguredSite)oldConfigSite).getConfigurationPolicy().getUnconfiguredFeatures().length;
- //assertEquals("wrong number of unconfigured features",oldNumberUnconfiguredFeatures+2,newNumberUnconfiguredFeatures);
-
- // cleanup
- localFile = new File(new URL(((SiteLocal)SiteManager.getLocalSite()).getLocationURL(),SiteLocal.SITE_LOCAL_FILE).getFile());
- UpdateManagerUtils.removeFromFileSystem(localFile);
- localFile = new File(new URL(((SiteLocal)SiteManager.getLocalSite()).getLocationURL(),SiteLocal.DEFAULT_CONFIG_FILE).getFile());
- UpdateManagerUtils.removeFromFileSystem(localFile);
- UpdateManagerUtils.removeFromFileSystem(file);
- time = ""+newConfig.getCreationDate().getTime();
- file = new File(new URL(((SiteLocal)SiteManager.getLocalSite()).getLocationURL(),"DefaultConfig"+time+".xml").getFile());
- UpdateManagerUtils.removeFromFileSystem(file);
- time = ""+newConfig2.getCreationDate().getTime();
- file = new File(new URL(((SiteLocal)SiteManager.getLocalSite()).getLocationURL(),"DefaultConfig"+time+".xml").getFile());
- UpdateManagerUtils.removeFromFileSystem(file);
- }
-
-}
-
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/core/boot/AllPlatformConfigurationTests.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/core/boot/AllPlatformConfigurationTests.java
deleted file mode 100644
index a0168e4..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/core/boot/AllPlatformConfigurationTests.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.eclipse.update.tests.core.boot;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-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 3f05e32..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/core/boot/PlatformConfigurationTestCase.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.eclipse.update.tests.core.boot;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-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 b33f3bd..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/core/boot/TestPlatCfgAPI.java
+++ /dev/null
@@ -1,206 +0,0 @@
-package org.eclipse.update.tests.core.boot;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Date;
-
-import junit.framework.Assert;
-import org.eclipse.core.boot.BootLoader;
-import org.eclipse.core.boot.IPlatformConfiguration;
-import org.eclipse.core.boot.IPlatformConfiguration.ISiteEntry;
-import org.eclipse.core.boot.IPlatformConfiguration.ISitePolicy;
-
-public class TestPlatCfgAPI extends PlatformConfigurationTestCase {
-
- public TestPlatCfgAPI(String arg0) {
- super(arg0);
- }
-
- public void testBasic() throws Exception {
-
- // get new config object
- IPlatformConfiguration cfig = null;
- try {
- cfig = BootLoader.getPlatformConfiguration(null);
- } catch (IOException e) {
- Assert.fail("0.0.0 "+e.toString());
- }
- ISiteEntry[] dflt = cfig.getConfiguredSites();
- Assert.assertEquals("0.0.1",dflt.length,0);
-
- // policy tests
- ISitePolicy p1 = cfig.createSitePolicy(ISitePolicy.USER_INCLUDE, null);
- Assert.assertEquals("1.0.0",p1.getType(),ISitePolicy.USER_INCLUDE);
- Assert.assertEquals("1.0.1",p1.getList().length,0);
- p1.setList(new String[] {"first"});
- Assert.assertEquals("1.0.2",p1.getList().length,1);
- Assert.assertEquals("1.0.3",p1.getList()[0],"first");
-
- ISitePolicy p2 = cfig.createSitePolicy(ISitePolicy.USER_EXCLUDE, new String[0]);
- Assert.assertEquals("1.1.0",p2.getType(),ISitePolicy.USER_EXCLUDE);
- Assert.assertEquals("1.1.1",p2.getList().length,0);
- p2.setList(new String[] {"first", "second"});
- Assert.assertEquals("1.1.2",p2.getList().length,2);
- Assert.assertEquals("1.1.3",p2.getList()[1],"second");
-
- // create some urls
- URL u1 = null;
- URL u2 = null;
-
- URL u4 = null;
- try {
- u1 = new URL("file:d:/temp/");
- u2 = new URL("file://localhost/temp/");
- new URL("http://some.server/temp/");
- u4 = new URL("http://bad.url");
- } catch (MalformedURLException e) {
- Assert.fail("2.0.0 unable to create URL "+e);
- }
-
- // site creation tests
- ISiteEntry s1 = cfig.createSiteEntry(u1,p2);
- Assert.assertEquals("3.0.0",s1.getURL(),u1);
- Assert.assertEquals("3.0.1",s1.getSitePolicy(),p2);
- s1.setSitePolicy(p1);
- Assert.assertEquals("3.0.2",s1.getSitePolicy(),p1);
-
- ISiteEntry s2 = cfig.createSiteEntry(u2,p1);
- Assert.assertEquals("3.1.0",s2.getURL(),u2);
- Assert.assertEquals("3.1.1",s2.getSitePolicy(),p1);
- s2.setSitePolicy(p2);
- Assert.assertEquals("3.1.2",s2.getSitePolicy(),p2);
-
- // configure site tests
- Assert.assertEquals("3.3.0",cfig.getConfiguredSites().length,0);
- cfig.configureSite(s1);
- Assert.assertEquals("3.3.1",cfig.getConfiguredSites().length,1);
- cfig.configureSite(s2);
- Assert.assertEquals("3.3.2",cfig.getConfiguredSites().length,2);
-
- // lookup site tests
- Assert.assertEquals("3.4.0",cfig.findConfiguredSite(u1),s1);
- Assert.assertEquals("3.4.1",cfig.findConfiguredSite(u2),s2);
- Assert.assertNull("3.4.3",cfig.findConfiguredSite(u4));
-
- // unconfigure site tests
- cfig.unconfigureSite(s1);
- Assert.assertEquals("3.5.0",cfig.getConfiguredSites().length,1);
- Assert.assertNull("3.5.1",cfig.findConfiguredSite(u1));
- cfig.unconfigureSite(s2);
- Assert.assertEquals("3.5.2",cfig.getConfiguredSites().length,0);
- Assert.assertNull("3.5.3",cfig.findConfiguredSite(u2));
- }
-
- public void testSaveRestore() throws Exception {
-
- Assert.assertNotNull("0.0 Unable to obtain temp directory",tempDir);
-
- // get new config object
- IPlatformConfiguration cfig = null;
- try {
- cfig = BootLoader.getPlatformConfiguration(null);
- } catch (IOException e) {
- Assert.fail("0.0.0 "+e.toString());
- }
- ISiteEntry[] sites = cfig.getConfiguredSites();
- Assert.assertEquals("0.0.1",sites.length,0);
-
- // create policies
- ISitePolicy p1 = cfig.createSitePolicy(ISitePolicy.USER_INCLUDE, null);
- ISitePolicy p2 = cfig.createSitePolicy(ISitePolicy.USER_EXCLUDE, new String[0]);
- ISitePolicy p3 = cfig.createSitePolicy(ISitePolicy.USER_INCLUDE, new String[] {"first"});
- ISitePolicy p4 = cfig.createSitePolicy(ISitePolicy.USER_EXCLUDE, new String[] {"first", "second"});
-
- // create some urls
- URL u1 = null;
- URL u2 = null;
- URL u3 = null;
- URL u4 = null;
-
- try {
- u1 = new URL("file:d:/temp/");
- u2 = new URL("file://localhost/temp/");
- u3 = new URL("http://some.server/temp/");
- u4 = new URL("http://another.server/temp/");
- new URL("http://one.more.server/temp/");
- } catch (MalformedURLException e) {
- Assert.fail("1.0 unable to create URL "+e);
- }
-
- // create and configure sites
- ISiteEntry s1 = cfig.createSiteEntry(u1,p1);
- cfig.configureSite(s1);
- ISiteEntry s2 = cfig.createSiteEntry(u2,p2);
- cfig.configureSite(s2);
- ISiteEntry s3 = cfig.createSiteEntry(u3,p3);
- cfig.configureSite(s3);
- ISiteEntry s4 = cfig.createSiteEntry(u4,p4);
- cfig.configureSite(s4);
- sites = cfig.getConfiguredSites();
- Assert.assertEquals("1.1",sites.length,4);
-
- // do save
- try {
- cfig.save();
- Assert.fail("2.0 was expecting IOException");
- } catch (IOException e) {
- }
-
- URL cfigURL = null;
- try {
- cfigURL = new URL("file:"+tempDir+(new Date()).getTime()+"_platform.cfg");
- } catch(MalformedURLException e) {
- Assert.fail("2.1 unable to create URL "+e);
- }
-
- try {
- cfig.save(cfigURL);
- } catch (IOException e) {
- Assert.fail("2.2 "+e);
- }
-
- // reload configuration
- try {
- BootLoader.getPlatformConfiguration(cfigURL);
- } catch (IOException e) {
- Assert.fail("2.3 "+e.toString());
- }
- ISiteEntry[] newSites = cfig.getConfiguredSites();
- Assert.assertEquals("2.4",newSites.length,4);
-
- // check what we've got
- Assert.assertEquals("3.0.1",sites[0].getURL(),newSites[0].getURL());
- Assert.assertEquals("3.0.2",sites[0].getSitePolicy().getType(),newSites[0].getSitePolicy().getType());
- Assert.assertEquals("3.0.3",sites[0].getSitePolicy().getList(),newSites[0].getSitePolicy().getList());
-
- Assert.assertEquals("3.1.1",sites[1].getURL(),newSites[1].getURL());
- Assert.assertEquals("3.1.2",sites[1].getSitePolicy().getType(),newSites[1].getSitePolicy().getType());
- Assert.assertEquals("3.1.3",sites[1].getSitePolicy().getList(),newSites[1].getSitePolicy().getList());
-
- Assert.assertEquals("3.2.1",sites[2].getURL(),newSites[2].getURL());
- Assert.assertEquals("3.2.2",sites[2].getSitePolicy().getType(),newSites[2].getSitePolicy().getType());
- Assert.assertEquals("3.2.3",sites[2].getSitePolicy().getList(),newSites[2].getSitePolicy().getList());
-
- Assert.assertEquals("3.3.1",sites[3].getURL(),newSites[3].getURL());
- Assert.assertEquals("3.3.2",sites[3].getSitePolicy().getType(),newSites[3].getSitePolicy().getType());
- Assert.assertEquals("3.3.3",sites[3].getSitePolicy().getList(),newSites[3].getSitePolicy().getList());
-
- }
-
- public void testCurrentConfiguration() throws Exception {
-
- Assert.assertNotNull("0.0 Unable to obtain temp directory",tempDir);
-
- // get new config object
- IPlatformConfiguration cfig = null;
- cfig = BootLoader.getCurrentPlatformConfiguration();
- cfig.getPluginPath();
- cfig.save();
- }
-}
-
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/core/boot/TestPlatCfgDefault.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/core/boot/TestPlatCfgDefault.java
deleted file mode 100644
index b9b846d..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/core/boot/TestPlatCfgDefault.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.eclipse.update.tests.core.boot;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import java.io.IOException;
-
-import org.eclipse.core.boot.BootLoader;
-import org.eclipse.core.boot.IPlatformConfiguration;
-import org.eclipse.core.boot.IPlatformConfiguration.ISiteEntry;
-import org.eclipse.core.boot.IPlatformConfiguration.ISitePolicy;
-
-public class TestPlatCfgDefault
- extends PlatformConfigurationTestCase {
-
- public TestPlatCfgDefault(String arg0) {
- super(arg0);
- }
-
- public void testInitial() throws Exception {
- IPlatformConfiguration cfig = null;
- cfig = BootLoader.getCurrentPlatformConfiguration();
- ISiteEntry se = cfig.getConfiguredSites()[0];
- ISitePolicy sp = cfig.createSitePolicy(ISitePolicy.USER_EXCLUDE, new String[] {"1", "2","3","4","5","6","7","8","9","10","11","12"});
- se.setSitePolicy(sp);
- cfig.save();
- System.out.println("done ...");
- }
-}
-
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/implementation/SiteFTP.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/implementation/SiteFTP.java
deleted file mode 100644
index 038acd4..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/implementation/SiteFTP.java
+++ /dev/null
@@ -1,250 +0,0 @@
-package org.eclipse.update.tests.implementation;
-
-import java.io.InputStream;
-import java.net.URL;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.core.IFeature;
-import org.eclipse.update.core.IFeatureReference;
-import org.eclipse.update.core.IPluginEntry;
-import org.eclipse.update.core.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.core.IURLEntry;
-import org.eclipse.update.core.model.InstallAbortedException;
-import org.eclipse.update.internal.core.*;
-
-public class SiteFTP implements ISite {
-
- private URL url;
- public SiteFTP(URL url){
- this.url = url;
- }
-
- /*
- * @see ISite#getFeatureReferences()
- */
- public ISiteFeatureReference[] getFeatureReferences() {
- return null;
- }
-
- /*
- * @see ISite#install(IFeature, FeatureVerification verifier,IProgressMonitor)
- */
- public IFeatureReference install(IFeature feature,IVerificationListener verificationListener, IProgressMonitor monitor) throws CoreException {
- return null;
- }
-
- /*
- * @see ISite#remove(IFeature, IProgressMonitor)
- */
- public void remove(IFeature feature, IProgressMonitor monitor) throws CoreException {
- }
-
- /*
- * @see ISite#addSiteChangedListener(IConfiguredSiteChangedListener)
- */
- public void addSiteChangedListener(IConfiguredSiteChangedListener listener) {
- }
-
- /*
- * @see ISite#removeSiteChangedListener(IConfiguredSiteChangedListener)
- */
- public void removeSiteChangedListener(IConfiguredSiteChangedListener listener) {
- }
-
- /*
- * @see ISite#getURL()
- */
- public URL getURL() {
- return url;
- }
-
- /*
- * @see ISite#getType()
- */
- public String getType() {
- return "org.eclipse.update.tests.ftp";
- }
-
- /*
- * @see ISite#getCategories()
- */
- public ICategory[] getCategories() {
- return null;
- }
-
- /*
- * @see ISite#getArchives()
- */
- public IArchiveReference[] getArchives() {
- return null;
- }
-
- /*
- * @see ISite#addCategory(ICategory)
- */
- public void addCategory(ICategory category) {
- }
-
- /*
- * @see ISite#save()
- */
- public void save() throws CoreException {
- }
-
- /*
- * @see IPluginContainer#getPluginEntries()
- */
- public IPluginEntry[] getPluginEntries() {
- return null;
- }
-
- /*
- * @see IPluginContainer#getPluginEntryCount()
- */
- public int getPluginEntryCount() {
- return 0;
- }
-
- /*
- * @see ISite#getDownloadSizeFor(IFeature)
- */
- public long getDownloadSizeFor(IFeature feature) {
- return 0;
- }
-
- /*
- * @see ISite#getInstallSizeFor(IFeature)
- */
- public long getInstallSizeFor(IFeature feature) {
- return 0;
- }
-
-
- /*
- * @see IPluginContainer#store(IPluginEntry, String, InputStream)
- */
- public void store(IPluginEntry entry, String name, InputStream inStream) throws CoreException {
- }
-
- /*
- * @see IAdaptable#getAdapter(Class)
- */
- public Object getAdapter(Class adapter) {
- return null;
- }
-
- /*
- * @see IPluginContainer#remove(IPluginEntry)
- */
- public void remove(IPluginEntry entry) throws CoreException {
- }
-
- /*
- * @see ISite#setSiteContentConsumer(ISiteContentConsumer)
- */
- public void setSiteContentConsumer(ISiteContentConsumer contentConsumer) {
- }
-
- /*
- * @see ISite#setSiteContentProvider(ISiteContentProvider)
- */
- public void setSiteContentProvider(ISiteContentProvider siteContentProvider) {
- }
-
- /*
- * @see ISite#getSiteContentProvider()
- */
- public ISiteContentProvider getSiteContentProvider() {
- return null;
- }
-
- /*
- * @see ISite#getDefaultPackagedFeatureType()
- */
- public String getDefaultPackagedFeatureType() {
- return null;
- }
-
- /*
- * @see ISite#store(IFeature, String, InputStream, IProgressMonitor)
- */
- public void store(IFeature feature, String name, InputStream inStream, IProgressMonitor monitor) throws CoreException {
- }
-
-
- /*
- * @see IPluginContainer#remove(IPluginEntry, IProgressMonitor)
- */
- public void remove(IPluginEntry entry, IProgressMonitor monitor) throws CoreException {
- }
-
- /*
- * @see ISite#getCategory(String)
- */
- public ICategory getCategory(String key) {
- return null;
- }
-
- /*
- * @see ISite#createSiteContentConsumer(IFeature)
- */
- public ISiteContentConsumer createSiteContentConsumer(IFeature feature) throws CoreException {
- return null;
- }
-
- /*
- * @see ISite#getFeatureReference(IFeature)
- */
- public ISiteFeatureReference getFeatureReference(IFeature feature) {
- return null;
- }
-
- /*
- * @see ISite#getDescription()
- */
- public IURLEntry getDescription() {
- return null;
- }
-
- /*
- * @see ISite#getPluginEntriesOnlyReferencedBy(IFeature)
- */
- public IPluginEntry[] getPluginEntriesOnlyReferencedBy(IFeature feature) throws CoreException {
- return null;
- }
-
- /**
- * @see ISite#addPluginEntry(IPluginEntry)
- */
- public void addPluginEntry(IPluginEntry pluginEntry) {
- }
-
- /**
- * @see org.eclipse.update.core.ISite#install(IFeature, IFeatureReference[], IVerificationListener, IProgressMonitor)
- */
- public IFeatureReference install(IFeature feature, IFeatureReference[] optionalfeatures, IVerificationListener verificationListener, IProgressMonitor monitor) throws InstallAbortedException, CoreException {
- return null;
- }
-
- /**
- * @see org.eclipse.update.core.ISite#getConfiguredSite()
- */
- public IConfiguredSite getCurrentConfiguredSite() {
- return null;
- }
-
- /**
- * @see org.eclipse.update.core.ISite#createFeature(String, URL)
- */
- public IFeature createFeature(String type, URL url) throws CoreException {
- return null;
- }
-
-}
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 61ff316..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/implementation/SiteFTPFactory.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.eclipse.update.tests.implementation;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-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.SiteURLContentProvider;
-import org.eclipse.update.internal.core.URLEncoder;
-
-public class SiteFTPFactory extends SiteModelFactory implements ISiteFactory {
-
- public static final String FILE = "a/b/c/";
-
- /*
- * @see ISiteFactory#createSite(URL, boolean)
- */
- public ISite createSite(URL url)
- throws CoreException, InvalidSiteTypeException {
- ISite site = null;
- InputStream siteStream = null;
-
- try {
- URL resolvedURL = URLEncoder.encode(url);
- siteStream = resolvedURL.openStream();
-
- SiteModelFactory factory = (SiteModelFactory) this;
- factory.parseSite(siteStream);
-
- site = new SiteFTP(new URL("http://eclipse.org/" + FILE));
-
- } catch (MalformedURLException e) {
- throw Utilities.newCoreException("Unable to create URL", e);
- } catch (IOException e) {
- throw Utilities.newCoreException("Unable to access URL",ISite.SITE_ACCESS_EXCEPTION, e);
- } finally {
- try {
- siteStream.close();
- } catch (Exception e) {
- }
- }
- return site;
- }
-
- /*
- * @see SiteModelFactory#canParseSiteType(String)
- */
- public boolean canParseSiteType(String type) {
- return "org.eclipse.update.tests.core.ftp".equalsIgnoreCase(type);
- }
-
-}
\ No newline at end of file
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 72e111c..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/AllModelTests.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.eclipse.update.tests.model;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.update.core.SiteManager;
-import org.eclipse.update.internal.core.UpdateManagerUtils;
-import org.eclipse.update.tests.UpdateManagerTestCase;
-import java.io.File;
-import junit.framework.*;
-
-/**
- * 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;
- }
-}
\ No newline at end of file
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 6756c43..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/FeatureMain.java
+++ /dev/null
@@ -1,185 +0,0 @@
-package org.eclipse.update.tests.model;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintWriter;
-import java.net.URL;
-import java.util.ResourceBundle;
-
-import org.eclipse.update.core.model.DefaultFeatureParser;
-import org.eclipse.update.core.model.FeatureModel;
-import org.eclipse.update.core.model.FeatureModelFactory;
-import org.eclipse.update.core.model.ImportModel;
-import org.eclipse.update.core.model.NonPluginEntryModel;
-import org.eclipse.update.core.model.PluginEntryModel;
-import org.eclipse.update.core.model.URLEntryModel;
-import org.eclipse.update.tests.UpdateManagerTestCase;
-
-public class FeatureMain extends UpdateManagerTestCase {
-
- public FeatureMain(String testcase){
- super(testcase);
- }
-
- public void testMain() throws Exception {
-
- FeatureModelFactory factory = new FeatureModelFactory();
- InputStream is = null;
- FeatureModel feature = null;
- PrintWriter w = new PrintWriter(System.out);
-
- w.println("Parsing feature ...");
- try {
- is = FeatureMain.class.getResourceAsStream("feature.xml");
- feature = factory.parseFeature(is);
- } finally {
- if (is != null) {
- try { is.close();} catch(IOException e) {}
- }
- }
-
- String base = "http://another.server/feature.xml";
- w.println("Resolving feature using "+base+" ...");
- ResourceBundle bundle = null;
- bundle = ResourceBundle.getBundle("org/eclipse/update/tests/model/test");
- feature.resolve(new URL(base), bundle);
-
- w.close();
- }
-
- private static void writeFeature(PrintWriter w, int level, FeatureModel feature) {
- if (feature == null) return;
-
- String in = getIndent(level);
- w.println(in+"<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-
- w.println(in+"<feature");
- w.println(in+" "+"id=\""+feature.getFeatureIdentifier()+"\"");
- w.println(in+" "+"version=\""+feature.getFeatureVersion()+"\"");
- w.println(in+" "+"label=\""+feature.getLabel()+"\"");
- w.println(in+" "+"provider-name=\""+feature.getProvider()+"\"");
- w.println(in+" "+"image=\""+feature.getImageURLString()+"\" -> "+feature.getImageURL());
- w.println(in+" "+"os=\""+feature.getOS()+"\"");
- w.println(in+" "+"ws=\""+feature.getWS()+"\"");
- w.println(in+" "+"nl=\""+feature.getNL()+"\"");
- w.println(in+" "+"application=\""+feature.getApplication()+"\"");
- w.println(in+" "+">");
-
- writeDescription(w, level+1, feature.getDescriptionModel());
- writeCopyright(w, level+1, feature.getCopyrightModel());
- writeLicense(w, level+1, feature.getLicenseModel());
- writeURLs(w, level+1, feature);
- writePrereqs(w, level+1, feature);
- writePluginEntries(w, level+1, feature);
- writeNonPluginEntries(w, level+1, feature);
-
- w.println(in+"</feature>");
- }
-
- private static void writeDescription(PrintWriter w, int level, URLEntryModel ue) {
- String in = getIndent(level);
- w.println("");
- w.println(in+"<description url=\""+ue.getURLString()+"\" -> "+ue.getURL()+">");
- w.println(in+ue.getAnnotation());
- w.println(in+"</description>");
- }
-
- private static void writeCopyright(PrintWriter w, int level, URLEntryModel ue) {
- String in = getIndent(level);
- w.println("");
- w.println(in+"<copyright url=\""+ue.getURLString()+"\" -> "+ue.getURL()+">");
- w.println(in+ue.getAnnotation());
- w.println(in+"</copyright>");
- }
-
- private static void writeLicense(PrintWriter w, int level, URLEntryModel ue) {
- String in = getIndent(level);
- w.println("");
- w.println(in+"<license url=\""+ue.getURLString()+"\" -> "+ue.getURL()+">");
- w.println(in+ue.getAnnotation());
- w.println(in+"</license>");
- }
-
- private static void writeURLs(PrintWriter w, int level, FeatureModel feature) {
- String in = getIndent(level);
- String in2 = getIndent(level+1);
- w.println("");
- w.println(in+"<url>");
-
- URLEntryModel update = feature.getUpdateSiteEntryModel();
- w.println(in2+"<update");
- w.println(in2+" "+"url=\""+update.getURLString()+"\" -> "+update.getURL());
- w.println(in2+" "+"label=\""+update.getAnnotation()+"\"");
- w.println(in2+" "+"/>");
-
- URLEntryModel[] discovery = feature.getDiscoverySiteEntryModels();
- for (int i=0; i<discovery.length; i++) {
- w.println(in2+"<discovery");
- w.println(in2+" "+"url=\""+discovery[i].getURLString()+"\" -> "+discovery[i].getURL());
- w.println(in2+" "+"label=\""+discovery[i].getAnnotation()+"\"");
- w.println(in2+" "+"/>");
- }
-
- w.println(in+"</url>");
- }
-
- private static void writePrereqs(PrintWriter w, int level, FeatureModel feature) {
- String in = getIndent(level);
- String in2 = getIndent(level+1);
- w.println("");
- w.println(in+"<requires>");
-
- ImportModel[] imp = feature.getImportModels();
- for (int i=0; i<imp.length; i++) {
- w.println(in2+"<import");
- w.println(in2+" "+(imp[i].isFeatureImport()?"feature":"plugin"));
- w.println(in2+" "+"id=\""+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 61194ab..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/SiteMain.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package org.eclipse.update.tests.model;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintWriter;
-import java.net.URL;
-
-import org.eclipse.update.core.SiteFeatureReferenceModel;
-import org.eclipse.update.core.model.*;
-import org.eclipse.update.core.model.ArchiveReferenceModel;
-import org.eclipse.update.core.model.DefaultSiteParser;
-import org.eclipse.update.core.model.FeatureReferenceModel;
-import org.eclipse.update.core.model.CategoryModel;
-import org.eclipse.update.core.model.SiteModel;
-import org.eclipse.update.core.model.SiteModelFactory;
-import org.eclipse.update.core.model.URLEntryModel;
-import org.eclipse.update.tests.UpdateManagerTestCase;
-
-public class SiteMain extends UpdateManagerTestCase {
-
- public SiteMain(String name){
- super(name);
- }
-
- public void testMain() throws Exception {
-
- PrintWriter w = new PrintWriter(System.out);
- process("site_old_format.xml",w);
- process("site.xml",w);
- try {
- process("site_with_type.xml",w);
- fail("InvalidSiteTypeException not thrown");
- } catch (InvalidSiteTypeException e) {
- assertEquals(e.getNewType(),"some.other.site.type");
- } finally {
- w.close();
- }
- }
-
- private static void process(String xml, PrintWriter w) throws Exception {
-
- SiteModelFactory factory = new SiteModelFactory();
- InputStream is = null;
- SiteModel site = null;
-
- w.println("");
- w.println("Parsing site map ...");
- try {
- is = SiteMain.class.getResourceAsStream(xml);
- site = factory.parseSite(is);
- } finally {
- if (is != null) {
- try { is.close();} catch(IOException e) {}
- }
- }
-
- if (site == null) return;
-
- String base = "http://another.server/site.xml";
- w.println("Resolving site using "+base+" ...");
- site.resolve(new URL(base), null);
-
- w.println("Writing site ...");
- writeSite(w,0,site);
- }
-
- private static void writeSite(PrintWriter w, int level, SiteModel site) {
- if (site == null) return;
-
- String in = getIndent(level);
- w.println(in+"<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-
- w.println(in+"<site");
- w.println(in+" "+"type=\""+site.getType()+"\"");
- w.println(in+" "+">");
-
- writeDescription(w, level+1, site.getDescriptionModel());
- writeFeatures(w, level+1, site);
- writeArchives(w, level+1, site);
- writeCategoryDefs(w, level+1, site);
-
- w.println(in+"</feature>");
- }
-
- private static void writeDescription(PrintWriter w, int level, URLEntryModel ue) {
- if (ue == null) return;
- String in = getIndent(level);
- w.println("");
- w.println(in+"<description url=\""+ue.getURLString()+"\" -> "+ue.getURL()+">");
- w.println(in+ue.getAnnotation());
- w.println(in+"</description>");
- }
-
- private static void writeFeatures(PrintWriter w, int level, SiteModel site) {
- String in = getIndent(level);
- getIndent(level+1);
- w.println("");
-
- SiteFeatureReferenceModel[] features = site.getFeatureReferenceModels();
- for (int i=0; i<features.length; i++) {
- w.println(in+"<feature");
- w.println(in+" "+"type=\""+features[i].getType()+"\"");
- w.println(in+" "+"url=\""+features[i].getURLString()+"\" -> "+features[i].getURL());
- w.println(in+" "+">");
- writeCategories(w, level+1, features[i]);
- w.println(in+"</feature>");
- }
- }
-
- private static void writeArchives(PrintWriter w, int level, SiteModel site) {
- String in = getIndent(level);
- w.println("");
-
- ArchiveReferenceModel[] archive = site.getArchiveReferenceModels();
- for (int i=0; i<archive.length; i++) {
- w.println(in+"<archive");
- w.println(in+" "+"path=\""+archive[i].getPath()+"\"");
- w.println(in+" "+"url=\""+archive[i].getURLString()+"\" -> "+archive[i].getURL());
- w.println(in+" "+"/>");
- }
- }
-
- private static void writeCategoryDefs(PrintWriter w, int level, SiteModel site) {
- String in = getIndent(level);
- getIndent(level+1);
- w.println("");
-
- CategoryModel[] cat = site.getCategoryModels();
- for (int i=0; i<cat.length; i++) {
- w.println(in+"<category-def");
- w.println(in+" "+"name=\""+cat[i].getName()+"\"");
- w.println(in+" "+"label=\""+cat[i].getLabel()+"\"");
- w.println(in+" "+">");
- writeDescription(w, level+1, cat[i].getDescriptionModel());
- w.println(in+"</category-def>");
- }
- }
-
- private static void writeCategories(PrintWriter w, int level, SiteFeatureReferenceModel feature) {
- String in = getIndent(level);
- String[] cat = feature.getCategoryNames();
- for (int i=0; i<cat.length; i++) {
- w.println(in+"<category name=\""+cat[i]+"\"");
- }
- }
-
- private static String getIndent(int level) {
- String indent = "";
- for (int i=0; i<level; i++)
- indent += " ";
- return indent;
- }
-}
-
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/feature.xml b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/feature.xml
deleted file mode 100644
index 1db9650..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/feature.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<feature id="my.feature" version="3.7.1" label="%s1" provider-name="VK Inc."
- image="images/feature.gif" os="Win32" ws="Win32" nl="en_CA,en_US"
- application="org.eclipse.ui.workbench">
-
- <install-handler url="install/handler.html" library="custom.jar" class="InstallHandler"/>
-
- <description url="http://www.tools.com/features/my.feature">
- Description of my.feature
- </description>
-
- <copyright url="copyright/my.feature">
- Copyright for my.feature
- </copyright>
-
- <license url="%url1">
- License for my.feature
- </license>
-
- <url>
- <update url="http://www.tools.com/update" label="Update site"/>
- <discovery url="http://www.tools.com/discovery1" label="%s2"/>
- <discovery url="%url2" label="%s3 Discovery site 2"/>
- <discovery url="%url3 http://www.tools.com/discovery3" label="Discovery site 3"/>
- </url>
-
- <requires>
- <import plugin="plugin.1" version="1.0.0" match="perfect"/>
- <import plugin="plugin.2" version="3.2.0"/>
- <import plugin="plugin.3"/>
- </requires>
-
- <plugin id="my.plugin.1" version="1.0.0" fragment="true"
- os="Win32" ws="Win32" nl="en_US" download-size="23456" install-size="1234567"/>
- <plugin id="my.plugin.2" version="1.0.1"/>
- <plugin id="my.plugin.3" version="1.0.2"/>
-
- <data id="examples.zip" download-size="23456" install-size="1234567"/>
- <data id="custom/rt.jar"/>
-
-</feature>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/site.xml b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/site.xml
deleted file mode 100644
index 7516f26..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/site.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<site>
-
- <description url="http://www.tools.com/updateSite">
- Site description
- </description>
-
- <feature type="my.feature.type" url="feature1.jar">
- <category name="tools"/>
- <category name="utilities"/>
- <category name="windows.tools"/>
- </feature>
-
- <feature type="" url="file:/feature2.jar">
- <category name="utilities"/>
- </feature>
-
-
- <archive path="first/archive" url="archive1.jar"/>
- <archive path="second/archive" url="archive2.jar"/>
-
- <category-def name="tools" label="Development Tools">
- <description url="http://www.tools.com/tools">
- This is description for tools
- </description>
- </category-def>
-
- <category-def name="utilities" label="Utilities">
- <description url="tools.html"/>/
- </category-def>
-
- <category-def name="windows.tools" label="Windows Development Tools"/>
-
-</site>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/site_old_format.xml b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/site_old_format.xml
deleted file mode 100644
index dd10ef7..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/site_old_format.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<site url="www.tools.com/updateSite">
-
- <feature type="my.feature.type" url="feature1.jar">
- <category name="tools"/>
- <category name="utilities"/>
- <category name="windows.tools"/>
- </feature>
-
- <feature type="" url="feature2.jar">
- <category name="utilities"/>
- </feature>
-
- <archive path="first/archive" url="archive1.jar"/>
- <archive path="second/archive" url="archive2.jar"/>
-
- <category-def name="tools" label="Development Tools">
- <description url="http://www.tools.com/tools">
- This is description for tools
- </description>
- </category-def>
-
- <category-def name="utilities" label="Utilities">
- <description url="utilities.html"/>
- </category-def>
-
- <category-def name="windows.tools" label="Windows Development Tools"/>
-
-</site>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/site_with_type.xml b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/site_with_type.xml
deleted file mode 100644
index 2ee3a3f..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/site_with_type.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<site url="http://www.tools.com/updateSite" type="some.other.site.type">
-
-</site>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/test.properties b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/test.properties
deleted file mode 100644
index d4d3b20..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/test.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-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 e714e68..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/nativeTests/TestLocalSystemInfo.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.eclipse.update.tests.nativeTests;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-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 {
- // space
- LocalSystemInfo system = new LocalSystemInfo();
-
- // mount point
- IVolume[] a = system.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 = system.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 78586dc..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/nestedfeatures/AllNestedTests.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.eclipse.update.tests.nestedfeatures;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-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 2735293..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/nestedfeatures/TestInstall.java
+++ /dev/null
@@ -1,289 +0,0 @@
-package org.eclipse.update.tests.nestedfeatures;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.update.core.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.internal.core.*;
-import org.eclipse.update.tests.UpdateManagerTestCase;
-
-public class TestInstall extends UpdateManagerTestCase {
-
- /**
- * Constructor for Test1
- */
- public TestInstall(String arg0) {
- super(arg0);
- }
-
- public void testFileSite() throws Exception {
-
- ISite remoteSite =
- SiteManager.getSite(new URL(SOURCE_FILE_SITE, "nestedFeatureSiteTest/"));
- IFeature remoteFeature = remoteSite.getFeatureReferences()[0].getFeature();
- ISite localSite = SiteManager.getSite(TARGET_FILE_SITE);
- localSite.install(remoteFeature, null, null);
-
- // verify root Feature
- String site = localSite.getURL().getFile();
- IPluginEntry[] entries = remoteFeature.getPluginEntries();
- assertTrue("no plugins entry", (entries != null && entries.length != 0));
- String pluginName = entries[0].getVersionedIdentifier().toString();
- File pluginFile = new File(site, Site.DEFAULT_PLUGIN_PATH + pluginName);
- assertTrue(
- "plugin files not installed locally:" + pluginFile,
- pluginFile.exists());
- File pluginXMLFile =
- new File(
- site,
- Site.DEFAULT_PLUGIN_PATH + pluginName + File.separator + "plugin.xml");
- assertTrue("plugin.xml file not installed locally", pluginXMLFile.exists());
-
- File featureFile =
- new File(
- site,
- Site.DEFAULT_INSTALLED_FEATURE_PATH
- + remoteFeature.getVersionedIdentifier().toString());
- assertTrue(
- "feature info not installed locally:" + featureFile,
- featureFile.exists());
-
- // clean plugins & feature
- for (int i = 0; i < entries.length; i++) {
- pluginName = entries[0].getVersionedIdentifier().toString();
- pluginFile = new File(site, Site.DEFAULT_PLUGIN_PATH + pluginName);
- UpdateManagerUtils.removeFromFileSystem(pluginFile);
- }
- UpdateManagerUtils.removeFromFileSystem(featureFile);
-
- // verify child Feature
- IFeature childFeature =
- remoteFeature.getIncludedFeatureReferences()[0].getFeature();
- entries = childFeature.getPluginEntries();
- assertTrue("no plugins entry", (entries != null && entries.length != 0));
- pluginName = entries[0].getVersionedIdentifier().toString();
- pluginFile = new File(site, Site.DEFAULT_PLUGIN_PATH + pluginName);
- assertTrue(
- "plugin files not installed locally:" + pluginFile,
- pluginFile.exists());
- pluginXMLFile =
- new File(
- site,
- Site.DEFAULT_PLUGIN_PATH + pluginName + File.separator + "plugin.xml");
- assertTrue("plugin.xml file not installed locally", pluginXMLFile.exists());
-
- featureFile =
- new File(
- site,
- Site.DEFAULT_INSTALLED_FEATURE_PATH
- + childFeature.getVersionedIdentifier().toString());
- assertTrue(
- "feature info not installed locally:" + featureFile,
- featureFile.exists());
-
- // clean plugins
- for (int i = 0; i < entries.length; i++) {
- pluginName = entries[0].getVersionedIdentifier().toString();
- pluginFile = new File(site, Site.DEFAULT_PLUGIN_PATH + pluginName);
- UpdateManagerUtils.removeFromFileSystem(pluginFile);
- }
-
- // clean features
- UpdateManagerUtils.removeFromFileSystem(featureFile);
- UpdateManagerUtils.removeFromFileSystem(new File(localSite.getURL().getFile()));
- }
-
- /**
- *
- */
- public void testHTTPSite() throws Exception {
-
- ISite remoteSite =
- SiteManager.getSite(new URL(SOURCE_HTTP_SITE, "nestedFeatureSiteTest/"));
- IFeatureReference[] features = remoteSite.getFeatureReferences();
- IFeature remoteFeature = null;
-
- if (features == null || features.length == 0)
- fail("No features on the site");
-
- for (int i = 0; i < features.length; i++) {
- if (features[i].getURL().toExternalForm().endsWith("rootfeature.jar")) {
- remoteFeature = features[i].getFeature();
- break;
- }
- }
-
- assertNotNull("Cannot find rootfeature.jar on site", remoteFeature);
- ISite localSite = SiteManager.getSite(TARGET_FILE_SITE);
- localSite.install(remoteFeature, null, null);
-
- // rootfeature.jar should not be in the local site
- IFeatureReference[] localFeatures = localSite.getFeatureReferences();
- if (localFeatures == null || localFeatures.length == 0)
- fail("No features on the target site");
-
- boolean found = false;
- for (int i = 0; i < localFeatures.length; i++) {
- if (localFeatures[i].getURL().toExternalForm().endsWith("rootfeature.jar")) {
- found = true;
- break;
- }
- }
-
- assertTrue(
- "Found rootfeature.jar on target site. Target site feature ref shouldnot contain JAR file",
- !found);
-
- // check root
- String site = localSite.getURL().getFile();
- IPluginEntry[] entries = remoteFeature.getPluginEntries();
- assertTrue("no plugins entry", (entries != null && entries.length != 0));
-
- String pluginName = entries[0].getVersionedIdentifier().toString();
- File pluginFile = new File(site, Site.DEFAULT_PLUGIN_PATH + pluginName);
- assertTrue(
- "plugin files not installed locally:" + pluginFile,
- pluginFile.exists());
- File pluginXMLFile = new File(site, Site.DEFAULT_PLUGIN_PATH + pluginName+ File.separator + "plugin.xml");
- assertTrue(
- "plugin info not installed locally:" + pluginXMLFile,
- pluginXMLFile.exists());
-
- File featureFile =
- new File(
- site,
- Site.DEFAULT_INSTALLED_FEATURE_PATH
- + remoteFeature.getVersionedIdentifier().toString());
- assertTrue("feature info not installed locally", featureFile.exists());
-
- // clean plugins & feature
- for (int i = 0; i < entries.length; i++) {
- pluginName = entries[0].getVersionedIdentifier().toString();
- pluginFile = new File(site, Site.DEFAULT_PLUGIN_PATH + pluginName);
- UpdateManagerUtils.removeFromFileSystem(pluginFile);
- }
- UpdateManagerUtils.removeFromFileSystem(featureFile);
-
- // verify child Feature
- IFeature childFeature =
- remoteFeature.getIncludedFeatureReferences()[0].getFeature();
- entries = childFeature.getPluginEntries();
- assertTrue("no plugins entry", (entries != null && entries.length != 0));
- pluginName = entries[0].getVersionedIdentifier().toString();
- pluginFile = new File(site, Site.DEFAULT_PLUGIN_PATH + pluginName);
- assertTrue(
- "plugin files not installed locally:" + pluginFile,
- pluginFile.exists());
- pluginXMLFile =
- new File(
- site,
- Site.DEFAULT_PLUGIN_PATH + pluginName + File.separator + "plugin.xml");
- assertTrue("plugin.xml file not installed locally", pluginXMLFile.exists());
-
- featureFile =
- new File(
- site,
- Site.DEFAULT_INSTALLED_FEATURE_PATH
- + childFeature.getVersionedIdentifier().toString());
- assertTrue(
- "feature info not installed locally:" + featureFile,
- featureFile.exists());
-
- // clean plugins
- for (int i = 0; i < entries.length; i++) {
- pluginName = entries[0].getVersionedIdentifier().toString();
- pluginFile = new File(site, Site.DEFAULT_PLUGIN_PATH + pluginName);
- UpdateManagerUtils.removeFromFileSystem(pluginFile);
- }
-
- // clean features
- UpdateManagerUtils.removeFromFileSystem(featureFile);
- UpdateManagerUtils.removeFromFileSystem(new File(localSite.getURL().getFile()));
- }
-
- public void testInstall() throws Exception {
-
- // cleanup local files...
- URL localURL = ((SiteLocal) SiteManager.getLocalSite()).getLocationURL();
- File localFile =
- new File(new URL(localURL, SiteLocal.SITE_LOCAL_FILE).getFile());
- UpdateManagerUtils.removeFromFileSystem(localFile);
-
- URL INSTALL_SITE = null;
- try {
- INSTALL_SITE = new URL(SOURCE_FILE_SITE, "nestedFeatureSiteTest/");
- } catch (Exception e) {
- fail(e.toString());
- e.printStackTrace();
- }
-
- ISite remoteSite = SiteManager.getSite(INSTALL_SITE);
- IFeatureReference[] features = remoteSite.getFeatureReferences();
- IFeature remoteFeature = null;
-
- if (features == null || features.length == 0)
- fail("No features on the site");
-
- for (int i = 0; i < features.length; i++) {
- if (features[i].getURL().toExternalForm().endsWith("rootfeature.jar")) {
- remoteFeature = features[i].getFeature();
- break;
- }
- }
-
- assertNotNull("Cannot find rootfeature.jar on site", remoteFeature);
- ILocalSite localSite = SiteManager.getLocalSite();
- IConfiguredSite site =
- localSite.getCurrentConfiguration().getConfiguredSites()[0];
-
- ((ConfiguredSite)site).isUpdatable(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()));
- }
-}
\ No newline at end of file
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 e1dfbe8..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/parser/AllParserTests.java
+++ /dev/null
Binary files differ
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 913519f..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/parser/TestCategories.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.eclipse.update.tests.parser;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import java.net.URL;
-
-import org.eclipse.update.core.*;
-import org.eclipse.update.core.SiteFeatureReference;
-import org.eclipse.update.tests.UpdateManagerTestCase;
-
-public class TestCategories extends UpdateManagerTestCase {
- /**
- * Constructor for Test1
- */
- public TestCategories(String arg0) {
- super(arg0);
- }
-
- public void testCategories() throws Exception {
-
- URL remoteUrl = new URL(SOURCE_FILE_SITE + "xmls/site1/");
- ISite remoteSite = SiteManager.getSite(remoteUrl);
-
- ISiteFeatureReference[] feature = remoteSite.getFeatureReferences();
- //ICategory[] categories = remoteSite.getCategories();
-
- ICategory featureCategory = feature[0].getCategories()[0];
-
- assertEquals("UML tools", featureCategory.getLabel());
-
- }
-
- public void testOrderedCategories() throws Exception {
-
- URL remoteUrl = new URL(SOURCE_FILE_SITE + "xmls/site1/");
- ISite remoteSite = SiteManager.getSite(remoteUrl);
-
- ICategory[] categories = remoteSite.getCategories();
- for (int i = 0; i < categories.length; i++) {
- System.out.println("Cat ordered->" + categories[i].getName());
- }
-
- assertEquals("Eclipse tools", categories[1].getLabel());
-
- }
-
- public void testTranslatedCategories() throws Exception {
-
- ISite remoteSite = SiteManager.getSite(SOURCE_HTTP_SITE);
-
- ICategory[] categories = remoteSite.getCategories();
-
- assertEquals("Required Drivers", categories[0].getLabel());
-
- }
-}
\ No newline at end of file
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 9e4e6fd..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/parser/TestFeatureParse.java
+++ /dev/null
Binary files differ
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 5cf7e79..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/parser/TestSiteParse.java
+++ /dev/null
@@ -1,279 +0,0 @@
-package org.eclipse.update.tests.parser;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import java.io.File;
-import java.io.FileNotFoundException;
-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.core.model.DefaultSiteParser;
-import org.eclipse.update.core.model.SiteModel;
-import org.eclipse.update.internal.core.*;
-import org.eclipse.update.internal.core.SiteFileFactory;
-import org.eclipse.update.internal.core.UpdateManagerUtils;
-import org.eclipse.update.tests.UpdateManagerTestCase;
-import org.xml.sax.SAXParseException;
-
-public class TestSiteParse extends UpdateManagerTestCase {
-
- /**
- * Constructor for Test1
- */
- public TestSiteParse(String arg0) {
- super(arg0);
- }
-
- public void testParse() throws Exception {
-
- URL remoteUrl = new URL(SOURCE_FILE_SITE + "xmls/site1/");
- ISite remoteSite = SiteManager.getSite(remoteUrl);
-
- //IFeatureReference[] feature = remoteSite.getFeatureReferences();
- //ICategory[] categories = remoteSite.getCategories();
-
- String path = remoteUrl.getFile();
- String path2 = remoteSite.getDescription().getURL().getFile();
- assertEquals(new File(path + "index.html"), new File(path2));
-
- }
-
- public void testNumberOfFeatures() throws Exception {
-
- URL remoteURL = new URL("http", getHttpHost(), getHttpPort(), bundle.getString("HTTP_PATH_2"));
- ISite remoteSite = SiteManager.getSite(remoteURL);
-
- IFeatureReference[] feature = remoteSite.getFeatureReferences();
- assertEquals(feature.length, 2);
-
- }
-
- public void testParseValid1() throws Exception {
-
- URL remoteURL = new URL(SOURCE_FILE_SITE + "parsertests/site.xml");
- DefaultSiteParser parser = new DefaultSiteParser(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(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(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(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");
- assertEquals(path1,feature[0].getURL());
- 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(new SiteFileFactory());
- URL resolvedURL = URLEncoder.encode(remoteURL);
- SiteModel remoteSite = parser.parse(resolvedURL.openStream());
- remoteSite.resolve(remoteURL, null);
-
- FeatureReferenceModel[] featureRef = remoteSite.getFeatureReferenceModels();
- //CategoryModel[] categories = remoteSite.getCategoryModels();
- ArchiveReferenceModel[] archives = remoteSite.getArchiveReferenceModels();
-
- assertTrue("Wrong number of features", featureRef.length == 1);
- assertTrue("Wrong number of archives", archives.length == 0);
-
- try {
- ((FeatureReference)featureRef[0]).getFeature();
- } catch (CoreException e){
- Throwable e1 = e.getStatus().getException();
- if (e1.getMessage().indexOf("not-eclipse")==-1){
- throw e;
- }
- }
- }
-
- public void testParseValid6() throws Exception {
-
- URL remoteURL = new URL(SOURCE_FILE_SITE + "parsertests/site4.xml");
- DefaultSiteParser parser = new DefaultSiteParser(new SiteFileFactory());
- URL resolvedURL = URLEncoder.encode(remoteURL);
- SiteModel remoteSite = parser.parse(resolvedURL.openStream());
- remoteSite.resolve(remoteURL, null);
-
- FeatureReferenceModel[] featureRef = remoteSite.getFeatureReferenceModels();
- //CategoryModel[] categories = remoteSite.getCategoryModels();
- ArchiveReferenceModel[] archives = remoteSite.getArchiveReferenceModels();
-
- assertTrue("Wrong number of features", featureRef.length == 2);
- assertTrue("Wrong number of archives", archives.length == 0);
-
- try {
- ((FeatureReference)featureRef[0]).getFeature();
- } catch (CoreException e){
- Throwable e1 = e.getStatus().getException();
- String msg = e1.getMessage().replace(File.separatorChar,'/');
- if (msg.indexOf("_1.0.0.jar/feature.xml")==-1){
- throw e;
- }
- }
- }
-
- public void testParseUnknownCategory() throws Exception {
-
- URL remoteURL = new URL(SOURCE_FILE_SITE + "parsertests/site3.xml");
- DefaultSiteParser parser = new DefaultSiteParser(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(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(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(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(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");
- }
-
-}
\ No newline at end of file
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 c620592..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/reconciliation/AllReconciliationTests.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.eclipse.update.tests.reconciliation;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.update.core.SiteManager;
-import org.eclipse.update.internal.core.UpdateManagerUtils;
-import org.eclipse.update.tests.UpdateManagerTestCase;
-import java.io.File;
-import junit.framework.*;
-
-/**
- * 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;
- }
-}
\ No newline at end of file
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 fa281cd..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/reconciliation/TestSiteReconciliation.java
+++ /dev/null
@@ -1,169 +0,0 @@
-package org.eclipse.update.tests.reconciliation;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import java.io.File;
-import java.net.URL;
-
-import org.eclipse.core.boot.BootLoader;
-import org.eclipse.core.boot.IPlatformConfiguration;
-import org.eclipse.core.boot.IPlatformConfiguration.ISiteEntry;
-import org.eclipse.core.boot.IPlatformConfiguration.ISitePolicy;
-import org.eclipse.core.internal.boot.PlatformConfiguration;
-import org.eclipse.update.core.*;
-import org.eclipse.update.core.SiteManager;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.configuration.ILocalSite;
-import org.eclipse.update.internal.core.*;
-import org.eclipse.update.internal.core.InternalSiteManager;
-import org.eclipse.update.internal.core.SiteLocal;
-import org.eclipse.update.tests.UpdateManagerTestCase;
-
-public class TestSiteReconciliation extends UpdateManagerTestCase {
-
-
-
-
- /**
- * Test the getFeatures()
- */
- public TestSiteReconciliation(String arg0) {
- super(arg0);
- }
-
- private void addConfigSite(int policy, URL url,String[] listOfPlugins) throws Exception {
- String xmlFile = ((SiteLocal)SiteManager.getLocalSite()).getLocationURL().getFile();
- UpdateManagerUtils.removeFromFileSystem(new File(xmlFile));
- InternalSiteManager.localSite=null;
- // get new config object
- PlatformConfiguration cfig = (PlatformConfiguration)BootLoader.getCurrentPlatformConfiguration();
- ISitePolicy p1 = cfig.createSitePolicy(policy, listOfPlugins);
- ISiteEntry s1 = cfig.createSiteEntry(url,p1);
- cfig.configureSite(s1);
- }
-
- private void removeConfigSite(URL url) throws Exception {
- // get new config object
- PlatformConfiguration cfig = (PlatformConfiguration)BootLoader.getCurrentPlatformConfiguration();
- ISiteEntry s1 = cfig.findConfiguredSite(url);
- assertNotNull("Unable to find site entry:"+url,s1);
- cfig.unconfigureSite(s1);
- cfig.save();
- }
- /**
- * Site 1 contains a feature which needs a plugin taht is not on the path when we start
- * it will never be configured
- */
- public void testNewSiteInclude1() throws Exception {
-
- int policy = ISitePolicy.USER_INCLUDE;
- URL url = new URL("file",null,dataPath+"reconciliationSites/site1/");
- String[] plugins = new String[]{};
- addConfigSite(policy,url, plugins);
-
- ILocalSite local = SiteManager.getLocalSite();
- ((SiteLocal)local).setStamp(0);
- IConfiguredSite[] newSites = local.getCurrentConfiguration().getConfiguredSites();
- IConfiguredSite newSite = null;
- for (int i = 0; i < newSites.length; i++) {
- if (UpdateManagerUtils.sameURL(newSites[i].getSite().getURL(),url)){
- newSite = newSites[i];
- }
- }
-
- if (newSite==null) fail("Site not found in configuration");
-
- IFeatureReference[] ref = newSite.getConfiguredFeatures();
- assertEquals("Wrong number of configured features",0,ref.length);
- ref = ((ConfiguredSite)newSite).getConfigurationPolicy().getUnconfiguredFeatures();
- assertEquals("Wrong number of unconfigured features",0,ref.length);
-
- removeConfigSite(url);
- }
-
- public void testNewSiteExclude1() throws Exception {
-
- int policy = ISitePolicy.USER_EXCLUDE;
- URL url = new URL("file",null,dataPath+"reconciliationSites/site1/");
- String[] plugins = new String[]{};
- addConfigSite(policy,url, plugins);
-
- ILocalSite local = SiteManager.getLocalSite();
- ((SiteLocal)local).setStamp(0);
- IConfiguredSite[] newSites = local.getCurrentConfiguration().getConfiguredSites();
- IConfiguredSite newSite = null;
- for (int i = 0; i < newSites.length; i++) {
- if (UpdateManagerUtils.sameURL(newSites[i].getSite().getURL(),url)){
- newSite = newSites[i];
- }
- }
-
- if (newSite==null) fail("Site not found in configuration");
-
- IFeatureReference[] ref = newSite.getConfiguredFeatures();
- assertEquals("Wrong number of configured features",0,ref.length);
- ref = ((ConfiguredSite)newSite).getConfigurationPolicy().getUnconfiguredFeatures();
- assertEquals("Wrong number of unconfigured features",0,ref.length);
- removeConfigSite(url);
- }
-
- /**
- * Site 2 contains a feature which needs a plugin taht is on the path when we start
- * it will be configured
- */
- public void testNewSiteInclude2() throws Exception {
-
- int policy = ISitePolicy.USER_INCLUDE;
- URL url = new URL("file",null,dataPath+"reconciliationSites/site2/");
- String[] plugins = new String[]{};
- addConfigSite(policy,url, plugins);
- ILocalSite local = SiteManager.getLocalSite();
- ((SiteLocal)local).setStamp(0);
- IConfiguredSite[] newSites = local.getCurrentConfiguration().getConfiguredSites();
- IConfiguredSite newSite = null;
- for (int i = 0; i < newSites.length; i++) {
- if (UpdateManagerUtils.sameURL(newSites[i].getSite().getURL(),url)){
- newSite = newSites[i];
- }
- }
-
- if (newSite==null) fail("Site not found in configuration");
-
- IFeatureReference[] ref = newSite.getConfiguredFeatures();
- assertEquals("Wrong number of configured features",0,ref.length);
- ref = ((ConfiguredSite)newSite).getConfigurationPolicy().getUnconfiguredFeatures();
- assertEquals("Wrong number of unconfigured features",0,ref.length);
-
- removeConfigSite(url);
- }
-
-
-
- public void testNewSiteExclude2() throws Exception {
-
- int policy = ISitePolicy.USER_EXCLUDE;
- URL url = new URL("file",null,dataPath+"reconciliationSites/site2/");
- String[] plugins = new String[]{};
- addConfigSite(policy,url, plugins);
- ILocalSite local = SiteManager.getLocalSite();
- ((SiteLocal)local).setStamp(0);
- IConfiguredSite[] newSites = local.getCurrentConfiguration().getConfiguredSites();
- IConfiguredSite newSite = null;
- for (int i = 0; i < newSites.length; i++) {
- if (UpdateManagerUtils.sameURL(newSites[i].getSite().getURL(),url)){
- newSite = newSites[i];
- }
- }
-
- if (newSite==null) fail("Site not found in configuration");
-
- IFeatureReference[] ref = newSite.getConfiguredFeatures();
- assertEquals("Wrong number of configured features",0,ref.length);
- ref = ((ConfiguredSite)newSite).getConfigurationPolicy().getUnconfiguredFeatures();
- assertEquals("Wrong number of unconfigured features",0,ref.length);
-
- removeConfigSite(url);
- }
-}
-
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/AllRegularInstallTests.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/AllRegularInstallTests.java
deleted file mode 100644
index d56dd55..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/AllRegularInstallTests.java
+++ /dev/null
Binary files differ
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 23f9a6e..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/MultipleTestLocalSite.java
+++ /dev/null
Binary files differ
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 3260c3b..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestDataEntryInstall.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package org.eclipse.update.tests.regularInstall;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.core.*;
-import org.eclipse.update.tests.UpdateManagerTestCase;
-
-public class TestDataEntryInstall extends UpdateManagerTestCase {
- /**
- * Constructor for Test1
- */
- public TestDataEntryInstall(String arg0) {
- super(arg0);
- }
-
- /**
- * With site.xml
- */
- public void testDataEntrySite() throws Exception {
-
- //cleanup target
- File target = new File(TARGET_FILE_SITE.getFile());
- UpdateManagerUtils.removeFromFileSystem(target);
-
- URL newURL =new File(dataPath + "dataEntrySiteTest/site1/site.xml").toURL();
- ISite remoteSite = SiteManager.getSite(newURL);
- IFeatureReference[] featuresRef = remoteSite.getFeatureReferences();
- ISite localSite = SiteManager.getSite(TARGET_FILE_SITE);
- IFeature remoteFeature = null;
-
- for (int i = 0; i < featuresRef.length; i++) {
- remoteFeature = featuresRef[i].getFeature();
- localSite.install(remoteFeature, null,null);
-
- // verify
- String site = localSite.getURL().getFile();
- INonPluginEntry[] entries = remoteFeature.getNonPluginEntries();
- assertTrue("no data entry", (entries != null && entries.length != 0));
- String pluginName = entries[0].getIdentifier().toString();
- File pluginFile = new File(site, Site.DEFAULT_INSTALLED_FEATURE_PATH + remoteFeature.getVersionedIdentifier().toString()+File.separator+ pluginName);
- assertTrue("data files not installed locally:"+pluginFile, pluginFile.exists());
- }
-
- //cleanup target
- UpdateManagerUtils.removeFromFileSystem(target);
-
-
- }
-
-
- /**
- * With site.xml
- */
- public void testDataEntrySitePackaged() throws Exception {
-
- //cleanup target
- File target = new File(TARGET_FILE_SITE.getFile());
- UpdateManagerUtils.removeFromFileSystem(target);
-
- URL newURL =new File(dataPath + "dataEntrySiteTest/site2/site.xml").toURL();
- ISite remoteSite = SiteManager.getSite(newURL);
- IFeatureReference[] featuresRef = remoteSite.getFeatureReferences();
- ISite localSite = SiteManager.getSite(TARGET_FILE_SITE);
- IFeature remoteFeature = null;
-
- for (int i = 0; i < featuresRef.length; i++) {
- remoteFeature = featuresRef[i].getFeature();
- localSite.install(remoteFeature, null,null);
-
- // verify
- String site = localSite.getURL().getFile();
- INonPluginEntry[] entries = remoteFeature.getNonPluginEntries();
- assertTrue("no data entry", (entries != null && entries.length != 0));
- entries[0].getIdentifier().toString();
- File pluginFile = new File(site, Site.DEFAULT_INSTALLED_FEATURE_PATH + remoteFeature.getVersionedIdentifier().toString()+File.separator+ "nondata"+File.separator+"file1.zip");
- assertTrue("Data file inside the jar not installed locally:"+pluginFile, pluginFile.exists());
- pluginFile = new File(site, Site.DEFAULT_INSTALLED_FEATURE_PATH + remoteFeature.getVersionedIdentifier().toString()+File.separator+ "file.zip");
- assertTrue("Data file outside the jar not installed locally:"+pluginFile, pluginFile.exists());
-
- }
-
-
- //cleanup target
- UpdateManagerUtils.removeFromFileSystem(target);
-
-
- }
-
-}
\ No newline at end of file
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 7557bf6..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestExecutableInstall.java
+++ /dev/null
Binary files differ
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 3d258fd..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestExecutablePackagedInstall.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package org.eclipse.update.tests.regularInstall;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import java.io.File;
-import java.net.URL;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.core.*;
-import org.eclipse.update.tests.UpdateManagerTestCase;
-
-public class TestExecutablePackagedInstall extends UpdateManagerTestCase {
- /**
- * Constructor for Test1
- */
- public TestExecutablePackagedInstall(String arg0) {
- super(arg0);
- }
-
- /**
- * With site.xml
- */
- public void testFilePackageExecutableFeatureSite() throws Exception {
-
- //cleanup target
- File target = new File(TARGET_FILE_SITE.getFile());
- UpdateManagerUtils.removeFromFileSystem(target);
-
- URL newURL = new File(dataPath + "ExecutableFeaturePackagedSite/data2/site.xml").toURL();
- ISite remoteSite = SiteManager.getSite(newURL);
- IFeatureReference[] featuresRef = remoteSite.getFeatureReferences();
- ISite localSite = SiteManager.getSite(TARGET_FILE_SITE);
- IFeature remoteFeature = null;
-
- // at least one executable feature and on packaged
- boolean execFeature = false;
- boolean packFeature = false;
-
- if (featuresRef.length==0) fail ("no feature found");
-
- for (int i = 0; i < featuresRef.length; i++) {
- remoteFeature = featuresRef[i].getFeature();
- remove(remoteFeature,localSite);
- localSite.install(remoteFeature, null,null);
-
- if (remoteFeature.getFeatureContentProvider() instanceof FeaturePackagedContentProvider) packFeature = true;
- if (remoteFeature.getFeatureContentProvider() instanceof FeatureExecutableContentProvider) execFeature = true;
-
- // verify
- String site = localSite.getURL().getFile();
- IPluginEntry[] entries = remoteFeature.getRawPluginEntries();
- assertTrue("no plugins entry", (entries != null && entries.length != 0));
- String pluginName = entries[0].getVersionedIdentifier().toString();
- File pluginFile = new File(site, Site.DEFAULT_PLUGIN_PATH + pluginName);
- assertTrue("plugin files not installed locally:"+pluginFile, pluginFile.exists());
-
- File featureFile = new File(site, Site.DEFAULT_INSTALLED_FEATURE_PATH + remoteFeature.getVersionedIdentifier().toString());
- assertTrue("feature info not installed locally:"+featureFile, featureFile.exists());
-
- File featureFileXML = new File(site, Site.DEFAULT_INSTALLED_FEATURE_PATH + remoteFeature.getVersionedIdentifier().toString() + File.separator + "feature.xml");
- assertTrue("feature info not installed locally: no feature.xml", featureFileXML.exists());
- }
-
- if (!execFeature && !packFeature){
- fail("cannot find one executable and one package feature on teh site");
- }
-
- //cleanup target
- UpdateManagerUtils.removeFromFileSystem(target);
-
-
- }
-
-
- /**
- * Without site.xml
- */
- public void testFileNoSiteXMLSite() throws Exception {
-
- //cleanup target
- File target = new File(TARGET_FILE_SITE.getFile());
- UpdateManagerUtils.removeFromFileSystem(target);
-
- URL newURL = new File(dataPath + "ExecutableFeaturePackagedSite/data/").toURL();
- ISite remoteSite = SiteManager.getSite(newURL);
- IFeatureReference[] featuresRef = remoteSite.getFeatureReferences();
- ISite localSite = SiteManager.getSite(TARGET_FILE_SITE);
- IFeature remoteFeature = null;
-
- // at least one executable feature and on packaged
- boolean execFeature = false;
- boolean packFeature = false;
-
- if (featuresRef.length==0) fail ("no feature found");
-
- for (int i = 0; i < featuresRef.length; i++) {
- try {
- remoteFeature = featuresRef[i].getFeature();
- } catch (CoreException e){
- Throwable e1 = e.getStatus().getException();
- String msg = e1.getMessage().replace(File.separatorChar,'/');
- if (msg.indexOf("CVS/feature.xml")==-1){
- throw e;
- }
- }
- if (remoteFeature!=null){
- remove(remoteFeature,localSite);
- localSite.install(remoteFeature,null, null);
-
- if (remoteFeature.getFeatureContentProvider() instanceof FeaturePackagedContentProvider) packFeature = true;
- if (remoteFeature.getFeatureContentProvider() instanceof FeatureExecutableContentProvider) execFeature = true;
-
- // verify
- String site = localSite.getURL().getFile();
- IPluginEntry[] entries = remoteFeature.getRawPluginEntries();
- assertTrue("no plugins entry", (entries != null && entries.length != 0));
- String pluginName = entries[0].getVersionedIdentifier().toString();
- File pluginFile = new File(site, Site.DEFAULT_PLUGIN_PATH + pluginName);
- assertTrue("plugin files not installed locally:"+pluginFile, pluginFile.exists());
-
- File featureFile = new File(site, Site.DEFAULT_INSTALLED_FEATURE_PATH + remoteFeature.getVersionedIdentifier().toString());
- assertTrue("feature info not installed locally:"+featureFile, featureFile.exists());
-
- File featureFileXML = new File(site, Site.DEFAULT_INSTALLED_FEATURE_PATH + remoteFeature.getVersionedIdentifier().toString() + File.separator + "feature.xml");
- assertTrue("feature info not installed locally: no feature.xml", featureFileXML.exists());
- }
- }
-
- if (!execFeature && !packFeature){
- fail("cannot find one executable and one package feature on teh site");
- }
-
- //cleanup target
- UpdateManagerUtils.removeFromFileSystem(target);
-
-
- }
-
-}
\ No newline at end of file
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 121e1b5..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestGetFeature.java
+++ /dev/null
Binary files differ
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 b62788f..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestInstall.java
+++ /dev/null
@@ -1,311 +0,0 @@
-package org.eclipse.update.tests.regularInstall;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.update.core.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.internal.core.*;
-import org.eclipse.update.tests.UpdateManagerTestCase;
-
-public class TestInstall extends UpdateManagerTestCase {
-
- /**
- *
- */
- public static final String PACKAGED_FEATURE_TYPE = "packaged"; //$NON-NLS-1$
-
- public class Listener implements IConfiguredSiteChangedListener {
-
- public boolean notified = false;
-
- public void featureInstalled(IFeature feature) {
- notified = true;
- System.out.println("Notified DefaultFeature Installed");
- }
-
- public void featureRemoved(IFeature feature) {
- }
-
- public void featureConfigured(IFeature feature) {
- };
- public void featureUnconfigured(IFeature feature) {
- };
-
- public boolean isNotified() {
- return notified;
- }
- }
-
- /**
- * Constructor for Test1
- */
- public TestInstall(String arg0) {
- super(arg0);
- }
-
- private IFeature getFeature1(ISite site)
- throws MalformedURLException, CoreException {
- SiteFeatureReference ref = new SiteFeatureReference();
- ref.setSite(site);
- ref.setURLString("features/org.eclipse.update.core.tests.feature1_1.0.4.jar");
- ref.setType(getDefaultInstallableFeatureType());
- ref.resolve(site.getURL(), null);
- return ref.getFeature();
- }
-
- public void testFileSite() throws Exception {
-
- ISite remoteSite = SiteManager.getSite(SOURCE_FILE_SITE);
- IFeature remoteFeature = getFeature1(remoteSite);
- ISite localSite = SiteManager.getSite(TARGET_FILE_SITE);
- localSite.install(remoteFeature, null, null);
-
- // verify
- String site = localSite.getURL().getFile();
- IPluginEntry[] entries = remoteFeature.getPluginEntries();
- assertTrue("no plugins entry", (entries != null && entries.length != 0));
- String pluginName = entries[0].getVersionedIdentifier().toString();
- File pluginFile = new File(site, Site.DEFAULT_PLUGIN_PATH + pluginName);
- assertTrue("plugin files not installed locally:"+pluginFile, pluginFile.exists());
- File pluginXMLFile =
- new File(
- site,
- Site.DEFAULT_PLUGIN_PATH + pluginName + File.separator + "plugin.xml");
- assertTrue("plugin.xml file not installed locally", pluginXMLFile.exists());
-
- File featureFile =
- new File(
- site,
- Site.DEFAULT_INSTALLED_FEATURE_PATH
- + remoteFeature.getVersionedIdentifier().toString());
- assertTrue(
- "feature info not installed locally:" + featureFile,
- featureFile.exists());
- //cleanup
- UpdateManagerUtils.removeFromFileSystem(pluginFile);
- UpdateManagerUtils.removeFromFileSystem(new File(localSite.getURL().getFile()));
-
- }
-
- /**
- *
- */
- public void testHTTPSite() throws Exception {
-
- ISite remoteSite = SiteManager.getSite(SOURCE_HTTP_SITE);
- IFeatureReference[] features = remoteSite.getFeatureReferences();
- IFeature remoteFeature = null;
-
- if (features == null || features.length == 0)
- fail("No features on the site");
-
- for (int i = 0; i < features.length; i++) {
- if (features[i].getURL().toExternalForm().endsWith("features2.jar")) {
- remoteFeature = features[i].getFeature();
- break;
- }
- }
-
- assertNotNull("Cannot find feature2.jar on site", remoteFeature);
- ISite localSite = SiteManager.getSite(TARGET_FILE_SITE);
- localSite.install(remoteFeature, null, null);
-
- // feature2.jar should not be in the local site
- IFeatureReference[] localFeatures = localSite.getFeatureReferences();
- if (localFeatures == null || localFeatures.length == 0)
- fail("No features on the target site");
-
- boolean found = false;
- for (int i = 0; i < localFeatures.length; i++) {
- if (localFeatures[i].getURL().toExternalForm().endsWith("features2.jar")) {
- found = true;
- break;
- }
- }
-
- assertTrue(
- "Found feature2.jar on target site. Target site feature ref shouldnot contain JAR file",
- !found);
-
- // check
- String site = localSite.getURL().getFile();
- IPluginEntry[] entries = remoteFeature.getPluginEntries();
- assertTrue("no plugins entry", (entries != null && entries.length != 0));
-
- String pluginName = entries[0].getVersionedIdentifier().toString();
- File pluginFile = new File(site, Site.DEFAULT_PLUGIN_PATH + pluginName);
- assertTrue("plugin info not installed locally:"+pluginFile, pluginFile.exists());
-
- File featureFile =
- new File(
- site,
- Site.DEFAULT_INSTALLED_FEATURE_PATH
- + remoteFeature.getVersionedIdentifier().toString());
- assertTrue("feature info not installed locally", featureFile.exists());
-
- //localSite.save();
-
- //cleanup
- UpdateManagerUtils.removeFromFileSystem(pluginFile);
- UpdateManagerUtils.removeFromFileSystem(new File(localSite.getURL().getFile()));
- }
-
- public void testInstall() throws Exception {
-
- // cleanup local files...
- URL localURL = ((SiteLocal) SiteManager.getLocalSite()).getLocationURL();
- File localFile =
- new File(new URL(localURL, SiteLocal.SITE_LOCAL_FILE).getFile());
- UpdateManagerUtils.removeFromFileSystem(localFile);
-
- URL INSTALL_SITE = null;
- try {
- INSTALL_SITE =
- new URL("http", getHttpHost(), getHttpPort(), bundle.getString("HTTP_PATH_2"));
- } catch (Exception e) {
- fail(e.toString());
- e.printStackTrace();
- }
-
- ISite remoteSite = SiteManager.getSite(INSTALL_SITE);
- IFeatureReference[] features = remoteSite.getFeatureReferences();
- IFeature remoteFeature = null;
-
- if (features == null || features.length == 0)
- fail("No features on the site");
-
- for (int i = 0; i < features.length; i++) {
- if (features[i].getURL().toExternalForm().endsWith("helpFeature.jar")) {
- remoteFeature = features[i].getFeature();
- break;
- }
- }
-
- assertNotNull("Cannot find help.jar on site", remoteFeature);
- ILocalSite localSite = SiteManager.getLocalSite();
- IConfiguredSite site =
- localSite.getCurrentConfiguration().getConfiguredSites()[0];
- Listener listener = new Listener();
- site.addConfiguredSiteChangedListener(listener);
-
- ((ConfiguredSite)site).isUpdatable(true);
- site.install(remoteFeature, null, null);
-
- IPluginEntry[] entries = remoteFeature.getRawPluginEntries();
- assertTrue("no plugins entry", (entries != null && entries.length != 0));
-
- String sitePath = site.getSite().getURL().getFile();
- String pluginName = entries[0].getVersionedIdentifier().toString();
- File pluginFile = new File(sitePath, Site.DEFAULT_PLUGIN_PATH + pluginName);
- assertTrue("plugin info not installed locally", pluginFile.exists());
-
- File featureFile =
- new File(
- sitePath,
- Site.DEFAULT_INSTALLED_FEATURE_PATH
- + remoteFeature.getVersionedIdentifier().toString());
- assertTrue("feature info not installed locally", featureFile.exists());
-
- //cleanup
- File file =
- new File(
- site.getSite().getURL().getFile()
- + File.separator
- + Site.DEFAULT_INSTALLED_FEATURE_PATH
- + remoteFeature.getVersionedIdentifier());
- UpdateManagerUtils.removeFromFileSystem(file);
- UpdateManagerUtils.removeFromFileSystem(pluginFile);
- UpdateManagerUtils.removeFromFileSystem(localFile);
- UpdateManagerUtils.removeFromFileSystem(
- new File(
- ((InstallConfiguration) localSite.getCurrentConfiguration())
- .getURL()
- .getFile()));
-
- site.removeConfiguredSiteChangedListener(listener);
- assertTrue("Listener hasn't received notification", listener.isNotified());
- }
-
- public void testFileSiteWithoutSiteXML() throws Exception {
-
- ISite remoteSite = SiteManager.getSite(SOURCE_FILE_SITE);
- IFeature remoteFeature = getFeature1(remoteSite);
- IConfiguredSite localSite =
- SiteManager.getLocalSite().getCurrentConfiguration().getConfiguredSites()[0];
- localSite.getSite().install(remoteFeature, null, null);
-
- IFeatureReference[] features = localSite.getSite().getFeatureReferences();
- if (features.length == 0)
- fail("The local site does not contain feature, should not contain an XML file but features should be found anyway by parsing");
- if (localSite.getSite().getArchives().length == 0)
- fail("The local site does not contain archives, should not contain an XML file but archives should be found anyway by parsing");
-
- //cleanup
- File file =
- new File(
- localSite.getSite().getURL().getFile()
- + File.separator
- + Site.DEFAULT_INSTALLED_FEATURE_PATH
- + remoteFeature.getVersionedIdentifier());
- UpdateManagerUtils.removeFromFileSystem(file);
- file =
- new File(
- localSite.getSite().getURL().getFile()
- + File.separator
- + Site.DEFAULT_PLUGIN_PATH
- + "org.eclipse.update.core.tests.feature1.plugin1_3.5.6");
- UpdateManagerUtils.removeFromFileSystem(file);
- file =
- new File(
- localSite.getSite().getURL().getFile()
- + File.separator
- + Site.DEFAULT_PLUGIN_PATH
- + "org.eclipse.update.core.tests.feature1.plugin2_5.0.0");
- UpdateManagerUtils.removeFromFileSystem(file);
- File localFile =
- new File(
- new URL(
- ((SiteLocal) SiteManager.getLocalSite()).getLocationURL(),
- SiteLocal.SITE_LOCAL_FILE)
- .getFile());
- UpdateManagerUtils.removeFromFileSystem(localFile);
-
- try {
- SiteManager.getSite(new URL("http://www.eclipse.org/"));
- fail("The site contains site.xml... it should be an HTTP site without an XML file");
- } catch (CoreException e) {
- // expected
- }
-
- }
-
- /**
- *
- */
- private Feature createPackagedFeature(URL url, ISite site)
- throws CoreException {
- String packagedFeatureType = site.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 =
- UpdateManagerPlugin.getPlugin().getDescriptor().getUniqueIdentifier() + ".";
- return pluginID + PACKAGED_FEATURE_TYPE;
- }
-
-}
\ No newline at end of file
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 470d7e8..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestInstallURLSIteXML.java
+++ /dev/null
@@ -1,324 +0,0 @@
-package org.eclipse.update.tests.regularInstall;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.update.core.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.internal.core.*;
-import org.eclipse.update.tests.UpdateManagerTestCase;
-
-public class TestInstallURLSIteXML extends UpdateManagerTestCase {
-
- /**
- *
- */
- public static final String PACKAGED_FEATURE_TYPE = "packaged"; //$NON-NLS-1$
-
- public class Listener implements IConfiguredSiteChangedListener {
-
- public boolean notified = false;
-
- public void featureInstalled(IFeature feature) {
- notified = true;
- System.out.println("Notified DefaultFeature Installed");
- }
-
- public void featureRemoved(IFeature feature) {
- }
-
- public void featureConfigured(IFeature feature) {
- };
- public void featureUnconfigured(IFeature feature) {
- };
-
- public boolean isNotified() {
- return notified;
- }
- }
-
- /**
- * Constructor for Test1
- */
- public TestInstallURLSIteXML(String arg0) {
- super(arg0);
- }
-
- private IFeature getFeature1(ISite site)
- throws MalformedURLException, CoreException {
- SiteFeatureReference ref = new SiteFeatureReference();
- ref.setSite(site);
- ref.setURLString("features/org.eclipse.update.core.tests.feature1_1.0.4.jar");
- ref.setType(ISite.DEFAULT_PACKAGED_FEATURE_TYPE);
- ref.resolve(site.getURL(), null);
- return ref.getFeature();
- }
-
- public void testFileSite() throws Exception {
-
- ISite remoteSite =
- SiteManager.getSite(new URL(SOURCE_FILE_SITE, Site.SITE_XML));
- IFeature remoteFeature = getFeature1(remoteSite);
- URL url = new URL(TARGET_FILE_SITE, Site.SITE_XML);
- File file = new File(TARGET_FILE_SITE.getFile());
- if (!file.exists()) file.mkdirs();
- ISite localSite = SiteManager.getSite(url);
- remove(remoteFeature,localSite);
- localSite.install(remoteFeature, null, null);
-
- // verify
- String site = TARGET_FILE_SITE.getFile();
- IPluginEntry[] entries = remoteFeature.getPluginEntries();
- assertTrue("no plugins entry", (entries != null && entries.length != 0));
- String pluginName = entries[0].getVersionedIdentifier().toString();
- File pluginFile = new File(site, Site.DEFAULT_PLUGIN_PATH + pluginName);
- assertTrue("plugin files not installed locally", pluginFile.exists());
- File pluginXMLFile =
- new File(
- site,
- Site.DEFAULT_PLUGIN_PATH + pluginName + File.separator + "plugin.xml");
- assertTrue("plugin.xml file not installed locally", pluginXMLFile.exists());
-
- File featureFile =
- new File(
- site,
- Site.DEFAULT_INSTALLED_FEATURE_PATH
- + remoteFeature.getVersionedIdentifier().toString());
- assertTrue(
- "feature info not installed locally:" + featureFile,
- featureFile.exists());
- //cleanup
- UpdateManagerUtils.removeFromFileSystem(pluginFile);
- UpdateManagerUtils.removeFromFileSystem(new File(localSite.getURL().getFile()));
-
- }
-
- /**
- *
- */
- public void testHTTPSite() throws Exception {
-
- // clean
- File targetFile = new File(TARGET_FILE_SITE.getFile());
- UpdateManagerUtils.removeFromFileSystem(targetFile);
-
- ISite remoteSite =
- SiteManager.getSite(new URL(SOURCE_HTTP_SITE, Site.SITE_XML));
- IFeatureReference[] features = remoteSite.getFeatureReferences();
- IFeature remoteFeature = null;
-
- if (features == null || features.length == 0)
- fail("No features on the site");
-
- for (int i = 0; i < features.length; i++) {
- if (features[i].getURL().toExternalForm().endsWith("features2.jar")) {
- remoteFeature = features[i].getFeature();
- break;
- }
- }
-
- assertNotNull("Cannot find feature2.jar on site", remoteFeature);
- URL url = new URL(TARGET_FILE_SITE, Site.SITE_XML);
- File file = new File(TARGET_FILE_SITE.getFile());
- if (!file.exists()) file.mkdirs();
- ISite localSite = SiteManager.getSite(url);
- localSite.install(remoteFeature, null, null);
-
- // feature2.jar should not be in the local site
- IFeatureReference[] localFeatures = localSite.getFeatureReferences();
- if (localFeatures == null || localFeatures.length == 0)
- fail("No features on the target site");
-
- boolean found = false;
- for (int i = 0; i < localFeatures.length; i++) {
- if (localFeatures[i].getURL().toExternalForm().endsWith("features2.jar")) {
- found = true;
- break;
- }
- }
-
- assertTrue(
- "Found feature2.jar on target site. Target site feature ref shouldnot contain JAR file",
- !found);
-
- // check
- String site = TARGET_FILE_SITE.getFile();
- IPluginEntry[] entries = remoteFeature.getPluginEntries();
- assertTrue("no plugins entry", (entries != null && entries.length != 0));
-
- String pluginName = entries[0].getVersionedIdentifier().toString();
- File pluginFile = new File(site, Site.DEFAULT_PLUGIN_PATH + pluginName);
- assertTrue("plugin info not installed locally", pluginFile.exists());
-
- File featureFile =
- new File(
- site,
- Site.DEFAULT_INSTALLED_FEATURE_PATH
- + remoteFeature.getVersionedIdentifier().toString());
- assertTrue("feature info not installed locally", featureFile.exists());
-
- //localSite.save();
-
- //cleanup
- UpdateManagerUtils.removeFromFileSystem(pluginFile);
- UpdateManagerUtils.removeFromFileSystem(new File(localSite.getURL().getFile()));
- }
-
- public void testInstall() throws Exception {
-
- // cleanup local files...
- SiteLocal siteLocal = ((SiteLocal) SiteManager.getLocalSite());
- File localFile = new File(siteLocal.getLocationURL().getFile());
- //if (!localFile.exists()) fail("LocalSite file doesn't exist ->"+localFile.getAbsolutePath()+"<-");
- UpdateManagerUtils.removeFromFileSystem(localFile.getParentFile());
- /*
- localFile = new File(localFile,SiteLocal.SITE_LOCAL_FILE);
- if (!localFile.exists()) fail("LocalSite.xml doesn't exist:"+localFile);
- UpdateManagerUtils.removeFromFileSystem(localFile);
- */
-
- InternalSiteManager.localSite = null;
-
- URL INSTALL_SITE = null;
- try {
- INSTALL_SITE =
- new URL("http", getHttpHost(), getHttpPort(), bundle.getString("HTTP_PATH_2"));
- } catch (Exception e) {
- fail(e.toString());
- e.printStackTrace();
- }
-
- ISite remoteSite = SiteManager.getSite(INSTALL_SITE);
- IFeatureReference[] features = remoteSite.getFeatureReferences();
- IFeature remoteFeature = null;
-
- if (features == null || features.length == 0)
- fail("No features on the site");
-
- for (int i = 0; i < features.length; i++) {
- if (features[i].getURL().toExternalForm().endsWith("helpFeature.jar")) {
- remoteFeature = features[i].getFeature();
- break;
- }
- }
-
- assertNotNull("Cannot find help.jar on site", remoteFeature);
- ILocalSite localSite = SiteManager.getLocalSite();
- IConfiguredSite site = localSite.getCurrentConfiguration().getConfiguredSites()[0];
- Listener listener = new Listener();
- site.addConfiguredSiteChangedListener(listener);
-
- ((ConfiguredSite)site).isUpdatable(true);
- site.install(remoteFeature, null, null);
-
- IPluginEntry[] entries = remoteFeature.getRawPluginEntries();
- assertTrue("no plugins entry", (entries != null && entries.length != 0));
-
- String sitePath = site.getSite().getURL().getFile();
- String pluginName = entries[0].getVersionedIdentifier().toString();
- File pluginFile = new File(sitePath, Site.DEFAULT_PLUGIN_PATH + pluginName);
- assertTrue("plugin info not installed locally:"+pluginFile, pluginFile.exists());
-
- File featureFile =
- new File(
- sitePath,
- Site.DEFAULT_INSTALLED_FEATURE_PATH
- + remoteFeature.getVersionedIdentifier().toString());
- assertTrue("feature info not installed locally", featureFile.exists());
-
- //cleanup
- File file =
- new File(
- site.getSite().getURL().getFile()
- + File.separator
- + Site.DEFAULT_INSTALLED_FEATURE_PATH
- + remoteFeature.getVersionedIdentifier());
- UpdateManagerUtils.removeFromFileSystem(file);
- UpdateManagerUtils.removeFromFileSystem(pluginFile);
- UpdateManagerUtils.removeFromFileSystem(localFile);
- UpdateManagerUtils.removeFromFileSystem(
- new File(
- ((InstallConfiguration) localSite.getCurrentConfiguration())
- .getURL()
- .getFile()));
-
- site.removeConfiguredSiteChangedListener(listener);
- assertTrue("Listener hasn't received notification", listener.isNotified());
- }
-
- public void testFileSiteWithoutSiteXML() throws Exception {
-
- ISite remoteSite =
- SiteManager.getSite(new URL(SOURCE_FILE_SITE, Site.SITE_XML));
- IFeature remoteFeature = getFeature1(remoteSite);
- IConfiguredSite localSite =
- SiteManager.getLocalSite().getCurrentConfiguration().getConfiguredSites()[0];
- localSite.getSite().install(remoteFeature, null, null);
-
- IFeatureReference[] features = localSite.getSite().getFeatureReferences();
- if (features.length == 0)
- fail("The local site does not contain feature, should not contain an XML file but features should be found anyway by parsing");
- if (localSite.getSite().getArchives().length == 0)
- fail("The local site does not contain archives, should not contain an XML file but archives should be found anyway by parsing");
-
- //cleanup
- File file =
- new File(
- localSite.getSite().getURL().getFile()
- + File.separator
- + Site.DEFAULT_INSTALLED_FEATURE_PATH
- + remoteFeature.getVersionedIdentifier());
- UpdateManagerUtils.removeFromFileSystem(file);
- file =
- new File(
- localSite.getSite().getURL().getFile()
- + File.separator
- + Site.DEFAULT_PLUGIN_PATH
- + "org.eclipse.update.core.tests.feature1.plugin1_3.5.6");
- UpdateManagerUtils.removeFromFileSystem(file);
- file =
- new File(
- localSite.getSite().getURL().getFile()
- + File.separator
- + Site.DEFAULT_PLUGIN_PATH
- + "org.eclipse.update.core.tests.feature1.plugin2_5.0.0");
- UpdateManagerUtils.removeFromFileSystem(file);
- File localFile =
- new File(
- new URL(
- ((SiteLocal) SiteManager.getLocalSite()).getLocationURL(),
- SiteLocal.SITE_LOCAL_FILE)
- .getFile());
- UpdateManagerUtils.removeFromFileSystem(localFile);
-
- }
-
- /**
- *
- */
- private Feature createPackagedFeature(URL url, ISite site)
- throws CoreException {
- String packagedFeatureType = ISite.DEFAULT_PACKAGED_FEATURE_TYPE;
- Feature result = null;
- if (packagedFeatureType != null) {
- IFeatureFactory factory =
- FeatureTypeFactory.getInstance().getFactory(packagedFeatureType);
- result = (Feature) factory.createFeature(url, site);
- }
- return result;
- }
- /*
- * @see ISite#getDefaultInstallableFeatureType()
- */
- public String getDefaultInstallableFeatureType() {
- String pluginID =
- UpdateManagerPlugin.getPlugin().getDescriptor().getUniqueIdentifier() + ".";
- return pluginID + PACKAGED_FEATURE_TYPE;
- }
-
-}
\ No newline at end of file
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 0231115..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestLocalSite.java
+++ /dev/null
@@ -1,338 +0,0 @@
-package org.eclipse.update.tests.regularInstall;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import java.io.File;
-import java.net.URL;
-
-import org.eclipse.core.boot.IPlatformConfiguration;
-import org.eclipse.update.core.*;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.internal.core.*;
-import org.eclipse.update.internal.model.*;
-import org.eclipse.update.internal.model.ConfigurationPolicyModel;
-import org.eclipse.update.tests.UpdateManagerTestCase;
-
-public class TestLocalSite extends UpdateManagerTestCase {
-
- /**
- * Test the getFeatures()
- */
- public TestLocalSite(String arg0) {
- super(arg0);
- }
-
- public void testCreationConfigFile() throws Exception {
-
- //clean up
- SiteLocal siteLocal = (SiteLocal)SiteManager.getLocalSite();
- URL newURL = new URL(siteLocal.getLocationURL(),SiteLocal.SITE_LOCAL_FILE);
- File localFile = new File(newURL.getFile());
- UpdateManagerUtils.removeFromFileSystem(localFile);
- UpdateManagerUtils.removeFromFileSystem(new File(((InstallConfiguration)siteLocal.getCurrentConfiguration()).getURL().getFile()));
- InternalSiteManager.localSite=null;
-
-
- ILocalSite site = SiteManager.getLocalSite();
- site.save();
- URL location = ((SiteLocal)site).getLocationURL();
- String fileName = UpdateManagerUtils.getLocalRandomIdentifier(SiteLocal.DEFAULT_CONFIG_FILE, site.getCurrentConfiguration().getCreationDate());
- String filePath = new URL(location,fileName).getFile();
- File file = new File(filePath);
- assertTrue("config file hasn't been saved in :"+filePath, file.exists());
- assertTrue("Local site hasn't been saved in :"+localFile.getAbsolutePath(),localFile.exists());
-
- // cleanup
- UpdateManagerUtils.removeFromFileSystem(file);
- UpdateManagerUtils.removeFromFileSystem(localFile);
-
-
- }
-
- public void testDefaultConfigFile() throws Exception {
-
- //clean up
- SiteLocal siteLocal = (SiteLocal)SiteManager.getLocalSite();
- URL newURL = new URL(siteLocal.getLocationURL(),SiteLocal.SITE_LOCAL_FILE);
- File localFile = new File(newURL.getFile());
- UpdateManagerUtils.removeFromFileSystem(localFile);
- UpdateManagerUtils.removeFromFileSystem(new File(((InstallConfiguration)siteLocal.getCurrentConfiguration()).getURL().getFile()));
- InternalSiteManager.localSite=null;
-
- ILocalSite site = SiteManager.getLocalSite();
- assertTrue("The local site does not contain an history of install configuration",site.getConfigurationHistory().length!=0);
- assertTrue("The local site does not contain an current install configuration",site.getCurrentConfiguration()!=null);
- assertTrue("The local site does not contain a default configuration site for the current install config",site.getCurrentConfiguration().getConfiguredSites().length!=0);
-
- System.out.println("Default Config Site is :"+site.getCurrentConfiguration().getConfiguredSites()[0].getSite().getURL().toExternalForm());
-
- // cleanup
- URL location = ((SiteLocal)site).getLocationURL();
- String filePath = new URL(location,SiteLocal.DEFAULT_CONFIG_FILE).getFile();
- File file = new File(filePath);
- UpdateManagerUtils.removeFromFileSystem(file);
- UpdateManagerUtils.removeFromFileSystem(localFile);
-
-
- }
-
-/* public void testInstallFeatureSaveConfig() throws Exception {
-
- //clean up
- SiteLocal siteLocal = (SiteLocal)SiteManager.getLocalSite();
- URL newURL = new URL(siteLocal.getLocationURL(),SiteLocal.SITE_LOCAL_FILE);
- File localFile = new File(newURL.getFile());
- UpdateManagerUtils.removeFromFileSystem(localFile);
- UpdateManagerUtils.removeFromFileSystem(new File(((InstallConfiguration)siteLocal.getCurrentConfiguration()).getURL().getFile()));
- InternalSiteManager.localSite=null;
-
- ILocalSite site = SiteManager.getLocalSite();
- ISite remoteSite = SiteManager.getSite(SOURCE_FILE_SITE_INSTALLED);
- IFeature feature = remoteSite.getFeatureReferences()[0].getFeature();
- int oldNumber = site.getCurrentConfiguration().getConfiguredSites().length;
-
- // we are not checking if this is read only
- IInstallConfiguration newConfig = site.cloneCurrentConfiguration();
- newConfig.setLabel("new Label");
- //IInstallConfiguration newConfig = site.getCurrentConfiguration();
- IConfiguredSite configSite = newConfig.getConfiguredSites()[0];
- ConfigurationPolicyModel configPolicy = new BaseSiteLocalFactory().createConfigurationPolicyModel();
- configPolicy.setPolicy(IPlatformConfiguration.ISitePolicy.USER_INCLUDE);
- ((ConfiguredSite)configSite).setConfigurationPolicy((ConfigurationPolicy)configPolicy);
- int oldNumberOfhistory = site.getConfigurationHistory().length;
- site.addConfiguration(newConfig);
- assertNotNull(feature);
-
- ((ConfiguredSite)configSite).isUpdatable(true);
- remove(feature,configSite);
- configSite.install(feature,null,null);
-
- // teh current one points to a real fature
- // does not throw error.
- IConfiguredSite configSite2 = site.getCurrentConfiguration().getConfiguredSites()[0];
- assertTrue("No Configured features found",configSite.getConfiguredFeatures().length>0);
- IFeatureReference ref = configSite2.getConfiguredFeatures()[0];
- IFeature feature2 = ref.getFeature();
- //String configuredFeature = feature2.getLabel();
-
- assertEquals(feature2.getVersionedIdentifier().toString(),"org.eclipse.update.core.tests.feature3_1.0.0");
- assertTrue("Wrong id version of feature",feature2.getVersionedIdentifier().toString().equalsIgnoreCase("org.eclipse.update.core.tests.feature3_1.0.0"));
-
- // only one feature configured
- assertTrue("too many features configured",configSite2.getConfiguredFeatures().length==1);
-
- // no feature unconfigured
- assertTrue("too many unconfigured features",((ConfiguredSite)configSite2).getConfigurationPolicy().getUnconfiguredFeatures().length==0);
-
- // test only 2 install config in local site
- //assertEquals("wrong number of history in Local site:",oldNumberOfhistory+1,site.getConfigurationHistory().length);
-
- // test same # of sites in current config
- assertTrue("Wrong number of config sites in current config",site.getCurrentConfiguration().getConfiguredSites().length==oldNumber);
-
- //test only one feature for the site
- assertTrue("wrong number of configured features for config site",site.getCurrentConfiguration().getConfiguredSites()[0].getConfiguredFeatures().length==1);
-
- // test only 2 activities
- assertTrue("Wrong number of activities for install config",site.getCurrentConfiguration().getActivities().length==2);
-
- site.save();
-
- // check
- // there are 2 configuration
- String time = ""+site.getCurrentConfiguration().getCreationDate().getTime();
- URL location = ((SiteLocal)site).getLocationURL();
- File file = new File(new URL(location,"Config"+time+".xml").getFile());
- assertTrue("new configuration does not exist", file.exists());
-
- // cleanup
- localFile = new File(new URL(location,SiteLocal.SITE_LOCAL_FILE).getFile());
- UpdateManagerUtils.removeFromFileSystem(localFile);
- localFile = new File(new URL(location,SiteLocal.DEFAULT_CONFIG_FILE).getFile());
- UpdateManagerUtils.removeFromFileSystem(localFile);
- localFile = new File(new URL(location,Site.DEFAULT_FEATURE_PATH+File.separator+feature.getVersionedIdentifier().toString()).getFile());
- UpdateManagerUtils.removeFromFileSystem(localFile);
- localFile = new File(new URL(location,Site.DEFAULT_FEATURE_PATH+File.separator+feature2.getVersionedIdentifier().toString()).getFile());
- UpdateManagerUtils.removeFromFileSystem(localFile);
- UpdateManagerUtils.removeFromFileSystem(file);
- localFile = new File(feature2.getURL().getFile());
- UpdateManagerUtils.removeFromFileSystem(localFile);
- }
-*/
-
- public void testRetriveConfig() throws Exception {
-
- //clean up
- SiteLocal siteLocal = (SiteLocal)SiteManager.getLocalSite();
- URL newURL = new URL(siteLocal.getLocationURL(),SiteLocal.SITE_LOCAL_FILE);
- File localFile = new File(newURL.getFile());
- UpdateManagerUtils.removeFromFileSystem(localFile);
- UpdateManagerUtils.removeFromFileSystem(new File(((InstallConfiguration)siteLocal.getCurrentConfiguration()).getURL().getFile()));
- InternalSiteManager.localSite=null;
-
- ILocalSite site = SiteManager.getLocalSite();
- ISite remoteSite = SiteManager.getSite(SOURCE_FILE_SITE_INSTALLED);
- IFeature feature = remoteSite.getFeatureReferences()[0].getFeature();
- int oldNumber = site.getCurrentConfiguration().getConfiguredSites().length;
-
- // we are not checking if this is read only
- IInstallConfiguration newConfig = site.cloneCurrentConfiguration();
- newConfig.setLabel("new Label");
- IConfiguredSite configSite = newConfig.getConfiguredSites()[0];
- ConfigurationPolicyModel configPolicy = new BaseSiteLocalFactory().createConfigurationPolicyModel();
- configPolicy.setPolicy(IPlatformConfiguration.ISitePolicy.USER_INCLUDE);
- ((ConfiguredSite)configSite).setConfigurationPolicyModel(configPolicy);
- int oldNumberOfhistory = site.getConfigurationHistory().length;
- site.addConfiguration(newConfig);
- assertNotNull(feature);
-
- ((ConfiguredSite)configSite).isUpdatable(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,"Config"+time+".xml").getFile());
- assertTrue("new configuration does not exist", file.exists());
-
- // teh current one points to a real fature
- // does not throw error.
- IConfiguredSite configSite2 = site.getCurrentConfiguration().getConfiguredSites()[0];
- IFeatureReference[] refs = configSite2.getConfiguredFeatures();
- boolean found = false;
- IFeature feature2 = null;
- for (int i = 0; i < refs.length; i++) {
- IFeature feature3 = refs[i].getFeature();
- if ("org.eclipse.update.core.tests.feature3_1.0.0".equals(feature3.getVersionedIdentifier().toString())){
- feature2 = feature3;
- found = true;
- }
- }
- assertNotNull("Feature 2 is Null",feature2);
- assertTrue("Wrong id version of feature",feature2.getVersionedIdentifier().toString().equalsIgnoreCase("org.eclipse.update.core.tests.feature3_1.0.0"));
-
- // test only 2 install config in local site
- //assertEquals("wrong number of history in Local site:",oldNumberOfhistory+1,site.getConfigurationHistory().length);
-
- // test # of sites in current config
- assertTrue("Wrong number of config sites in current config",site.getCurrentConfiguration().getConfiguredSites().length==oldNumber);
-
- //test only one feature for the site
- assertTrue("wrong number of configured features for config site",site.getCurrentConfiguration().getConfiguredSites()[0].getConfiguredFeatures().length==1);
-
- // test only 2 activities
- assertTrue("Wrong number of activities for install config",site.getCurrentConfiguration().getActivities().length==2);
-
-
- // cleanup
- localFile = new File(new URL(location,SiteLocal.SITE_LOCAL_FILE).getFile());
- UpdateManagerUtils.removeFromFileSystem(localFile);
- localFile = new File(new URL(location,SiteLocal.DEFAULT_CONFIG_FILE).getFile());
- UpdateManagerUtils.removeFromFileSystem(localFile);
- localFile = new File(new URL(location,Site.DEFAULT_FEATURE_PATH+File.separator+feature.getVersionedIdentifier().toString()).getFile());
- UpdateManagerUtils.removeFromFileSystem(localFile);
- UpdateManagerUtils.removeFromFileSystem(new File(((InstallConfiguration)site.getCurrentConfiguration()).getURL().getFile()));
- UpdateManagerUtils.removeFromFileSystem(file);
- }
-
- public void testRetriveConfigHTTPInstall() throws Exception {
-
- //clean up
- SiteLocal siteLocal = (SiteLocal)SiteManager.getLocalSite();
- URL newURL = new URL(siteLocal.getLocationURL(),SiteLocal.SITE_LOCAL_FILE);
- File localFile = new File(newURL.getFile());
- UpdateManagerUtils.removeFromFileSystem(localFile);
- UpdateManagerUtils.removeFromFileSystem(new File(((InstallConfiguration)siteLocal.getCurrentConfiguration()).getURL().getFile()));
- InternalSiteManager.localSite=null;
-
- ILocalSite site = SiteManager.getLocalSite();
- ISite remoteSite = SiteManager.getSite(SOURCE_HTTP_SITE);
- IFeature feature = remoteSite.getFeatureReferences()[0].getFeature();
-
- // we are not checking if this is read only
- IInstallConfiguration newConfig = site.cloneCurrentConfiguration();
- newConfig.setLabel("new Label");
- IConfiguredSite configSite = newConfig.getConfiguredSites()[0];
- ConfigurationPolicyModel configPolicy = new BaseSiteLocalFactory().createConfigurationPolicyModel();
- configPolicy.setPolicy(IPlatformConfiguration.ISitePolicy.USER_INCLUDE);
- ((ConfiguredSite)configSite).setConfigurationPolicyModel(configPolicy);
- int oldNumberOfhistory = site.getConfigurationHistory().length;
- site.addConfiguration(newConfig);
-
-
- ((ConfiguredSite)configSite).isUpdatable(true);
- configSite.install(feature,null,null);
- site.save();
-
- //do not cleanup, we want to reuse previously created local site
- // but force re-read of xml File
- InternalSiteManager.localSite=null;
- site = SiteManager.getLocalSite();
- feature = remoteSite.getFeatureReferences()[0].getFeature();
- int oldNumber = site.getCurrentConfiguration().getConfiguredSites().length;
-
- // check
- // there are 2 configuration
- String time = ""+site.getCurrentConfiguration().getCreationDate().getTime();
- URL location = ((SiteLocal)site).getLocationURL();
- File file = new File(new URL(location,"Config"+time+".xml").getFile());
- assertTrue("new configuration does not exist", file.exists());
-
- // teh current one points to a real fature
- // does not throw error.
- IConfiguredSite configSite2 = site.getCurrentConfiguration().getConfiguredSites()[0];
-
- IFeatureReference[] refs = configSite2.getConfiguredFeatures();
- boolean found = false;
- IFeature feature2 = null;
- for (int i = 0; i < refs.length; i++) {
- IFeature feature3 = refs[i].getFeature();
- if ("org.test1.ident1_1.0.0".equals(feature3.getVersionedIdentifier().toString())){
- feature2 = feature3;
- found = true;
- }
- }
-
- //String configuredFeature = feature2.getLabel();
- assertTrue("cannot find feature org.test1.ident1_1.0.0 in configured Site",found);
- assertTrue("Wrong id version of feature",feature2.getVersionedIdentifier().toString().equalsIgnoreCase("org.test1.ident1_1.0.0"));
-
- // test only 2 install config in local site
- //assertEquals("wrong number of history in Local site:",oldNumberOfhistory+1,site.getConfigurationHistory().length);
-
- // test same number of sites in current config
- assertTrue("Wrong number of config sites in current config",site.getCurrentConfiguration().getConfiguredSites().length==oldNumber);
-
- //test only one feature for the site
- assertTrue("wrong number of configured features for config site",site.getCurrentConfiguration().getConfiguredSites()[0].getConfiguredFeatures().length==1);
-
- // test only 2 activities
- assertTrue("Wrong number of activities for install config",site.getCurrentConfiguration().getActivities().length==2);
-
-
- // cleanup
- localFile = new File(new URL(location,SiteLocal.SITE_LOCAL_FILE).getFile());
- UpdateManagerUtils.removeFromFileSystem(localFile);
- localFile = new File(new URL(location,SiteLocal.DEFAULT_CONFIG_FILE).getFile());
- UpdateManagerUtils.removeFromFileSystem(localFile);
- localFile = new File(new URL(location,Site.DEFAULT_FEATURE_PATH+File.separator+feature.getVersionedIdentifier().toString()).getFile());
- UpdateManagerUtils.removeFromFileSystem(localFile);
- UpdateManagerUtils.removeFromFileSystem(new File(((InstallConfiguration)site.getCurrentConfiguration()).getURL().getFile()));
- UpdateManagerUtils.removeFromFileSystem(file);
- localFile = new File(feature2.getURL().getFile());
- UpdateManagerUtils.removeFromFileSystem(localFile);
- }
-
-}
-
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 d05be72..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestSpaceInInstall.java
+++ /dev/null
@@ -1,134 +0,0 @@
-package org.eclipse.update.tests.regularInstall;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import java.io.File;
-import java.net.URL;
-
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.core.*;
-import org.eclipse.update.tests.UpdateManagerTestCase;
-
-public class TestSpaceInInstall extends UpdateManagerTestCase {
- /**
- * Constructor for Test1
- */
- public TestSpaceInInstall(String arg0) {
- super(arg0);
- }
-
- /**
- *
- */
- public void testSpaceInURL() throws Exception {
-
- //cleanup target
- URL testURL = new URL(TARGET_FILE_SITE,"test site space/");
- String testPath = testURL.getFile();
- File target = new File(testPath);
- UpdateManagerUtils.removeFromFileSystem(target);
-
- URL newURL = new File(dataPath + "Site with space/site.xml").toURL();
- ISite remoteSite = SiteManager.getSite(newURL);
- IFeatureReference[] featuresRef = remoteSite.getFeatureReferences();
- File file = new File(testURL.getFile());
- if (!file.exists()) file.mkdirs();
- ISite localSite = SiteManager.getSite(testURL);
- IFeature remoteFeature = null;
-
- // at least one executable feature and on packaged
- boolean execFeature = false;
- boolean packFeature = false;
-
- if (featuresRef.length==0) fail ("no feature found");
-
- for (int i = 0; i < featuresRef.length; i++) {
- remoteFeature = featuresRef[i].getFeature();
- remove(remoteFeature,localSite);
- localSite.install(remoteFeature, null,null);
-
- if (remoteFeature.getFeatureContentProvider() instanceof FeaturePackagedContentProvider) packFeature = true;
- if (remoteFeature.getFeatureContentProvider() instanceof FeatureExecutableContentProvider) execFeature = true;
-
- // verify
- String site = testURL.getFile();
- IPluginEntry[] entries = remoteFeature.getRawPluginEntries();
- assertTrue("no plugins entry", (entries != null && entries.length != 0));
- String pluginName = entries[0].getVersionedIdentifier().toString();
- File pluginFile = new File(site, Site.DEFAULT_PLUGIN_PATH + pluginName);
- assertTrue("plugin files not installed locally", pluginFile.exists());
-
- File featureFile = new File(site, Site.DEFAULT_INSTALLED_FEATURE_PATH + remoteFeature.getVersionedIdentifier().toString());
- assertTrue("feature info not installed locally:"+featureFile, featureFile.exists());
-
- File featureFileXML = new File(site, Site.DEFAULT_INSTALLED_FEATURE_PATH + remoteFeature.getVersionedIdentifier().toString() + File.separator + "feature.xml");
- assertTrue("feature info not installed locally: no feature.xml", featureFileXML.exists());
- }
-
- if (!execFeature && !packFeature){
- fail("cannot find one executable and one package feature on teh site");
- }
-
- //cleanup target
- UpdateManagerUtils.removeFromFileSystem(target);
-
-
- }
-
-
- /**
- *
- */
- public void testSpaceInHTTPURL() throws Exception {
-
- //cleanup target
- File target = new File(TARGET_FILE_SITE.getFile());
- UpdateManagerUtils.removeFromFileSystem(target);
-
- String path = bundle.getString("HTTP_PATH_3");
- ISite remoteSite = SiteManager.getSite(new URL("http",getHttpHost(),getHttpPort(),path));
- IFeatureReference[] featuresRef = remoteSite.getFeatureReferences();
- ISite localSite = SiteManager.getSite(TARGET_FILE_SITE);
- IFeature remoteFeature = null;
-
- // at least one executable feature and on packaged
- boolean execFeature = false;
- boolean packFeature = false;
-
- if (featuresRef.length==0) fail ("no feature found");
-
- for (int i = 0; i < featuresRef.length; i++) {
- remoteFeature = featuresRef[i].getFeature();
- localSite.install(remoteFeature, null,null);
-
- if (remoteFeature.getFeatureContentProvider() instanceof FeaturePackagedContentProvider) packFeature = true;
- if (remoteFeature.getFeatureContentProvider() instanceof FeatureExecutableContentProvider) execFeature = true;
-
- // verify
- String site = TARGET_FILE_SITE.getFile();
- IPluginEntry[] entries = remoteFeature.getRawPluginEntries();
- assertTrue("no plugins entry", (entries != null && entries.length != 0));
- String pluginName = entries[0].getVersionedIdentifier().toString();
- File pluginFile = new File(site, Site.DEFAULT_PLUGIN_PATH + pluginName);
- assertTrue("plugin files not installed locally", pluginFile.exists());
-
- File featureFile = new File(site, Site.DEFAULT_INSTALLED_FEATURE_PATH + remoteFeature.getVersionedIdentifier().toString());
- assertTrue("feature info not installed locally:"+featureFile, featureFile.exists());
-
- File featureFileXML = new File(site, Site.DEFAULT_INSTALLED_FEATURE_PATH + remoteFeature.getVersionedIdentifier().toString() + File.separator + "feature.xml");
- assertTrue("feature info not installed locally: no feature.xml", featureFileXML.exists());
- }
-
- if (!execFeature && !packFeature){
- fail("cannot find one executable and one package feature on teh site");
- }
-
- //cleanup target
- UpdateManagerUtils.removeFromFileSystem(target);
-
-
- }
-
-
-}
\ No newline at end of file
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 04bc913..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularRemove/AllRegularRemoveTests.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.eclipse.update.tests.regularRemove;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-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 6f13f6d..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularRemove/TestRemove.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package org.eclipse.update.tests.regularRemove;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.core.*;
-import org.eclipse.update.tests.UpdateManagerTestCase;
-import org.eclipse.update.tests.api.DefaultFeature;
-
-public class TestRemove extends UpdateManagerTestCase {
-
- public class Listener implements IConfiguredSiteChangedListener {
-
- public boolean notified = false;
-
- public void featureInstalled(IFeature feature) {
- notified = true;
- System.out.println("Notified DefaultFeature Installed");
- }
-
- public void featureRemoved(IFeature feature) {
- }
- public void featureConfigured(IFeature feature) {
- };
- public void featureUnconfigured(IFeature feature) {
- };
-
- public boolean isNotified() {
- return notified;
- }
- }
-
- /**
- * Constructor for Test1
- */
- public TestRemove(String arg0) {
- super(arg0);
- }
-
- private IFeature getFeature1(ISite site)
- throws MalformedURLException, CoreException {
- //URL url = UpdateManagerUtils.getURL(site.getURL(), "features/org.eclipse.update.core.tests.feature1_1.0.4.jar", null);
- SiteFeatureReference ref = new SiteFeatureReference();
- ref.setSite(site);
- ref.setURLString("features/org.eclipse.update.core.tests.feature1_1.0.4.jar");
- ref.setType(ISite.DEFAULT_PACKAGED_FEATURE_TYPE);
- ref.resolve(site.getURL(), null);
- return ref.getFeature();
- }
-
- public void testRemoveFeature() throws Exception {
-
- // install feature
- ISite remoteSite = SiteManager.getSite(SOURCE_FILE_SITE);
- IFeature remoteFeature = getFeature1(remoteSite);
- ISite localSite = SiteManager.getSite(TARGET_FILE_SITE);
- IFeatureReference ref = localSite.install(remoteFeature, null, null);
-
- // then remove it
- assertNotNull("Feature is null",ref.getFeature());
- String featureRef = ref.getFeature().getVersionedIdentifier().toString();
- localSite.remove(ref.getFeature(), null);
-
- // verify
- String site = TARGET_FILE_SITE.getFile();
- IPluginEntry[] entries = remoteFeature.getPluginEntries();
- assertTrue("no plugins entry", (entries != null && entries.length != 0));
- String pluginName = entries[0].getVersionedIdentifier().toString();
-
- File pluginFile = new File(site, Site.DEFAULT_PLUGIN_PATH + pluginName);
- assertTrue("plugin files installed locally", !pluginFile.exists());
-
- File featureFile =
- new File(site, Site.DEFAULT_INSTALLED_FEATURE_PATH + featureRef);
- assertTrue(
- "feature info installed locally:" + featureFile,
- !featureFile.exists());
-
- }
-
-}
\ No newline at end of file
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 dc172bc..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/sitevalidation/AllSiteValidationTests.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.eclipse.update.tests.sitevalidation;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-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;
- }
-}
\ No newline at end of file
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 3a15698..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/sitevalidation/TestSiteValidation.java
+++ /dev/null
@@ -1,155 +0,0 @@
-package org.eclipse.update.tests.sitevalidation;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import java.io.File;
-import java.net.URL;
-
-import org.eclipse.core.boot.BootLoader;
-import org.eclipse.core.boot.IPlatformConfiguration.ISiteEntry;
-import org.eclipse.core.internal.boot.PlatformConfiguration;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.SiteManager;
-import org.eclipse.update.internal.core.UpdateManagerUtils;
-import org.eclipse.update.tests.UpdateManagerTestCase;
-
-public class TestSiteValidation extends UpdateManagerTestCase {
-
-
- /**
- * Constructor
- */
- public TestSiteValidation(String arg0) {
- super(arg0);
- }
-
- private void removeConfigSite(URL url) throws Exception {
- // get new config object
- PlatformConfiguration cfig = (PlatformConfiguration)BootLoader.getCurrentPlatformConfiguration();
- ISiteEntry s1 = cfig.findConfiguredSite(url);
- assertNotNull("Unable to find site entry:"+url,s1);
- cfig.unconfigureSite(s1);
- }
-
- public void testSite1() throws Exception {
-
- URL remoteUrl = new URL(TARGET_FILE_SITE + "validation/site1");
- File file = new File(remoteUrl.getFile());
- ILocalSite local = SiteManager.getLocalSite();
- IInstallConfiguration currentConfig = local.getCurrentConfiguration();
- file.mkdirs();
- IConfiguredSite configuredSite = currentConfig.createConfiguredSite(file);
- IStatus status = configuredSite.verifyUpdatableStatus();
-
- String msg = "The site "+file+" should be updatable.";
- if (!status.isOK()){
- fail(msg+status.getMessage());
- }
- currentConfig.removeConfiguredSite(configuredSite);
- removeConfigSite(configuredSite.getSite().getURL());
- }
-
- public void testSite2() throws Exception {
-
- URL remoteUrl = new URL(SOURCE_FILE_SITE + "validation/site2/children");
- File file = new File(remoteUrl.getFile());
- ILocalSite local = SiteManager.getLocalSite();
- IInstallConfiguration currentConfig = local.getCurrentConfiguration();
- IConfiguredSite configuredSite = currentConfig.createConfiguredSite(file);
- IStatus status = configuredSite.verifyUpdatableStatus();
-
- UpdateManagerUtils.removeFromFileSystem(new File(file,".eclipseUM"));
-
- String msg = "The site "+file+" should not be updatable.";
- if (status.isOK()){
- fail(msg+status.getMessage());
- }
- if (status.getMessage().indexOf("This site is contained in another site:")==-1){
- fail("Wrong validation:"+status.getMessage());
- }
- }
-
- public void testSite3() throws Exception {
-
- URL remoteUrl = new URL(SOURCE_FILE_SITE + "validation/site3");
- File file = new File(remoteUrl.getFile());
- ILocalSite local = SiteManager.getLocalSite();
- IInstallConfiguration currentConfig = local.getCurrentConfiguration();
- IConfiguredSite configuredSite = currentConfig.createConfiguredSite(file);
- IStatus status = configuredSite.verifyUpdatableStatus();
-
- UpdateManagerUtils.removeFromFileSystem(new File(file,".eclipseUM"));
-
- String msg = "The site "+file+" should not be updatable.";
- if (status.isOK()){
- fail(msg+status.getMessage());
- }
- if (status.getMessage().indexOf("This site is contained in another site:")==-1){
- fail("Wrong validation:"+status.getMessage());
- }
- }
-
- public void testSite4() throws Exception {
-
- URL remoteUrl = new URL(SOURCE_FILE_SITE + "validation/site4");
- File file = new File(remoteUrl.getFile());
- ILocalSite local = SiteManager.getLocalSite();
- IInstallConfiguration currentConfig = local.getCurrentConfiguration();
- IConfiguredSite configuredSite = currentConfig.createConfiguredSite(file);
- IStatus status = configuredSite.verifyUpdatableStatus();
-
- String msg = "The site "+file+" should not be updatable.";
- if (status.isOK()){
- fail(msg+status.getMessage());
- }
- if (status.getMessage().indexOf("The site cannot be modifed by this product. It is already associated with product:")==-1){
- fail("Wrong validation:"+status.getMessage());
- }
- }
-
- public void testSite5() throws Exception {
-
- URL remoteUrl = new URL(SOURCE_FILE_SITE + "validation/site5/");
- File file = new File(remoteUrl.getFile());
- ILocalSite local = SiteManager.getLocalSite();
- IInstallConfiguration currentConfig = local.getCurrentConfiguration();
- IConfiguredSite configuredSite = currentConfig.createConfiguredSite(file);
- IStatus status = configuredSite.verifyUpdatableStatus();
-
- String msg = "The site "+file+" should be updatable.";
- if (!status.isOK()){
- fail(msg+status.getMessage());
- }
-
- // get new config object
- URL url = configuredSite.getSite().getURL();
- PlatformConfiguration cfig = (PlatformConfiguration)BootLoader.getCurrentPlatformConfiguration();
- ISiteEntry s1 = cfig.findConfiguredSite(url);
- assertNotNull("Site entry not found:"+url,s1);
- cfig.unconfigureSite(s1);
- cfig.save();
- }
-
- public void testSite6() throws Exception {
-
- URL remoteUrl = new URL(SOURCE_FILE_SITE + "validation/site6/children/children");
- File file = new File(remoteUrl.getFile());
- if (!file.exists()) file.mkdirs();
- ILocalSite local = SiteManager.getLocalSite();
- IInstallConfiguration currentConfig = local.getCurrentConfiguration();
- IConfiguredSite configuredSite = currentConfig.createConfiguredSite(file);
- IStatus status = configuredSite.verifyUpdatableStatus();
-
- UpdateManagerUtils.removeFromFileSystem(new File(file,".eclipseUM"));
-
- String msg = "The site "+file+" should not be updatable.";
- if (status.isOK()){
- fail(msg+status.getMessage());
- }
- if (status.getMessage().indexOf("This site is contained in another site:")==-1){
- fail("Wrong validation:"+status.getMessage());
- }
- }
-}
\ 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 acdad72..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/types/AllTypesTests.java
+++ /dev/null
Binary files differ
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 8463645..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/types/TestFeatureType.java
+++ /dev/null
Binary files differ
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 3592050..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/types/TestSiteType.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.eclipse.update.tests.types;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-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.internal.core.FeaturePackagedContentProvider;
-import org.eclipse.update.internal.core.SiteURLContentProvider;
-import org.eclipse.update.tests.UpdateManagerTestCase;
-import org.eclipse.update.tests.implementation.SiteFTPFactory;
-
-public class TestSiteType extends UpdateManagerTestCase {
-
- /**
- * Test the getFeatures()
- */
- public TestSiteType(String arg0) {
- super(arg0);
- }
-
- /**
- * @throws Exception
- */
- public void testSiteType() throws Exception {
-
- String featurePath = dataPath + "SiteTypeExamples/site1/site.xml";
- ISite site = SiteManager.getSite(new File(featurePath).toURL());
- IFeatureReference ref = site.getFeatureReferences()[0];
- IFeature feature = ref.getFeature();
-
- assertTrue(site.getSiteContentProvider() instanceof SiteURLContentProvider);
- assertTrue(((Site) site).getType().equals("org.eclipse.update.core.http"));
- assertTrue(feature.getFeatureContentProvider() instanceof FeaturePackagedContentProvider);
-
- }
-
- /**
- * @throws Exception
- */
- public void testFTPSiteType() throws Exception {
-
- ISite site = SiteManager.getSite(new URL(SOURCE_FILE_SITE + "FTPLikeSite/"));
-
- // should not find the mapping
- // but then should attempt to read the XML file
- // found a new type
- // call the new type
- assertTrue(
- "Wrong site type",
- site.getType().equals("org.eclipse.update.tests.ftp"));
- assertTrue(
- "Wrong file",
- site.getURL().getFile().equals("/" + SiteFTPFactory.FILE));
-
- }
-
- public void testParseValid1() throws Exception {
- try {
- URL remoteURL = new URL(SOURCE_FILE_SITE + "parsertests/siteftp.xml");
- ISite site = SiteManager.getSite(remoteURL);
- site.getArchives();
- } catch (CoreException e) {
- if (e.getMessage().indexOf("</feature>") == -1) {
- throw e;
- }
- }
- }
-
-}
\ No newline at end of file
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 60669b4..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/uivalues/AllCoreUITests.java
+++ /dev/null
Binary files differ
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 74db585..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/uivalues/TestUILabel.java
+++ /dev/null
Binary files differ
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 0420da6..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 870a70d..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 6afaca7..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 72bb15e..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 12ee4ba..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 899bdda..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 623cb1a..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"/>
-</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 639ac8c..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 211986b..0000000
--- a/update/org.eclipse.update.tests.core/webserver/UpdateManager2/site.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-drivers=Required Drivers
-security=Security Fixes
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/webserver/UpdateManager2/site.xml b/update/org.eclipse.update.tests.core/webserver/UpdateManager2/site.xml
deleted file mode 100644
index 657d9b2..0000000
--- a/update/org.eclipse.update.tests.core/webserver/UpdateManager2/site.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site id="org.eclipse.update.core.tests" name="Tests" version="0.0.1">
- <feature url="features/org.eclipse.test.feature_1.0.0.jar">
- <category name="category1"/>
- </feature>
- <feature url="features/features2.jar">
- <category name="category1/subcat1"/>
- <category name="category2"/>
- </feature>
- <feature url="features/org.eclipse.update.core.tests.feature1_1.0.4.jar">
- <category name="category1"/>
- <category name="category2"/>
- </feature>
- <feature url="features/org.eclipse_test_feature.jar"/>
- <feature url="org.eclipse.update.core.feature2_1.0.0/org.eclipse.update.core.feature2_2.2.2.jar">
- <category name="category1"/>
- </feature>
- <feature url="org.eclipse.update.core.feature2_1.0.0/org.eclipse.update.core.feature2_2.2.2.jar">
- </feature>
-
- <category-def name="category1/subcat1" label="Special Fix"/>
- <category-def name="category1" label="%drivers"/>
- <category-def name="category2" label="%security"/>
-</site>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/webserver/WEB-INF/web.xml b/update/org.eclipse.update.tests.core/webserver/WEB-INF/web.xml
deleted file mode 100644
index 1a6d904..0000000
--- a/update/org.eclipse.update.tests.core/webserver/WEB-INF/web.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-
-<!DOCTYPE web-app
- PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
- "http://java.sun.com/j2ee/dtds/web-app_2.2.dtd">
-
-<web-app>
-
-</web-app>
diff --git a/update/org.eclipse.update.ui.forms/.classpath b/update/org.eclipse.update.ui.forms/.classpath
deleted file mode 100644
index ba738a7..0000000
--- a/update/org.eclipse.update.ui.forms/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/"/>
- <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
- <classpathentry kind="src" path="/org.eclipse.ui"/>
- <classpathentry kind="src" path="/org.apache.xerces"/>
- <classpathentry kind="src" path="/org.eclipse.core.boot"/>
- <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
- <classpathentry kind="src" path="/org.eclipse.swt"/>
- <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 37d76d1..0000000
--- a/update/org.eclipse.update.ui.forms/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.update.ui.forms</name>
- <comment></comment>
- <projects>
- <project>org.apache.xerces</project>
- <project>org.eclipse.core.boot</project>
- <project>org.eclipse.core.runtime</project>
- <project>org.eclipse.swt</project>
- <project>org.eclipse.ui</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/update/org.eclipse.update.ui.forms/about.html b/update/org.eclipse.update.ui.forms/about.html
deleted file mode 100644
index 9db411a..0000000
--- a/update/org.eclipse.update.ui.forms/about.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>20th June, 2002</p>
-<h3>License</h3>
-<p>Eclipse.org makes available all content in this plug-in ("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 3f6eaaf..0000000
--- a/update/org.eclipse.update.ui.forms/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.forms.jar = src/
-src.includes=about.html
-bin.includes = plugin.properties,\
- *.jar,\
- plugin.xml,\
- about.html
diff --git a/update/org.eclipse.update.ui.forms/plugin.properties b/update/org.eclipse.update.ui.forms/plugin.properties
deleted file mode 100644
index 470a1ad..0000000
--- a/update/org.eclipse.update.ui.forms/plugin.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# 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 0bd8654..0000000
--- a/update/org.eclipse.update.ui.forms/plugin.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
- id="org.eclipse.update.ui.forms"
- name="%name"
- version="2.0.0"
- provider-name="%provider-name"
- class="org.eclipse.update.ui.forms.internal.FormsPlugin">
-
- <runtime>
- <library name="forms.jar">
- <export name="*"/>
- </library>
- </runtime>
- <requires>
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.eclipse.ui"/>
- <import plugin="org.apache.xerces"/>
- </requires>
-
-
-</plugin>
diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/AbstractForm.java b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/AbstractForm.java
deleted file mode 100644
index b83d823..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/AbstractForm.java
+++ /dev/null
@@ -1,224 +0,0 @@
-package org.eclipse.update.ui.forms.internal;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.jface.preference.*;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.resource.*;
-import org.eclipse.jface.util.*;
-import org.eclipse.ui.*;
-
-/**
- * This class implements IForm interface and
- * provides some common services to its subclasses.
- * It handles some common properties like heading
- * text, image and colors, as well as
- * font change processing.
- */
-
-public abstract class AbstractForm implements IForm, IPropertyChangeListener {
- protected FormWidgetFactory factory;
- protected Color headingBackground;
- protected Color headingForeground;
- protected boolean headingVisible = true;
- protected Image headingImage;
- protected String headingText;
- protected Font titleFont;
-
- public AbstractForm() {
- factory = new FormWidgetFactory();
- titleFont = JFaceResources.getHeaderFont();
- JFaceResources.getFontRegistry().addListener(this);
- IPreferenceStore pstore = JFacePreferences.getPreferenceStore();
- pstore.addPropertyChangeListener(new IPropertyChangeListener() {
- public void propertyChange(PropertyChangeEvent e) {
- if (e.getProperty().equals(JFacePreferences.HYPERLINK_COLOR)
- || e.getProperty().equals(
- JFacePreferences.ACTIVE_HYPERLINK_COLOR)) {
- updateHyperlinkColors();
- }
- }
- });
- }
-
- 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);
- }
-
- /**
- * @see IForm#doGlobalAction(String)
- */
- public boolean doGlobalAction(String actionId) {
- return false;
- }
-
- /**
- * @see IForm#expandTo(Object)
- */
- public void expandTo(Object object) {
- }
-
- /**
- * @see IForm#getControl()
- */
- public abstract Control getControl();
-
- /**
- * @see IForm#getFactory()
- */
- public FormWidgetFactory getFactory() {
- return factory;
- }
-
- /**
- * @see IForm#getHeadingBackground()
- */
- public Color getHeadingBackground() {
- return headingBackground;
- }
-
- /**
- * @see IForm#getHeadingForeground()
- */
- public Color getHeadingForeground() {
- return headingForeground;
- }
-
- /**
- * @see IForm#getHeadingImage()
- */
- public Image getHeadingImage() {
- return headingImage;
- }
-
- /**
- * @see IForm#getHeading()
- */
- public String getHeadingText() {
- if (headingText == null)
- return "";
- return headingText;
- }
-
- /**
- * @see IForm#initialize(Object)
- */
- public void initialize(Object model) {
- }
-
- /**
- * @see IForm#isHeadingVisible()
- */
- public boolean isHeadingVisible() {
- return headingVisible;
- }
-
- /**
- * @see IForm#registerSection(FormSection)
- */
- public void registerSection(FormSection section) {
- }
-
- /**
- * @see IForm#setFocus()
- */
- public void setFocus() {
- }
-
- /**
- * @see IForm#setHeadingBackground(Color)
- */
- public void setHeadingBackground(Color newHeadingBackground) {
- this.headingBackground = newHeadingBackground;
- }
-
- /**
- * @see IForm#setHeadingForeground(Color)
- */
- public void setHeadingForeground(Color newHeadingForeground) {
- this.headingForeground = newHeadingForeground;
- }
-
- /**
- * @see IForm#setHeadingImage(Image)
- */
- public void setHeadingImage(Image headingImage) {
- this.headingImage = headingImage;
- }
-
- /**
- * @see IForm#setHeadingVisible(boolean)
- */
- public void setHeadingVisible(boolean newHeadingVisible) {
- this.headingVisible = newHeadingVisible;
- }
-
- /**
- * @see IForm#setHeading(String)
- */
- public void setHeadingText(String headingText) {
- this.headingText = headingText;
- }
-
- /**
- * @see IForm#update()
- */
- public void update() {
- }
-
- protected boolean canPerformDirectly(String id, Control control) {
- if (control instanceof Text) {
- Text text = (Text) control;
- if (id.equals(IWorkbenchActionConstants.CUT)) {
- text.cut();
- return true;
- }
- if (id.equals(IWorkbenchActionConstants.COPY)) {
- text.copy();
- return true;
- }
- if (id.equals(IWorkbenchActionConstants.PASTE)) {
- text.paste();
- return true;
- }
- if (id.equals(IWorkbenchActionConstants.SELECT_ALL)) {
- text.selectAll();
- return true;
- }
- if (id.equals(IWorkbenchActionConstants.DELETE)) {
- int count = text.getSelectionCount();
- if (count == 0) {
- int caretPos = text.getCaretPosition();
- text.setSelection(caretPos, caretPos + 1);
- }
- text.insert("");
- return true;
- }
- }
- return false;
- }
-}
\ No newline at end of file
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 d307f4d..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/AbstractSectionForm.java
+++ /dev/null
@@ -1,210 +0,0 @@
-package org.eclipse.update.ui.forms.internal;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import java.util.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.custom.ScrolledComposite;
-import org.eclipse.swt.graphics.*;
-
-/**
- * This form class understands form sections.
- * It assumes that they are part of the form
- * and it offers life cycle handling of sections
- * once they are registered.
- */
-
-public abstract class AbstractSectionForm extends AbstractForm {
- public static final int H_SCROLL_INCREMENT = 5;
- public static final int V_SCROLL_INCREMENT = 64;
- protected Vector sections = null;
-
- public void registerSection(FormSection section) {
- if (sections == null)
- sections = new Vector();
- if (!sections.contains(section))
- sections.add(section);
- }
-
- public void unregisterSection(FormSection section) {
- if (sections != null && sections.contains(section))
- sections.remove(section);
- }
-
- public void initialize(Object model) {
- if (sections != null) {
- for (Iterator iter = sections.iterator(); iter.hasNext();) {
- FormSection section = (FormSection) iter.next();
- section.initialize(model);
- }
- }
- }
-
- public void setFocus() {
- if (sections != null && sections.size() > 0) {
- FormSection firstSection = (FormSection) sections.firstElement();
- firstSection.setFocus();
- }
- }
-
- public void update() {
- if (sections != null) {
- for (Iterator iter = sections.iterator(); iter.hasNext();) {
- FormSection section = (FormSection) iter.next();
- section.update();
- }
- }
- }
-
- public void commitChanges(boolean onSave) {
- if (sections != null) {
- for (Iterator iter = sections.iterator(); iter.hasNext();) {
- FormSection section = (FormSection) iter.next();
- if (section.isDirty())
- section.commitChanges(onSave);
- }
- }
- }
-
- public boolean doGlobalAction(String actionId) {
- Control focusControl = getFocusControl();
- if (focusControl == null)
- return false;
-
- if (canPerformDirectly(actionId, focusControl))
- return true;
- Composite parent = focusControl.getParent();
- FormSection targetSection = null;
- while (parent != null) {
- Object data = parent.getData();
- if (data != null && data instanceof FormSection) {
- targetSection = (FormSection) data;
- break;
- }
- parent = parent.getParent();
- }
- if (targetSection != null) {
- return targetSection.doGlobalAction(actionId);
- }
- return false;
- }
-
- protected Control getFocusControl() {
- Control control = getControl();
- if (control == null || control.isDisposed())
- return null;
- Display display = control.getDisplay();
- Control focusControl = display.getFocusControl();
- if (focusControl == null || focusControl.isDisposed())
- return null;
- return focusControl;
- }
-
- public boolean canPaste(Clipboard clipboard) {
- Control focusControl = getFocusControl();
- if (focusControl == null)
- return false;
- Composite parent = focusControl.getParent();
- FormSection targetSection = null;
- while (parent != null) {
- Object data = parent.getData();
- if (data != null && data instanceof FormSection) {
- targetSection = (FormSection) data;
- break;
- }
- parent = parent.getParent();
- }
- if (targetSection != null) {
- return targetSection.canPaste(clipboard);
- }
- return false;
- }
-
- public void dispose() {
- if (sections != null) {
- for (Iterator iter = sections.iterator(); iter.hasNext();) {
- FormSection section = (FormSection) iter.next();
- section.dispose();
- }
- }
- super.dispose();
- }
-
- public static void ensureVisible(ScrolledComposite scomp, Control control) {
- Point controlSize = control.getSize();
- Point controlOrigin = getControlLocation(scomp, control);
- ensureVisible(scomp, controlOrigin, controlSize);
- }
-
- public static void ensureVisible(ScrolledComposite scomp, Point controlOrigin, Point controlSize) {
- Rectangle area = scomp.getClientArea();
- Point scompOrigin = scomp.getOrigin();
-
- int x = scompOrigin.x;
- int y = scompOrigin.y;
-
- if (controlOrigin.x < scompOrigin.x ) {
- x = controlOrigin.x;
- } else if (controlOrigin.x + controlSize.x > scompOrigin.x + area.width) {
- x = controlOrigin.x + controlSize.x - area.width;
- }
-
- if (controlOrigin.y < scompOrigin.y) {
- y = controlOrigin.y;
- } else if (controlOrigin.y + controlSize.y > scompOrigin.y + area.height) {
- y = controlOrigin.y + controlSize.y - area.height;
- }
- scomp.setOrigin(x, y);
- }
-
- public static Point getControlLocation(ScrolledComposite scomp, Control control) {
- int x = 0;
- int y = 0;
- Control currentControl = control;
- for (;;) {
- if (currentControl == scomp)
- break;
- if (currentControl.getLocation().x > 0)
- x += currentControl.getLocation().x;
- if (currentControl.getLocation().y > 0)
- y += currentControl.getLocation().y;
- currentControl = currentControl.getParent();
- }
- return new Point(x, y);
- }
-
- public static void scrollVertical(ScrolledComposite scomp, boolean up) {
- scroll(scomp, 0, up ? -V_SCROLL_INCREMENT : V_SCROLL_INCREMENT);
- }
- public static void scrollHorizontal(ScrolledComposite scomp, boolean left) {
- scroll(scomp, left ? -H_SCROLL_INCREMENT : H_SCROLL_INCREMENT, 0);
- }
- public static void scrollPage(ScrolledComposite scomp, boolean up) {
- Point origin = scomp.getOrigin();
- 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);
- }
- }
-}
\ No newline at end of file
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 34aa1a9..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/CustomWorkbook.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package org.eclipse.update.ui.forms.internal;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.graphics.*;
-import java.util.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.*;
-import org.eclipse.ui.part.*;
-import org.eclipse.jface.resource.*;
-import org.eclipse.swt.custom.*;
-
-
-public class CustomWorkbook implements IFormWorkbook {
- private Hashtable pages;
- private IFormPage sourcePage;
- private IFormPage lastFormPage;
- 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 (page.isSource()) sourcePage = page;
-
- if (firstPageSelected && currentPage == null)
- selectPage(page);
-}
-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);
- }
- });
- // 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) {
- for (Iterator iter = listeners.iterator(); iter.hasNext();) {
- IFormSelectionListener listener = (IFormSelectionListener) iter.next();
- listener.formSelected(page);
- }
-}
-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);
- }
- });
-}
-public void selectPage(final IFormPage page) {
- final IFormPage oldPage = currentPage;
- currentPage = page;
-
- // It may take a while
- BusyIndicator.showWhile(tabFolder.getDisplay(), new Runnable() {
- public void run() {
- switchPages(oldPage, page);
- }
- });
-}
-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) {
- 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);
-}
-}
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 fd2e880..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/ExpandableGroup.java
+++ /dev/null
@@ -1,204 +0,0 @@
-package org.eclipse.update.ui.forms.internal;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-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 int style;
- 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, 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)) {
- setExpanded(!isExpanded());
- }
- }
- });
- 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() {
- }
-}
\ No newline at end of file
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 5d7f87f..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/FormButton.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.eclipse.update.ui.forms.internal;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-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 a7b12e1..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/FormEntry.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package org.eclipse.update.ui.forms.internal;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-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 19f0093..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/FormLabel.java
+++ /dev/null
@@ -1,230 +0,0 @@
-package org.eclipse.update.ui.forms.internal;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import java.text.BreakIterator;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.*;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.widgets.*;
-
-/**
- * FormText is a windowless control that
- * draws text in the provided context.
- */
-public class FormLabel extends Canvas {
- private String text = "";
- int textMarginWidth = 5;
- int textMarginHeight = 5;
- private boolean underlined;
-
- public FormLabel(Composite parent, int style) {
- super(parent, style);
- addPaintListener(new PaintListener() {
- public void paintControl(PaintEvent e) {
- paint(e);
- }
- });
- }
- public String getText() {
- return text;
- }
- public void setText(String text) {
- if (text != null)
- this.text = text;
- else
- text = "";
- }
-
- private void initAccessible() {
- Accessible accessible = getAccessible();
- accessible.addAccessibleListener(new AccessibleAdapter() {
- public void getName(AccessibleEvent e) {
- e.result = getText();
- }
-
- public void getHelp(AccessibleEvent e) {
- e.result = getToolTipText();
- }
- });
-
- accessible
- .addAccessibleControlListener(new AccessibleControlAdapter() {
- public void getChildAtPoint(AccessibleControlEvent e) {
- Point pt = toControl(new Point(e.x, e.y));
- e.childID =
- (getBounds().contains(pt))
- ? ACC.CHILDID_SELF
- : ACC.CHILDID_NONE;
- }
-
- public void getLocation(AccessibleControlEvent e) {
- Rectangle location = getBounds();
- Point pt = toDisplay(new Point(location.x, location.y));
- e.x = pt.x;
- e.y = pt.y;
- e.width = location.width;
- e.height = location.height;
- }
-
- public void getChildCount(AccessibleControlEvent e) {
- e.detail = 0;
- }
-
- public void getRole(AccessibleControlEvent e) {
- e.detail = ACC.ROLE_LABEL;
- }
-
- public void getState(AccessibleControlEvent e) {
- e.detail = ACC.STATE_READONLY;
- }
- });
- }
-
- public void setUnderlined(boolean underlined) {
- this.underlined = underlined;
- }
-
- public boolean isUnderlined() {
- return underlined;
- }
-
- public Point computeSize(int wHint, int hHint, boolean changed) {
- int innerWidth = wHint;
- if (innerWidth != SWT.DEFAULT)
- innerWidth -= textMarginWidth * 2;
- Point textSize = computeTextSize(innerWidth, hHint);
- int textWidth = textSize.x + 2 * textMarginWidth;
- int textHeight = textSize.y + 2 * textMarginHeight;
- return new Point(textWidth, textHeight);
- }
-
- public static int computeWrapHeight(GC gc, String text, int width) {
- BreakIterator wb = BreakIterator.getWordInstance();
- wb.setText(text);
- FontMetrics fm = gc.getFontMetrics();
- int lineHeight = fm.getHeight();
-
- int saved = 0;
- int last = 0;
- int height = lineHeight;
-
- for (int loc = wb.first();
- loc != BreakIterator.DONE;
- loc = wb.next()) {
- String word = text.substring(saved, loc);
- Point extent = gc.textExtent(word);
- if (extent.x > width) {
- // overflow
- saved = last;
- height += extent.y;
- }
- last = loc;
- }
- return height;
- }
-
- private Point computeTextSize(int wHint, int hHint) {
- Point extent;
- GC gc = new GC(this);
-
- gc.setFont(getFont());
- if ((getStyle() & SWT.WRAP) != 0 && wHint != SWT.DEFAULT) {
- int height = computeWrapHeight(gc, text, wHint);
- extent = new Point(wHint, height);
- } else {
- extent = gc.textExtent(getText());
- }
- gc.dispose();
- return extent;
- }
-
- public static void paintWrapText(
- GC gc,
- Point size,
- String text,
- int marginWidth,
- int marginHeight) {
- paintWrapText(gc, size, text, marginWidth, marginHeight, false);
- }
-
- public static void paintWrapText(
- GC gc,
- Point size,
- String text,
- int marginWidth,
- int marginHeight,
- boolean underline) {
- BreakIterator wb = BreakIterator.getWordInstance();
- wb.setText(text);
- FontMetrics fm = gc.getFontMetrics();
- int lineHeight = fm.getHeight();
- int descent = fm.getDescent();
-
- int saved = 0;
- int last = 0;
- int y = marginHeight;
- int width = size.x - marginWidth * 2;
-
- for (int loc = wb.first();
- loc != BreakIterator.DONE;
- loc = wb.next()) {
- String line = text.substring(saved, loc);
- Point extent = gc.textExtent(line);
- if (extent.x > width) {
- // overflow
- String prevLine = text.substring(saved, last);
- gc.drawString(prevLine, marginWidth, y, true);
- if (underline) {
- Point prevExtent = gc.textExtent(prevLine);
- int lineY = y + lineHeight - descent + 1;
- gc.drawLine(marginWidth, lineY, prevExtent.x, lineY);
- }
-
- saved = last;
- y += lineHeight;
- }
- last = loc;
- }
- // paint the last line
- String lastLine = text.substring(saved, last);
- gc.drawString(lastLine, marginWidth, y, true);
- if (underline) {
- int lineY = y + lineHeight - descent + 1;
- Point lastExtent = gc.textExtent(lastLine);
- gc.drawLine(marginWidth, lineY, marginWidth + lastExtent.x, lineY);
- }
- }
-
- protected void paint(PaintEvent e) {
- GC gc = e.gc;
- Point size = getSize();
- gc.setFont(getFont());
- gc.setForeground(getForeground());
- if ((getStyle() & SWT.WRAP) != 0) {
- paintWrapText(
- gc,
- size,
- text,
- textMarginWidth,
- textMarginHeight,
- underlined);
- } else {
- gc.drawText(getText(), textMarginWidth, textMarginHeight, true);
- if (underlined) {
- FontMetrics fm = gc.getFontMetrics();
- int descent = fm.getDescent();
- int lineY = size.y - textMarginHeight - descent + 1;
- gc.drawLine(
- textMarginWidth,
- lineY,
- size.x - textMarginWidth,
- lineY);
- }
- }
- }
-}
\ No newline at end of file
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 be5edda..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/FormSection.java
+++ /dev/null
@@ -1,425 +0,0 @@
-package org.eclipse.update.ui.forms.internal;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.*;
-import org.eclipse.jface.util.*;
-import org.eclipse.jface.resource.*;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.dnd.Clipboard;
-
-public abstract class FormSection implements IPropertyChangeListener {
- public static final int SELECTION = 1;
- private String headerColorKey = FormWidgetFactory.DEFAULT_HEADER_COLOR;
- private String headerText;
- private Control client;
- protected Label header;
- protected Control separator;
- private SectionChangeManager sectionManager;
- private String description;
- private boolean dirty;
- protected Label descriptionLabel;
- private ToggleControl toggle;
- private boolean readOnly;
- private boolean addSeparator = true;
- private boolean descriptionPainted = true;
- private boolean headerPainted = true;
- private boolean collapsable = false;
- private boolean collapsed = false;
- private int widthHint = SWT.DEFAULT;
- private int heightHint = SWT.DEFAULT;
- private Composite control;
-
- /*
- * This is a special layout for the section. Both the
- * header and the description labels will wrap and
- * they will use client's size to calculate needed
- * height. This kind of behaviour is not possible
- * with stock grid layout.
- */
- class SectionLayout extends Layout {
- int vspacing = 3;
- int sepHeight = 2;
-
- 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) {
- Point csize = client.computeSize(SWT.DEFAULT, SWT.DEFAULT, flush);
- if (width == 0) {
- width = csize.x;
- cwidth = width;
- }
- if (height == 0)
- height = csize.y;
- }
-
- Point toggleSize = null;
-
- if (collapsable && toggle != null)
- toggleSize = toggle.computeSize(SWT.DEFAULT, SWT.DEFAULT, flush);
-
- if (hHint == SWT.DEFAULT && headerPainted && header != null) {
- int hwidth = cwidth;
- if (toggleSize != null)
- hwidth = cwidth - toggleSize.x - 5;
- Point hsize = header.computeSize(hwidth, SWT.DEFAULT, flush);
- height += hsize.y;
- collapsedHeight = hsize.y;
- height += vspacing;
- }
-
- if (hHint == SWT.DEFAULT && addSeparator) {
- height += sepHeight;
- height += vspacing;
- collapsedHeight += vspacing + sepHeight;
- }
- if (hHint == SWT.DEFAULT && descriptionPainted && descriptionLabel != null) {
- Point dsize = descriptionLabel.computeSize(cwidth, SWT.DEFAULT, flush);
- height += dsize.y;
- height += vspacing;
- }
- if (toggle != null && toggle.getSelection()) {
- // collapsed state
- height = collapsedHeight;
- }
- return new Point(width, height);
- }
- protected void layout(Composite parent, boolean flush) {
- int width = parent.getClientArea().width;
- int height = parent.getClientArea().height;
- int y = 0;
- Point toggleSize = null;
-
- if (collapsable) {
- toggleSize = toggle.computeSize(SWT.DEFAULT, SWT.DEFAULT, flush);
- }
- if (headerPainted && header != null) {
- Point hsize;
-
- int availableWidth = width;
- if (toggleSize != null)
- availableWidth = width - toggleSize.x - 5;
- hsize = header.computeSize(availableWidth, SWT.DEFAULT, flush);
- int hx = 0;
- if (toggle != null) {
- int ty = y + hsize.y - toggleSize.y;
- toggle.setBounds(0, ty, toggleSize.x, toggleSize.y);
- hx = toggleSize.x; // + 5;
- }
- header.setBounds(hx, y, availableWidth, hsize.y);
-
- y += hsize.y + vspacing;
- }
- if (addSeparator && separator != null) {
- separator.setBounds(0, y, width, 2);
- y += sepHeight + vspacing;
- }
- if (toggle != null && toggle.getSelection()) {
- return;
- }
- if (descriptionPainted && descriptionLabel != null) {
- Point dsize = descriptionLabel.computeSize(width, SWT.DEFAULT, flush);
- descriptionLabel.setBounds(0, y, width, dsize.y);
- y += dsize.y + vspacing;
- }
- if (client != null) {
- client.setBounds(0, y, width, height - y);
- }
- }
- }
-
- public FormSection() {
- /*
- // Description causes problems re word wrapping
- // and causes bad layout in schema and
- // feature editors when in Motif - turning off
- if (SWT.getPlatform().equals("motif")) {
- descriptionPainted = false;
- }
- */
- JFaceResources.getFontRegistry().addListener(this);
- }
- public void commitChanges(boolean onSave) {
- }
- public abstract Composite createClient(
- Composite parent,
- FormWidgetFactory factory);
- public final Control createControl(
- Composite parent,
- final FormWidgetFactory factory) {
- Composite section = factory.createComposite(parent);
- SectionLayout slayout = new SectionLayout();
- section.setLayout(slayout);
- section.setData(this);
-
- if (headerPainted) {
- Color headerColor = factory.getColor(getHeaderColorKey());
- header =
- factory.createHeadingLabel(section, getHeaderText(), headerColor, SWT.WRAP);
- if (collapsable) {
- toggle = new ToggleControl(section, SWT.NULL);
- toggle.setSelection(collapsed);
- toggle.setBackground(factory.getBackgroundColor());
- toggle.setActiveDecorationColor(factory.getHyperlinkColor());
- toggle.setDecorationColor(factory.getColor(factory.COLOR_COMPOSITE_SEPARATOR));
- toggle.setActiveCursor(factory.getHyperlinkCursor());
- toggle.addFocusListener(factory.visibilityHandler);
- toggle.addKeyListener(factory.keyboardHandler);
- toggle.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- doToggle();
- }
- });
- header.addMouseListener(new MouseAdapter() {
- public void mouseDown(MouseEvent e) {
- toggle.setSelection(!toggle.getSelection());
- toggle.redraw();
- doToggle();
- }
- });
- header.addMouseTrackListener(new MouseTrackAdapter() {
- public void mouseEnter(MouseEvent e) {
- header.setCursor(factory.getHyperlinkCursor());
- }
- public void mouseExit(MouseEvent e) {
- header.setCursor(null);
- }
- });
- }
- }
-
- if (addSeparator) {
- //separator = factory.createSeparator(section, SWT.HORIZONTAL);
- separator = factory.createCompositeSeparator(section);
- }
-
- if (descriptionPainted && description != null) {
- descriptionLabel = factory.createLabel(section, description, SWT.WRAP);
- }
- client = createClient(section, factory);
- section.setData(this);
- control = section;
- return section;
- }
-
- private void doToggle() {
- boolean collapsed = toggle.getSelection();
- reflow();
- if (descriptionLabel != null)
- descriptionLabel.setVisible(!collapsed);
- if (client != null)
- client.setVisible(!collapsed);
- }
-
- protected void reflow() {
- control.setRedraw(false);
- control.getParent().setRedraw(false);
- control.layout(true);
- control.getParent().layout(true);
- control.setRedraw(true);
- control.getParent().setRedraw(true);
- }
-
- protected Text createText(
- Composite parent,
- String label,
- FormWidgetFactory factory) {
- return createText(parent, label, factory, 1);
- }
- protected Text createText(
- Composite parent,
- String label,
- FormWidgetFactory factory,
- int span) {
- factory.createLabel(parent, label);
- Text text = factory.createText(parent, "");
- int hfill = span==1 ? GridData.FILL_HORIZONTAL : GridData.HORIZONTAL_ALIGN_FILL;
- GridData gd =
- new GridData(hfill | GridData.VERTICAL_ALIGN_CENTER);
- //gd.grabExcessHorizontalSpace = true;
- gd.horizontalSpan = span;
- text.setLayoutData(gd);
- return text;
- }
- protected Text createText(
- Composite parent,
- FormWidgetFactory factory,
- int span) {
- Text text = factory.createText(parent, "");
- int hfill = span==1 ? GridData.FILL_HORIZONTAL : GridData.HORIZONTAL_ALIGN_FILL;
- GridData gd =
- new GridData(hfill | GridData.VERTICAL_ALIGN_CENTER);
- //gd.grabExcessHorizontalSpace = true;
- gd.horizontalSpan = span;
- text.setLayoutData(gd);
- return text;
- }
- public void dispose() {
- JFaceResources.getFontRegistry().removeListener(this);
- }
- public boolean doGlobalAction(String actionId) {
- return false;
- }
- public void expandTo(Object object) {
- }
- public final void fireChangeNotification(int changeType, Object changeObject) {
- if (sectionManager == null)
- return;
- sectionManager.dispatchNotification(this, changeType, changeObject);
- }
- public final void fireSelectionNotification(Object changeObject) {
- fireChangeNotification(SELECTION, changeObject);
- }
- public java.lang.String getDescription() {
- return description;
- }
- public java.lang.String getHeaderColorKey() {
- return headerColorKey;
- }
- public java.lang.String getHeaderText() {
- return headerText;
- }
- public int getHeightHint() {
- return heightHint;
- }
- public int getWidthHint() {
- return widthHint;
- }
- public void initialize(Object input) {
- }
- public boolean isAddSeparator() {
- return addSeparator;
- }
- public boolean isDescriptionPainted() {
- return descriptionPainted;
- }
- public boolean isDirty() {
- return dirty;
- }
- public boolean isHeaderPainted() {
- return headerPainted;
- }
- public boolean isReadOnly() {
- return readOnly;
- }
- public void sectionChanged(
- FormSection source,
- int changeType,
- Object changeObject) {
- }
- public void setAddSeparator(boolean newAddSeparator) {
- addSeparator = newAddSeparator;
- }
-
- private String trimNewLines(String text) {
- StringBuffer buff = new StringBuffer();
- for (int i = 0; i < text.length(); i++) {
- char c = text.charAt(i);
- if (c == '\n')
- buff.append(' ');
- else
- buff.append(c);
- }
- return buff.toString();
- }
-
- public void setDescription(java.lang.String newDescription) {
- // we will trim the new lines so that we can
- // use layout-based word wrapping instead
- // of hard-coded one
- description = trimNewLines(newDescription);
- //description = newDescription;
- if (descriptionLabel != null)
- descriptionLabel.setText(newDescription);
- }
- public void setDescriptionPainted(boolean newDescriptionPainted) {
- descriptionPainted = newDescriptionPainted;
- }
- public void setDirty(boolean newDirty) {
- dirty = newDirty;
- }
- public void setFocus() {
- if (toggle!=null)
- toggle.setFocus();
- }
- public void setHeaderColorKey(java.lang.String newHeaderColorKey) {
- headerColorKey = newHeaderColorKey;
- }
- public void setHeaderPainted(boolean newHeaderPainted) {
- headerPainted = newHeaderPainted;
- }
- public void setHeaderText(java.lang.String newHeaderText) {
- headerText = newHeaderText;
- if (header != null)
- header.setText(headerText);
- }
- public void setHeightHint(int newHeightHint) {
- heightHint = newHeightHint;
- }
- void setManager(SectionChangeManager manager) {
- this.sectionManager = manager;
- }
- public void setReadOnly(boolean newReadOnly) {
- readOnly = newReadOnly;
- }
-
- public void setWidthHint(int newWidthHint) {
- widthHint = newWidthHint;
- }
-
- public void update() {
- }
-
- public void propertyChange(PropertyChangeEvent arg0) {
- if (control != null && header != null) {
- header.setFont(JFaceResources.getBannerFont());
- control.layout(true);
- }
- }
-
- /**
- * Gets the collapsable.
- * @return Returns a boolean
- */
- public boolean getCollapsable() {
- return collapsable;
- }
-
- /**
- * Sets the collapsable.
- * @param collapsable The collapsable to set
- */
- public void setCollapsable(boolean collapsable) {
- this.collapsable = collapsable;
- }
-
- public void setCollapsed(boolean collapsed) {
- this.collapsed = collapsed;
- }
-
- public boolean canPaste(Clipboard clipboard) {
- return false;
- }
-}
\ No newline at end of file
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 bc3ff0f..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/FormWidgetFactory.java
+++ /dev/null
@@ -1,407 +0,0 @@
-package org.eclipse.update.ui.forms.internal;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.graphics.*;
-import java.util.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.jface.resource.*;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.custom.*;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.update.ui.forms.internal.engine.FormEngine;
-
-public class FormWidgetFactory {
- public static final String 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];
- if (c.getEnabled() == false && !(c instanceof CCombo))
- continue;
- if (c instanceof SelectableFormLabel)
- continue;
- if (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 (c instanceof Table || c instanceof Tree || c instanceof TableTree) {
- Rectangle b = c.getBounds();
- GC gc = event.gc;
- gc.setForeground(borderColor);
- //gc.drawRectangle(b.x - 2, b.y - 2, b.width + 3, b.height + 3);
- gc.drawRectangle(b.x - 1, b.y - 1, b.width + 2, b.height + 2);
- }
- }
- }
- }
-
- class VisibilityHandler extends FocusAdapter {
- public void focusGained(FocusEvent e) {
- Widget w = e.widget;
- if (w instanceof Control) {
- ensureVisible((Control) w);
- }
- }
- }
-
- class KeyboardHandler extends KeyAdapter {
- public void keyPressed(KeyEvent e) {
- Widget w = e.widget;
- if (w instanceof Control) {
- processKey(e.keyCode, (Control) w);
- }
- }
- }
-
- public FormWidgetFactory() {
- this(Display.getCurrent());
- }
-
- public FormWidgetFactory(Display display) {
- this.display = display;
- initialize();
- }
-
- public static ScrolledComposite getScrolledComposite(Control c) {
- Composite parent = c.getParent();
-
- while (parent != null) {
- if (parent instanceof ScrolledComposite) {
- return (ScrolledComposite) parent;
- }
- parent = parent.getParent();
- }
- return null;
- }
-
- public static void ensureVisible(Control c) {
- ScrolledComposite scomp = getScrolledComposite(c);
- if (scomp != null) {
- AbstractSectionForm.ensureVisible(scomp, c);
- }
- }
-
- public static void processKey(int keyCode, Control c) {
- ScrolledComposite scomp = getScrolledComposite(c);
- if (scomp != null) {
- switch (keyCode) {
- case SWT.ARROW_DOWN :
- AbstractSectionForm.scrollVertical(scomp, false);
- break;
- case SWT.ARROW_UP :
- AbstractSectionForm.scrollVertical(scomp, true);
- break;
- case SWT.ARROW_LEFT :
- AbstractSectionForm.scrollHorizontal(scomp, true);
- break;
- case SWT.ARROW_RIGHT :
- AbstractSectionForm.scrollHorizontal(scomp, false);
- break;
- case SWT.PAGE_UP :
- AbstractSectionForm.scrollPage(scomp, true);
- break;
- case SWT.PAGE_DOWN :
- AbstractSectionForm.scrollPage(scomp, false);
- break;
- }
- }
- }
-
- public Button createButton(Composite parent, String text, int style) {
- int flatStyle = BORDER_STYLE == SWT.BORDER ? SWT.NULL : SWT.FLAT;
- //int flatStyle = SWT.NULL;
- Button button = new Button(parent, style | flatStyle);
- button.setBackground(backgroundColor);
- button.setForeground(foregroundColor);
- if (text != null)
- button.setText(text);
- button.addFocusListener(visibilityHandler);
- return button;
- }
- public Composite createComposite(Composite parent) {
- return createComposite(parent, SWT.NULL);
- }
- public Composite createComposite(Composite parent, int style) {
- Composite composite = new Composite(parent, style);
- composite.setBackground(backgroundColor);
- composite.addMouseListener(new MouseAdapter() {
- public void mousePressed(MouseEvent e) {
- ((Control) e.widget).setFocus();
- }
- });
- composite.setMenu(parent.getMenu());
- return composite;
- }
- public Composite createCompositeSeparator(Composite parent) {
- Composite composite = new Composite(parent, SWT.NONE);
- composite.setBackground(getColor(COLOR_COMPOSITE_SEPARATOR));
- return composite;
- }
-
- public Label createHeadingLabel(Composite parent, String text) {
- return createHeadingLabel(parent, text, null, SWT.NONE);
- }
-
- public Label createHeadingLabel(Composite parent, String text, int style) {
- return createHeadingLabel(parent, text, null, style);
- }
-
- public Label createHeadingLabel(Composite parent, String text, Color bg) {
- return createHeadingLabel(parent, text, bg, SWT.NONE);
- }
-
- public Label createHeadingLabel(
- Composite parent,
- String text,
- Color bg,
- int style) {
- Label label = new Label(parent, style);
- if (text != null)
- label.setText(text);
- label.setBackground(backgroundColor);
- label.setForeground(foregroundColor);
- label.setFont(JFaceResources.getFontRegistry().get(JFaceResources.BANNER_FONT));
- return label;
- }
-
- public Label createHyperlinkLabel(
- Composite parent,
- String text,
- IHyperlinkListener listener) {
- return createHyperlinkLabel(parent, text, listener, SWT.NULL);
- }
- public Label createHyperlinkLabel(
- Composite parent,
- String text,
- IHyperlinkListener listener,
- int style) {
- Label label = createLabel(parent, text, style);
- turnIntoHyperlink(label, listener);
- return label;
- }
- public Label createLabel(Composite parent, String text) {
- return createLabel(parent, text, SWT.NONE);
- }
- public Label createLabel(Composite parent, String text, int style) {
- Label label = new Label(parent, style);
- if (text != null)
- label.setText(text);
- label.setBackground(backgroundColor);
- label.setForeground(foregroundColor);
- return label;
- }
-
- public SelectableFormLabel createSelectableLabel(
- Composite parent,
- String text) {
- return createSelectableLabel(parent, text, SWT.NONE);
- }
-
- public SelectableFormLabel createSelectableLabel(
- Composite parent,
- String text,
- int style) {
- SelectableFormLabel label = new SelectableFormLabel(parent, style);
- if (text != null)
- label.setText(text);
- label.setBackground(backgroundColor);
- label.setForeground(foregroundColor);
- label.addFocusListener(visibilityHandler);
- label.addKeyListener(keyboardHandler);
- return label;
- }
-
- public FormEngine createFormEngine(Composite parent) {
- FormEngine engine = new FormEngine(parent, SWT.WRAP);
- engine.setBackground(backgroundColor);
- engine.setForeground(foregroundColor);
- engine.marginWidth = 1;
- engine.marginHeight = 0;
- engine.setHyperlinkSettings(getHyperlinkHandler());
- engine.addKeyListener(keyboardHandler);
- engine.setMenu(parent.getMenu());
- return engine;
- }
-
- public Label createSeparator(Composite parent, int style) {
- Label label = new Label(parent, SWT.SEPARATOR | style);
- label.setBackground(backgroundColor);
- label.setForeground(borderColor);
- return label;
- }
- public Table createTable(Composite parent, int style) {
- Table table = new Table(parent, BORDER_STYLE | style);
- table.setBackground(backgroundColor);
- table.setForeground(foregroundColor);
- hookDeleteListener(table);
- return table;
- }
- public Text createText(Composite parent, String value) {
- return createText(parent, value, BORDER_STYLE | SWT.SINGLE);
- }
- public Text createText(Composite parent, String value, int style) {
- Text text = new Text(parent, style);
- if (value != null)
- text.setText(value);
- text.setBackground(backgroundColor);
- text.setForeground(foregroundColor);
- text.addFocusListener(visibilityHandler);
- return text;
- }
- public Tree createTree(Composite parent, int style) {
- Tree tree = new Tree(parent, BORDER_STYLE | style);
- tree.setBackground(backgroundColor);
- tree.setForeground(foregroundColor);
- hookDeleteListener(tree);
- return tree;
- }
- private void deleteKeyPressed(Widget widget) {
- if (!(widget instanceof Control))
- return;
- Control control = (Control) widget;
- for (Control parent = control.getParent();
- parent != null;
- parent = parent.getParent()) {
- if (parent.getData() instanceof FormSection) {
- FormSection section = (FormSection) parent.getData();
- section.doGlobalAction(IWorkbenchActionConstants.DELETE);
- break;
- }
- }
- }
- public void dispose() {
- Enumeration colors = colorRegistry.elements();
- while (colors.hasMoreElements()) {
- Color c = (Color) colors.nextElement();
- c.dispose();
- }
- hyperlinkHandler.dispose();
- colorRegistry = null;
- }
- public Color getBackgroundColor() {
- return backgroundColor;
- }
- public Color getBorderColor() {
- return borderColor;
- }
- public Cursor getBusyCursor() {
- return hyperlinkHandler.getBusyCursor();
- }
- public Color getColor(String key) {
- return (Color) colorRegistry.get(key);
- }
- public Color getForegroundColor() {
- return foregroundColor;
- }
- public HyperlinkHandler getHyperlinkHandler() {
- return hyperlinkHandler;
- }
- public Cursor getHyperlinkCursor() {
- return hyperlinkHandler.getHyperlinkCursor();
- }
- public Color getHyperlinkColor() {
- return hyperlinkHandler.getForeground();
- }
- public Color getHyperlinkHoverColor() {
- return hyperlinkHandler.getActiveForeground();
- }
- public int getHyperlinkUnderlineMode() {
- return hyperlinkHandler.getHyperlinkUnderlineMode();
- }
- public void hookDeleteListener(Control control) {
- if (deleteListener == null) {
- deleteListener = new KeyAdapter() {
- public void keyPressed(KeyEvent event) {
- if (event.character == SWT.DEL && event.stateMask == 0) {
- deleteKeyPressed(event.widget);
- }
- }
- };
- }
- control.addKeyListener(deleteListener);
- }
- private void initialize() {
- backgroundColor = display.getSystemColor(SWT.COLOR_LIST_BACKGROUND);
- registerColor(COLOR_BORDER, 195, 191, 179);
- registerColor(COLOR_COMPOSITE_SEPARATOR, 152, 170, 203);
- registerColor(DEFAULT_HEADER_COLOR, 0x48, 0x70, 0x98);
- if (isWhiteBackground())
- borderColor = getColor(COLOR_BORDER);
- else
- borderColor = display.getSystemColor(SWT.COLOR_WIDGET_BACKGROUND);
- foregroundColor = display.getSystemColor(SWT.COLOR_LIST_FOREGROUND);
- hyperlinkHandler = new HyperlinkHandler();
- hyperlinkHandler.setBackground(backgroundColor);
- updateHyperlinkColors();
- visibilityHandler = new VisibilityHandler();
- keyboardHandler = new KeyboardHandler();
- }
-
- public boolean isWhiteBackground() {
- return backgroundColor.getRed()==255 && backgroundColor.getGreen()==255 &&
- backgroundColor.getBlue()==255;
- }
-
- public void updateHyperlinkColors() {
- Color hyperlinkColor = JFaceColors.getHyperlinkText(display);
- Color activeHyperlinkColor = JFaceColors.getActiveHyperlinkText(display);
- hyperlinkHandler.setForeground(hyperlinkColor);
- hyperlinkHandler.setActiveForeground(activeHyperlinkColor);
- }
-
- public void paintBordersFor(Composite parent) {
- if (BORDER_STYLE == SWT.BORDER)
- return;
- if (borderPainter == null)
- borderPainter = new BorderPainter();
- parent.addPaintListener(borderPainter);
- }
- public Color registerColor(String key, int r, int g, int b) {
- Color c = new Color(display, r, g, b);
- colorRegistry.put(key, c);
- return c;
- }
- public void setBackgroundColor(Color color) {
- backgroundColor = color;
- }
- public void setHyperlinkColor(Color color) {
- hyperlinkHandler.setForeground(color);
- }
- public void setHyperlinkHoverColor(org.eclipse.swt.graphics.Color hoverColor) {
- hyperlinkHandler.setActiveForeground(hoverColor);
- }
- public void setHyperlinkUnderlineMode(int newHyperlinkUnderlineMode) {
- hyperlinkHandler.setHyperlinkUnderlineMode(newHyperlinkUnderlineMode);
- }
- public void turnIntoHyperlink(Control control, IHyperlinkListener listener) {
- hyperlinkHandler.registerHyperlink(control, listener);
- }
-}
\ No newline at end of file
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 69296d3..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/FormsPlugin.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package org.eclipse.update.ui.forms.internal;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.*;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-public class FormsPlugin extends AbstractUIPlugin {
- private static FormsPlugin instance;
- private ResourceBundle resourceBundle;
-
- /**
- * Constructor for FormsPlugin.
- * @param descriptor
- */
- public FormsPlugin(IPluginDescriptor descriptor) {
- super(descriptor);
- instance = this;
- try {
- resourceBundle =
- ResourceBundle.getBundle(
- "org.eclipse.update.ui.forms.internal.FormsPluginResources");
- } catch (MissingResourceException x) {
- resourceBundle = null;
- }
- }
-
- /**
- * Returns the string from the plugin's resource bundle,
- * or 'key' if not found.
- */
- public static String getResourceString(String key) {
- ResourceBundle bundle = FormsPlugin.getDefault().getResourceBundle();
- try {
- return bundle.getString(key);
- } catch (MissingResourceException e) {
- return key;
- }
- }
-
- public static String getFormattedMessage(String key, String[] args) {
- String text = getResourceString(key);
- return java.text.MessageFormat.format(text, args);
- }
-
- public static String getFormattedMessage(String key, String arg) {
- String text = getResourceString(key);
- return java.text.MessageFormat.format(text, new Object[] { arg });
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- return resourceBundle;
- }
-
- public static FormsPlugin getDefault() {
- return instance;
- }
-
- public static IWorkbenchPage getActivePage() {
- return getDefault().internalGetActivePage();
- }
-
- private IWorkbenchPage internalGetActivePage() {
- return getWorkbench().getActiveWorkbenchWindow().getActivePage();
- }
-
- public static Shell getActiveWorkbenchShell() {
- return getActiveWorkbenchWindow().getShell();
- }
-
- public static IWorkbenchWindow getActiveWorkbenchWindow() {
- return getDefault().getWorkbench().getActiveWorkbenchWindow();
- }
-
- public static String getPluginId() {
- return getDefault().getDescriptor().getUniqueIdentifier();
- }
-
- public static void logException(Throwable e) {
- logException(e, true);
- }
-
- public static void logException(Throwable e, boolean showErrorDialog) {
- if (e instanceof InvocationTargetException) {
- e = ((InvocationTargetException) e).getTargetException();
- }
-
- IStatus status = null;
- if (e instanceof CoreException) {
- status = ((CoreException) e).getStatus();
- } else {
- String message = e.getMessage();
- if (message == null)
- message = e.toString();
- status =
- new Status(
- IStatus.ERROR,
- getPluginId(),
- IStatus.OK,
- message,
- e);
- }
- log(status, showErrorDialog);
- }
-
- public static void log(IStatus status, boolean showErrorDialog) {
- if (showErrorDialog)
- ErrorDialog.openError(
- getActiveWorkbenchShell(),
- null,
- null,
- status);
- Platform.getPlugin("org.eclipse.core.runtime").getLog().log(status);
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/FormsPluginResources.properties b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/FormsPluginResources.properties
deleted file mode 100644
index c8ad693..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/FormsPluginResources.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-
-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 3232633..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/HTMLTableLayout.java
+++ /dev/null
@@ -1,645 +0,0 @@
-package org.eclipse.update.ui.forms.internal;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.widgets.*;
-import java.util.*;
-import org.eclipse.swt.SWT;
-
-/**
- * This implementation of the layout algorithm
- * attempts to position controls in the composite
- * using a two-pass autolayout HTML table altorithm
- * recommeded by HTML 4.01 W3C specification.
- * The main differences with GridLayout is that
- * it has two passes and that width and height
- * are not calculated in the same pass.
- * <p>
- * The advantage of the algorithm over GridLayout
- * is that it is capable of flowing text controls
- * capable of line wrap. These controls do not
- * have natural 'preferred size'. Instead,
- * they are capable of providing the required
- * height if the width is set. Consequently,
- * this algorithm first calculates the widths
- * that will be assigned to columns, and then
- * passes those widths to the controls to
- * calculate the height. When a composite
- * with this layout is a child of the scrolling
- * composite, they should interact in such
- * a way that reduction in the scrolling composite
- * width results in the reflow and increase of
- * the overall height.
- * <p>
- * If none of the columns contain expandable
- * and wrappable controls, the end-result
- * will be similar to the one provided
- * by GridLayout. The difference will
- * show up for layouts that contain
- * controls whose minimum and maximum
- * widths are not the same.
- */
-
-public class HTMLTableLayout extends Layout {
- public int numColumns = 1;
- public int leftMargin = 5;
- public int rightMargin = 5;
- public int topMargin = 5;
- public int bottomMargin = 5;
- public int horizontalSpacing = 5;
- public int verticalSpacing = 5;
- public boolean makeColumnsEqualWidth = false;
-
- private boolean initialLayout=true;
- private Vector grid = null;
- private int [] minColumnWidths, maxColumnWidths;
- private int widestColumnWidth;
- private int [] growingColumns;
-
- public int getMinimumWidth(Composite parent, boolean changed) {
- changed = true;
- initializeIfNeeded(parent, changed);
- if (initialLayout) {
- changed = true;
- initialLayout = false;
- }
- if (grid==null || changed) {
- changed = true;
- grid = new Vector();
- createGrid(parent);
- }
- if (minColumnWidths==null)
- minColumnWidths = new int [numColumns];
- for (int i=0; i<numColumns; i++) {
- minColumnWidths[i] = 0;
- }
- return internalGetMinimumWidth(parent, changed);
- }
-
- public int getMaximumWidth(Composite parent, boolean changed) {
- changed = true;
- initializeIfNeeded(parent, changed);
- if (initialLayout) {
- changed = true;
- initialLayout = false;
- }
- if (grid==null || changed) {
- changed = true;
- grid = new Vector();
- createGrid(parent);
- }
- if (maxColumnWidths==null)
- maxColumnWidths = new int[numColumns];
- for (int i=0; i<numColumns; i++) {
- maxColumnWidths[i] = 0;
- }
- return internalGetMaximumWidth(parent, changed);
- }
-
- /**
- * @see Layout#layout(Composite, boolean)
- */
- protected void layout(Composite parent, boolean changed) {
- Rectangle clientArea = parent.getClientArea();
- Control [] children = parent.getChildren();
- if (children.length ==0) return;
- int parentWidth = clientArea.width;
- changed = true;
- initializeIfNeeded(parent, changed);
- if (initialLayout) {
- changed = true;
- initialLayout = false;
- }
- if (grid==null || changed) {
- changed = true;
- grid = new Vector();
- createGrid(parent);
- }
- resetColumnWidths();
- int minWidth = internalGetMinimumWidth(parent, changed);
- int maxWidth = internalGetMaximumWidth(parent, changed);
-
- int tableWidth = parentWidth;
-
- int [] columnWidths;
-
- if (parentWidth < minWidth) {
- tableWidth = minWidth;
- if (makeColumnsEqualWidth) {
- columnWidths = new int[numColumns];
- for (int i=0; i<numColumns; i++) {
- columnWidths[i] = widestColumnWidth;
- }
- }
- else
- columnWidths = minColumnWidths;
- }
- else if (parentWidth > maxWidth) {
- if (growingColumns.length==0) {
- tableWidth = maxWidth;
- columnWidths = maxColumnWidths;
- }
- else {
- columnWidths = new int [numColumns];
- int colSpace = tableWidth - leftMargin - rightMargin;
- colSpace -= (numColumns-1)*horizontalSpacing;
- int extra = parentWidth - maxWidth;
- int colExtra = extra / growingColumns.length;
- for (int i=0; i<numColumns; i++) {
- columnWidths[i] = maxColumnWidths[i];
-
- if (isGrowingColumn(i)) {
- columnWidths[i] += colExtra;
- }
- }
- }
- }
- else {
- columnWidths = new int [numColumns];
- if (makeColumnsEqualWidth) {
- int colSpace = tableWidth - leftMargin - rightMargin;
- colSpace -= (numColumns-1)*horizontalSpacing;
- int col = colSpace/numColumns;
- for (int i=0; i<numColumns; i++) {
- columnWidths[i] = col;
- }
- }
- else {
- int [] extraSpace = calculateExtraSpace(tableWidth, maxWidth, minWidth);
- for (int i=0; i<numColumns; i++) {
- int minCWidth = minColumnWidths[i];
- columnWidths[i] = minCWidth + extraSpace[i];
- }
- }
- }
- int x = 0;
- int y = topMargin;
- // assign widths
- for (int i=0; i<grid.size(); i++) {
- TableData [] row = (TableData [])grid.elementAt(i);
- // assign widths, calculate heights
- int rowHeight = 0;
- x = leftMargin;
- for (int j=0; j<numColumns; j++) {
- TableData td = row[j];
- if (td.isItemData==false) {
- continue;
- }
- Control child = children[td.childIndex];
- int span = td.colspan;
- int cwidth = 0;
- for (int k=j; k<j+span; k++) {
- cwidth += columnWidths[k];
- if (k<j+span-1) cwidth += horizontalSpacing;
- }
- Point size = computeSize(child, cwidth, changed);
- td.compWidth = cwidth;
- if (td.heightHint!=SWT.DEFAULT) {
- size = new Point(size.x, td.heightHint);
- }
- td.compSize = size;
- rowHeight = Math.max(rowHeight, size.y);
- }
- for (int j=0; j<numColumns; j++) {
- TableData td = row[j];
- if (td.isItemData==false) {
- continue;
- }
- Control child = children[td.childIndex];
- placeControl(child, td, x, y, rowHeight);
- x += td.compWidth;
- if (j<numColumns-1) x+= horizontalSpacing;
- }
- y += rowHeight + verticalSpacing;
- }
- }
-
-boolean isGrowingColumn(int col) {
- if (growingColumns==null) return false;
- for (int i=0; i<growingColumns.length; i++) {
- if (col == growingColumns[i]) return true;
- }
- return false;
-}
-
-int [] calculateExtraSpace(int tableWidth, int maxWidth, int minWidth) {
- int fixedPart = leftMargin + rightMargin + (numColumns-1)*horizontalSpacing;
- int D = maxWidth - minWidth;
-
- int W = tableWidth -fixedPart - minWidth;
-
- int extraSpace [] = new int [numColumns];
-
- int rem = 0;
- for (int i=0; i<numColumns; i++) {
- int cmin = minColumnWidths[i];
- int cmax = maxColumnWidths[i];
- int d = cmax - cmin;
- int extra = D!=0 ? (d * W)/D : 0;
- if (i<numColumns-1) {
- extraSpace [i] = extra;
- rem += extra;
- }
- else {
- extraSpace[i] = W - rem;
- }
- }
- return extraSpace;
-}
-
-Point computeSize(Control child, int width, boolean changed) {
- int widthArg = width;
- if (!isWrap(child))
- widthArg = SWT.DEFAULT;
- Point size = child.computeSize(widthArg, SWT.DEFAULT, changed);
- return size;
-}
-
-void placeControl(Control control, TableData td, int x, int y, int rowHeight) {
- int xloc = x + td.indent;
- int yloc = y;
- int width = td.compSize.x;
- int height = td.compSize.y;
- int colWidth = td.compWidth;
-
- // align horizontally
- if (td.align==TableData.CENTER) {
- xloc = x + colWidth/2 - width/2;
- }
- else if (td.align==TableData.RIGHT) {
- xloc = x + colWidth - width;
- }
- else if (td.align==TableData.FILL) {
- width = colWidth;
- }
- // align vertically
- if (td.valign == TableData.MIDDLE) {
- yloc = y + rowHeight/2 - height/2;
- }
- else if (td.valign==TableData.BOTTOM) {
- yloc = y + rowHeight - height;
- }
- else if (td.valign==TableData.FILL) {
- height = rowHeight;
- }
- control.setBounds(xloc, yloc, width, height);
-}
-
-void createGrid(Composite composite) {
- int row, column, rowFill, columnFill;
- Control[] children;
- TableData spacerSpec;
- Vector growingCols = new Vector();
-
- //
- children = composite.getChildren();
- if (children.length==0) return;
-
- //
- grid.addElement(createEmptyRow());
- row = 0;
- column = 0;
-
- // Loop through the children and place their associated layout specs in the
- // grid. Placement occurs left to right, top to bottom (i.e., by row).
- for (int i = 0; i < children.length; i++) {
- // Find the first available spot in the grid.
- Control child = children[i];
- TableData spec = (TableData) child.getLayoutData();
- while (((TableData[]) grid.elementAt(row))[column] != null) {
- column = column + 1;
- if (column >= numColumns) {
- row = row + 1;
- column = 0;
- if (row >= grid.size()) {
- grid.addElement(createEmptyRow());
- }
- }
- }
- // See if the place will support the widget's horizontal span. If not, go to the
- // next row.
- if (column + spec.colspan - 1 >= numColumns) {
- grid.addElement(createEmptyRow());
- row = row + 1;
- column = 0;
- }
-
- // The vertical span for the item will be at least 1. If it is > 1,
- // add other rows to the grid.
- for (int j = 2; j <= spec.rowspan; j++) {
- if (row + j > grid.size()) {
- grid.addElement(createEmptyRow());
- }
- }
-
- // Store the layout spec. Also cache the childIndex. NOTE: That we assume the children of a
- // composite are maintained in the order in which they are created and added to the composite.
- ((TableData[]) grid.elementAt(row))[column] = spec;
- spec.childIndex = i;
-
- if (spec.grabHorizontal) {
- updateGrowingColumns(growingCols, spec, column);
- }
-
- // Put spacers in the grid to account for the item's vertical and horizontal
- // span.
- rowFill = spec.rowspan - 1;
- columnFill = spec.colspan - 1;
- for (int r = 1; r <= rowFill; r++) {
- for (int c = 0; c < spec.colspan; c++) {
- spacerSpec = new TableData();
- spacerSpec.isItemData = false;
- ((TableData[]) grid.elementAt(row + r))[column + c] = spacerSpec;
- }
- }
- for (int c = 1; c <= columnFill; c++) {
- for (int r = 0; r < spec.rowspan; r++) {
- spacerSpec = new TableData();
- spacerSpec.isItemData = false;
- ((TableData[]) grid.elementAt(row + r))[column + c] = spacerSpec;
- }
- }
- column = column + spec.colspan - 1;
- }
-
- // Fill out empty grid cells with spacers.
- for (int k = column + 1; k < numColumns; k++) {
- spacerSpec = new TableData();
- spacerSpec.isItemData = false;
- ((TableData[]) grid.elementAt(row))[k] = spacerSpec;
- }
- for (int k = row + 1; k < grid.size(); k++) {
- spacerSpec = new TableData();
- spacerSpec.isItemData = false;
- ((TableData[]) grid.elementAt(k))[column] = spacerSpec;
- }
- growingColumns = new int [growingCols.size()];
- for (int i=0; i<growingCols.size(); i++) {
- growingColumns[i] = ((Integer)growingCols.get(i)).intValue();
- }
-}
-
-private void updateGrowingColumns(Vector growingColumns, TableData spec, int column) {
- int affectedColumn = column + spec.colspan -1;
- for (int i=0; i<growingColumns.size(); i++) {
- Integer col = (Integer)growingColumns.get(i);
- if (col.intValue()==affectedColumn)
- return;
- }
- growingColumns.add(new Integer(affectedColumn));
-}
-
-private TableData [] createEmptyRow() {
- TableData [] row = new TableData[numColumns];
- for (int i=0; i<numColumns; i++)
- row[i] = null;
- return row;
-}
-
- /**
- * @see Layout#computeSize(Composite, int, int, boolean)
- */
- protected Point computeSize(Composite parent, int wHint, int hHint, boolean changed) {
- Control [] children = parent.getChildren();
- if (children.length == 0) {
- return new Point(0, 0);
- }
- int parentWidth = wHint;
- changed = true;
- initializeIfNeeded(parent, changed);
- if (initialLayout) {
- changed = true;
- initialLayout = false;
- }
- if (grid==null || changed) {
- changed = true;
- grid = new Vector();
- createGrid(parent);
- }
- resetColumnWidths();
- int minWidth = internalGetMinimumWidth(parent, changed);
- int maxWidth = internalGetMaximumWidth(parent, changed);
-
- int tableWidth = parentWidth;
-
- int [] columnWidths;
-
- if (parentWidth < minWidth) {
- tableWidth = minWidth;
- if (makeColumnsEqualWidth) {
- columnWidths = new int[numColumns];
- for (int i=0; i<numColumns; i++) {
- columnWidths[i] = widestColumnWidth;
- }
- }
- else
- columnWidths = minColumnWidths;
- }
- else if (parentWidth > maxWidth) {
- tableWidth = maxWidth;
- columnWidths = maxColumnWidths;
- }
- else {
- columnWidths = new int [numColumns];
- if (makeColumnsEqualWidth) {
- int colSpace = tableWidth - leftMargin - rightMargin;
- colSpace -= (numColumns-1)*horizontalSpacing;
- int col = colSpace/numColumns;
- for (int i=0; i<numColumns; i++) {
- columnWidths[i] = col;
- }
- }
- else {
- int [] extraSpace = calculateExtraSpace(tableWidth, maxWidth, minWidth);
- for (int i=0; i<numColumns; i++) {
- int minCWidth = minColumnWidths[i];
- columnWidths[i] = minCWidth + extraSpace[i];
- }
- }
- }
- int totalHeight=0;
- int y = topMargin;
- // compute widths
- for (int i=0; i<grid.size(); i++) {
- TableData [] row = (TableData [])grid.elementAt(i);
- // assign widths, calculate heights
- int rowHeight = 0;
- for (int j=0; j<numColumns; j++) {
- TableData td = row[j];
- if (td.isItemData==false) {
- continue;
- }
- Control child = children[td.childIndex];
- int span = td.colspan;
- int cwidth = 0;
- for (int k=j; k<j+span; k++) {
- if (k>j) cwidth += horizontalSpacing;
- cwidth += columnWidths[k];
- }
- int cy = td.heightHint;
- if (cy == SWT.DEFAULT) {
- Point size = computeSize(child, cwidth, changed);
- cy = size.y;
- }
- rowHeight = Math.max(rowHeight, cy);
- }
- y += rowHeight + verticalSpacing;
- }
- totalHeight = y + bottomMargin;
- return new Point(tableWidth, totalHeight);
- }
-
- int internalGetMinimumWidth(Composite parent, boolean changed) {
- if (changed)
- calculateMinimumColumnWidths(parent, true);
- int minimumWidth = 0;
-
- widestColumnWidth = 0;
-
- if (makeColumnsEqualWidth) {
- for (int i=0; i<numColumns; i++) {
- widestColumnWidth = Math.max(widestColumnWidth, minColumnWidths[i]);
- }
- }
- for (int i=0; i<numColumns; i++) {
- if (i>0) minimumWidth += horizontalSpacing;
- if (makeColumnsEqualWidth)
- minimumWidth += widestColumnWidth;
- else
- minimumWidth += minColumnWidths[i];
- }
- // add margins
- minimumWidth += leftMargin + rightMargin;
- return minimumWidth;
- }
-
- int internalGetMaximumWidth(Composite parent, boolean changed) {
- if (changed)
- calculateMaximumColumnWidths(parent, true);
- int maximumWidth = 0;
- for (int i=0; i<numColumns; i++) {
- if (i>0) maximumWidth += horizontalSpacing;
- maximumWidth += maxColumnWidths[i];
- }
- // add margins
- maximumWidth += leftMargin + rightMargin;
- return maximumWidth;
- }
-
- void resetColumnWidths() {
- if (minColumnWidths == null)
- minColumnWidths = new int [numColumns];
- if (maxColumnWidths == null)
- maxColumnWidths = new int [numColumns];
- for (int i=0; i<numColumns; i++) {
- minColumnWidths [i] = 0;
- }
- for (int i=0; i<numColumns; i++) {
- maxColumnWidths [i] = 0;
- }
- }
-
- void calculateMinimumColumnWidths(Composite parent, boolean changed) {
- Control [] children = parent.getChildren();
-
- for (int i=0; i<grid.size(); i++) {
- TableData [] row = (TableData [])grid.elementAt(i);
- for (int j=0; j<numColumns; j++) {
- TableData td = row[j];
- if (td.isItemData==false) continue;
- Control child = children[td.childIndex];
- int minWidth = -1;
- if (child instanceof Composite) {
- Composite cc = (Composite)child;
- Layout l = cc.getLayout();
- if (l instanceof HTMLTableLayout) {
- minWidth = ((HTMLTableLayout)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 HTMLTableLayout)
- 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 HTMLTableLayout) {
- maxWidth = ((HTMLTableLayout)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());
- }
- }
-}
-}
\ No newline at end of file
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 56c92db..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/HyperlinkAdapter.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.eclipse.update.ui.forms.internal;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-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 0be9ad9..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/HyperlinkHandler.java
+++ /dev/null
@@ -1,218 +0,0 @@
-package org.eclipse.update.ui.forms.internal;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-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(busyCursor);
- action.linkActivated(link);
- if (!link.isDisposed())
- link.setCursor(
- isHyperlinkCursorUsed() ? hyperlinkCursor : null);
- }
- }
-
- private void linkEntered(Control link) {
- if (lastEntered != null
- && lastEntered instanceof SelectableFormLabel) {
- SelectableFormLabel fl = (SelectableFormLabel) lastEntered;
- linkExited(fl);
- }
- if (isHyperlinkCursorUsed())
- link.setCursor(hyperlinkCursor);
- 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);
- }
- }
-}
\ No newline at end of file
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 0aa0b31..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/HyperlinkSettings.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package org.eclipse.update.ui.forms.internal;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.*;
-import java.util.*;
-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 Cursor hyperlinkCursor;
- protected Cursor busyCursor;
- protected Cursor textCursor;
-
-public HyperlinkSettings() {
- hyperlinkCursor = new Cursor(Display.getCurrent(), SWT.CURSOR_HAND);
- busyCursor = new Cursor(Display.getCurrent(), SWT.CURSOR_WAIT);
- textCursor = new Cursor(Display.getCurrent(), SWT.CURSOR_IBEAM);
-}
-
-public void dispose() {
- hyperlinkCursor.dispose();
- busyCursor.dispose();
- textCursor.dispose();
-}
-
-public Color getActiveBackground() {
- return activeBackground;
-}
-public Color getActiveForeground() {
- return activeForeground;
-}
-public Color getBackground() {
- return background;
-}
-public Cursor getBusyCursor() {
- return busyCursor;
-}
-public Cursor getTextCursor() {
- return textCursor;
-}
-public Color getForeground() {
- return foreground;
-}
-public Cursor getHyperlinkCursor() {
- return 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 b0f5747..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/IForm.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.eclipse.update.ui.forms.internal;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-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();
-}
\ No newline at end of file
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 2717583..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/IFormPage.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.eclipse.update.ui.forms.internal;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-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 a131d34..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/IFormSelectionListener.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.eclipse.update.ui.forms.internal;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-public interface IFormSelectionListener {
- public void formSelected(IFormPage page);
-}
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 8aedbf9..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/IFormTextListener.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.eclipse.update.ui.forms.internal;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-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 c729331..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/IFormWorkbook.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.eclipse.update.ui.forms.internal;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.graphics.*;
-import java.util.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.*;
-import org.eclipse.ui.part.*;
-import org.eclipse.jface.resource.*;
-import org.eclipse.jface.window.*;
-
-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);
-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 e04f2dd..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/IHyperlinkListener.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.eclipse.update.ui.forms.internal;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.widgets.Label;
-
-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/NoTabsWorkbook.java b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/NoTabsWorkbook.java
deleted file mode 100644
index 59aa53d..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/NoTabsWorkbook.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package org.eclipse.update.ui.forms.internal;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.graphics.*;
-import java.util.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.*;
-import org.eclipse.ui.part.*;
-import org.eclipse.jface.resource.*;
-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);
- }
-
- public void createControl(Composite parent) {
- pageBook = new PageBook(parent, SWT.NULL);
- }
-
- private void fireSelectionChanged(IFormPage page) {
- for (Iterator iter = listeners.iterator(); iter.hasNext();) {
- IFormSelectionListener listener = (IFormSelectionListener) iter.next();
- listener.formSelected(page);
- }
- }
-
- 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 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);
- }
- });
- }
- }
-
- public void setFirstPageSelected(boolean newFirstPageSelected) {
- firstPageSelected = newFirstPageSelected;
- }
-
- private void switchPages(IFormPage oldPage, IFormPage newPage) {
- if (oldPage != null && oldPage != newPage) {
- oldPage.becomesInvisible(newPage);
- }
- if (newPage.getControl() == null)
- newPage.createControl(pageBook);
- pageBook.showPage(newPage.getControl());
-
- newPage.becomesVisible(oldPage);
- fireSelectionChanged(newPage);
- }
-}
\ No newline at end of file
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 7919ea1..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/ScrollableSectionForm.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package org.eclipse.update.ui.forms.internal;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.custom.*;
-import org.eclipse.swt.events.*;
-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);
- }
-}
\ No newline at end of file
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 1ff42f2..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/SectionChangeManager.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.eclipse.update.ui.forms.internal;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-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 f2edcb9..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/SectionForm.java
+++ /dev/null
@@ -1,162 +0,0 @@
-package org.eclipse.update.ui.forms.internal;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.events.*;
-import java.util.*;
-import org.eclipse.ui.*;
-import org.eclipse.jface.resource.*;
-import org.eclipse.jface.util.*;
-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];
- 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(factory.DEFAULT_HEADER_COLOR));
- //gc.fillRectangle(TITLE_HMARGIN, TITLE_VMARGIN, bounds.width-TITLE_HMARGIN*2, height-TITLE_VMARGIN*2);
- gc.setForeground(factory.getForegroundColor());
- gc.drawText(getHeadingText(), TITLE_HMARGIN, TITLE_VMARGIN, true);
- }
- }
-
- public final void paintControl(PaintEvent event) {
- if (!headingVisible)
- return;
- GC gc = event.gc;
- Control form = (Control) event.widget;
- paint(form, gc);
- }
-
- public void setHeadingVisible(boolean newHeadingVisible) {
- super.setHeadingVisible(newHeadingVisible);
- if (control != null)
- control.layout(true);
- }
- public void setHeadingText(String headingText) {
- super.setHeadingText(headingText);
- if (control != null) {
- control.layout(true);
- control.redraw();
- }
- }
-
- public void propertyChange(PropertyChangeEvent event) {
- titleFont = JFaceResources.getHeaderFont();
- if (control != null) {
- control.layout(true);
- control.redraw();
- }
- }
-
-}
\ No newline at end of file
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 ea81992..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/SelectableControl.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package org.eclipse.update.ui.forms.internal;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-
-import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.*;
-import java.text.*;
-
-/**
- * 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);
- }
-}
\ No newline at end of file
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 d24ce43..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/SelectableFormLabel.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package org.eclipse.update.ui.forms.internal;
-
-import org.eclipse.swt.SWT;
-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;
- }
-
- 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 e2243e2..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/TableData.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.eclipse.update.ui.forms.internal;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Point;
-
-public class TableData {
- public static final int LEFT = 1;
- public static final int CENTER = 2;
- public static final int RIGHT = 3;
- public static final int TOP = 4;
- public static final int MIDDLE = 5;
- public static final int BOTTOM = 6;
- public static final int FILL = 7;
- public int colspan=1;
- public int rowspan=1;
- public int align = LEFT;
- public int valign = TOP;
- public int indent = 0;
- public int maxWidth = SWT.DEFAULT;
- public int maxHeight = SWT.DEFAULT;
- public int heightHint = SWT.DEFAULT;
- public boolean grabHorizontal=false;
-
- //private
- int childIndex;
- boolean isItemData=true;
- int compWidth;
- Point compSize;
-
- public TableData() {
- }
-
- public TableData(int align, int valign) {
- this(align, valign, 1, 1);
- }
-
- public TableData(int align, int valign, int rowspan, int colspan) {
- this.align = align;
- this.valign = valign;
- this.rowspan = rowspan;
- this.colspan = colspan;
- }
-}
\ No newline at end of file
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 0205ddd..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/TableLayoutTest.java
+++ /dev/null
@@ -1,229 +0,0 @@
-package org.eclipse.update.ui.forms.internal;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.custom.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.events.*;
-import java.io.InputStream;
-import org.eclipse.swt.program.Program;
-import org.eclipse.update.ui.forms.internal.engine.*;
-import org.eclipse.jface.action.IStatusLineManager;
-import org.eclipse.jface.action.StatusLineManager;
-
-public class TableLayoutTest {
-
-public static void main (String [] args) {
- Display display = new Display ();
- Shell shell = new Shell (display);
- shell.setLayout(new FillLayout());
- final ScrolledComposite sc = new ScrolledComposite(shell, SWT.H_SCROLL | SWT.V_SCROLL);
- // sc.setAlwaysShowScrollBars(true);
- sc.setBackground(sc.getDisplay().getSystemColor(SWT.COLOR_WHITE));
- final Composite c = new Composite(sc, SWT.NONE);
- //c.setBackground(c.getDisplay().getSystemColor(SWT.COLOR_RED));
- sc.setContent(c);
- sc.addListener (SWT.Resize, new Listener () {
- public void handleEvent (Event e) {
- Rectangle ssize = sc.getClientArea();
- int swidth = ssize.width;
- HTMLTableLayout layout = (HTMLTableLayout)c.getLayout();
- Point size = layout.computeSize(c, swidth, SWT.DEFAULT, true);
- //if (size.x < swidth) size.x = swidth;
- Rectangle trim = c.computeTrim(0, 0, size.x, size.y);
- size = new Point(trim.width, trim.height);
- /*
- Point size = c.computeSize(swidth, SWT.DEFAULT, true);
- */
- //System.out.println("in: "+swidth+", out: "+size.x);
- c.setSize(size);
- }
- });
- c.setBackground(c.getDisplay().getSystemColor(SWT.COLOR_WHITE));
- HTMLTableLayout layout = new HTMLTableLayout();
- layout.numColumns = 2;
- //layout.horizontalSpacing = 0;
- layout.leftMargin = 0;
- layout.rightMargin = 0;
- layout.makeColumnsEqualWidth=false;
- //layout.marginWidth = layout.marginHeight = 0;
- //layout.horizontalSpacing = 0;
- c.setLayout(layout);
-
- Label label;
- CLabel clabel;
- Button b;
- TableData td;
-/*
- label = new Label(c, SWT.NULL);
- label.setText("Single line1");
-
- //label = new Label(c, SWT.WRAP);
- Text text = new Text(c, SWT.MULTI | SWT.WRAP);
- text.setEditable(false);
- text.setText("This is a much longer text that I want wrapped,"+
- " but depending on the window size it can be rendered completely.");
-
- b = new Button(c, SWT.PUSH);
- b.setText("Simple button");
-
- label = new Label(c, SWT.WRAP);
- label.setText("Another text that may or may not be wrapped");
-
- label = new Label(c, SWT.NULL);
- td = new TableData(TableData.RIGHT, TableData.BOTTOM);
- label.setLayoutData(td);
- label.setText("Fixed label");
-
- Composite nested = new Composite(c, SWT.NULL);
- layout = new HTMLTableLayout();
- layout.numColumns = 2;
- nested.setLayout(layout);
- b = new Button(nested, SWT.PUSH);
- b.setText("Button2");
- label = new Label(nested, SWT.WRAP);
- td = new TableData(TableData.LEFT, TableData.MIDDLE);
- label.setLayoutData(td);
- label.setText("Some text in the nested label that can be wrapped");
-*/
- label = new Label(c, SWT.NULL);
- label.setText("Text in the left column");
-
- b = new Button(c, SWT.CHECK);
- b.setText("Checkbox in the right column");
-
-
- label = new Label(c, SWT.WRAP);
- label.setText("This assignment step is then repeated for nested tables using the minimum and maximum widths derived for all such tables in the first pass. In this case, the width of the parent table cell plays the role of the current window size in the above description. This process is repeated recursively for all nested tables. The topmost table is then rendered using the assigned widths. Nested tables are subsequently rendered as part of the parent table's cell contents.");
- td = new TableData();
- td.colspan = 2;
- td.align = TableData.FILL;
- label.setLayoutData(td);
-
- ExpandableGroup exp = new ExpandableGroup (SWT.WRAP) {
- public void fillExpansion(Composite container, FormWidgetFactory factory) {
- HTMLTableLayout layout = new HTMLTableLayout();
- container.setLayout(layout);
- layout.leftMargin = layout.rightMargin = 0;
- Button button = factory.createButton(container, null, SWT.PUSH);
- button.setText("Button");
- }
- public void expanded() {
- c.layout(true);
- updateSize(sc, c);
- }
- public void collapsed() {
- c.layout(true);
- updateSize(sc, c);
- }
- };
- exp.setText("Expandable Section");
- //exp.setExpandable(false);
- FormWidgetFactory factory = new FormWidgetFactory();
- exp.createControl(c, factory);
- //exp.getControl().setBackground(label.getDisplay().getSystemColor(SWT.COLOR_GREEN));
- td = new TableData();
- td.colspan = 2;
- td.align = TableData.FILL;
- exp.getControl().setLayoutData(td);
-
- StatusLineManager manager = new StatusLineManager();
- addFormEngine(c, factory, manager);
- //addFormEngine(c, factory, manager);
- //addFormEngine(c, factory, manager);
-
- addRow(c);
-
- Control mcontrol = manager.createControl(c);
- td = new TableData();
- td.colspan = 2;
- td.align = TableData.FILL;
- mcontrol.setLayoutData(td);
-
- factory.setHyperlinkUnderlineMode(HyperlinkHandler.UNDERLINE_ROLLOVER);
-
- SelectableFormLabel ft = new SelectableFormLabel(c, SWT.WRAP);
- ft.setText("Some text in the form text that should also wrap");
- factory.turnIntoHyperlink(ft, new IHyperlinkListener() {
- public void linkEntered(Control link) {
- System.out.println("Link entered");
- }
- public void linkExited(Control link) {
- System.out.println("Link exited");
- }
- public void linkActivated(Control link) {
- System.out.println("Link activated");
- }
- });
-
- ft = new SelectableFormLabel(c, SWT.WRAP);
- ft.setText("Some more form text here");
- factory.turnIntoHyperlink(ft, new IHyperlinkListener() {
- public void linkEntered(Control link) {
- System.out.println("Link entered");
- }
- public void linkExited(Control link) {
- System.out.println("Link exited");
- }
- public void linkActivated(Control link) {
- System.out.println("Link activated");
- }
- });
-
- shell.open ();
- while (!shell.isDisposed ()) {
- if (!display.readAndDispatch ()) display.sleep ();
- }
- display.dispose ();
-}
-
-public static void addFormEngine(Composite c, FormWidgetFactory factory, IStatusLineManager manager) {
- new Label(c, SWT.NULL);
- FormEngine html = new FormEngine(c, SWT.WRAP);
- html.setHyperlinkSettings(factory.getHyperlinkHandler());
- HTTPAction action = new HTTPAction();
- action.setStatusLineManager(manager);
- html.registerTextObject("urlHandler", action);
- //html.setBackground(factory.getBackgroundColor());
- html.setForeground(factory.getForegroundColor());
- InputStream is = TableLayoutTest.class.getResourceAsStream("index.xml");
- //html.setParagraphsSeparated(false);
- html.load(is, true);
- TableData td = new TableData();
- td.colspan = 1;
- td.align = TableData.FILL;
- html.setLayoutData(td);
-}
-
-public static void addRow(Composite c) {
- Composite row = new Composite(c, SWT.WRAP);
- RowLayout layout = new RowLayout();
- layout.wrap = true;
- row.setLayout(layout);
-
- for (int i=0; i<10; i++) {
- Button button = new Button(row, SWT.PUSH);
- button.setText("Button that should be wrapped");
- }
- TableData td = new TableData();
- td.colspan = 2;
- td.align = TableData.FILL;
- td.grabHorizontal = true;
- row.setLayoutData(td);
-}
-
-private static void updateSize(ScrolledComposite sc, Composite c) {
- Rectangle ssize = sc.getClientArea();
- int swidth = ssize.width;
- HTMLTableLayout layout = (HTMLTableLayout)c.getLayout();
- Point size = layout.computeSize(c, swidth, SWT.DEFAULT, true);
- Rectangle trim = c.computeTrim(0, 0, size.x, size.y);
- size = new Point(trim.width, trim.height);
- c.setSize(size);
-}
-
-}
\ No newline at end of file
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 89ec8f6..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/ToggleControl.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package org.eclipse.update.ui.forms.internal;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.SWT;
-
-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();
- }
- });
- }
-
- 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 4f156ea..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/WebForm.java
+++ /dev/null
@@ -1,233 +0,0 @@
-package org.eclipse.update.ui.forms.internal;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import org.eclipse.swt.layout.*;
-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 java.util.*;
-import org.eclipse.ui.*;
-import org.eclipse.jface.resource.*;
-import org.eclipse.jface.util.*;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.swt.custom.*;
-
-/**
- * This form implementation assumes that it contains
- * children that do not have independent dimensions.
- * In other words, these widgets are not capable
- * of answering their preferred size. Instead,
- * desired width must be supplied to get the
- * preferred height. These forms are layed out
- * top to bottom, left to right and use
- * a layout algorithm very similar to
- * HTML tables. Scrolling is not optional
- * for this type of presentation -
- * scroll bars will show up when needed.
- */
-
-public class WebForm extends AbstractSectionForm {
- protected ScrolledComposite scrollComposite;
- private Composite control;
- private Composite client;
- private final static int HMARGIN = 5;
- private final static int VMARGIN = 5;
- private Image headingUnderlineImage;
-
- class WebFormLayout extends Layout {
-
- protected void layout(Composite parent, boolean changed) {
- Rectangle bounds = parent.getClientArea();
- int x = 0;
- int y = 0;
- if (isHeadingVisible()) {
- y = getHeadingHeight(parent);
- }
- Point csize;
- Layout layout = client.getLayout();
- if (layout != null && layout instanceof HTMLTableLayout) {
- HTMLTableLayout hlayout = (HTMLTableLayout) layout;
- csize = hlayout.computeSize(client, bounds.width, SWT.DEFAULT, true);
- if (csize.x < bounds.width)
- csize.x = bounds.width;
- Rectangle trim = control.computeTrim(0, 0, csize.x, csize.y);
- csize = new Point(trim.width, trim.height);
- } else {
- csize = client.computeSize(bounds.width, SWT.DEFAULT, changed);
- }
- client.setBounds(x, y, csize.x, csize.y);
- }
-
- protected Point computeSize(
- Composite parent,
- int wHint,
- int hHint,
- boolean changed) {
- int width = wHint;
- int height = 0;
- if (isHeadingVisible()) {
- height = getHeadingHeight(parent);
- }
- Point csize;
- Layout layout = client.getLayout();
- if (layout != null && layout instanceof HTMLTableLayout) {
- HTMLTableLayout hlayout = (HTMLTableLayout) layout;
- csize = hlayout.computeSize(client, width, SWT.DEFAULT, true);
- if (csize.x < width)
- csize.x = width;
- Rectangle trim = control.computeTrim(0, 0, csize.x, csize.y);
- csize = new Point(trim.width, trim.height);
- } else {
- csize = client.computeSize(width, SWT.DEFAULT, changed);
- }
- width = csize.x;
- height += csize.y;
- return new Point(width, height);
- }
- }
-
- public WebForm() {
- }
-
- public Control createControl(Composite parent) {
- scrollComposite = new ScrolledComposite(parent, SWT.V_SCROLL | SWT.H_SCROLL);
- scrollComposite.setBackground(factory.getBackgroundColor());
- scrollComposite.setMenu(parent.getMenu());
- final Composite form = factory.createComposite(scrollComposite);
-
- scrollComposite.setContent(form);
- scrollComposite.addListener(SWT.Resize, new Listener() {
- public void handleEvent(Event e) {
- updateSize();
- }
- });
- WebFormLayout layout = new WebFormLayout();
- form.setLayout(layout);
- form.addPaintListener(new PaintListener() {
- public void paintControl(PaintEvent e) {
- paint(e);
- }
- });
- this.control = form;
- client = factory.createComposite(form);
- createContents(client);
- initializeScrollBars(scrollComposite);
- //form.setFocus();
- return scrollComposite;
- }
- private void initializeScrollBars(ScrolledComposite scomp) {
- ScrollBar hbar = scomp.getHorizontalBar();
- if (hbar != null) {
- hbar.setIncrement(H_SCROLL_INCREMENT);
- }
- ScrollBar vbar = scomp.getVerticalBar();
- if (vbar != null) {
- vbar.setIncrement(V_SCROLL_INCREMENT);
- }
- updatePageIncrement(scomp);
- }
-
- private int getHeadingHeight(Composite parent) {
- int width = parent.getSize().x;
- int height = 0;
- int imageHeight = 0;
- if (getHeadingImage() != null) {
- Rectangle ibounds = getHeadingImage().getBounds();
- imageHeight = ibounds.height;
- }
- GC gc = new GC(parent);
- gc.setFont(titleFont);
- int textWidth = width - 2 * HMARGIN;
- height = FormLabel.computeWrapHeight(gc, getHeadingText(), textWidth);
- height += 2 * VMARGIN;
- height = Math.max(height, imageHeight);
- if (headingUnderlineImage != null) {
- Rectangle ibounds = headingUnderlineImage.getBounds();
- height += ibounds.height;
- }
- gc.dispose();
- return height;
- }
-
- protected void createContents(Composite parent) {
- }
-
- public Control getControl() {
- return control;
- }
-
- public void setHeadingVisible(boolean newHeadingVisible) {
- super.setHeadingVisible(newHeadingVisible);
- if (control != null)
- control.layout();
- }
-
- public Image getHeadingUnderlineImage() {
- return headingUnderlineImage;
- }
-
- public void setHeadingUnderlineImage(Image image) {
- this.headingUnderlineImage = image;
- }
-
- public void propertyChange(PropertyChangeEvent event) {
- titleFont = JFaceResources.getHeaderFont();
- if (control != null) {
- control.layout();
- }
- }
-
- protected void updateHyperlinkColors() {
- factory.updateHyperlinkColors();
- if (control != null && !control.isDisposed()) {
- control.redraw();
- }
- }
-
- public void updateSize() {
- Rectangle ssize = scrollComposite.getClientArea();
- int swidth = ssize.width;
- WebFormLayout layout = (WebFormLayout) control.getLayout();
- Point size = layout.computeSize(control, swidth, SWT.DEFAULT, true);
- if (size.x < swidth)
- size.x = swidth;
- Rectangle trim = control.computeTrim(0, 0, size.x, size.y);
- size = new Point(trim.width, trim.height);
- control.setSize(size);
- updatePageIncrement(scrollComposite);
- }
-
- private void paint(PaintEvent e) {
- if (isHeadingVisible() == false)
- return;
- GC gc = e.gc;
- if (headingImage != null) {
- gc.drawImage(headingImage, 0, 0);
- }
- Point size = control.getSize();
- if (getHeadingBackground() != null)
- gc.setBackground(getHeadingBackground());
- if (getHeadingForeground() != null)
- gc.setForeground(getHeadingForeground());
- gc.setFont(titleFont);
- FormLabel.paintWrapText(gc, size, getHeadingText(), HMARGIN, VMARGIN);
- if (headingUnderlineImage != null) {
- int y =
- getHeadingHeight((Composite) control)
- - headingUnderlineImage.getBounds().height;
- gc.drawImage(headingUnderlineImage, 0, y);
- }
- }
- public void setHeadingText(String headingText) {
- super.setHeadingText(headingText);
- if (control!=null)
- control.redraw();
- }
-
-}
\ No newline at end of file
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 2669443..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/BulletParagraph.java
+++ /dev/null
@@ -1,93 +0,0 @@
-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 8c2a262..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/FormEngine.java
+++ /dev/null
@@ -1,519 +0,0 @@
-package org.eclipse.update.ui.forms.internal.engine;
-
-import java.io.InputStream;
-import java.util.Hashtable;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.*;
-import org.eclipse.swt.accessibility.Accessible;
-import org.eclipse.swt.custom.ScrolledComposite;
-import org.eclipse.swt.dnd.*;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.update.ui.forms.internal.*;
-
-public class FormEngine extends Canvas {
- public static final String URL_HANDLER_ID = "urlHandler";
- boolean hasFocus;
- boolean paragraphsSeparated = true;
- TextModel model;
- Hashtable objectTable = new Hashtable();
- public int marginWidth = 0;
- public int marginHeight = 1;
- IHyperlinkSegment entered;
- boolean mouseDown = false;
- Point dragOrigin;
- private Action openAction;
- private Action copyShortcutAction;
-
- public boolean getFocus() {
- return hasFocus;
- }
-
- public int getParagraphSpacing(int lineHeight) {
- return lineHeight / 2;
- }
-
- public void setParagraphsSeparated(boolean value) {
- paragraphsSeparated = value;
- }
-
- /**
- * Constructor for SelectableFormLabel
- */
- public FormEngine(Composite parent, int style) {
- super(parent, style);
- setLayout(new FormEngineLayout());
- model = new TextModel();
-
- addDisposeListener(new DisposeListener() {
- public void widgetDisposed(DisposeEvent e) {
- model.dispose();
- }
- });
- addPaintListener(new PaintListener() {
- public void paintControl(PaintEvent e) {
- paint(e);
- }
- });
- addListener(SWT.KeyDown, new Listener() {
- public void handleEvent(Event e) {
- if (e.character == '\r') {
- activateSelectedLink();
- return;
- }
- }
- });
- addListener(SWT.Traverse, new Listener() {
- public void handleEvent(Event e) {
- switch (e.detail) {
- case SWT.TRAVERSE_PAGE_NEXT :
- case SWT.TRAVERSE_PAGE_PREVIOUS :
- case SWT.TRAVERSE_ARROW_NEXT :
- case SWT.TRAVERSE_ARROW_PREVIOUS :
- e.doit = false;
- return;
- }
- if (!model.hasFocusSegments()) {
- e.doit = true;
- return;
- }
- if (e.detail == SWT.TRAVERSE_TAB_NEXT)
- e.doit = advance(true);
- else if (e.detail == SWT.TRAVERSE_TAB_PREVIOUS)
- e.doit = advance(false);
- else if (e.detail != SWT.TRAVERSE_RETURN)
- e.doit = true;
- }
- });
- addFocusListener(new FocusListener() {
- public void focusGained(FocusEvent e) {
- if (!hasFocus) {
- hasFocus = true;
- handleFocusChange();
- }
- }
- public void focusLost(FocusEvent e) {
- if (hasFocus) {
- hasFocus = false;
- handleFocusChange();
- }
- }
- });
- addMouseListener(new MouseListener() {
- public void mouseDoubleClick(MouseEvent e) {
- }
- public void mouseDown(MouseEvent e) {
- // select a link
- handleMouseClick(e, true);
- }
- public void mouseUp(MouseEvent e) {
- // activate a link
- handleMouseClick(e, false);
- }
- });
- addMouseTrackListener(new MouseTrackListener() {
- public void mouseEnter(MouseEvent e) {
- handleMouseMove(e);
- }
- public void mouseExit(MouseEvent e) {
- if (entered != null) {
- exitLink(entered);
- paintLinkHover(entered, false);
- entered = null;
- setCursor(null);
- }
- }
- public void mouseHover(MouseEvent e) {
- handleMouseHover(e);
- }
- });
- addMouseMoveListener(new MouseMoveListener() {
- public void mouseMove(MouseEvent e) {
- handleMouseMove(e);
- }
- });
- initAccessible();
- makeActions();
- }
-
- private void makeActions() {
- openAction = new Action() {
- public void run() {
- activateSelectedLink();
- }
- };
- openAction.setText(
- FormsPlugin.getResourceString("FormEgine.linkPopup.open"));
- copyShortcutAction = new Action() {
- public void run() {
- copyShortcut(getSelectedLink());
- }
- };
- copyShortcutAction.setText(
- FormsPlugin.getResourceString("FormEgine.linkPopup.copyShortcut"));
- }
-
- private String getAcessibleText() {
- return model.getAccessibleText();
- }
-
- private void initAccessible() {
- Accessible accessible = getAccessible();
- accessible.addAccessibleListener(new AccessibleAdapter() {
- public void getName(AccessibleEvent e) {
- e.result = getAcessibleText();
- }
-
- public void getHelp(AccessibleEvent e) {
- e.result = getToolTipText();
- }
- });
-
- accessible
- .addAccessibleControlListener(new AccessibleControlAdapter() {
- public void getChildAtPoint(AccessibleControlEvent e) {
- Point pt = toControl(new Point(e.x, e.y));
- e.childID =
- (getBounds().contains(pt))
- ? ACC.CHILDID_SELF
- : ACC.CHILDID_NONE;
- }
-
- public void getLocation(AccessibleControlEvent e) {
- Rectangle location = getBounds();
- Point pt = toDisplay(new Point(location.x, location.y));
- e.x = pt.x;
- e.y = pt.y;
- e.width = location.width;
- e.height = location.height;
- }
-
- public void getChildCount(AccessibleControlEvent e) {
- e.detail = 0;
- }
-
- public void getRole(AccessibleControlEvent e) {
- e.detail = ACC.ROLE_TEXT;
- }
-
- public void getState(AccessibleControlEvent e) {
- e.detail = ACC.STATE_READONLY;
- }
- });
- }
-
- private void handleMouseClick(MouseEvent e, boolean down) {
- if (down) {
- // select a hyperlink
- IHyperlinkSegment segmentUnder = model.findHyperlinkAt(e.x, e.y);
- if (segmentUnder != null) {
- IHyperlinkSegment oldLink = model.getSelectedLink();
- model.selectLink(segmentUnder);
- enterLink(segmentUnder);
- paintFocusTransfer(oldLink, segmentUnder);
- }
- mouseDown = true;
- dragOrigin = new Point(e.x, e.y);
- } else {
- if (e.button == 1) {
- IHyperlinkSegment segmentUnder =
- model.findHyperlinkAt(e.x, e.y);
- if (segmentUnder != null) {
- activateLink(segmentUnder);
- }
- }
- mouseDown = false;
- }
- }
- private void handleMouseHover(MouseEvent e) {
- }
- private void handleMouseMove(MouseEvent e) {
- if (mouseDown) {
- handleDrag(e);
- return;
- }
- ITextSegment segmentUnder = model.findSegmentAt(e.x, e.y);
-
- if (segmentUnder == null) {
- if (entered != null) {
- exitLink(entered);
- paintLinkHover(entered, false);
- entered = null;
- }
- setCursor(null);
- } else {
- if (segmentUnder instanceof IHyperlinkSegment) {
- IHyperlinkSegment linkUnder = (IHyperlinkSegment) segmentUnder;
- if (entered == null) {
- entered = linkUnder;
- enterLink(linkUnder);
- paintLinkHover(entered, true);
- setCursor(
- model.getHyperlinkSettings().getHyperlinkCursor());
- }
- } else {
- if (entered != null) {
- exitLink(entered);
- paintLinkHover(entered, false);
- entered = null;
- }
- setCursor(model.getHyperlinkSettings().getTextCursor());
- }
- }
- }
-
- private void handleDrag(MouseEvent e) {
- }
-
- public HyperlinkSettings getHyperlinkSettings() {
- return model.getHyperlinkSettings();
- }
-
- public void setHyperlinkSettings(HyperlinkSettings settings) {
- model.setHyperlinkSettings(settings);
- }
-
- private boolean advance(boolean next) {
- IHyperlinkSegment current = model.getSelectedLink();
- if (current != null)
- exitLink(current);
-
- boolean valid = model.traverseLinks(next);
-
- if (valid)
- enterLink(model.getSelectedLink());
- paintFocusTransfer(current, model.getSelectedLink());
- 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);
- setCursor(model.getHyperlinkSettings().getHyperlinkCursor());
- }
-
- protected void paint(PaintEvent e) {
- int width = getClientArea().width;
- IParagraph[] paragraphs = model.getParagraphs();
-
- GC gc = e.gc;
- gc.setFont(getFont());
- gc.setForeground(getForeground());
- gc.setBackground(getBackground());
-
- Locator loc = new Locator();
- loc.marginWidth = marginWidth;
- loc.marginHeight = marginHeight;
- loc.x = marginWidth;
- loc.y = marginHeight;
-
- FontMetrics fm = gc.getFontMetrics();
- int lineHeight = fm.getHeight();
-
- IHyperlinkSegment selectedLink = model.getSelectedLink();
-
- for (int i = 0; i < paragraphs.length; i++) {
- IParagraph p = paragraphs[i];
-
- if (i > 0 && paragraphsSeparated && p.getAddVerticalSpace())
- loc.y += getParagraphSpacing(lineHeight);
-
- loc.indent = p.getIndent();
- loc.resetCaret();
- loc.rowHeight = 0;
- p.paint(gc, width, loc, lineHeight, objectTable, selectedLink);
- }
- }
-
- public void registerTextObject(String key, Object value) {
- objectTable.put(key, value);
- }
-
- public void load(String text, boolean parseTags, boolean expandURLs) {
- try {
- if (parseTags)
- model.parseTaggedText(text, expandURLs);
- else
- model.parseRegularText(text, expandURLs);
- } catch (CoreException e) {
- FormsPlugin.logException(e);
- }
- }
- public void load(InputStream is, boolean expandURLs) {
- try {
- model.parseInputStream(is, expandURLs);
- } catch (CoreException e) {
- FormsPlugin.logException(e);
- }
- }
-
- public boolean setFocus() {
- /*
- if (!model.hasFocusSegments())
- return false;
- */
- return super.setFocus();
- }
-
- private void paintFocusTransfer(
- IHyperlinkSegment oldLink,
- IHyperlinkSegment newLink) {
- GC gc = new GC(this);
- Color bg = getBackground();
- Color fg = getForeground();
-
- gc.setFont(getFont());
-
- if (oldLink != null) {
- gc.setBackground(bg);
- gc.setForeground(fg);
- oldLink.paintFocus(gc, bg, fg, false);
- }
- if (newLink != null) {
- //ensureVisible(newLink);
- gc.setBackground(bg);
- gc.setForeground(fg);
- newLink.paintFocus(gc, bg, fg, true);
- }
- gc.dispose();
- }
- /**
- * Gets the marginWidth.
- * @return Returns a int
- */
- public int getMarginWidth() {
- return marginWidth;
- }
-
- /**
- * Sets the marginWidth.
- * @param marginWidth The marginWidth to set
- */
- public void setMarginWidth(int marginWidth) {
- this.marginWidth = marginWidth;
- }
-
- /**
- * Gets the marginHeight.
- * @return Returns a int
- */
- public int getMarginHeight() {
- return marginHeight;
- }
-
- /**
- * Sets the marginHeight.
- * @param marginHeight The marginHeight to set
- */
- public void setMarginHeight(int marginHeight) {
- this.marginHeight = marginHeight;
- }
-
- public void contextMenuAboutToShow(IMenuManager manager) {
- IHyperlinkSegment link = getSelectedLink();
- if (link != null)
- contributeLinkActions(manager, link);
- }
-
- private void contributeLinkActions(
- IMenuManager manager,
- IHyperlinkSegment link) {
- manager.add(openAction);
- manager.add(copyShortcutAction);
- manager.add(new Separator());
- }
-
- private void copyShortcut(IHyperlinkSegment link) {
- String text = link.getText();
- Clipboard clipboard = new Clipboard(getDisplay());
- clipboard.setContents(
- new Object[] { text },
- new Transfer[] { TextTransfer.getInstance()});
- }
-
- private void ensureVisible(IHyperlinkSegment segment) {
- Rectangle bounds = segment.getBounds();
- ScrolledComposite scomp = getScrolledComposite();
- if (scomp == null)
- return;
- Point origin = AbstractSectionForm.getControlLocation(scomp, this);
- origin.x += bounds.x;
- origin.y += bounds.y;
- AbstractSectionForm.ensureVisible(
- scomp,
- origin,
- new Point(bounds.width, bounds.height));
- }
- ScrolledComposite getScrolledComposite() {
- Composite parent = getParent();
- while (parent != null) {
- if (parent instanceof ScrolledComposite)
- return (ScrolledComposite) parent;
- parent = parent.getParent();
- }
- return null;
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/FormEngineLayout.java b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/FormEngineLayout.java
deleted file mode 100644
index 382cb4b..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/FormEngineLayout.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2002 IBM Corp. All rights reserved.
- * This file is made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- */
-package org.eclipse.update.ui.forms.internal.engine;
-
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Layout;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.*;
-
-/**
- * @version 1.0
- * @author
- */
-public class FormEngineLayout extends Layout {
-
- /*
- * @see Layout#computeSize(Composite, int, int, boolean)
- */
-
- public Point computeSize(
- Composite composite,
- int wHint,
- int hHint,
- boolean changed) {
- FormEngine engine = (FormEngine) composite;
- int innerWidth = wHint;
- if (innerWidth != SWT.DEFAULT)
- innerWidth -= engine.marginWidth * 2;
- Point textSize = computeTextSize(engine, innerWidth);
- int textWidth = textSize.x + 2 * engine.marginWidth;
- int textHeight = textSize.y + 2 * engine.marginHeight;
- Point result = new Point(textWidth, textHeight);
- return result;
- }
-
- private Point computeTextSize(FormEngine engine, int wHint) {
- IParagraph[] paragraphs = engine.model.getParagraphs();
-
- GC gc = new GC(engine);
- gc.setFont(engine.getFont());
-
- Locator loc = new Locator();
-
- int width = wHint != SWT.DEFAULT ? wHint : 0;
-
- FontMetrics fm = gc.getFontMetrics();
- int lineHeight = fm.getHeight();
-
- for (int i = 0; i < paragraphs.length; i++) {
- IParagraph p = paragraphs[i];
-
- if (i > 0 && engine.paragraphsSeparated && p.getAddVerticalSpace())
- loc.y += engine.getParagraphSpacing(lineHeight);
-
- loc.rowHeight = 0;
- loc.indent = p.getIndent();
- loc.x = p.getIndent();
-
- IParagraphSegment[] segments = p.getSegments();
- if (segments.length > 0) {
- for (int j = 0; j < segments.length; j++) {
- IParagraphSegment segment = segments[j];
- segment.advanceLocator(gc, wHint, loc, engine.objectTable);
- width = Math.max(width, loc.width);
- }
- loc.y += loc.rowHeight;
- } else {
- // empty new line
- loc.y += lineHeight;
- }
- }
- gc.dispose();
- return new Point(width, loc.y);
- }
-
- /*
- * @see Layout#layout(Composite, boolean)
- */
- protected void layout(Composite composite, boolean flushCache) {
- }
-}
\ No newline at end of file
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 af70868..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/HTTPAction.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2002 IBM Corp. All rights reserved.
- * This file is made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- */
-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);
- }
-}
\ No newline at end of file
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 d1ca1a7..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) 2002 IBM Corp. All rights reserved.
- * This file is made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- */
-package org.eclipse.update.ui.forms.internal.engine;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.update.ui.forms.internal.IHyperlinkListener;
-import org.eclipse.jface.action.IStatusLineManager;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * @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;
- }
-}
\ No newline at end of file
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 fe1c965..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/HyperlinkSegment.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2002 IBM Corp. All rights reserved.
- * This file is made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- */
-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 HyperlinkSettings settings;
-
- public HyperlinkSegment(String text, HyperlinkSettings settings, String fontId) {
- super(text, fontId);
- this.settings = settings;
- underline = true;
- }
-
- /*
- * @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();
- 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) {
- int lineY = rect.y + lineHeight - descent + 1;
- gc.drawLine(textX, lineY, textX+extent.x, lineY);
- }
- }
- }
-}
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 faa8dbb..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/IBulletParagraph.java
+++ /dev/null
@@ -1,15 +0,0 @@
-
-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 d10767d..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/IHyperlinkSegment.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2002 IBM Corp. All rights reserved.
- * This file is made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- */
-package org.eclipse.update.ui.forms.internal.engine;
-
-import java.util.Hashtable;
-
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.update.ui.forms.internal.IHyperlinkListener;
-
-/**
- * @version 1.0
- * @author
- */
-public interface IHyperlinkSegment extends ITextSegment, IObjectReference {
- HyperlinkAction getAction(Hashtable objectTable);
-
- boolean contains(int x, int y);
-
- public void repaint(GC gc, boolean hover);
-}
\ No newline at end of file
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 48462f2..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/IImageSegment.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (c) 2002 IBM Corp. All rights reserved.
- * This file is made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- */
-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);
-}
\ No newline at end of file
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 c0d503f..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/IObjectReference.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright (c) 2002 IBM Corp. All rights reserved.
- * This file is made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- */
-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 96cf40d..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/IParagraph.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2002 IBM Corp. All rights reserved.
- * This file is made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- */
-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 71918f3..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/IParagraphSegment.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (c) 2002 IBM Corp. All rights reserved.
- * This file is made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- */
-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);
-}
\ No newline at end of file
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 5879b76..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/ITextModel.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (c) 2002 IBM Corp. All rights reserved.
- * This file is made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- */
-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();
-}
\ No newline at end of file
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 9c4c86b..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/ITextSegment.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2002 IBM Corp. All rights reserved.
- * This file is made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- */
-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);
-}
\ No newline at end of file
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 9e4d45e..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/ImageSegment.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 2002 IBM Corp. All rights reserved.
- * This file is made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- */
-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 77e8f32..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/Locator.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2002 IBM Corp. All rights reserved.
- * This file is made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- */
-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 3d784d7..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/Paragraph.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Copyright (c) 2002 IBM Corp. All rights reserved.
- * This file is made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- */
-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;
- }
-}
\ No newline at end of file
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 64060d9..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/ParagraphSegment.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright (c) 2002 IBM Corp. All rights reserved.
- * This file is made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- */
-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 9aab6d4..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/TextModel.java
+++ /dev/null
@@ -1,438 +0,0 @@
-/*
- * Copyright (c) 2002 IBM Corp. All rights reserved.
- * This file is made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- */
-package org.eclipse.update.ui.forms.internal.engine;
-
-import java.util.Vector;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.update.ui.forms.internal.*;
-import org.apache.xerces.parsers.DOMParser;
-import org.xml.sax.*;
-import java.io.*;
-import org.w3c.dom.*;
-import org.eclipse.jface.resource.JFaceResources;
-
-/**
- * @version 1.0
- * @author
- */
-public class TextModel implements ITextModel {
- Vector paragraphs;
- IHyperlinkListener urlListener;
- IHyperlinkSegment[] hyperlinks;
- int selectedLinkIndex = -1;
- HyperlinkSettings hyperlinkSettings;
-
- class LocalHyperlinkSettings extends HyperlinkSettings {
- }
-
- /*
- * @see ITextModel#getParagraphs()
- */
- public IParagraph[] getParagraphs() {
- if (paragraphs == null)
- return new IParagraph[0];
- return (IParagraph[]) paragraphs.toArray(
- new IParagraph[paragraphs.size()]);
- }
-
- public String getAccessibleText() {
- if (paragraphs == null)
- return "";
- StringBuffer sbuf = new StringBuffer();
- for (int i=0; i<paragraphs.size(); i++) {
- IParagraph paragraph = (IParagraph)paragraphs.get(i);
- String text = paragraph.getAccessibleText();
- sbuf.append(text);
- }
- return sbuf.toString();
- }
-
- /*
- * @see ITextModel#parse(String)
- */
- public void parseTaggedText(String taggedText, boolean expandURLs)
- throws CoreException {
- if (taggedText==null) {
- reset();
- return;
- }
- try {
- InputStream stream =
- new ByteArrayInputStream(taggedText.getBytes("UTF8"));
- parseInputStream(stream, expandURLs);
- } catch (UnsupportedEncodingException e) {
- }
- }
-
- public void parseInputStream(InputStream is, boolean expandURLs)
- throws CoreException {
- DOMParser parser = new DOMParser();
- reset();
- try {
- InputSource source = new InputSource(is);
- parser.parse(source);
- processDocument(parser.getDocument(), expandURLs);
- } catch (SAXException e) {
- FormsPlugin.logException(e);
- } catch (IOException e) {
- FormsPlugin.logException(e);
- }
- }
-
- private void processDocument(Document doc, boolean expandURLs) {
- Node root = doc.getDocumentElement();
- NodeList children = root.getChildNodes();
- for (int i = 0; i < children.getLength(); i++) {
- Node child = children.item(i);
- if (child.getNodeType() == Node.TEXT_NODE) {
- // Make an implicit paragraph
- String text = child.getNodeValue();
- if (text != null && !isIgnorableWhiteSpace(text, true)) {
- Paragraph p = new Paragraph(true);
- p.parseRegularText(
- text,
- expandURLs,
- getHyperlinkSettings(),
- null);
- paragraphs.add(p);
- }
- } else if (child.getNodeType() == Node.ELEMENT_NODE) {
- String tag = child.getNodeName().toLowerCase();
- if (tag.equals("p")) {
- IParagraph p = processParagraph(child, expandURLs);
- if (p != null)
- paragraphs.add(p);
- } else if (tag.equals("li")) {
- IParagraph p = processListItem(child, expandURLs);
- if (p != null)
- paragraphs.add(p);
- }
- }
- }
- }
- private IParagraph processParagraph(Node paragraph, boolean expandURLs) {
- NodeList children = paragraph.getChildNodes();
- NamedNodeMap atts = paragraph.getAttributes();
- Node addSpaceAtt = atts.getNamedItem("addVerticalSpace");
- boolean addSpace = true;
-
- if (addSpaceAtt != null) {
- String value = addSpaceAtt.getNodeValue();
- addSpace = value.equalsIgnoreCase("true");
- }
- Paragraph p = new Paragraph(addSpace);
-
- processSegments(p, children, expandURLs);
- return p;
- }
- private IParagraph processListItem(Node listItem, boolean expandURLs) {
- NodeList children = listItem.getChildNodes();
- NamedNodeMap atts = listItem.getAttributes();
- Node addSpaceAtt = atts.getNamedItem("addVerticalSpace");
- Node styleAtt = atts.getNamedItem("style");
- Node valueAtt = atts.getNamedItem("value");
- Node indentAtt = atts.getNamedItem("indent");
- int style = IBulletParagraph.CIRCLE;
- int indent = -1;
- String text = null;
- boolean addSpace = true;
-
- if (addSpaceAtt != null) {
- String value = addSpaceAtt.getNodeValue();
- addSpace = value.equalsIgnoreCase("true");
- }
- if (styleAtt != null) {
- String value = styleAtt.getNodeValue();
- if (value.equalsIgnoreCase("text")) {
- style = IBulletParagraph.TEXT;
- } else if (value.equalsIgnoreCase("image")) {
- style = IBulletParagraph.IMAGE;
- }
- }
- if (valueAtt != null) {
- text = valueAtt.getNodeValue();
- }
- if (indentAtt != null) {
- String value = valueAtt.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);
- }
- 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();
- }
-}
\ No newline at end of file
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 1659392..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/TextSegment.java
+++ /dev/null
@@ -1,365 +0,0 @@
-/*
- * Copyright (c) 2002 IBM Corp. All rights reserved.
- * This file is made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- */
-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;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * @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);
- }
- }
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/index.xml b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/index.xml
deleted file mode 100644
index ea4421b..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/index.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<form>
-<p>
-To check for updates for features you have installed,
-go to the <a href="action1">My Eclipse</a> and select
-<b>Available Updates</b> folder. <b>Search page</b> will
-be shown allowing you to initiate and customize the search.
-</p>
-<li style="text" value="1.">To check for updates for features you have installed,
-go to the <a href="action1">My Eclipse</a> and select
-<b>Available Updates</b> folder. <b>Search page</b> will
-be shown allowing you to initiate and customize the search.</li>
-<li style="text" value="2.">This is the item number 2.</li>
-<li style="text" value="3.">This is the item number 3.</li>
-</form>
\ No newline at end of file
diff --git a/update/org.eclipse.update.ui.win32/.classpath b/update/org.eclipse.update.ui.win32/.classpath
deleted file mode 100644
index b7f3dc9..0000000
--- a/update/org.eclipse.update.ui.win32/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/"/>
- <classpathentry kind="src" path="/org.eclipse.core.resources"/>
- <classpathentry kind="src" path="/org.eclipse.ui"/>
- <classpathentry kind="src" path="/org.eclipse.update.ui"/>
- <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
- <classpathentry kind="src" path="/org.eclipse.core.boot"/>
- <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/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 706350c..0000000
--- a/update/org.eclipse.update.ui.win32/.project
+++ /dev/null
@@ -1,33 +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.ui</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.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 6e2cd8b..0000000
--- a/update/org.eclipse.update.ui.win32/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-bin.includes = fragment.properties,\
- icons/,\
- *.jar,\
- fragment.xml,\
- about.html
-source.updateui32.jar = src/
-src.includes=about.html
diff --git a/update/org.eclipse.update.ui.win32/fragment.xml b/update/org.eclipse.update.ui.win32/fragment.xml
deleted file mode 100644
index 0464b34..0000000
--- a/update/org.eclipse.update.ui.win32/fragment.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
- id="org.eclipse.update.ui.win32"
- name="%fragmentNameWin"
- version="2.0.0"
- provider-name="%providerName"
- plugin-id="org.eclipse.update.ui"
- plugin-version="2.0.0"
- match="compatible">
-
- <runtime>
- <library name="updateui32.jar">
- <export name="*"/>
- </library>
- </runtime>
-
- <requires>
- <import plugin="org.eclipse.core.resources"/>
- <import plugin="org.eclipse.ui"/>
- </requires>
-
-
- <extension
- point="org.eclipse.ui.views">
- <view
- name="%views.webBrowser.label"
- icon="icons/full/cview16/browser.gif"
- category="org.eclipse.update.ui"
- class="org.eclipse.update.internal.ui.win32.views.WebBrowserView"
- id="org.eclipse.update.ui.WebBrowser">
- </view>
- </extension>
-</fragment>
-
-
-
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/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/src/org/eclipse/update/internal/ui/win32/views/BrowserControlSite.java b/update/org.eclipse.update.ui.win32/src/org/eclipse/update/internal/ui/win32/views/BrowserControlSite.java
deleted file mode 100644
index 5552250..0000000
--- a/update/org.eclipse.update.ui.win32/src/org/eclipse/update/internal/ui/win32/views/BrowserControlSite.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package org.eclipse.update.internal.ui.win32.views;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.ole.win32.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.internal.win32.OS;
-import org.eclipse.update.internal.ui.*;
-
-import java.net.URL;
-import org.eclipse.core.runtime.Platform;
-import java.io.IOException;
-import java.util.*;
-import org.eclipse.ui.texteditor.*;
-import org.eclipse.jface.action.IStatusLineManager;
-
-/**
- * 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("");
- }
- }
- });
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.ui.win32/src/org/eclipse/update/internal/ui/win32/views/WebBrowser.java b/update/org.eclipse.update.ui.win32/src/org/eclipse/update/internal/ui/win32/views/WebBrowser.java
deleted file mode 100644
index 327bb6c..0000000
--- a/update/org.eclipse.update.ui.win32/src/org/eclipse/update/internal/ui/win32/views/WebBrowser.java
+++ /dev/null
@@ -1,460 +0,0 @@
-package org.eclipse.update.internal.ui.win32.views;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-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)
- 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)
- 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)
- 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)
- 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)
- 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) {
- command = varResult.getInt();
- }
-
- varResult = event.arguments[1];
- if (varResult != null) {
- 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)
- 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)
- 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);
- }
- /**
- * Gets the forwardEnabled
- * @return Returns a boolean
- */
- public boolean isForwardEnabled() {
- return forwardEnabled;
- }
-
- /**
- * Gets the backwardEnabled
- * @return Returns a boolean
- */
- public boolean isBackwardEnabled() {
- return backwardEnabled;
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.ui.win32/src/org/eclipse/update/internal/ui/win32/views/WebBrowserView.java b/update/org.eclipse.update.ui.win32/src/org/eclipse/update/internal/ui/win32/views/WebBrowserView.java
deleted file mode 100644
index 9264067..0000000
--- a/update/org.eclipse.update.ui.win32/src/org/eclipse/update/internal/ui/win32/views/WebBrowserView.java
+++ /dev/null
@@ -1,264 +0,0 @@
-package org.eclipse.update.internal.ui.win32.views;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import org.eclipse.core.boot.BootLoader;
-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.help.WorkbenchHelp;
-import org.eclipse.ui.part.ViewPart;
-import org.eclipse.update.internal.ui.*;
-import org.eclipse.update.internal.ui.views.IEmbeddedWebBrowser;
-
-public class WebBrowserView extends ViewPart implements IEmbeddedWebBrowser {
- // NL
- 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 Action backwardAction;
- private Action forwardAction;
-
- public WebBrowserView() {
- }
-
- /**
- * @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);
- if (BootLoader.getWS().equals("win32") == false) {
- Text infoText =
- new Text(container, SWT.MULTI | SWT.V_SCROLL | SWT.WRAP);
- GridData gd = new GridData(GridData.FILL_BOTH);
- infoText.setLayoutData(gd);
- infoText.setEditable(false);
- infoText.setText(
- UpdateUIPlugin.getResourceString(KEY_NOT_AVAILABLE));
- return;
- }
- 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 =
- getViewSite().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");
- }
-
- public void openTo(final String url) {
- addressCombo.setText(url);
- control.getDisplay().asyncExec(new Runnable() {
- public void run() {
- navigate(url);
- }
- });
- }
-
- private void downloadComplete(String url) {
- backwardAction.setEnabled(browser.isBackwardEnabled());
- forwardAction.setEnabled(browser.isForwardEnabled());
- stopAction.setEnabled(false);
- refreshAction.setEnabled(true);
- }
-
- private void createNavBar(Composite parent) {
- Label addressLabel = new Label(parent, SWT.NONE);
- addressLabel.setText(UpdateUIPlugin.getResourceString(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();
- IToolBarManager localBar =
- getViewSite().getActionBars().getToolBarManager();
- localBar.add(backwardAction);
- localBar.add(forwardAction);
- }
-
- 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);
- }
- }
-
- private void makeActions() {
- goAction = new Action() {
- public void run() {
- navigate(addressCombo.getText());
- }
- };
- goAction.setEnabled(false);
- goAction.setToolTipText(UpdateUIPlugin.getResourceString(KEY_GO));
- goAction.setImageDescriptor(UpdateUIPluginImages.DESC_GO_NAV);
- goAction.setDisabledImageDescriptor(UpdateUIPluginImages.DESC_GO_NAV_D);
- goAction.setHoverImageDescriptor(UpdateUIPluginImages.DESC_GO_NAV_H);
-
- stopAction = new Action() {
- public void run() {
- browser.stop();
- }
- };
- stopAction.setToolTipText(UpdateUIPlugin.getResourceString(KEY_STOP));
- stopAction.setImageDescriptor(UpdateUIPluginImages.DESC_STOP_NAV);
- stopAction.setDisabledImageDescriptor(
- UpdateUIPluginImages.DESC_STOP_NAV_D);
- stopAction.setHoverImageDescriptor(
- UpdateUIPluginImages.DESC_STOP_NAV_H);
- stopAction.setEnabled(false);
-
- refreshAction = new Action() {
- public void run() {
- browser.refresh();
- }
- };
- refreshAction.setToolTipText(
- UpdateUIPlugin.getResourceString(KEY_REFRESH));
- refreshAction.setImageDescriptor(UpdateUIPluginImages.DESC_REFRESH_NAV);
- refreshAction.setDisabledImageDescriptor(
- UpdateUIPluginImages.DESC_REFRESH_NAV_D);
- refreshAction.setHoverImageDescriptor(
- UpdateUIPluginImages.DESC_REFRESH_NAV_H);
- refreshAction.setEnabled(false);
-
- backwardAction = new Action() {
- public void run() {
- browser.back();
- }
- };
- backwardAction.setEnabled(false);
- backwardAction.setToolTipText(
- UpdateUIPlugin.getResourceString(KEY_BACKWARD));
- backwardAction.setImageDescriptor(
- UpdateUIPluginImages.DESC_BACKWARD_NAV);
- backwardAction.setDisabledImageDescriptor(
- UpdateUIPluginImages.DESC_BACKWARD_NAV_D);
- backwardAction.setHoverImageDescriptor(
- UpdateUIPluginImages.DESC_BACKWARD_NAV_H);
-
- forwardAction = new Action() {
- public void run() {
- browser.forward();
- }
- };
- forwardAction.setToolTipText(
- UpdateUIPlugin.getResourceString(KEY_FORWARD));
- forwardAction.setImageDescriptor(UpdateUIPluginImages.DESC_FORWARD_NAV);
- forwardAction.setDisabledImageDescriptor(
- UpdateUIPluginImages.DESC_FORWARD_NAV_D);
- forwardAction.setHoverImageDescriptor(
- UpdateUIPluginImages.DESC_FORWARD_NAV_H);
- forwardAction.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();
- super.dispose();
- }
-
- public void setFocus() {
- if (control != null)
- control.setFocus();
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.ui/plugin.xml b/update/org.eclipse.update.ui/plugin.xml
index 8e90cda..05505de 100644
--- a/update/org.eclipse.update.ui/plugin.xml
+++ b/update/org.eclipse.update.ui/plugin.xml
@@ -2,7 +2,7 @@
<plugin
id="org.eclipse.update.ui"
name="%pluginName"
- version="2.0.2"
+ version="2.0.3"
provider-name="%providerName"
class="org.eclipse.update.internal.ui.UpdateUIPlugin">
diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/UpdateUIPlugin.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/UpdateUIPlugin.java
index 6fae4b9..9c79101 100644
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/UpdateUIPlugin.java
+++ b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/UpdateUIPlugin.java
@@ -22,7 +22,6 @@
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.eclipse.update.configuration.*;
import org.eclipse.update.core.*;
-import org.eclipse.update.internal.core.UpdateManagerPlugin;
import org.eclipse.update.internal.model.SiteLocalModel;
import org.eclipse.update.internal.ui.forms.UpdateAdapterFactory;
import org.eclipse.update.internal.ui.model.*;
@@ -30,7 +29,7 @@
import org.eclipse.update.internal.ui.parts.SWTUtil;
import org.eclipse.update.internal.ui.preferences.MainPreferencePage;
import org.eclipse.update.internal.ui.preferences.UpdateColors;
-import org.eclipse.update.internal.ui.security.UpdateManagerAuthenticator;
+import org.eclipse.update.internal.ui.security.AuthorizationDatabase;
/**
* The main plugin class to be used in the desktop.
@@ -43,7 +42,7 @@
private ResourceBundle resourceBundle;
private UpdateAdapterFactory adapterFactory;
private UpdateModel model;
- private UpdateManagerAuthenticator authenticator;
+ private AuthorizationDatabase database;
private AboutInfo aboutInfo;
/**
@@ -140,8 +139,8 @@
IAdapterManager manager = Platform.getAdapterManager();
adapterFactory = new UpdateAdapterFactory();
manager.registerAdapters(adapterFactory, UIModelObject.class);
- authenticator = new UpdateManagerAuthenticator();
- UpdateManagerPlugin.getPlugin().setDefaultAuthenticator(authenticator);
+ database = new AuthorizationDatabase();
+ Authenticator.setDefault(database);
int historyPref = getPluginPreferences().getInt(MainPreferencePage.P_HISTORY_SIZE);
if(historyPref>0){
SiteLocalModel.DEFAULT_HISTORY= historyPref;
@@ -302,6 +301,14 @@
return null;
}
+ /**
+ * Gets the database.
+ * @return Returns a AuthorizationDatabase
+ */
+ public AuthorizationDatabase getDatabase() {
+ return database;
+ }
+
public static URL getOriginatingURL(String id) {
IDialogSettings section = getOriginatingURLSection();
String value=section.get(id);
@@ -401,12 +408,4 @@
MainPreferencePage.EQUIVALENT_VALUE);
UpdateColors.setDefaults(store);
}
- /**
- * Returns the authenticator.
- * @return UpdateManagerAuthenticator
- */
- public UpdateManagerAuthenticator getAuthenticator() {
- return authenticator;
- }
-
}
\ No newline at end of file
diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/forms/ActivityConstraints.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/forms/ActivityConstraints.java
index 43f26cd..7364899 100644
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/forms/ActivityConstraints.java
+++ b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/forms/ActivityConstraints.java
@@ -342,7 +342,7 @@
return features;
}
-
+
/*
* Compute the nested feature subtree starting at the specified base feature
*/
@@ -352,6 +352,24 @@
ArrayList features,
boolean tolerateMissingChildren)
throws CoreException {
+ return computeFeatureSubtree(
+ top,
+ feature,
+ features,
+ tolerateMissingChildren,
+ null);
+ }
+
+ /*
+ * Compute the nested feature subtree starting at the specified base feature
+ */
+ private static ArrayList computeFeatureSubtree(
+ IFeature top,
+ IFeature feature,
+ ArrayList features,
+ boolean tolerateMissingChildren,
+ ArrayList configuredFeatures)
+ throws CoreException {
// check arguments
if (features == null)
@@ -373,7 +391,11 @@
IFeatureReference[] children = feature.getIncludedFeatureReferences();
for (int i = 0; i < children.length; i++) {
try {
- IFeature child = children[i].getFeature();
+ IFeature child;
+ if (configuredFeatures == null)
+ child = children[i].getFeature();
+ else
+ child = getBestMatch(children[i], configuredFeatures);
features =
computeFeatureSubtree(
top,
@@ -402,7 +424,8 @@
add,
null,
null,
- false /* do not tolerate missing children */
+ false, /* do not tolerate missing children */
+ features
);
ArrayList removeTree =
computeFeatureSubtree(
@@ -416,16 +439,84 @@
// those features. Include them in the list.
contributePatchesFor(removeTree, features, removeTree);
}
+
+ if (remove != null)
+ features.removeAll(removeTree);
if (add != null)
features.addAll(addTree);
- if (remove != null)
- features.removeAll(removeTree);
-
return features;
}
+ /*
+ * This method fixes the defect 34241. Included feature reference
+ * of the feature from the remote server always returns
+ * a perfect match. However, the actual install behaviour is
+ * different if that feature already exists (as disabled)
+ * while a better one is enabled. This typically happens
+ * through branch updates or patches.
+ *
+ * To avoid this problem, we need to check if a better feature
+ * that still matches the reference is enabled in the current
+ * configuration. If it is, it will be used instead of the
+ * 'perfect' match. If not, we should default to the old
+ * behaviour.
+ */
+
+ private static IFeature getBestMatch(
+ IFeatureReference ref,
+ ArrayList configuredFeatures)
+ throws CoreException {
+ int match = ref.getMatch();
+ ISite site = ref.getSite();
+ IConfiguredSite csite = site.getCurrentConfiguredSite();
+ // If the feature is from the remote server and
+ // it can handle better features, see if you can
+ // resolve locally.
+ if (csite == null && match != IUpdateConstants.RULE_PERFECT) {
+ // there is a chance that there is a better match
+ // in the platform
+ VersionedIdentifier vid = ref.getVersionedIdentifier();
+ PluginVersionIdentifier version = vid.getVersion();
+
+ for (int i = 0; i < configuredFeatures.size(); i++) {
+ IFeature feature = (IFeature) configuredFeatures.get(i);
+ VersionedIdentifier fvid = feature.getVersionedIdentifier();
+ if (fvid.getIdentifier().equals(vid.getIdentifier())) {
+ // Feature found in local configuration.
+ // Ignore if the same version.
+ // Use it if better
+ PluginVersionIdentifier fversion = fvid.getVersion();
+ if (fversion.isGreaterThan(version)) {
+ boolean matches = false;
+ switch (match) {
+ case IImport.RULE_COMPATIBLE :
+ matches =
+ fvid.getVersion().isCompatibleWith(
+ vid.getVersion());
+ break;
+ case IImport.RULE_EQUIVALENT :
+ matches =
+ fvid.getVersion().isEquivalentTo(
+ vid.getVersion());
+ break;
+ case IImport.RULE_GREATER_OR_EQUAL :
+ matches =
+ fvid.getVersion().isGreaterOrEqualTo(
+ vid.getVersion());
+ break;
+ }
+ if (matches)
+ return feature;
+ }
+ }
+ }
+ }
+ // fallback - just get the feature from the reference.
+ return ref.getFeature();
+ }
+
private static void contributePatchesFor(
ArrayList removeTree,
ArrayList features,
@@ -516,6 +607,7 @@
IFeature[] array =
(IFeature[]) siteFeatures.toArray(
new IFeature[siteFeatures.size()]);
+ ArrayList removeTree = new ArrayList();
for (int j = 0; j < array.length; j++) {
VersionedIdentifier id1 = array[j].getVersionedIdentifier();
for (int k = 0; k < array.length; k++) {
@@ -525,11 +617,17 @@
if (id1.getIdentifier().equals(id2.getIdentifier())) {
if (id2.getVersion().isGreaterThan(id1.getVersion())) {
siteFeatures.remove(array[j]);
+ removeTree.add(array[j]);
break;
}
}
}
}
+ // Compute patches that will need to be removed together with
+ // the removed features
+ ArrayList patchesTree = new ArrayList();
+ contributePatchesFor(removeTree, siteFeatures, patchesTree);
+ siteFeatures.removeAll(patchesTree);
// accumulate site results
features.addAll(siteFeatures);
@@ -585,6 +683,7 @@
for (int i = 0; i < irefs.length; i++) {
IFeatureReference iref = irefs[i];
IFeature ifeature = iref.getFeature();
+ boolean patch = isPatch(ifeature);
VersionedIdentifier vid = ifeature.getVersionedIdentifier();
String id = vid.getIdentifier();
PluginVersionIdentifier version = vid.getVersion();
@@ -615,14 +714,17 @@
if (!found) {
// All the features carried in a patch must
// already be present, unless this feature
- // is a patch itself
- if (!isPatch(ifeature)) {
+ // is a patch itself.
+ //
+ // 30849: optional feature does not need
+ // to be present.
+ if (!patch && iref.isOptional()==false) {
String msg = UpdateUIPlugin.getFormattedMessage(KEY_PATCH_MISSING_TARGET,
new String[] { ifeature.getLabel(), version.toString() });
status.add(createStatus(feature, msg));
}
}
- checkUnique(ifeature, features, status);
+ if (patch) checkUnique(ifeature, features, status);
}
}
diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/security/AuthorizationDatabase.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/security/AuthorizationDatabase.java
new file mode 100644
index 0000000..0afce4b
--- /dev/null
+++ b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/security/AuthorizationDatabase.java
@@ -0,0 +1,194 @@
+package org.eclipse.update.internal.ui.security;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2002.
+ * All Rights Reserved.
+ */
+
+import java.net.*;
+import java.util.*;
+
+import org.eclipse.core.runtime.*;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.update.core.Utilities;
+import org.eclipse.update.internal.core.UpdateManagerPlugin;
+
+/**
+ * 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 extends Authenticator {
+
+ private InetAddress requestingSite;
+ private int requestingPort;
+ private String requestingProtocol;
+ private String requestingPrompt;
+ private String requestingScheme;
+ private PasswordAuthentication savedPasswordAuthentication;
+
+ // fields needed for caching the password
+ public static final String INFO_PASSWORD = "org.eclipse.update.internal.ui.security.password"; //$NON-NLS-1$
+ public static final String INFO_USERNAME = "org.eclipse.update.internal.ui.security.username"; //$NON-NLS-1$
+ public static final String AUTH_SCHEME = ""; //$NON-NLS-1$
+
+ /**
+ * 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.getPlugin().getLog().log(e.getStatus());
+ }
+ }
+
+ /**
+ *
+ */
+ public Map getAuthenticationInfo(URL serverUrl, String realm, String scheme) {
+
+ return Platform.getAuthorizationInfo(serverUrl, realm, scheme);
+ }
+
+ /**
+ *
+ */
+ public Map requestAuthenticationInfo(final URL resourceUrl, final String realm, final String scheme) {
+
+ result = new Hashtable();
+ if (scheme != null && 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;
+ }
+
+ public void reset(){
+ requestingPort = 0;
+ requestingPrompt = null;
+ requestingProtocol = null;
+ requestingScheme = null;
+ requestingSite = null;
+ }
+
+ /**
+ *
+ */
+ private void promptForPassword(URL resourceUrl, String realm, Map info) {
+
+ Shell shell = new Shell();
+ UserValidationDialog ui = new UserValidationDialog(shell, resourceUrl, realm, ""); //$NON-NLS-1$
+ ui.setUsernameMutable(true);
+ ui.setBlockOnOpen(true);
+ ui.open();
+
+ if (ui.getReturnCode() != ui.CANCEL) {
+ info.put(INFO_USERNAME, ui.getUserid());
+ info.put(INFO_PASSWORD, ui.getPassword());
+ }
+ shell.dispose();
+
+ }
+ /*
+ * @see Authenticator#getPasswordAuthentication()
+ */
+ protected PasswordAuthentication getPasswordAuthentication() {
+
+ try {
+ URL url = new URL(getRequestingProtocol(), getRequestingSite().getHostName(), getRequestingPort(), ""); //$NON-NLS-1$
+ return retrievePasswordAuthentication(url);
+ } catch (MalformedURLException e) {
+ IStatus status = Utilities.newCoreException("",e).getStatus();
+ UpdateManagerPlugin.getPlugin().getLog().log(status);
+ }
+ return new PasswordAuthentication("", new char[] { ' ' }); //$NON-NLS-1$
+ }
+
+ /*
+ *
+ */
+ private PasswordAuthentication retrievePasswordAuthentication(URL url) {
+
+ Map map = null;
+ String username = null;
+ String password = null;
+
+ if (equalsPreviousRequest()) {
+ // same request, the userid/password was wrong
+ // or user cancelled. force a refresh
+ if (savedPasswordAuthentication != null)
+ // only prompt if the user didn't cancel
+ map = requestAuthenticationInfo(url, requestingPrompt, requestingScheme);
+ } else {
+ // save state
+ requestingPort = getRequestingPort();
+ requestingPrompt = getRequestingPrompt();
+ requestingProtocol = getRequestingProtocol();
+ requestingScheme = getRequestingScheme();
+ requestingSite = getRequestingSite();
+ map = Platform.getAuthorizationInfo(url, requestingPrompt, requestingScheme);
+ if (map == null) {
+ map = requestAuthenticationInfo(url, requestingPrompt, requestingScheme);
+ }
+ }
+
+ if (map != null) {
+ username = (String) map.get(INFO_USERNAME);
+ password = (String) map.get(INFO_PASSWORD);
+ }
+
+ if (username!=null && password!=null){
+ savedPasswordAuthentication = new PasswordAuthentication(username, password.toCharArray());
+ } else {
+ savedPasswordAuthentication = null;
+ }
+
+ return savedPasswordAuthentication;
+
+ }
+
+ private boolean equalsPreviousRequest() {
+
+ if (requestingPort != getRequestingPort())
+ return false;
+
+ if (requestingPrompt != null && !requestingPrompt.equals(getRequestingPrompt()))
+ return false;
+ if (requestingPrompt == null && getRequestingPrompt() != null)
+ return false;
+
+ if (requestingProtocol != null && !requestingProtocol.equals(getRequestingProtocol()))
+ return false;
+ if (requestingProtocol == null && getRequestingProtocol() != null)
+ return false;
+
+ if (requestingScheme != null && !requestingScheme.equals(getRequestingScheme()))
+ return false;
+ if (requestingScheme == null && getRequestingScheme() != null)
+ return false;
+
+ if (requestingSite != null && !requestingSite.equals(getRequestingSite()))
+ return false;
+ if (requestingSite == null && getRequestingSite() != null)
+ return false;
+
+ return true;
+ }
+
+}
\ No newline at end of file
diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/security/UpdateManagerAuthenticator.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/security/UpdateManagerAuthenticator.java
deleted file mode 100644
index 5f578ec..0000000
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/security/UpdateManagerAuthenticator.java
+++ /dev/null
@@ -1,207 +0,0 @@
-package org.eclipse.update.internal.ui.security;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-
-import java.net.*;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.update.internal.core.net.http.client.Authenticator;
-import org.eclipse.core.runtime.*;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.update.internal.core.UpdateManagerPlugin;
-
-/**
- * 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 UpdateManagerAuthenticator extends Authenticator {
-
- // fields needed for caching the password
- public static final String INFO_PASSWORD = "password"; //$NON-NLS-1$
- public static final String INFO_USERNAME = "username"; //$NON-NLS-1$
- public static final String AUTH_SCHEME = ""; //$NON-NLS-1$
-
- private InetAddress requestingSite;
- private int requestingPort;
- private String requestingProtocol;
- private String requestingPrompt;
- private String requestingScheme;
- private Map savedPasswordAuthentication;
-
- /**
- * The Map containing the userid and password
- * HashMap allows <code>null</code> as the value
- */
- private Map result = new HashMap();
-
- /**
- *
- */
- public void addAuthenticationInfo(URL serverUrl, String realm, String scheme, Map info) {
- try {
- Platform.addAuthorizationInfo(serverUrl, realm, scheme, info);
- } catch (CoreException e) {
- UpdateManagerPlugin.warn("",e);
- }
- }
-
- /**
- *
- */
- public Map getAuthenticationInfo(URL serverUrl, String realm, String scheme) {
- return Platform.getAuthorizationInfo(serverUrl, realm, scheme);
- }
-
- /**
- *
- */
- public Map requestAuthenticationInfo(URL resourceUrl,String realm,String scheme) {
- if (!equalsPreviousRequest(resourceUrl,realm,scheme)) {
- // save state
- InetAddress ip = null;
- try {
- ip = InetAddress.getByName(resourceUrl.getHost());
- } catch (UnknownHostException e){
- UpdateManagerPlugin.warn("",e);
- }
-
- this.requestingPort = resourceUrl.getPort();
- this.requestingPrompt = realm;
- this.requestingProtocol = resourceUrl.getProtocol();
- this.requestingScheme = scheme;
- this.requestingSite = ip;
-
- // try to get the password info from the in-memory database first
- Map map = Platform.getAuthorizationInfo(resourceUrl, requestingPrompt, requestingScheme);
- if (map == null) {
- map = retrievePasswordAuthentication(resourceUrl, requestingPrompt, requestingScheme);
- }
- savedPasswordAuthentication = map;
- }
-
- // we must return a valid Map while we internally manage Cancel dialog (map==null -> dialog cancelled)
- return savedPasswordAuthentication;
- }
-
- /**
- * @see org.eclipse.update.internal.core.net.http.client.IAuthenticator#addProtectionSpace(URL, String)
- */
- public void addProtectionSpace(URL resourceUrl, String realm) {
- try {
- Platform.addProtectionSpace(resourceUrl, realm);
- }
- catch (CoreException e) {
- UpdateManagerPlugin.warn("",e);
- }
- }
-
- /**
- * @see org.eclipse.update.internal.core.net.http.client.IAuthenticator#getProtectionSpace(URL)
- */
- public String getProtectionSpace(URL resourceUrl) {
- return Platform.getProtectionSpace(resourceUrl);
- }
-
-
- /*
- * forces a refresh
- */
- public void reset(){
- requestingPort = 0;
- requestingPrompt = null;
- requestingProtocol = null;
- requestingScheme = null;
- requestingSite = null;
- }
-
- /*
- * returns a map that contains the userid and the password
- * or <code>null</code> if the dialog has been cancelled
- */
- private Map retrievePasswordAuthentication(final URL resourceUrl, final String realm, final String scheme) {
- result = new HashMap();
- if ("Basic".equalsIgnoreCase(scheme)) {
- Display disp = Display.getCurrent();
- if (disp != null) {
- result = promptForPassword(resourceUrl, realm);
- } else {
- Display.getDefault().syncExec(new Runnable() {
- public void run() {
- result = promptForPassword(resourceUrl, realm);
- }
- });
- };
- }
- return result;
- }
-
- /*
- * returns true if this request is the same as the saved one
- * used to prevent double dialog if user cancelled or entered wrong userid/password
- */
- private boolean equalsPreviousRequest(URL url,String realm,String scheme) {
-
- if (requestingPort != url.getPort())
- return false;
-
- if (requestingPrompt != null && !requestingPrompt.equals(realm))
- return false;
- if (requestingPrompt == null && realm != null)
- return false;
-
- if (requestingProtocol != null && !requestingProtocol.equals(url.getProtocol()))
- return false;
- if (requestingProtocol == null && url.getProtocol() != null)
- return false;
-
- if (requestingScheme != null && !requestingScheme.equals(scheme))
- return false;
- if (requestingScheme == null && scheme != null)
- return false;
-
- InetAddress ip = null;
- try {
- ip = InetAddress.getByName(url.getHost());
- } catch (UnknownHostException e){
- UpdateManagerPlugin.warn("",e);
- }
-
- if (requestingSite != null && !requestingSite.equals(ip))
- return false;
- if (requestingSite == null && ip != null)
- return false;
-
- return true;
- }
-
- /*
- * returns a map that contains the userid and the password
- * or <code>null</code> if the dialog has been cancelled
- */
- private Map promptForPassword(URL resourceUrl, String realm) {
-
- Map result = null;
- Shell shell = new Shell();
- UserValidationDialog ui = new UserValidationDialog(shell, resourceUrl, realm, ""); //$NON-NLS-1$
- ui.setUsernameMutable(true);
- ui.setBlockOnOpen(true);
- ui.open();
-
- boolean isCancelled = ui.getReturnCode() == ui.CANCEL;
- if (!isCancelled){
- result= new HashMap();
- result.put(INFO_USERNAME, ui.getUserid());
- result.put(INFO_PASSWORD, ui.getPassword());
- }
- shell.dispose();
-
- return result;
- }
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/UpdatesView.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/UpdatesView.java
index ab8e17f..65aedbd 100644
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/UpdatesView.java
+++ b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/UpdatesView.java
@@ -27,7 +27,7 @@
import org.eclipse.update.internal.ui.model.*;
import org.eclipse.update.internal.ui.parts.*;
import org.eclipse.update.internal.ui.search.*;
-import org.eclipse.update.internal.ui.security.UpdateManagerAuthenticator;
+import org.eclipse.update.internal.ui.security.AuthorizationDatabase;
import org.eclipse.update.internal.ui.wizards.*;
/**
@@ -717,9 +717,9 @@
.showWhile(viewer.getTree().getDisplay(), new Runnable() {
public void run() {
try {
- // reinitialize the authenticator
- UpdateManagerAuthenticator auth =
- UpdateUIPlugin.getDefault().getAuthenticator();
+ // reinitialize the authenticator
+ AuthorizationDatabase auth =
+ UpdateUIPlugin.getDefault().getDatabase();
if (auth != null)
auth.reset();
if (obj instanceof SiteBookmark)
diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/FeatureHierarchyElement.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/FeatureHierarchyElement.java
index b44bb5b..50b255e 100644
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/FeatureHierarchyElement.java
+++ b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/FeatureHierarchyElement.java
@@ -173,15 +173,15 @@
* Computes children by linking matching features from the
* old feature's and new feature's hierarchy.
*/
- public Object[] getChildren(boolean update) {
- computeChildren(update);
+ public Object[] getChildren(boolean update, boolean patch, IInstallConfiguration config) {
+ computeChildren(update, patch, config);
return children.toArray();
}
/**
* Computes children of this node.
* @return true if some of the children are optional, false otherwise.
*/
- public void computeChildren(boolean update) {
+ public void computeChildren(boolean update, boolean patch, IInstallConfiguration config) {
if (children == null) {
children = new ArrayList();
try {
@@ -190,7 +190,7 @@
newFeature = newFeatureRef.getFeature();
if (oldFeatureRef != null)
oldFeature = oldFeatureRef.getFeature();
- optionalChildren = computeElements(oldFeature, newFeature, update, children);
+ optionalChildren = computeElements(oldFeature, newFeature, update, patch, config, children);
} catch (CoreException e) {
}
}
@@ -204,7 +204,7 @@
/**
* Adds checked optional features to the provided set.
*/
- public void addCheckedOptionalFeatures(boolean update, Set set) {
+ public void addCheckedOptionalFeatures(boolean update, boolean patch, IInstallConfiguration config, Set set) {
if (isOptional() && isChecked()) {
// Do not add checked optional features
// if this is an update case but
@@ -213,10 +213,10 @@
if (!update || !isFalseUpdate())
set.add(newFeatureRef);
}
- Object[] list = getChildren(update);
+ Object[] list = getChildren(update, patch, config);
for (int i = 0; i < list.length; i++) {
FeatureHierarchyElement element = (FeatureHierarchyElement) list[i];
- element.addCheckedOptionalFeatures(update, set);
+ element.addCheckedOptionalFeatures(update, patch, config, set);
}
}
@@ -230,6 +230,8 @@
IFeature oldFeature,
IFeature newFeature,
boolean update,
+ boolean patch,
+ IInstallConfiguration config,
ArrayList list) {
Object[] oldChildren = null;
Object[] newChildren = getIncludedFeatures(newFeature);
@@ -261,10 +263,18 @@
}
}
}
+ else if (patch) {
+ // 30849 - find the old reference in the
+ // configuration.
+ if (!UpdateUIPlugin.isPatch(newFeature)) {
+ oldRef = findPatchedReference(newRef, config);
+ }
+ }
// test if the old optional feature exists
- if (oldRef!=null && oldRef.isOptional()) {
+ if (oldRef!=null && (oldRef.isOptional() || patch)) {
try {
- oldRef.getFeature();
+ IFeature f = oldRef.getFeature();
+ if (f==null) oldRef = null;
}
catch (CoreException e) {
// missing
@@ -276,7 +286,7 @@
// If this is an update (old feature exists),
// only check the new optional feature if the old exists.
// Otherwise, always check.
- if (newRef.isOptional() && update) {
+ if (newRef.isOptional() && (update || patch)) {
element.setChecked(oldRef != null);
if (oldRef == null) {
// Does not have an old reference,
@@ -293,7 +303,7 @@
} else
element.setChecked(true);
list.add(element);
- element.computeChildren(update);
+ element.computeChildren(update, patch, config);
if (element.isOptional() || element.hasOptionalChildren())
optionalChildren=true;
}
@@ -301,6 +311,23 @@
}
return optionalChildren;
}
+
+ private static IFeatureReference findPatchedReference(IFeatureReference newRef, IInstallConfiguration config) throws CoreException {
+ VersionedIdentifier vid = newRef.getVersionedIdentifier();
+ IConfiguredSite [] csites = config.getConfiguredSites();
+ for (int i=0; i<csites.length; i++) {
+ IConfiguredSite csite = csites[i];
+ IFeatureReference [] refs = csite.getConfiguredFeatures();
+ for (int j=0; j<refs.length; j++) {
+ IFeatureReference ref = refs[j];
+ VersionedIdentifier refVid = ref.getVersionedIdentifier();
+ if (vid.getIdentifier().equals(refVid.getIdentifier()))
+ return ref;
+ }
+ }
+ return null;
+ }
+
private static boolean hasOlderVersion(IFeatureReference newRef) {
try {
IFeature feature = newRef.getFeature();
diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/InstallWizard.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/InstallWizard.java
index 2736697..631a4a2 100644
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/InstallWizard.java
+++ b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/InstallWizard.java
@@ -32,6 +32,7 @@
private PendingChange job;
private boolean successfulInstall = false;
private IInstallConfiguration config;
+ private boolean patch;
public InstallWizard(PendingChange job) {
setDialogSettings(UpdateUIPlugin.getDefault().getDialogSettings());
@@ -39,6 +40,8 @@
setForcePreviousAndNextButtons(true);
setNeedsProgressMonitor(true);
this.job = job;
+ IFeature feature = job.getFeature();
+ patch = UpdateUIPlugin.isPatch(feature);
}
public boolean isSuccessfulInstall() {
@@ -206,8 +209,10 @@
monitor);
IFeature oldFeature = job.getOldFeature();
if (oldFeature != null && !job.isOptionalDelta()) {
- if (optionalElements != null)
- preserveOptionalState(config, targetSite, optionalElements);
+ if (optionalElements != null) {
+ boolean patch = UpdateUIPlugin.isPatch(feature);
+ preserveOptionalState(config, targetSite, patch, optionalElements);
+ }
boolean oldSuccess = unconfigure(config, oldFeature);
if (!oldSuccess) {
if (!isNestedChild(oldFeature))
@@ -366,12 +371,13 @@
static void preserveOptionalState(
IInstallConfiguration config,
IConfiguredSite targetSite,
+ boolean patch,
Object[] optionalElements) {
for (int i = 0; i < optionalElements.length; i++) {
FeatureHierarchyElement fe =
(FeatureHierarchyElement) optionalElements[i];
- Object[] children = fe.getChildren(true);
- preserveOptionalState(config, targetSite, children);
+ Object[] children = fe.getChildren(true, patch, config);
+ preserveOptionalState(config, targetSite, patch, children);
if (!fe.isEnabled(config)) {
IFeature newFeature = fe.getFeature();
try {
@@ -394,7 +400,16 @@
IFeatureReference[] included = feature.getIncludedFeatureReferences();
for (int i = 0; i < included.length; i++) {
IFeatureReference iref = included[i];
- IFeature ifeature = iref.getFeature();
+ IFeature ifeature;
+
+ try {
+ ifeature = iref.getFeature();
+ }
+ catch (CoreException e) {
+ if (iref.isOptional())
+ continue;
+ throw e;
+ }
// find other features and unconfigure
String id = iref.getVersionedIdentifier().getIdentifier();
IFeature[] sameIds =
diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/NewUpdatesWizard.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/NewUpdatesWizard.java
index 1d15c11..ac5e7f9 100644
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/NewUpdatesWizard.java
+++ b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/NewUpdatesWizard.java
@@ -213,6 +213,8 @@
oldFeature,
feature,
oldFeature != null,
+ false,
+ config,
optionalElements);
if (hasOptionalFeatures)
optionalFeatures = computeOptionalFeatures(optionalElements, oldFeature!=null);
@@ -224,7 +226,7 @@
targetSite.install(feature, getVerificationListener(), monitor);
if (!reinstall) {
if (optionalFeatures!=null) {
- InstallWizard.preserveOptionalState(config, targetSite, optionalElements.toArray());
+ InstallWizard.preserveOptionalState(config, targetSite, false, optionalElements.toArray());
}
unconfigure(oldFeature);
}
@@ -239,6 +241,8 @@
(FeatureHierarchyElement) elements.get(i);
element.addCheckedOptionalFeatures(
update,
+ false,
+ config,
set);
}
return (IFeatureReference[]) set.toArray(
diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/OptionalFeaturesPage.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/OptionalFeaturesPage.java
index 0bd9abe..c1c7ddd 100644
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/OptionalFeaturesPage.java
+++ b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/OptionalFeaturesPage.java
@@ -34,6 +34,7 @@
private PendingChange pendingChange;
private Image featureImage;
private Object[] elements;
+ private boolean patch;
class TreeContentProvider
extends DefaultContentProvider
@@ -42,7 +43,7 @@
public Object[] getChildren(Object parent) {
if (parent instanceof FeatureHierarchyElement) {
FeatureHierarchyElement fe = (FeatureHierarchyElement) parent;
- return fe.getChildren(pendingChange.getOldFeature() != null);
+ return fe.getChildren(pendingChange.getOldFeature() != null, patch, config);
}
return new Object[0];
}
@@ -89,6 +90,7 @@
this.config = config;
this.pendingChange = pendingChange;
featureImage = UpdateUIPluginImages.DESC_FEATURE_OBJ.createImage();
+ patch = UpdateUIPlugin.isPatch(pendingChange.getFeature());
}
public void dispose() {
@@ -191,6 +193,8 @@
oldFeature,
newFeature,
oldFeature != null,
+ patch,
+ config,
list);
elements = list.toArray();
}
@@ -217,7 +221,7 @@
if (!element.isEditable())
grayed.add(element);
Object[] children =
- element.getChildren(pendingChange.getOldFeature() != null);
+ element.getChildren(pendingChange.getOldFeature() != null, patch, config);
initializeStates(children, checked, grayed);
}
}
@@ -252,7 +256,7 @@
}
}
Object[] included =
- ref.getChildren(pendingChange.getOldFeature() != null);
+ ref.getChildren(pendingChange.getOldFeature() != null, patch, config);
for (int i = 0; i < included.length; i++) {
FeatureHierarchyElement fe = (FeatureHierarchyElement) included[i];
selectAll(fe, selected, value);
@@ -282,6 +286,8 @@
(FeatureHierarchyElement) elements[i];
element.addCheckedOptionalFeatures(
pendingChange.getOldFeature() != null,
+ patch,
+ config,
set);
}
return (IFeatureReference[]) set.toArray(
