[SCM] eclipse - Powerful IDE written in java - Debian package. branch, upstream, updated. 358693990b4f3f85ee6b398b5d13cfb1ffdc375d
Benjamin Drung
bdrung-guest at alioth.debian.org
Thu Feb 18 20:57:49 UTC 2010
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "eclipse - Powerful IDE written in java - Debian package.".
The branch, upstream has been updated
via 358693990b4f3f85ee6b398b5d13cfb1ffdc375d (commit)
via 771699f068f96b99691e5bf6190332a11d35e07b (commit)
via 621ec9a094fa497b2eec15b3b227946ebe7b4dfd (commit)
via 556c3951d277fd55d17b220a0d10a85ac3fa0a39 (commit)
via 418475d06d15085b6fcf87c248d441f726a3740e (commit)
from 76aad4ba8357eb0f109949a7c4469ae791ae9148 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 358693990b4f3f85ee6b398b5d13cfb1ffdc375d
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Thu Feb 18 21:54:43 2010 +0100
Remove binary .a files.
commit 771699f068f96b99691e5bf6190332a11d35e07b
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Thu Feb 18 21:49:22 2010 +0100
Remove unused jar files.
commit 621ec9a094fa497b2eec15b3b227946ebe7b4dfd
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Thu Feb 18 21:41:18 2010 +0100
Fix file permissions of scripts to 755.
commit 556c3951d277fd55d17b220a0d10a85ac3fa0a39
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Thu Feb 18 21:38:19 2010 +0100
Import eclipse 3.5.2 snapshot (eclipse-vM20100210-0800-fetched-src).
commit 418475d06d15085b6fcf87c248d441f726a3740e
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Thu Feb 18 21:28:43 2010 +0100
Import eclipse-build R3.5.2 branch (revision 24233).
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 71 +
build.properties | 6 +-
build.xml | 79 +-
buildSDKSource.sh | 12 +-
eclipse-build-config/ChangeLog | 17 +-
.../productFiles/rcp.sdk/rcp.product | 2 +-
.../productFiles/rcpConfig/build.properties | 1 -
eclipse-build-config/productFiles/sdk/sdk.product | 4 +-
eclipse-build-feature/ChangeLog | 6 +-
eclipse-build-feature/feature.xml | 2 +-
eclipse-build-generatedScripts.tar.bz2 | Bin 13474 -> 14599 bytes
eclipse/artifacts.jar | Bin 1586 -> 1601 bytes
eclipse/content.jar | Bin 10092 -> 10071 bytes
eclipse/directory.txt | 402 ++--
eclipse/featureVersions.properties | 26 +-
.../org.eclipse.equinox.compendium.sdk/feature.xml | 4 +-
.../org.eclipse.equinox.core.sdk/feature.xml | 2 +-
.../org.eclipse.equinox.executable/feature.xml | 3 +-
.../library/eclipse.c | 41 +-
.../library/eclipseCommon.h | 6 +-
.../library/eclipseJNI.c | 36 +-
.../library/eclipseMain.c | 9 +-
.../library/make_version.mak | 2 +-
.../library/motif/eclipseMotif.h | 5 +-
.../library/motif/eclipseMotifCommon.c | 5 +-
.../library/motif/eclipseMotifInit.c | 37 +-
.../library/motif/eclipseMotifShim.c | 17 +
.../library/motif/make_aix.mak | 20 +-
.../org.eclipse.equinox.p2.user.ui/feature.xml | 2 +-
.../features/org.eclipse.equinox.sdk/feature.xml | 2 +-
eclipse/features/org.eclipse.help/feature.xml | 15 +-
.../features/org.eclipse.jdt/feature.properties | 4 +-
eclipse/features/org.eclipse.jdt/feature.xml | 4 +-
.../sourceTemplateFeature/feature.properties | 4 +-
eclipse/features/org.eclipse.pde/feature.xml | 2 +-
.../about_files/linux.gtk.ppc/about.html | 2 +-
.../about_files/linux.gtk.x86/about.html | 2 +-
.../about_files/linux.gtk.x86_64/about.html | 2 +-
.../about_files/linux.motif.x86/about.html | 2 +-
.../org.eclipse.platform/feature.properties | 4 +-
eclipse/features/org.eclipse.platform/feature.xml | 16 +-
.../rootfiles/readme/readme_eclipse.html | 2753 ++++----------------
.../sourceTemplateFeature/feature.properties | 4 +-
eclipse/features/org.eclipse.rcp/feature.xml | 2 +-
eclipse/features/org.eclipse.sdk/feature.xml | 10 +-
eclipse/fetch_com.ibm.icu.base.xml | 4 +-
eclipse/fetch_master-ecf.xml | 40 +-
eclipse/fetch_master-equinox.xml | 12 +-
eclipse/fetch_master-jetty.xml | 2 +-
eclipse/fetch_master.xml | 8 +-
eclipse/fetch_org.eclipse.cvs.xml | 6 +-
.../fetch_org.eclipse.equinox.compendium.sdk.xml | 8 +-
eclipse/fetch_org.eclipse.equinox.core.sdk.xml | 8 +-
eclipse/fetch_org.eclipse.equinox.executable.xml | 8 +-
...etch_org.eclipse.equinox.jmx.common.feature.xml | 18 +-
...etch_org.eclipse.equinox.jmx.server.feature.xml | 4 +-
.../fetch_org.eclipse.equinox.p2.agent.feature.xml | 28 +-
...tch_org.eclipse.equinox.p2.director.feature.xml | 28 +-
...ch_org.eclipse.equinox.p2.generator.feature.xml | 30 +-
eclipse/fetch_org.eclipse.equinox.p2.sdk.xml | 52 +-
eclipse/fetch_org.eclipse.equinox.p2.user.ui.xml | 52 +-
eclipse/fetch_org.eclipse.equinox.sdk.xml | 2 +-
.../fetch_org.eclipse.equinox.serverside.sdk.xml | 8 +-
eclipse/fetch_org.eclipse.help.xml | 22 +-
eclipse/fetch_org.eclipse.jdt.xml | 30 +-
eclipse/fetch_org.eclipse.pde.xml | 14 +-
eclipse/fetch_org.eclipse.platform.xml | 62 +-
eclipse/fetch_org.eclipse.rcp.xml | 62 +-
eclipse/fetch_org.eclipse.sdk.examples.xml | 18 +-
eclipse/fetch_org.eclipse.sdk.xml | 32 +-
eclipse/label.properties | 6 +-
eclipse/maps/org.eclipse.releng/maps/ant.map | 12 +-
eclipse/maps/org.eclipse.releng/maps/base.map | 8 +-
eclipse/maps/org.eclipse.releng/maps/compare.map | 12 +-
eclipse/maps/org.eclipse.releng/maps/core-hpux.map | 4 +-
.../maps/org.eclipse.releng/maps/core-macosx.map | 2 +-
eclipse/maps/org.eclipse.releng/maps/core-qnx.map | 2 +-
.../org.eclipse.releng/maps/core-variables.map | 2 +-
eclipse/maps/org.eclipse.releng/maps/core.map | 173 +-
eclipse/maps/org.eclipse.releng/maps/doc.map | 10 +-
.../org.eclipse.releng/maps/equinox-incubator.map | 34 +-
eclipse/maps/org.eclipse.releng/maps/feature.map | 104 +-
eclipse/maps/org.eclipse.releng/maps/jdtapt.map | 14 +-
eclipse/maps/org.eclipse.releng/maps/jdtcore.map | 16 +-
eclipse/maps/org.eclipse.releng/maps/jdtdebug.map | 22 +-
eclipse/maps/org.eclipse.releng/maps/jdtui.map | 32 +-
eclipse/maps/org.eclipse.releng/maps/orbit.map | 104 +-
eclipse/maps/org.eclipse.releng/maps/p2.map | 113 +-
eclipse/maps/org.eclipse.releng/maps/pde.map | 54 +-
eclipse/maps/org.eclipse.releng/maps/rcp.map | 6 +-
eclipse/maps/org.eclipse.releng/maps/releng.map | 24 +-
eclipse/maps/org.eclipse.releng/maps/swt.map | 66 +-
eclipse/maps/org.eclipse.releng/maps/team.map | 36 +-
.../maps/org.eclipse.releng/maps/testframework.map | 14 +-
eclipse/maps/org.eclipse.releng/maps/text.map | 24 +-
eclipse/maps/org.eclipse.releng/maps/ui.map | 72 +-
eclipse/maps/org.eclipse.releng/maps/update.map | 14 +-
.../maps/org.eclipse.releng/maps/userassist.map | 24 +-
eclipse/pluginVersions.properties | 199 +-
.../com.ibm.icu.base.source_4.0.1.v20090822.jar | Bin 113433 -> 114619 bytes
.../plugins/com.ibm.icu.source_4.0.1.v20090822.jar | Bin 1582857 -> 1584040 bytes
...com.jcraft.jsch.source_0.1.41.v200903070017.jar | Bin 223513 -> 224697 bytes
...avax.servlet.jsp.source_2.0.0.v200806031607.jar | Bin 106949 -> 108130 bytes
.../javax.servlet.source_2.5.0.v200806031605.jar | Bin 157873 -> 159053 bytes
.../org.apache.ant.source_1.7.1.v20090120-1145.jar | Bin 2156606 -> 2157789 bytes
.../META-INF/ECLIPSEF.RSA | Bin 3487 -> 5640 bytes
.../META-INF/ECLIPSEF.SF | 50 +-
.../META-INF/MANIFEST.MF | 48 +-
...e.commons.codec.source_1.3.0.v20080530-1600.jar | Bin 66255 -> 67441 bytes
...pache.commons.el.source_1.0.0.v200806031608.jar | Bin 152740 -> 153929 bytes
...mons.httpclient.source_3.1.0.v20080605-1935.jar | Bin 427316 -> 428499 bytes
....commons.logging.source_1.0.4.v200904062259.jar | Bin 52727 -> 53906 bytes
...g.apache.jasper.source_5.5.17.v200903231320.jar | Bin 395521 -> 396709 bytes
...lucene.analysis.source_1.9.1.v20080530-1600.jar | Bin 365605 -> 366787 bytes
.../org.eclipse.ant.core/META-INF/MANIFEST.MF | 2 +-
.../ant/internal/core/ant/InternalAntMessages.java | 2 +
.../core/ant/InternalAntMessages.properties | 1 +
.../ant/internal/core/ant/InternalAntRunner.java | 71 +-
.../ant/internal/ui/AntRunnerWorkbenchAdvisor.java | 4 +-
.../ui/launchConfigurations/AntLaunchDelegate.java | 28 +-
.../org.eclipse.ant.ui/META-INF/MANIFEST.MF | 2 +-
.../org.eclipse.compare/META-INF/MANIFEST.MF | 2 +-
.../org/eclipse/compare/CompareEditorInput.java | 43 +-
.../contentmergeviewer/TextMergeViewer.java | 2 +-
.../eclipse/compare/internal/CompareEditor.java | 8 +-
.../META-INF/MANIFEST.MF | 2 +-
.../org.eclipse.core.filesystem.aix.ppc/.project | 22 +
.../BUILD_INFO.txt | 10 +
.../META-INF/MANIFEST.MF | 9 +
.../about.html | 0
.../build.properties | 16 +
.../fragment.properties | 12 +
.../BUILD_INFO.txt | 12 +-
.../META-INF/MANIFEST.MF | 2 +-
.../BUILD_INFO.txt | 18 +-
.../META-INF/MANIFEST.MF | 2 +-
.../BUILD_INFO.txt | 8 +-
.../META-INF/MANIFEST.MF | 2 +-
.../os/macosx/liblocalfile_1_0_0.jnilib | Bin 50568 -> 50784 bytes
.../BUILD_INFO.txt | 21 +-
.../META-INF/MANIFEST.MF | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
.../org.eclipse.core.filesystem.aix.ppc/.project | 22 +
.../BUILD_INFO.txt | 10 +
.../META-INF/MANIFEST.MF | 9 +
.../about.html | 0
.../build.properties | 16 +
.../fragment.properties | 12 +
.../org.eclipse.core.filesystem.aix.ppc64/.project | 22 +
.../BUILD_INFO.txt | 10 +
.../META-INF/MANIFEST.MF | 9 +
.../about.html | 0
.../build.properties | 16 +
.../fragment.properties | 12 +
.../.project | 11 +
.../BUILD_INFO.txt | 10 +
.../META-INF/MANIFEST.MF | 9 +
.../about.html | 0
.../build.properties | 0
.../fragment.properties | 12 +
.../natives/macosx/Makefile | 5 +-
.../natives/macosx/localfile.c | 78 +-
.../natives/unix/aix/Makefile | 28 +
.../natives/unix/aix/include/os_custom.h | 22 +
.../natives/unix/linux/Makefile | 4 +-
.../natives/unix/localfile.c | 11 +-
.../natives/unix/solaris/Makefile | 26 +-
.../core/internal/filesystem/local/LocalFile.java | 13 +-
.../internal/filesystem/local/LocalFileSystem.java | 4 +-
.../META-INF/MANIFEST.MF | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
.../org.eclipse.core.resources/natives/ref.c | 287 ++
.../core/internal/localstore/UnifiedTree.java | 15 +-
.../core/internal/localstore/UnifiedTreeNode.java | 12 +
.../internal/resources/MarkerAttributeMap.java | 43 +-
.../internal/resources/ProjectPreferences.java | 30 +-
.../plugins/org.eclipse.cvs/META-INF/MANIFEST.MF | 2 +-
eclipse/plugins/org.eclipse.cvs/about.properties | 4 +-
.../org.eclipse.debug.core/META-INF/MANIFEST.MF | 2 +-
.../core/org/eclipse/debug/core/DebugPlugin.java | 7 +-
.../internal/core/DebugPreferenceInitializer.java | 3 +-
.../internal/core/IInternalDebugCoreConstants.java | 16 +-
.../org.eclipse.debug.ui/META-INF/MANIFEST.MF | 2 +-
.../LaunchConfigurationTabGroupViewer.java | 24 +-
.../LaunchConfigurationsDialog.java | 7 +-
.../LaunchConfigurationsMessages.java | 1 -
.../LaunchConfigurationsMessages.properties | 1 -
.../org.eclipse.equinox.app/META-INF/MANIFEST.MF | 2 +-
.../equinox/internal/app/CommandLineArgs.java | 5 +-
.../META-INF/MANIFEST.MF | 2 +-
.../org.eclipse.equinox.event/META-INF/MANIFEST.MF | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
.../frameworkadmin/equinox/ParserUtils.java | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
.../build.properties | 1 +
.../META-INF/MANIFEST.MF | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
.../META-INF/MANIFEST.MF | 6 +-
.../equinox/internal/p2/director/Projector.java | 44 +-
.../META-INF/MANIFEST.MF | 2 +-
.../internal/p2/engine/ProfilePreferences.java | 11 +-
.../META-INF/MANIFEST.MF | 2 +-
.../metadata/generator/features/SiteFeature.java | 84 +-
.../META-INF/MANIFEST.MF | 2 +-
.../p2/metadata/ResolvedInstallableUnit.java | 16 +-
.../provisional/p2/metadata/query/UpdateQuery.java | 19 +-
.../META-INF/MANIFEST.MF | 3 +-
.../internal/p2/publisher/eclipse/ProductFile.java | 25 +-
.../p2/publisher/eclipse/ProductFileAdvice.java | 9 +-
.../META-INF/MANIFEST.MF | 2 +-
.../repository/tools/AbstractApplication.java | 6 +
.../equinox/internal/p2/persistence/XMLParser.java | 5 +-
.../META-INF/MANIFEST.MF | 2 +-
.../internal/p2/updatesite/SiteXMLAction.java | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
.../preferences/ConfigurationPreferences.java | 19 +-
.../internal/preferences/DefaultPreferences.java | 6 +-
.../internal/preferences/InstancePreferences.java | 6 +-
.../META-INF/MANIFEST.MF | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
.../advanced/searchToolbar.jsp | 11 +-
.../advanced/tocToolbar.jsp | 5 +-
.../org.eclipse.jdt.apt.core/META-INF/MANIFEST.MF | 2 +-
.../org.eclipse.jdt.apt.core/build_notes.html | 11 +-
.../apt/core/internal/env/BaseProcessorEnv.java | 6 +-
.../org.eclipse.jdt.core/.settings/.api_filters | 30 +-
.../org.eclipse.jdt.core/META-INF/MANIFEST.MF | 2 +-
.../internal/compiler/batch/messages.properties | 4 +-
.../org.eclipse.jdt.core/buildnotes_jdt-core.html | 137 +
.../jdt/internal/codeassist/CompletionEngine.java | 4 +-
.../InternalExtendedCompletionContext.java | 58 +-
.../eclipse/jdt/internal/compiler/Compiler.java | 13 +-
.../compiler/ast/AllocationExpression.java | 3 +-
.../jdt/internal/compiler/ast/EqualExpression.java | 7 +-
.../compiler/ast/ExplicitConstructorCall.java | 3 +-
.../internal/compiler/ast/ForeachStatement.java | 22 +-
.../jdt/internal/compiler/ast/MessageSend.java | 6 +-
.../ast/QualifiedAllocationExpression.java | 3 +-
.../jdt/internal/compiler/ast/TypeDeclaration.java | 20 +-
.../jdt/internal/compiler/codegen/CodeStream.java | 4 +-
.../internal/compiler/impl/CompilerOptions.java | 4 +
.../compiler/lookup/BinaryTypeBinding.java | 23 +-
.../internal/compiler/lookup/MethodBinding.java | 15 +
.../internal/compiler/lookup/MethodVerifier15.java | 26 +-
.../jdt/internal/compiler/lookup/Scope.java | 43 +-
.../internal/compiler/lookup/TypeConstants.java | 7 +
.../jdt/internal/compiler/parser/Parser.java | 118 +-
.../compiler/problem/AbortCompilation.java | 25 +-
.../internal/compiler/problem/ProblemReporter.java | 6 +-
.../dom/org/eclipse/jdt/core/dom/ASTParser.java | 25 +-
.../jdt/core/dom/CompilationUnitResolver.java | 18 +-
.../org/eclipse/jdt/core/dom/DocCommentParser.java | 3 +
.../eclipse/jdt/core/dom/InternalASTRewrite.java | 9 +-
.../eclipse/jdt/core/dom/rewrite/ASTRewrite.java | 3 +-
.../core/dom/rewrite/ASTRewriteAnalyzer.java | 4 +-
.../core/dom/rewrite/ASTRewriteFormatter.java | 6 -
.../internal/formatter/CodeFormatterVisitor.java | 20 +-
.../eclipse/jdt/internal/formatter/Location.java | 4 +-
.../org/eclipse/jdt/internal/formatter/Scribe.java | 278 ++-
.../jdt/internal/formatter/align/Alignment.java | 70 +-
.../org/eclipse/jdt/core/ICompilationUnit.java | 8 +
.../jdt/core/compiler/ReconcileContext.java | 3 +-
.../eclipse/jdt/internal/core/CompilationUnit.java | 8 +-
.../core/CompilationUnitProblemFinder.java | 16 +-
.../jdt/internal/core/JavaModelManager.java | 84 +-
.../eclipse/jdt/internal/core/SourceMapper.java | 36 +-
.../eclipse/jdt/internal/core/builder/State.java | 2 +-
.../core/hierarchy/IndexBasedHierarchyBuilder.java | 4 +-
.../hierarchy/RegionBasedHierarchyBuilder.java | 4 +-
.../internal/core/util/CodeSnippetParsingUtil.java | 13 +
.../eclipse/jdt/internal/core/util/Messages.java | 3 +-
.../org/eclipse/jdt/internal/core/util/Util.java | 72 +-
.../jdt/internal/core/util/messages.properties | 3 +-
.../core/search/matching/MatchLocator.java | 4 +-
.../core/search/processing/JobManager.java | 5 +-
.../org.eclipse.jdt.doc.user/META-INF/MANIFEST.MF | 2 +-
.../gettingStarted/intro/overview.htm | 22 +-
.../org.eclipse.jdt.junit/META-INF/MANIFEST.MF | 2 +-
.../jdt/internal/junit/buildpath/P2Utils.java | 171 +-
.../org.eclipse.jdt.launching/META-INF/MANIFEST.MF | 2 +-
.../internal/launching/JavaSourceLookupUtil.java | 87 +-
.../internal/launching/RuntimeClasspathEntry.java | 10 +-
.../org.eclipse.jdt.ui/META-INF/MANIFEST.MF | 2 +-
.../proposals/ChangeCorrectionProposal.java | 4 +-
.../JavaWorkingSetPageContentProvider.java | 15 +-
.../internal/ui/workingsets/WorkingSetFilter.java | 31 +-
.../eclipse/jdt/ui/jarpackager/JarPackageData.java | 25 +-
.../plugins/org.eclipse.jdt/META-INF/MANIFEST.MF | 2 +-
.../org.eclipse.jface.text/.settings/.api_filters | 8 +
.../org.eclipse.jface.text/META-INF/MANIFEST.MF | 2 +-
.../text/AbstractInformationControlManager.java | 21 +-
.../contentassist/AdditionalInfoController.java | 10 +-
.../plugins/org.eclipse.jface/META-INF/MANIFEST.MF | 2 +-
.../jface/fieldassist/ControlDecoration.java | 4 +-
.../eclipse/jface/viewers/StructuredViewer.java | 4 +-
.../jface/viewers/TableViewerFocusCellManager.java | 19 +-
.../jface/viewers/TreeViewerFocusCellManager.java | 18 +-
.../META-INF/MANIFEST.MF | 2 +-
.../plugins/org.eclipse.osgi/META-INF/MANIFEST.MF | 2 +-
.../osgi/framework/eventmgr/EventManager.java | 6 +-
.../osgi/framework/internal/core/FilterImpl.java | 65 +-
.../serviceregistry/ServiceRegistrationImpl.java | 18 +-
.../internal/serviceregistry/ServiceRegistry.java | 55 +-
.../osgi/src/org/osgi/framework/FrameworkUtil.java | 82 +-
.../osgi/internal/module/PermissionChecker.java | 4 +-
.../osgi/internal/module/ResolverConstraint.java | 6 +-
.../org.eclipse.pde.build/META-INF/MANIFEST.MF | 2 +-
.../eclipse/pde/internal/build/BrandingIron.java | 3 +-
.../build/builder/ModelBuildScriptGenerator.java | 10 +-
.../pde/internal/build/site/BuildTimeSite.java | 2 +-
.../eclipse/pde/internal/build/site/PDEState.java | 10 +-
.../org.eclipse.pde.core/META-INF/MANIFEST.MF | 2 +-
.../core/exports/FeatureExportOperation.java | 42 +-
.../core/target/NameVersionDescriptor.java | 2 +-
.../org.eclipse.pde.ds.core/META-INF/MANIFEST.MF | 2 +-
.../internal/ds/core/builders/DSErrorReporter.java | 2 +-
.../org.eclipse.pde.ui/META-INF/MANIFEST.MF | 2 +-
.../targetdefinition/EnvironmentSection.java | 43 +-
.../ui/wizards/exports/ProductExportWizard.java | 352 ++--
.../ui/wizards/imports/PluginImportOperation.java | 112 +-
.../target/TargetDefinitionContentPage.java | 38 +-
.../META-INF/MANIFEST.MF | 2 +-
.../reference/misc/runtime-options.html | 6 +-
.../META-INF/MANIFEST.MF | 2 +-
.../contexts_Workbench.xml | 4 +-
.../gettingStarted/intro/overview.htm | 38 +-
.../org.eclipse.platform/3_6SplashHeliosPsd.zip | Bin 0 -> 6243715 bytes
.../org.eclipse.platform/META-INF/MANIFEST.MF | 2 +-
.../plugins/org.eclipse.platform/about.properties | 4 +-
.../plugins/org.eclipse.platform/launchersrc.zip | Bin 166168 -> 167661 bytes
.../plugins/org.eclipse.platform/plugin.properties | 6 +-
eclipse/plugins/org.eclipse.platform/splash.bmp | Bin 403616 -> 403616 bytes
eclipse/plugins/org.eclipse.rcp/about.properties | 4 +-
.../plugins/org.eclipse.sdk/META-INF/MANIFEST.MF | 2 +-
eclipse/plugins/org.eclipse.sdk/about.properties | 4 +-
eclipse/plugins/org.eclipse.sdk/plugin.properties | 4 +-
eclipse/plugins/org.eclipse.sdk/plugin.xml | 13 -
.../META-INF/MANIFEST.MF | 2 +-
.../org.eclipse.swt.carbon.macosx/about.html | 2 +-
...n-3555.jnilib => libswt-agl-carbon-3557.jnilib} | Bin 30604 -> 30604 bytes
...arbon-3555.jnilib => libswt-carbon-3557.jnilib} | Bin 274828 -> 274828 bytes
.../libswt-cocoa-carbon-3555.jnilib | Bin 82864 -> 0 bytes
.../libswt-cocoa-carbon-3557.jnilib | Bin 0 -> 82864 bytes
...on-3555.jnilib => libswt-pi-carbon-3557.jnilib} | Bin 862052 -> 862052 bytes
....jnilib => libswt-xulrunner-carbon-3557.jnilib} | Bin 313992 -> 313992 bytes
.../META-INF/MANIFEST.MF | 2 +-
.../libswt-awt-cocoa-3555.jnilib | Bin 8416 -> 0 bytes
.../libswt-awt-cocoa-3557.jnilib | Bin 0 -> 8416 bytes
.../libswt-cocoa-3555.jnilib | Bin 310392 -> 0 bytes
.../libswt-cocoa-3557.jnilib | Bin 0 -> 310392 bytes
.../libswt-pi-cocoa-3555.jnilib | Bin 222432 -> 0 bytes
.../libswt-pi-cocoa-3557.jnilib | Bin 0 -> 222432 bytes
.../META-INF/MANIFEST.MF | 2 +-
.../org.eclipse.swt.cocoa.macosx/about.html | 2 +-
.../libswt-awt-cocoa-3555.jnilib | Bin 37104 -> 0 bytes
.../libswt-awt-cocoa-3557.jnilib | Bin 0 -> 37104 bytes
.../libswt-cocoa-3555.jnilib | Bin 287228 -> 0 bytes
.../libswt-cocoa-3557.jnilib | Bin 0 -> 287228 bytes
.../libswt-pi-cocoa-3555.jnilib | Bin 548252 -> 0 bytes
.../libswt-pi-cocoa-3557.jnilib | Bin 0 -> 548252 bytes
.../libswt-xulrunner-cocoa-3555.jnilib | Bin 313420 -> 0 bytes
.../libswt-xulrunner-cocoa-3557.jnilib | Bin 0 -> 313420 bytes
.../META-INF/MANIFEST.MF | 2 +-
.../org.eclipse.swt.gtk.linux.ppc/about.html | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
.../org.eclipse.swt.gtk.linux.x86/about.html | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
.../org.eclipse.swt.gtk.linux.x86_64/about.html | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
.../org.eclipse.swt.gtk.solaris.sparc/about.html | 31 +
.../META-INF/MANIFEST.MF | 2 +-
.../org.eclipse.swt.gtk.solaris.x86/about.html | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
.../libswt-awt-motif-3555.a | Bin 2536 -> 0 bytes
.../libswt-cairo-motif-3555.a | Bin 139609 -> 0 bytes
.../libswt-cde-motif-3555.a | Bin 24619 -> 0 bytes
.../libswt-motif-3555.a | Bin 1082352 -> 0 bytes
.../META-INF/MANIFEST.MF | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
.../org.eclipse.swt.motif.linux.x86/about.html | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
.../swt/accessibility/AccessibleObject.java | 9 +-
.../win32/org/eclipse/swt/browser/IE.java | 60 +-
.../win32/org/eclipse/swt/browser/WebSite.java | 23 +-
.../common/org/eclipse/swt/custom/StyledText.java | 10 +-
.../win32/org/eclipse/swt/dnd/Clipboard.java | 4 +-
.../win32/org/eclipse/swt/dnd/DragSource.java | 4 +-
.../win32/org/eclipse/swt/dnd/DropTarget.java | 12 +-
.../org/eclipse/swt/dnd/OleEnumFORMATETC.java | 4 +-
.../common/library/xpcom_custom.cpp | 2 +-
.../common/org/eclipse/swt/browser/Mozilla.java | 123 +-
.../org/eclipse/swt/browser/PromptService2.java | 19 +-
.../org/eclipse/swt/ole/win32/OleClientSite.java | 150 +-
.../org/eclipse/swt/ole/win32/OleControlSite.java | 128 +-
.../win32/org/eclipse/swt/ole/win32/OleFrame.java | 4 +-
.../org/eclipse/swt/internal/cocoa/Cocoa.java | 3 +
.../cocoa/FoundationFull.bridgesupport.extras | 4 +
.../eclipse/swt/internal/cocoa/NSFileManager.java | 6 +-
.../cocoa/org/eclipse/swt/internal/cocoa/OS.java | 1 +
.../org/eclipse/swt/internal/Library.java | 2 +-
.../org/eclipse/swt/internal/Library.java | 2 +-
.../Eclipse SWT PI/gtk/library/os.c | 18 +
.../Eclipse SWT PI/gtk/library/os_custom.h | 1 +
.../Eclipse SWT PI/gtk/library/os_stats.c | 5 +-
.../Eclipse SWT PI/gtk/library/os_stats.h | 1 +
.../gtk/org/eclipse/swt/internal/gtk/OS.java | 15 +
.../org/eclipse/swt/internal/ole/win32/COM.java | 2 +
.../win32/org/eclipse/swt/internal/win32/OS.java | 1 +
.../carbon/org/eclipse/swt/program/Program.java | 98 +-
.../cocoa/org/eclipse/swt/program/Program.java | 56 +-
.../carbon/org/eclipse/swt/widgets/Display.java | 5 +-
.../carbon/org/eclipse/swt/widgets/FileDialog.java | 45 +-
.../cocoa/org/eclipse/swt/widgets/Control.java | 11 +-
.../cocoa/org/eclipse/swt/widgets/Shell.java | 2 +-
.../cocoa/org/eclipse/swt/widgets/Table.java | 4 +-
.../cocoa/org/eclipse/swt/widgets/TableColumn.java | 23 +-
.../cocoa/org/eclipse/swt/widgets/TreeColumn.java | 23 +-
.../Eclipse SWT/common/library/make_common.mak | 4 +-
.../org/eclipse/swt/internal/image/PngEncoder.java | 48 +-
.../org.eclipse.swt/Eclipse SWT/common/version.txt | 2 +-
.../gtk/org/eclipse/swt/graphics/GC.java | 50 +-
.../gtk/org/eclipse/swt/widgets/Control.java | 69 +-
.../gtk/org/eclipse/swt/widgets/FileDialog.java | 6 +-
.../gtk/org/eclipse/swt/widgets/Shell.java | 2 +-
.../win32/org/eclipse/swt/graphics/TextLayout.java | 2 +
.../win32/org/eclipse/swt/widgets/Display.java | 40 +-
.../win32/org/eclipse/swt/widgets/ProgressBar.java | 2 +-
.../win32/org/eclipse/swt/widgets/Table.java | 24 +-
.../win32/org/eclipse/swt/widgets/ToolBar.java | 17 +
.../win32/org/eclipse/swt/widgets/ToolItem.java | 3 +-
.../win32/org/eclipse/swt/widgets/Tracker.java | 114 +-
.../plugins/org.eclipse.swt/META-INF/MANIFEST.MF | 2 +-
.../plugins/org.eclipse.swt/buildnotes_swt.html | 84 +
.../org.eclipse.team.core/META-INF/MANIFEST.MF | 2 +-
.../org.eclipse.team.core/buildnotes_team.html | 35 +-
.../org.eclipse.team.cvs.ui/META-INF/MANIFEST.MF | 2 +-
.../internal/ccvs/ui/ExtMethodPreferencePage.java | 62 +-
.../org.eclipse.ui.browser/META-INF/MANIFEST.MF | 2 +-
eclipse/plugins/org.eclipse.ui.browser/plugin.xml | 4 +-
.../org.eclipse.ui.ide/META-INF/MANIFEST.MF | 2 +-
.../eclipse/ui/actions/CloseResourceAction.java | 148 +-
.../wizards/datatransfer/ZipFileExporter.java | 8 +-
.../ui/wizards/datatransfer/ImportOperation.java | 37 +-
.../org.eclipse.ui.intro/META-INF/MANIFEST.MF | 2 +-
.../ui/internal/intro/impl/model/IntroLink.java | 8 +-
.../org.eclipse.ui.navigator/META-INF/MANIFEST.MF | 2 +-
.../internal/navigator/ContributorTrackingSet.java | 32 +-
.../navigator/NavigatorContentService.java | 40 +-
.../NavigatorContentServiceContentProvider.java | 17 +-
.../NavigatorContentServiceLabelProvider.java | 13 +-
.../navigator/NavigatorPipelineService.java | 37 +-
.../ui/internal/navigator/NavigatorPlugin.java | 35 +
.../actions/CommonActionProviderDescriptor.java | 10 +-
.../navigator/dnd/CommonDropAdapterDescriptor.java | 5 +-
.../navigator/extensions/LinkHelperDescriptor.java | 7 +-
.../extensions/NavigatorContentDescriptor.java | 8 +-
.../extensions/NavigatorContentExtension.java | 4 +-
.../SafeDelegateTreeContentProvider.java | 14 +-
.../extensions/StructuredViewerManager.java | 12 +-
.../navigator/filters/CoreExpressionFilter.java | 6 +-
.../navigator/sorters/CommonSorterDescriptor.java | 5 +-
.../navigator/wizards/CommonWizardDescriptor.java | 6 +-
.../META-INF/MANIFEST.MF | 2 +-
.../eclipse/ui/texteditor/AbstractTextEditor.java | 23 +-
.../org/eclipse/ui/internal/WorkingSetManager.java | 44 +-
.../ui/internal/keys/BindingPersistence.java | 6 +-
.../ui/internal/keys/model/KeyController.java | 4 +-
.../org/eclipse/ui/internal/progress/JobInfo.java | 3 +-
.../org.eclipse.ui.workbench/META-INF/MANIFEST.MF | 2 +-
.../plugins/org.eclipse.ui/META-INF/MANIFEST.MF | 2 +-
.../org.eclipse.ui/buildnotes_workbench.html | 63 +
....hamcrest.core.source_1.1.0.v20090501071000.jar | Bin 21894 -> 23078 bytes
.../org.junit.source_3.8.2.v20090203-1005.jar | Bin 73162 -> 74344 bytes
.../META-INF/ECLIPSEF.RSA | Bin 3487 -> 5641 bytes
.../META-INF/ECLIPSEF.SF | 4 +-
.../META-INF/MANIFEST.MF | 2 +-
...ay.jetty.server.source_6.1.15.v200905151201.jar | Bin 393418 -> 394601 bytes
...tbay.jetty.util.source_6.1.15.v200905182336.jar | Bin 134541 -> 135725 bytes
...rg.objectweb.asm.source_3.1.0.v200803061910.jar | Bin 619876 -> 621060 bytes
eclipse/removed-jars | 4 +-
patches/eclipse-add-archs-executable.patch | 45 +-
patches/eclipse-help-toolbar.patch | 71 -
patches/gtk2.18zorder.patch | 218 --
patches/tests-BZ295666.patch | 10 +
pdebuild.properties | 4 +-
pdebuild.xml | 12 +-
regenerateBootstrapFiles.sh | 24 +
494 files changed, 6388 insertions(+), 5832 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ae0d619..9a5e97f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,74 @@
+2010-02-18 akurtakov <akurtakov at localhost.localdomain>
+
+ * regenerateBootstrapFiles.sh: New file.(Fedora specific but let's at least keep it in the repo)
+ * build.xml: Don't build ecf. It's done in pdebuild now.
+ * eclipse-build-generatedScripts.tar.bz2: Regenerated.
+ * pdebuild.xml: Build ecf.
+
+2010-02-16 Andrew Overholt <overholt at redhat.com>
+
+ Bug #302256
+
+ * build.xml: Add -Xmx to JVM arguments when forking separate java
+ processes (Matt Whitlock).
+
+2010-02-16 Alexander Kurtakov <akurtako at redhat.com>
+
+ * pdebuild.properties: Fix properties to match 3.5.2 M-build.
+ * eclipse-build-generatedScripts.tar.bz2: Regenerated.
+
+2010-02-11 Andrew Overholt <overholt at redhat.com>
+
+ * patches/eclipse-add-archs-executable.patch: Re-generate.
+ * build.xml: Apply eclipse-add-arches-executable.patch in proper location.
+
+2010-02-11 Andrew Overholt <overholt at redhat.com>
+
+ * build.xml: Remove patches present in 3.5.2.
+ * patches/eclipse-help-toolbar.patch: Removed.
+ * patches/gtk2.18zorder.patch: Removed.
+ * patches/swtbug290395-updatedialog.patch: Removed.
+ * patches/swtbug291128.patch: Removed.
+ * patches/swtbug296284-xulrunner192.patch: Removed.
+ * patches/transformclipping.patch: Removed.
+ * build.properties: Update for build towards 3.5.2.
+ * buildSDKSource.sh: Likewise.
+ * patches/eclipse-add-archs-executable.patch: Likewise.
+
+2010-01-14 Andrew Overholt <overholt at redhat.com>
+
+ * patches/swtbug290395-updatedialog.patch: Backport patch from 3.5
+ maintenance branch.
+ * patches/swtbug296284-xulrunner192.patch: Likewise.
+ * build.xml: Add above 2 patches.
+
+2009-12-22 Andrew Overholt <overholt at redhat.com>
+
+ * patches/swtbug291128.patch: Add back-ported patch from bug #291128.
+ * build.xml: Add above patch.
+
+2009-12-08 Roland Grunberg <rgrunber at redhat.com>
+
+ * patches/tests-BZ295666.patch: New file.
+ * build.xml: Fix for bug #295666
+
+2009-12-03 Alexander Kurtakov <akurtako at redhat.com>
+
+ * build.xml: Install eclipse.ini in etc/. (bug #295523 Benjamin Drung)
+
+2009-12-03 Alexander Kurtakov <akurtako at redhat.com>
+
+ * build.xml: Fix dropins path in eclipse.ini. (bug #295525 Benjamin Drung)
+
+2009-12-01 Andrew Overholt <overholt at redhat.com>
+
+ * build.xml: Add patch for transform clipping with GTK 2.18 (bug #286687).
+ * patches/transformclipping.patch: Likewise.
+
+2009-11-17 Alexander Kurtakov <akurtako at redhat.com>
+
+ * build.xml: Remove version string from extracted eclipse tarball when running unpacked. (Benjamin Drung)
+
2009-11-11 Alexander Kurtakov <akurtako at redhat.com>
* pdebuild/eclipse-pdebuild.sh: Do not escape $orbitDepsDir.
diff --git a/build.properties b/build.properties
index 560d186..dd91f87 100644
--- a/build.properties
+++ b/build.properties
@@ -1,8 +1,8 @@
#baseLocation=${basedir}/bootstrap
# Note: this is also in pdebuild.properties
-buildId=M20090917-0800
-buildTag=R3_5_1
-testsBuildLabel=3.5.1
+buildId=M200100210-0800
+buildTag=vM20100210-0800
+testsBuildLabel=3.5.2
p2.director.version=${testsBuildLabel}
testsBuildId=v20090227
featureToBuild=eclipse-build-feature
diff --git a/build.xml b/build.xml
index 3265a96..d5a384b 100644
--- a/build.xml
+++ b/build.xml
@@ -6,7 +6,7 @@
<property file="build.properties" />
<available file="eclipse-${buildTag}-fetched-src.tar.bz2" property="sdkSourcePresent" value="true" />
- <available file="eclipse-${testsBuildLabel}/plugins/org.eclipse.equinox.launcher/build.properties" property="extractedSdkSourcePresent" value="true" />
+ <available file="eclipse/plugins/org.eclipse.equinox.launcher/build.properties" property="extractedSdkSourcePresent" value="true" />
<condition property="onlyExtractedSdkSourcePresent">
<and>
@@ -16,8 +16,8 @@
</condition>
<condition property="sdkSourceTarballPresent">
<or>
- <isset property="sdkSourcePresent"/>
- <isset property="extractedSdkSourcePresent"/>
+ <isset property="sdkSourcePresent" />
+ <isset property="extractedSdkSourcePresent" />
</or>
</condition>
@@ -120,11 +120,11 @@
</target>
<target name="copySource" unless="sdkSourcePresent">
- <echo message="Copy SDK source (cp -rd --not-target-directory eclipse-${testsBuildLabel} ${buildDirectory})" />
+ <echo message="Copy SDK source (cp -rd --not-target-directory eclipse ${buildDirectory})" />
<exec executable="cp" failonerror="true">
<arg value="-rd" />
<arg value="--no-target-directory" />
- <arg value="eclipse-${testsBuildLabel}" />
+ <arg value="eclipse" />
<arg value="${buildDirectory}" />
</exec>
</target>
@@ -162,14 +162,18 @@
<untar compression="bzip2" dest="${basedir}/build/eclipse-${buildTag}-fetched-src/plugins" src="${basedir}/eclipse-build-additionalArchs.tar.bz2" />
<!-- prepare ecf build tree -->
<mkdir dir="${buildDirectory}/ecf-src/plugins" />
- <move todir="${buildDirectory}/ecf-src/plugins">
+ <delete >
+ <fileset dir="${buildDirectory}/plugins" includes="org.eclipse.ecf*" />
+ </delete>
+ <move todir="${buildDirectory}/plugins">
<fileset dir="${buildDirectory}/ecf-src">
- <filename name="org.eclipse*" />
+ <filename name="org.eclipse*/**" />
</fileset>
</move>
<mkdir dir="${buildDirectory}/ecf-src/features/org.eclipse.ecf.filetransfer-feature" />
<copy tofile="${buildDirectory}/ecf-src/features/org.eclipse.ecf.filetransfer-feature/feature.xml" file="ecf-filetransfer-feature.xml" />
<copy tofile="${buildDirectory}/ecf-src/features/org.eclipse.ecf.filetransfer-feature/build.properties" file="ecf-filetransfer-build.properties" />
+
<!-- Create a stamp file -->
<echo file="unpack-stamp" />
</target>
@@ -242,7 +246,7 @@
<patch patchfile="${basedir}/patches/eclipse-addArchesAnd64bitSWT.patch" dir="${buildDirectory}/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library" strip="6" />
<patch patchfile="${basedir}/patches/eclipse-add-archs-filesystem.patch" dir="${buildDirectory}" strip="0" />
<patch patchfile="${basedir}/patches/eclipse-add-archs-swt.patch" dir="${buildDirectory}" strip="0" />
- <patch patchfile="${basedir}/patches/eclipse-add-archs-executable.patch" dir="${buildDirectory}" strip="0" />
+ <patch patchfile="${basedir}/patches/eclipse-add-archs-executable.patch" dir="${buildDirectory}/features/org.eclipse.equinox.executable" strip="0" />
<patch patchfile="${basedir}/patches/eclipse-add-ppc64-sparc64-s390-s390x.patch" dir="${buildDirectory}" strip="0" />
<patch patchfile="${basedir}/patches/donotstorebuildlogsinfiles.patch" dir="${buildDirectory}" strip="3" />
<patch patchfile="${basedir}/patches/donotsetjavahomeandoptimizeliblocalfile.patch" dir="${buildDirectory}" strip="3" />
@@ -251,22 +255,18 @@
<replace file="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build/build.properties" token="/usr/share/eclipse" value="/usr/${libDir}/eclipse" />
<chmod dir="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build" includes="*.sh" perm="a+x" />
<!-- end eclipse-build-only patches -->
- <!-- https://bugs.eclipse.org/bugs/show_bug.cgi?id=290064-->
- <patch patchfile="${basedir}/patches/eclipse-help-toolbar.patch" dir="${buildDirectory}" strip="0" />
- <!-- https://bugs.eclipse.org/bugs/show_bug.cgi?id=287307 -->
- <patch patchfile="${basedir}/patches/gtk2.18zorder.patch" dir="${buildDirectory}/plugins/org.eclipse.swt" strip="0" />
+ <!-- back-ported patches -->
+ <!-- end back-ported patches -->
<!-- Only build for one target (bug #293952) -->
- <copy
- file="${buildConfigs}/eclipse-build-config/build.properties.in"
- tofile="${buildConfigs}/eclipse-build-config/build.properties"/>
- <replace file="${buildConfigs}/eclipse-build-config/build.properties"
- token="@build_arch@" value="${buildArch}"/>
+ <copy file="${buildConfigs}/eclipse-build-config/build.properties.in" tofile="${buildConfigs}/eclipse-build-config/build.properties" />
+ <replace file="${buildConfigs}/eclipse-build-config/build.properties" token="@build_arch@" value="${buildArch}" />
<echo file="patch-stamp" />
</target>
<target name="applyTestPatches" depends="unpackTests" unless="testspatch.complete">
<patch patchfile="${basedir}/patches/tests-noapttests.patch" dir="${testsBuildDirectory}/features/org.eclipse.sdk.tests" strip="0" />
<patch patchfile="${basedir}/patches/tests-nostyletask.patch" dir="${testsBuildDirectory}" strip="0" />
+ <patch patchfile="${basedir}/patches/tests-BZ295666.patch" dir="${testsBuildDirectory}" strip="0" />
<echo file="testspatch-stamp" />
</target>
@@ -283,6 +283,7 @@
<arg line="-Dbuilder=${buildConfig} " />
<arg line="-DbuildDirectory=${buildDirectory} " />
<arg line="-consolelog " />
+ <jvmarg value="-Xmx512M" />
</java>
<!--
<ant antfile="build.xml" dir="${eclipse.pdebuild.scripts}">
@@ -459,6 +460,7 @@
<arg line="-Dp2.build.repo=file:/${reposource} " />
<arg line="-consolelog " />
<arg line="publish.bin.parts " />
+ <jvmarg value="-Xmx512M" />
</java>
</target>
@@ -487,6 +489,7 @@
<arg line="-DbaseBuildPath=${buildDirectory} " />
<arg line="-Declipse.pdebuild.scripts=${eclipse.pdebuild.scripts} " />
<arg line="-consolelog " />
+ <jvmarg value="-Xmx512M" />
</java>
<!--
@@ -510,6 +513,7 @@
<arg line="-DproductFiles=${productFiles} " />
<arg line="-DbuildDirectory=${buildDirectory} " />
<arg line="-consolelog " />
+ <jvmarg value="-Xmx512M" />
</java>
</target>
@@ -539,39 +543,13 @@
<arg line="-application org.eclipse.ant.core.antRunner" />
<arg line="-f build.xml" />
<arg line="build.update.jar" />
+ <jvmarg value="-Xmx512M" />
</java>
<copy todir="${buildDirectory}/installation/plugins">
<fileset dir="${buildDirectory}/plugins/org.eclipse.equinox.initializer">
<include name="org.eclipse.equinox.initializer*.jar" />
</fileset>
</copy>
- <!-- build ecf -->
- <mkdir dir="${buildDirectory}/ecf-src/build" />
- <dirset dir="${buildDirectory}/installation/plugins" includes="org.eclipse.pde.build_*" id="pdebuild" />
- <property name="pdebuildplugin" refid="pdebuild" />
- <java classname="org.eclipse.core.launcher.Main" dir="${buildDirectory}/ecf-src" fork="true">
- <classpath>
- <fileset dir="${buildDirectory}/installation/plugins">
- <include name="org.eclipse.equinox.launcher_*.jar" />
- </fileset>
- </classpath>
- <arg line="-data ${buildworkspace} " />
- <arg line="-Duser.home=${buildDirectory}/home" />
- <arg line="-application org.eclipse.ant.core.antRunner" />
- <arg line="-Dtype=feature" />
- <arg line="-Did=org.eclipse.ecf.filetransfer_feature" />
- <arg line="-DsourceDirectory=${buildDirectory}/ecf-src" />
- <arg line="-DbaseLocation=${buildDirectory}/installation" />
- <arg line="-DforceContextQualifier=v20090831-1906" />
- <arg line="-Dbuilder=${buildDirectory}/installation/plugins/${pdebuildplugin}/templates/package-build" />
- <arg line="-f ${buildDirectory}/installation/plugins/${pdebuildplugin}/scripts/build.xml" />
- </java>
- <unzip dest="${buildDirectory}/ecf-src/build/rpmBuild" src="${buildDirectory}/ecf-src/build/rpmBuild/org.eclipse.ecf.filetransfer_feature.zip" />
- <copy todir="${buildDirectory}/installation/plugins">
- <fileset dir="${buildDirectory}/ecf-src/build/rpmBuild/eclipse/plugins">
- <filename name="org.eclipse.*.jar" />
- </fileset>
- </copy>
<echo file="provision.sdk-stamp" />
</target>
@@ -700,6 +678,7 @@
<jvmarg value="-XX:MaxPermSize=512M" />
-->
<jvmarg value="-Declipse.p2.data.area=${p2.director.install.path}/p2" />
+ <jvmarg value="-Xmx512M" />
</java>
<delete dir="${baseBuilderConfig}" includeemptydirs="true" failonerror="false" />
<move file="${baseBuilderConfig}.bak" tofile="${baseBuilderConfig}" />
@@ -737,10 +716,10 @@
<target name="install" depends="provision.sdk">
<mkdir dir="${destDir}${prefix}/${libDir}/eclipse" />
<exec executable="cp" failonerror="true">
- <arg value="-rd"/>
+ <arg value="-rd" />
<arg value="--no-target-directory" />
<arg value="${buildDirectory}/installation" />
- <arg value="${destDir}${prefix}/${libDir}/eclipse"/>
+ <arg value="${destDir}${prefix}/${libDir}/eclipse" />
</exec>
<!-- install desktop file -->
<copy file="eclipse.desktop" todir="${destDir}${prefix}/share/applications" />
@@ -760,7 +739,13 @@
<property name="startupjarpath" refid="startupjar" />
<symlink link="${destDir}/${prefix}/${libDir}/eclipse/startup.jar" resource="plugins/${startupjarpath}" />
- <echo append="true" file="${destDir}${prefix}/${libDir}/eclipse/eclipse.ini" message="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${destDir}${prefix}/share/eclipse/dropins" />
+ <echo append="true" file="${destDir}${prefix}/${libDir}/eclipse/eclipse.ini" message="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${prefix}/share/eclipse/dropins" />
+
+ <!-- Move config file to /etc -->
+ <mkdir dir="${destDir}/etc" />
+ <move file="${destDir}${prefix}/lib/eclipse/eclipse.ini" tofile="${destDir}/etc/eclipse.ini" />
+ <symlink link="${destDir}${prefix}/lib/eclipse/eclipse.ini" resource="/etc/eclipse.ini" />
+
</target>
<target name="package.extract.swt">
diff --git a/buildSDKSource.sh b/buildSDKSource.sh
index 2496f17..e7f5b86 100755
--- a/buildSDKSource.sh
+++ b/buildSDKSource.sh
@@ -6,11 +6,13 @@ set -e
baseDir=$(pwd)
workDirectory=
-buildID=R3_5_1
+buildID="vM20100210-0800"
+mapsTag="M20100210-0800"
+equinoxTag=R3_5_1
baseBuilder=
eclipseBuilder=
baseBuilderTag="R3_5"
-eclipseBuilderTag="R3_5_1"
+eclipseBuilderTag=${buildID}
fetchTests="no"
orbitRepoZip=orbitRepo-R20090825191606.zip
ecfBundlesZip=ecf-R3_5_1.zip
@@ -143,8 +145,8 @@ fetchMasterFeature \
-DmapCvsRoot=${cvsRepo} \
-DmapsCvsRoot=${cvsRepo} \
-DmapsRoot=${mapsRoot} \
--DmapsCheckoutTag=${buildID} \
--DmapVersionTag=${buildID} \
+-DmapsCheckoutTag=${mapsTag} \
+-DmapVersionTag=${mapsTag} \
-Duser.home="${homeDirectory}" \
2>&1 | tee ${workDirectory}/sourcesFetch.log
@@ -180,7 +182,7 @@ mv org.eclipse.ecf/providers/bundles/* ecf-src
rm -fr org.eclipse.ecf
cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/rt \
-export -r ${buildID} org.eclipse.equinox/components/bundles/org.eclipse.equinox.concurrent;
+export -r ${equinoxTag} org.eclipse.equinox/components/bundles/org.eclipse.equinox.concurrent;
mv org.eclipse.equinox/components/bundles/* ecf-src
rm -rf org.eclipse.equinox
diff --git a/eclipse-build-config/ChangeLog b/eclipse-build-config/ChangeLog
index ea69312..30fd7b7 100644
--- a/eclipse-build-config/ChangeLog
+++ b/eclipse-build-config/ChangeLog
@@ -1,3 +1,18 @@
+2010-02-11 Andrew Overholt <overholt at redhat.com>
+
+ * productFiles/sdk/sdk.product: Update for 3.5.2.
+ * productFiles/rcp.sdk/rcp.product: Likewise.
+
+2009-11-13 Alexander Kurtakov <akurtako at redhat.com>
+
+ * productFiles/rcpConfig/build.properties: Remove duplicated root.linux.gtk.ppc line
+
+2009-11-11 Andrew Overholt <overholt at redhat.com>
+
+ Bug #294877
+
+ * productFiles/sdk/sdk.product: Set HotSpot JIT excludes to avoid crashes.
+
2009-11-03 Andrew Overholt <overholt at redhat.com>
Bug #293952 (Matthias Klose)
@@ -97,4 +112,4 @@
* allElements.xml: Initial checkin.
* customTargets.xml: Likewise.
* customAssembly.xml: Likewise.
- * build.properties: Likewise.
\ No newline at end of file
+ * build.properties: Likewise.
diff --git a/eclipse-build-config/productFiles/rcp.sdk/rcp.product b/eclipse-build-config/productFiles/rcp.sdk/rcp.product
index 2d2313e..abd3db2 100644
--- a/eclipse-build-config/productFiles/rcp.sdk/rcp.product
+++ b/eclipse-build-config/productFiles/rcp.sdk/rcp.product
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="Eclipse RCP SDK" uid="org.eclipse.rcp.sdk.id" version="3.5.1. at qualifier@" useFeatures="true" includeLaunchers="true">
+<product name="Eclipse RCP SDK" uid="org.eclipse.rcp.sdk.id" version="3.5.2. at qualifier@" useFeatures="true" includeLaunchers="true">
<configIni use="default">
</configIni>
diff --git a/eclipse-build-config/productFiles/rcpConfig/build.properties b/eclipse-build-config/productFiles/rcpConfig/build.properties
index 3863774..2033af5 100644
--- a/eclipse-build-config/productFiles/rcpConfig/build.properties
+++ b/eclipse-build-config/productFiles/rcpConfig/build.properties
@@ -41,7 +41,6 @@ root.linux.gtk.s390=absolute:${buildDirectory}/features/org.eclipse.platform/abo
root.linux.gtk.s390.permissions.755=*.so*
root.linux.gtk.s390x=absolute:${buildDirectory}/features/org.eclipse.platform/about_files/linux.gtk.s390x,absolute:${buildDirectory}/features/org.eclipse.equinox.executable/contributed/gtk/linux/s390x
root.linux.gtk.s390x.permissions.755=*.so*
-root.linux.gtk.ppc=absolute:${buildDirectory}/features/org.eclipse.equinox.executable/bin/gtk/linux/ppc
root.linux.gtk.x86_64=absolute:${buildDirectory}/features/org.eclipse.platform/about_files/linux.gtk.x86_64,absolute:${buildDirectory}/features/org.eclipse.equinox.executable/bin/gtk/linux/x86_64
root.linux.gtk.x86_64.permissions.755=*.so*
root.linux.gtk.ia64=absolute:${buildDirectory}/features/org.eclipse.platform/about_files/linux.gtk.ia64,absolute:${buildDirectory}/features/org.eclipse.equinox.executable/bin/gtk/linux/ia64
diff --git a/eclipse-build-config/productFiles/sdk/sdk.product b/eclipse-build-config/productFiles/sdk/sdk.product
index e90949a..cdc3944 100644
--- a/eclipse-build-config/productFiles/sdk/sdk.product
+++ b/eclipse-build-config/productFiles/sdk/sdk.product
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="Eclipse SDK" id="org.eclipse.sdk.ide" application="org.eclipse.ui.ide.workbench" version="3.5.1. at qualifier@" useFeatures="true" includeLaunchers="true">
+<product name="Eclipse SDK" id="org.eclipse.sdk.ide" application="org.eclipse.ui.ide.workbench" version="3.5.2. at qualifier@" useFeatures="true" includeLaunchers="true">
<configIni use="default">
</configIni>
<launcherArgs>
<programArgs>-showsplash org.eclipse.platform --launcher.XXMaxPermSize 256m</programArgs>
- <vmArgs>-Xms128m -Xmx512m</vmArgs>
+ <vmArgs>-Xms128m -Xmx512m -XX:CompileCommand=exclude${#44}org/eclipse/core/internal/dtree/DataTreeNode${#44}forwardDeltaWith -XX:CompileCommand=exclude${#44}org/eclipse/jdt/internal/compiler/lookup/ParameterizedMethodBinding${#44}<init> -XX:CompileCommand=exclude${#44}org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates${#44}instantiateTemplate -XX:CompileCommand=exclude${#44}org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage${#44}addBinding -XX:CompileCommand=exclude${#44}org/python/pydev/editor/codecompletion/revisited/PythonPathHelper${#44}isValidSourceFile -XX:CompileCommand=exclude${#44}org/python/pydev/ui/filetypes/FileTypesPreferencesPage${#44}getDottedValidSourceFiles</vmArgs>
<vmArgsMac>-Xdock:icon=../Resources/Eclipse.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
</launcherArgs>
diff --git a/eclipse-build-feature/ChangeLog b/eclipse-build-feature/ChangeLog
index fca85bf..9a2abf6 100644
--- a/eclipse-build-feature/ChangeLog
+++ b/eclipse-build-feature/ChangeLog
@@ -1,6 +1,10 @@
+2010-02-11 Andrew Overholt <overholt at redhat.com>
+
+ * feature.xml: Update to 3.5.2.
+
2009-09-29 Andrew Overholt <overholt at redhat.com>
- * feature.xml: Update to 3.5.1
+ * feature.xml: Update to 3.5.1.
2009-06-17 Andrew Overholt <overholt at redhat.com>
diff --git a/eclipse-build-feature/feature.xml b/eclipse-build-feature/feature.xml
index 91a9170..2d63b66 100755
--- a/eclipse-build-feature/feature.xml
+++ b/eclipse-build-feature/feature.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="eclipse-build-feature"
- version="3.5.1.qualifier">
+ version="3.5.2.qualifier">
<includes
id="master-jetty"
diff --git a/eclipse-build-generatedScripts.tar.bz2 b/eclipse-build-generatedScripts.tar.bz2
index 654c773..63aaa28 100644
Binary files a/eclipse-build-generatedScripts.tar.bz2 and b/eclipse-build-generatedScripts.tar.bz2 differ
diff --git a/eclipse/artifacts.jar b/eclipse/artifacts.jar
index 4d983ca..c16120d 100644
Binary files a/eclipse/artifacts.jar and b/eclipse/artifacts.jar differ
diff --git a/eclipse/content.jar b/eclipse/content.jar
index d4348c9..e59bd50 100644
Binary files a/eclipse/content.jar and b/eclipse/content.jar differ
diff --git a/eclipse/directory.txt b/eclipse/directory.txt
index 6e64fd1..e9aa2b4 100644
--- a/eclipse/directory.txt
+++ b/eclipse/directory.txt
@@ -1,13 +1,13 @@
!*************** ANT CONTRIBUTION ********************************************************
#plugin at org.apache.ant=v20070416,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ant.core=v20090817_r351,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ant.core=v20091110_r352,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ant.ui=v20090901_r351,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ant.ui=v20091204_r352,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.ui.externaltools=v20090504,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ant.tests.core=v20090504,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ant.tests.core=v20091110_r352,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.ant.tests.ui=v20090504,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
! map file used as input to custom Ant task <fetch.base> implemented in org.eclipse.releng.basebuilder.
! Generates a fetch script which populates a baseLocation with prebuilt plug-ins or features.
@@ -19,7 +19,7 @@ plugin at org.eclipse.ant.tests.ui=v20090504,:pserver:anonymous at dev.eclipse.org:/cv
#base.plugin at com.ibm.icu.base.source=v20070123,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/plugins/com.ibm.icu/com.ibm.icu.base.source_3.6.0.20061215
!*************** COMPARE CONTRIBUTION ********************************************************
-plugin at org.eclipse.compare=I20090514-0808,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.compare/plugins/org.eclipse.compare
+plugin at org.eclipse.compare=r35x_20100113-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.compare/plugins/org.eclipse.compare
plugin at org.eclipse.compare.core=I20090430-0408,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.compare/plugins/org.eclipse.compare.core
plugin at org.eclipse.compare.win32=I20090430-0408,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.compare/plugins/org.eclipse.compare.win32
@@ -33,7 +33,7 @@ fragment at org.eclipse.core.filesystem.hpux.ia64_32=v20080604-1400,:pserver:anonym
fragment at org.eclipse.core.filesystem.hpux.PA_RISC=v20080604-1400,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
!*************** CORE (MacOSX) CONTRIBUTION ************************************************
-fragment at org.eclipse.core.filesystem.macosx=v20090112,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.core.filesystem.macosx=R35x_v20091203-1235,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
!*************** CORE (QNX) CONTRIBUTION ***************************************************
fragment at org.eclipse.core.filesystem.qnx.x86=v20080604-1400,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
@@ -43,18 +43,18 @@ plugin at org.eclipse.core.variables=v20090521,:pserver:anonymous at dev.eclipse.org:/
!*************** CORE CONTRIBUTION ********************************************************
!**** OSGi
-plugin at org.eclipse.osgi=R35x_v20090827,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.osgi
+plugin at org.eclipse.osgi=R35x_v20100126,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.osgi
plugin at org.eclipse.osgi.services=v20090520-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.osgi.services
plugin at org.eclipse.osgi.util=v20090520-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.osgi.util
!**** Equinox
plugin at org.eclipse.equinox.common=R35x_v20090807-1100,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/components/bundles/org.eclipse.equinox.common
-plugin at org.eclipse.equinox.preferences=v20090520-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.preferences
+plugin at org.eclipse.equinox.preferences=R35x_v20091117,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.preferences
plugin at org.eclipse.equinox.registry=v20090520-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/components/bundles/org.eclipse.equinox.registry
plugin at org.eclipse.equinox.supplement=v20090518,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.osgi/supplement
-plugin at org.eclipse.equinox.app=v20090520-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.app
+plugin at org.eclipse.equinox.app=R35x_v20091203,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.app
plugin at org.eclipse.equinox.device=v20090520-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.device
-plugin at org.eclipse.equinox.event=v20090520-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.event
+plugin at org.eclipse.equinox.event=R35x_v20100209,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.event
plugin at org.eclipse.equinox.http=R35x_v20090728,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.http
plugin at org.eclipse.equinox.log=v20090520-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.log
plugin at org.eclipse.equinox.metatype=v20090520-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.metatype
@@ -68,7 +68,7 @@ plugin at org.eclipse.equinox.servletbridge=v20090520-1800,:pserver:anonymous at dev.e
bundle at org.eclipse.equinox.jsp.jasper=v20090520-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/server-side/bundles/org.eclipse.equinox.jsp.jasper
bundle at org.eclipse.equinox.jsp.jasper.registry=v20090520-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/server-side/bundles/org.eclipse.equinox.jsp.jasper.registry
plugin at org.eclipse.equinox.cm=v20090520-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.cm
-plugin at org.eclipse.equinox.concurrent=v20090520-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/components/bundles/org.eclipse.equinox.concurrent
+plugin at org.eclipse.equinox.concurrent=R35x_v20100209,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/components/bundles/org.eclipse.equinox.concurrent
!**** Prosyst Contributions
plugin at org.eclipse.equinox.ds=R35x_v20090806,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.ds
@@ -84,7 +84,7 @@ plugin at org.eclipse.equinox.security.ui=v20090520-1800,:pserver:anonymous at dev.ecl
fragment at org.eclipse.equinox.security.win32.x86=v20090520-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/security/bundles/org.eclipse.equinox.security.win32.x86
fragment at org.eclipse.equinox.security.macosx=v20090520-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/security/bundles/org.eclipse.equinox.security.macosx
!**** Transforms
-plugin at org.eclipse.equinox.transforms.xslt=v20090520-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/components/bundles/org.eclipse.equinox.transforms.xslt
+plugin at org.eclipse.equinox.transforms.xslt=R35x_v20100209,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/components/bundles/org.eclipse.equinox.transforms.xslt
fragment at org.eclipse.equinox.transforms.hook=v20090520-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/components/bundles/org.eclipse.equinox.transforms.hook
@@ -102,17 +102,17 @@ fragment at org.eclipse.equinox.launcher.gtk.linux.x86_64=v20090519,:pserver:anonym
fragment at org.eclipse.equinox.launcher.gtk.linux.ppc=v20090519,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.ppc
fragment at org.eclipse.equinox.launcher.motif.hpux.PA_RISC=v20090306-1900,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.hpux.PA_RISC
fragment at org.eclipse.equinox.launcher.motif.hpux.ia64_32=v20090519,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.hpux.ia64_32
-fragment at org.eclipse.equinox.launcher.motif.aix.ppc=v20090519,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.aix.ppc
-fragment at org.eclipse.equinox.launcher.motif.linux.x86=v20090520,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.linux.x86
+fragment at org.eclipse.equinox.launcher.motif.aix.ppc=R35x_v20091211,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.aix.ppc
+fragment at org.eclipse.equinox.launcher.motif.linux.x86=R35x_v20100209,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.linux.x86
fragment at org.eclipse.equinox.launcher.gtk.solaris.sparc=R35x_v20090720,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.solaris.sparc
!****contributed fragments
fragment at org.eclipse.equinox.launcher.gtk.linux.s390=v20090426-1530,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.linux.s390
fragment at org.eclipse.equinox.launcher.gtk.linux.s390x=v20090426-1530,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.linux.s390x
fragment at org.eclipse.equinox.launcher.gtk.solaris.x86=R35x_v20090720,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.solaris.x86
-fragment at org.eclipse.equinox.launcher.motif.solaris.sparc=HEAD,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.solaris.sparc
+fragment at org.eclipse.equinox.launcher.motif.solaris.sparc=R35x_20090929,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.solaris.sparc
-feature at org.eclipse.equinox.executable=R35x_v20090724,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.executable
+feature at org.eclipse.equinox.executable=R35x_v20091211,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.executable
!**** Runtime
plugin at org.eclipse.core.runtime=v20090525,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
@@ -120,25 +120,26 @@ plugin at org.eclipse.core.contenttype=R35x_v20090826-0451,:pserver:anonymous at dev.e
plugin at org.eclipse.core.jobs=v20090429-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
!**** Expressions
-plugin at org.eclipse.core.expressions=v20090429-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.expressions=R35x_v20100209,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.core.expressions.tests=v20090324-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
!**** Resources
-plugin at org.eclipse.core.resources=R35x_v20090826-0451,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.resources=R35x_v20091203-1235,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
fragment at org.eclipse.core.resources.win32=v20080508,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
fragment at org.eclipse.core.resources.win32.x86=v20081020,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
fragment at org.eclipse.core.resources.win32.ia64=v20081020,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.core.resources.compatibility=v20090505,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.core.resources.compatibility=R35x_v20100113-0530,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
!**** File System
-plugin at org.eclipse.core.filesystem=v20090507,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.filesystem=R35x_v20091203-1235,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
fragment at org.eclipse.core.filesystem.win32.x86=v20080604-1400,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
fragment at org.eclipse.core.filesystem.win32.x86_64=v20090316-0910,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
fragment at org.eclipse.core.filesystem.win32.ia64=v20071121,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.core.filesystem.linux.x86=v20080604-1400,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.core.filesystem.linux.x86_64=v20080604-1400,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.core.filesystem.linux.x86=R35x_v20091203-1235,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.core.filesystem.linux.x86_64=R35x_v20091203-1235,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
fragment at org.eclipse.core.filesystem.linux.ppc=v20080604-1400,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.core.filesystem.solaris.sparc=v20080604-1400,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.core.filesystem.solaris.sparc=R35x_v20091203-1235,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.core.filesystem.aix.ppc=R35x_v20091203-1235,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.aix.ppc
!**** Legacy Runtime
plugin at org.eclipse.core.boot=v20080218,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
@@ -147,21 +148,21 @@ plugin at org.eclipse.core.runtime.compatibility.auth=v20090413,:pserver:anonymous@
fragment at org.eclipse.core.runtime.compatibility.registry=v20090429-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
!**** Other Core Code
-plugin at org.eclipse.pde.build=R35x_20090820,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/build/org.eclipse.pde.build
-plugin at org.eclipse.pde.build.tests=R35x_20090721,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/build/org.eclipse.pde.build.tests
+plugin at org.eclipse.pde.build=R35x_20100114,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/build/org.eclipse.pde.build
+plugin at org.eclipse.pde.build.tests=R35x_20091105,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/build/org.eclipse.pde.build.tests
feature at org.eclipse.pde.builder=v20040624a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/build/org.eclipse.pde.build/feature
!**** Test Suites
-plugin at org.eclipse.core.tests.harness=v20090525,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.core.tests.resources=R35x_v20090826-0451,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.tests.harness=R35x_v20091203-1235,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.tests.resources=R35x_v20091203-1235,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.core.tests.runtime=R35x_v20090807-1100,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.osgi.tests=R35x_v20090827,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.osgi.tests
+plugin at org.eclipse.osgi.tests=R35x_v20100126,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.osgi.tests
!*************** DOC CONTRIBUTION ********************************************************
-plugin at org.eclipse.platform.doc.user=r351_v20090821-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.platform.doc.isv=r351_v20090831,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.platform.doc.user=r352_v20091111-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.platform.doc.isv=r352_v20100119,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.doc.user=r351_v20090821-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.doc.user=r352_v20091015,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.jdt.doc.isv=r351_v20090831,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.pde.doc.user=v20090818,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/doc/org.eclipse.pde.doc.user
@@ -179,7 +180,7 @@ plugin at org.eclipse.equinox.jmx.client.xmlrpc=v20070515,:pserver:anonymous at dev.ec
feature at org.eclipse.equinox.jmx.client.feature=v20081124,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.client.feature
!** Common **
-plugin at org.eclipse.equinox.jmx.common=v20070510,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.common
+plugin at org.eclipse.equinox.jmx.common=R35x_v20100209,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.common
feature at org.eclipse.equinox.jmx.common.feature=v20070507,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.common.feature
!** Server **
@@ -194,13 +195,13 @@ plugin at org.eclipse.swt.jmx=v20090331,:pserver:anonymous at dev.eclipse.org:/cvsroot
plugin at org.eclipse.core.resources.jmx=v20070510,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.core.resources.jmx
feature at org.eclipse.equinox.jmx.server.feature=v20081124,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.server.feature
!*************** FEATURE CONTRIBUTION ******************************************************
-feature at org.eclipse.sdk=R35x_v20090811,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.sdk
-plugin at org.eclipse.sdk=R35x_v20090827,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+feature at org.eclipse.sdk=R35x_v20100119,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.sdk
+plugin at org.eclipse.sdk=R35x_v20100204,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-feature at org.eclipse.jdt=r351_v20090810-0600,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.jdt-feature
+feature at org.eclipse.jdt=r352_v20100108,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.jdt-feature
feature at org.eclipse.jdt.sdk=v20080507,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.jdt.sdk
-feature at org.eclipse.pde=R35x_v20090811,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.pde-feature
+feature at org.eclipse.pde=R35x_v20100119,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.pde-feature
feature at org.eclipse.pde.sdk=v20080313a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.pde.sdk
feature at org.eclipse.pde.api.tools.ee.cdcfoundation10_feature=v20090407-1030,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10-feature
feature at org.eclipse.pde.api.tools.ee.cdcfoundation11_feature=v20090407-1030,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11-feature
@@ -214,10 +215,10 @@ feature at org.eclipse.pde.api.tools.ee.osgiminimum10_feature=v20090407-1030,:pserv
feature at org.eclipse.pde.api.tools.ee.osgiminimum11_feature=v20090407-1030,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11-feature
feature at org.eclipse.pde.api.tools.ee.osgiminimum12_feature=v20090407-1030,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12-feature
-feature at org.eclipse.platform=R35x_v20090910,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.platform-feature
+feature at org.eclipse.platform=R35x_v20100210-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.platform-feature
feature at org.eclipse.platform.sdk=v20080314,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.platform.sdk
-plugin at org.eclipse.platform=R35x_v20090813,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.platform=R35x_v20100121,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
feature at org.eclipse.sdk.examples=v20080717,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk.examples-feature
plugin at org.eclipse.sdk.examples=v20080612,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
@@ -226,54 +227,54 @@ feature at org.eclipse.sdk.tests=v20090227,:pserver:anonymous at dev.eclipse.org:/cvsr
plugin at org.eclipse.sdk.tests=v20060605,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
feature at org.eclipse.equinox=v20090407,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.equinox
-feature at org.eclipse.equinox.sdk=r351_v20090901,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.equinox.sdk
+feature at org.eclipse.equinox.sdk=r352_v20100209,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.equinox.sdk
-feature at org.eclipse.cvs=R35x_v20090811,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.cvs-feature
+feature at org.eclipse.cvs=R35x_v20100125,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.cvs-feature
feature at org.eclipse.cvs.sdk=v20080507,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.cvs.sdk
-plugin at org.eclipse.cvs=v20090520,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/plugins/org.eclipse.cvs
+plugin at org.eclipse.cvs=R35x_v20100119,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/plugins/org.eclipse.cvs
-feature at org.eclipse.help=R35x_v20090811,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.help-feature
+feature at org.eclipse.help=R35x_v20100119,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.help-feature
feature at org.eclipse.help.sdk=v20080314,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.help.sdk
-feature at org.eclipse.equinox.p2.user.ui=R35x_v20090811,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/p2/org.eclipse.equinox.p2.releng/buildtime-features/org.eclipse.equinox.p2.user.ui
+feature at org.eclipse.equinox.p2.user.ui=R35x_v20091106,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/p2/org.eclipse.equinox.p2.releng/buildtime-features/org.eclipse.equinox.p2.user.ui
feature at org.eclipse.equinox.p2.agent.feature=CVS,tag=R35x_v20090811,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/org.eclipse.equinox.p2.releng/buildtime-features/org.eclipse.equinox.p2.agent.feature
feature at org.eclipse.equinox.p2.generator.feature=CVS,tag=R35x_v20090811,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/org.eclipse.equinox.p2.releng/buildtime-features/org.eclipse.equinox.p2.generator.feature
feature at org.eclipse.equinox.p2.director.feature=CVS,tag=R35x_v20090811,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/org.eclipse.equinox.p2.releng/buildtime-features/org.eclipse.equinox.p2.director.feature
feature at org.eclipse.equinox.p2.sdk=CVS,tag=R35x_v20090811,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/features/org.eclipse.equinox.p2.sdk
-feature at org.eclipse.equinox.core.sdk=CVS,tag=R35x_v20090811,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/framework/features/org.eclipse.equinox.core.sdk
-feature at org.eclipse.equinox.compendium.sdk=CVS,tag=R35x_v20090811,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/compendium/features/org.eclipse.equinox.compendium.sdk
+feature at org.eclipse.equinox.core.sdk=CVS,tag=R35x_v20100105,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/framework/features/org.eclipse.equinox.core.sdk
+feature at org.eclipse.equinox.compendium.sdk=CVS,tag=R35x_v20100105,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/compendium/features/org.eclipse.equinox.compendium.sdk
feature at org.eclipse.equinox.serverside.sdk=CVS,tag=v20090505,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/server-side/features/org.eclipse.equinox.serverside.sdk
feature at org.eclipse.pde.api.tools.ee.fragments=v20090512,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.pde.api.tools.ee.fragments
!*************** JDT APT CONTRIBUTION [R3_5_maintenance] *******************************************
-plugin at org.eclipse.jdt.apt.core=R35x_v20090818-0235,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.apt.ui=v20090528-1135,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.apt.tests=v20090528-1135,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.jdt.compiler.apt=R35x_v20090825-1530,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.compiler.apt.tests=R35x_v20090825-1530,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.apt.pluggable.core=R35x_v20090818-0225,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.apt.pluggable.tests=R35x_v20090818-0225,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.apt.core=R35x_v20091130-2300,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.apt.ui=v20090930-2100_R35x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.apt.tests=R35x_v20091130-2300,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.jdt.compiler.apt=R35x_v20090925-1100,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.compiler.apt.tests=R35x_v20090925-1100,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.apt.pluggable.core=R35x_v20090925-1100,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.apt.pluggable.tests=R35x_v20090925-1100,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-!*************** JDT CORE CONTRIBUTION [20090902-0800] *******************************************
+!*************** JDT CORE CONTRIBUTION [20100113-0800] *******************************************
-plugin at org.eclipse.jdt.core=v_972_R35x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.jdt.compiler.tool=v_972_R35x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.core=v_980_R35x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.jdt.compiler.tool=v_980_R35x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.core.tests.builder=v_972_R35x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.core.tests.compiler=v_972_R35x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.core.tests.model=v_972_R35x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.core.tests.performance=v_972_R35x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.compiler.tool.tests=v_972_R35x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.core.tests.builder=v_980_R35x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.core.tests.compiler=v_980_R35x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.core.tests.model=v_980_R35x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.core.tests.performance=v_980_R35x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.compiler.tool.tests=v_980_R35x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
!*************** DEBUG CONTRIBUTION ********************************************************
-plugin at org.eclipse.debug.core=v20090526-1600,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.debug.ui=v20090811_r351,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.debug.core=v20091103_r352,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.debug.ui=v20091028_r352,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.jdt.debug=v20090526,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.jdt.debug.ui=v20090811_r351,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.launching=v20090527,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.launching=v20100108_r352,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.jdt.launching.macosx=v20090527,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.jdt.launching.ui.macosx=v20090527,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
@@ -289,103 +290,103 @@ plugin at org.eclipse.search.tests=v20090513-2000,:pserver:anonymous at dev.eclipse.or
plugin at org.eclipse.ltk.core.refactoring=v20090513-2000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.ltk.core.refactoring.tests=v20090513-2000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ltk.ui.refactoring=v20090604,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ltk.ui.refactoring=r352_v20100209,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.ltk.ui.refactoring.tests=v20090513-2000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt=r351_v20090810-0600,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt=r352_v20100106-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.jdt.core.manipulation=v20090603,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.ui=r351_v20090821-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.ui=r352_v20100106-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.jdt.ui.examples.projects=v20090603,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.jdt.ui.tests=v20090526-2000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.jdt.ui.tests.refactoring=r351_v20090708-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.junit=r351_v20090708-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.junit=r352_v20100113-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.jdt.junit.runtime=v20090513-2000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.jdt.junit4.runtime=v20090513-2000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.junit4=v20090824,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
!*************** ORBIT CONTRIBUTION ********************************************************
-plugin at com.ibm.icu,4.0.1=p2IU,id=com.ibm.icu,version=4.0.1.v20090822,repository=file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo
-plugin at com.ibm.icu.base,4.0.1=p2IU,id=com.ibm.icu.base,version=4.0.1.v20090822,repository=file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo
-plugin at com.ibm.icu.base.source,4.0.1=p2IU,id=com.ibm.icu.base.source,version=4.0.1.v20090822,repository=file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo
-plugin at com.ibm.icu.source,4.0.1=p2IU,id=com.ibm.icu.source,version=4.0.1.v20090822,repository=file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo
-plugin at com.jcraft.jsch,0.1.41=p2IU,id=com.jcraft.jsch,version=0.1.41.v200903070017,repository=file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo
-plugin at com.jcraft.jsch.source,0.1.41=p2IU,id=com.jcraft.jsch.source,version=0.1.41.v200903070017,repository=file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo
-plugin at javax.management,1.2.0=p2IU,id=javax.management,version=1.2.0.v200803061811,repository=file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo
-plugin at javax.management.remote,1.0.0=p2IU,id=javax.management.remote,version=1.0.0.v200803061811,repository=file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo
-plugin at javax.servlet,2.4.0=p2IU,id=javax.servlet,version=2.4.0.v200806031604,repository=file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo
-plugin at javax.servlet,2.5.0=p2IU,id=javax.servlet,version=2.5.0.v200806031605,repository=file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo
-plugin at javax.servlet.source,2.4.0=p2IU,id=javax.servlet.source,version=2.4.0.v200806031604,repository=file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo
-plugin at javax.servlet.source,2.5.0=p2IU,id=javax.servlet.source,version=2.5.0.v200806031605,repository=file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo
-plugin at javax.servlet.jsp,2.0.0=p2IU,id=javax.servlet.jsp,version=2.0.0.v200806031607,repository=file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo
-plugin at javax.servlet.jsp.source,2.0.0=p2IU,id=javax.servlet.jsp.source,version=2.0.0.v200806031607,repository=file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo
-plugin at net.sourceforge.mx4j,3.0.1=p2IU,id=net.sourceforge.mx4j,version=3.0.1.v200803061811,repository=file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo
-plugin at net.sourceforge.mx4j.remote,3.0.1=p2IU,id=net.sourceforge.mx4j.remote,version=3.0.1.v200803061811,repository=file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo
-plugin at org.apache.ant,1.7.1=p2IU,id=org.apache.ant,version=1.7.1.v20090120-1145,repository=file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo
-plugin at org.apache.ant.source,1.7.1=p2IU,id=org.apache.ant.source,version=1.7.1.v20090120-1145,repository=file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo
-plugin at org.apache.commons.codec,1.3.0=p2IU,id=org.apache.commons.codec,version=1.3.0.v20080530-1600,repository=file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo
-plugin at org.apache.commons.codec.source,1.3.0=p2IU,id=org.apache.commons.codec.source,version=1.3.0.v20080530-1600,repository=file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo
-plugin at org.apache.commons.el,1.0.0=p2IU,id=org.apache.commons.el,version=1.0.0.v200806031608,repository=file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo
-plugin at org.apache.commons.el.source,1.0.0=p2IU,id=org.apache.commons.el.source,version=1.0.0.v200806031608,repository=file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo
-plugin at org.apache.commons.httpclient,3.1.0=p2IU,id=org.apache.commons.httpclient,version=3.1.0.v20080605-1935,repository=file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo
-plugin at org.apache.commons.httpclient.source,3.1.0=p2IU,id=org.apache.commons.httpclient.source,version=3.1.0.v20080605-1935,repository=file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo
-plugin at org.apache.commons.logging,1.0.4=p2IU,id=org.apache.commons.logging,version=1.0.4.v200904062259,repository=file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo
-plugin at org.apache.commons.logging.source,1.0.4=p2IU,id=org.apache.commons.logging.source,version=1.0.4.v200904062259,repository=file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo
-plugin at org.apache.jasper,5.5.17=p2IU,id=org.apache.jasper,version=5.5.17.v200903231320,repository=file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo
-plugin at org.apache.jasper.source,5.5.17=p2IU,id=org.apache.jasper.source,version=5.5.17.v200903231320,repository=file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo
-plugin at org.apache.lucene,1.9.1=p2IU,id=org.apache.lucene,version=1.9.1.v20080530-1600,repository=file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo
-plugin at org.apache.lucene.analysis,1.9.1=p2IU,id=org.apache.lucene.analysis,version=1.9.1.v20080530-1600,repository=file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo
-plugin at org.apache.lucene.analysis.source,1.9.1=p2IU,id=org.apache.lucene.analysis.source,version=1.9.1.v20080530-1600,repository=file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo
-plugin at org.apache.ws.commons.util,1.0.0=p2IU,id=org.apache.ws.commons.util,version=1.0.0.v20081204,repository=file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo
-plugin at org.apache.ws.jaxme,0.5.1=p2IU,id=org.apache.ws.jaxme,version=0.5.1.v20080530-1550,repository=file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo
-plugin at org.apache.xmlrpc,3.0.0=p2IU,id=org.apache.xmlrpc,version=3.0.0.v20080530-1550,repository=file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo
-plugin at org.easymock,2.4.0=p2IU,id=org.easymock,version=2.4.0.v20090202-0900,repository=file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo
-plugin at org.easymock.source,2.4.0=p2IU,id=org.easymock.source,version=2.4.0.v20090202-0900,repository=file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo
-plugin at org.hamcrest.core,1.1.0=p2IU,id=org.hamcrest.core,version=1.1.0.v20090501071000,repository=file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo
-plugin at org.hamcrest.core.source,1.1.0=p2IU,id=org.hamcrest.core.source,version=1.1.0.v20090501071000,repository=file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo
-plugin at org.junit,3.8.2=p2IU,id=org.junit,version=3.8.2.v20090203-1005,repository=file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo
-plugin at org.junit.source,3.8.2=p2IU,id=org.junit.source,version=3.8.2.v20090203-1005,repository=file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo
-plugin at org.mortbay.jetty,5.1.14=p2IU,id=org.mortbay.jetty,version=5.1.14.v200806031611,repository=file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo
-plugin at org.mortbay.jetty.source,5.1.14=p2IU,id=org.mortbay.jetty.source,version=5.1.14.v200806031611,repository=file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo
-plugin at org.mortbay.jetty.server,6.1.15=p2IU,id=org.mortbay.jetty.server,version=6.1.15.v200905151201,repository=file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo
-plugin at org.mortbay.jetty.server.source,6.1.15=p2IU,id=org.mortbay.jetty.server.source,version=6.1.15.v200905151201,repository=file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo
-plugin at org.mortbay.jetty.util,6.1.15=p2IU,id=org.mortbay.jetty.util,version=6.1.15.v200905182336,repository=file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo
-plugin at org.mortbay.jetty.util.source,6.1.15=p2IU,id=org.mortbay.jetty.util.source,version=6.1.15.v200905182336,repository=file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo
+plugin at com.ibm.icu,4.0.1=p2IU,id=com.ibm.icu,version=4.0.1.v20090822,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at com.ibm.icu.base,4.0.1=p2IU,id=com.ibm.icu.base,version=4.0.1.v20090822,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at com.ibm.icu.base.source,4.0.1=p2IU,id=com.ibm.icu.base.source,version=4.0.1.v20090822,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at com.ibm.icu.source,4.0.1=p2IU,id=com.ibm.icu.source,version=4.0.1.v20090822,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at com.jcraft.jsch,0.1.41=p2IU,id=com.jcraft.jsch,version=0.1.41.v200903070017,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at com.jcraft.jsch.source,0.1.41=p2IU,id=com.jcraft.jsch.source,version=0.1.41.v200903070017,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at javax.management,1.2.0=p2IU,id=javax.management,version=1.2.0.v200803061811,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at javax.management.remote,1.0.0=p2IU,id=javax.management.remote,version=1.0.0.v200803061811,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at javax.servlet,2.4.0=p2IU,id=javax.servlet,version=2.4.0.v200806031604,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at javax.servlet,2.5.0=p2IU,id=javax.servlet,version=2.5.0.v200806031605,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at javax.servlet.source,2.4.0=p2IU,id=javax.servlet.source,version=2.4.0.v200806031604,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at javax.servlet.source,2.5.0=p2IU,id=javax.servlet.source,version=2.5.0.v200806031605,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at javax.servlet.jsp,2.0.0=p2IU,id=javax.servlet.jsp,version=2.0.0.v200806031607,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at javax.servlet.jsp.source,2.0.0=p2IU,id=javax.servlet.jsp.source,version=2.0.0.v200806031607,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at net.sourceforge.mx4j,3.0.1=p2IU,id=net.sourceforge.mx4j,version=3.0.1.v200803061811,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at net.sourceforge.mx4j.remote,3.0.1=p2IU,id=net.sourceforge.mx4j.remote,version=3.0.1.v200803061811,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.apache.ant,1.7.1=p2IU,id=org.apache.ant,version=1.7.1.v20090120-1145,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.apache.ant.source,1.7.1=p2IU,id=org.apache.ant.source,version=1.7.1.v20090120-1145,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.apache.commons.codec,1.3.0=p2IU,id=org.apache.commons.codec,version=1.3.0.v20080530-1600,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.apache.commons.codec.source,1.3.0=p2IU,id=org.apache.commons.codec.source,version=1.3.0.v20080530-1600,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.apache.commons.el,1.0.0=p2IU,id=org.apache.commons.el,version=1.0.0.v200806031608,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.apache.commons.el.source,1.0.0=p2IU,id=org.apache.commons.el.source,version=1.0.0.v200806031608,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.apache.commons.httpclient,3.1.0=p2IU,id=org.apache.commons.httpclient,version=3.1.0.v20080605-1935,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.apache.commons.httpclient.source,3.1.0=p2IU,id=org.apache.commons.httpclient.source,version=3.1.0.v20080605-1935,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.apache.commons.logging,1.0.4=p2IU,id=org.apache.commons.logging,version=1.0.4.v200904062259,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.apache.commons.logging.source,1.0.4=p2IU,id=org.apache.commons.logging.source,version=1.0.4.v200904062259,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.apache.jasper,5.5.17=p2IU,id=org.apache.jasper,version=5.5.17.v200903231320,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.apache.jasper.source,5.5.17=p2IU,id=org.apache.jasper.source,version=5.5.17.v200903231320,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.apache.lucene,1.9.1=p2IU,id=org.apache.lucene,version=1.9.1.v20080530-1600,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.apache.lucene.analysis,1.9.1=p2IU,id=org.apache.lucene.analysis,version=1.9.1.v20080530-1600,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.apache.lucene.analysis.source,1.9.1=p2IU,id=org.apache.lucene.analysis.source,version=1.9.1.v20080530-1600,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.apache.ws.commons.util,1.0.0=p2IU,id=org.apache.ws.commons.util,version=1.0.0.v20081204,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.apache.ws.jaxme,0.5.1=p2IU,id=org.apache.ws.jaxme,version=0.5.1.v20080530-1550,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.apache.xmlrpc,3.0.0=p2IU,id=org.apache.xmlrpc,version=3.0.0.v20080530-1550,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.easymock,2.4.0=p2IU,id=org.easymock,version=2.4.0.v20090202-0900,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.easymock.source,2.4.0=p2IU,id=org.easymock.source,version=2.4.0.v20090202-0900,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.hamcrest.core,1.1.0=p2IU,id=org.hamcrest.core,version=1.1.0.v20090501071000,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.hamcrest.core.source,1.1.0=p2IU,id=org.hamcrest.core.source,version=1.1.0.v20090501071000,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.junit,3.8.2=p2IU,id=org.junit,version=3.8.2.v20090203-1005,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.junit.source,3.8.2=p2IU,id=org.junit.source,version=3.8.2.v20090203-1005,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.mortbay.jetty,5.1.14=p2IU,id=org.mortbay.jetty,version=5.1.14.v200806031611,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.mortbay.jetty.source,5.1.14=p2IU,id=org.mortbay.jetty.source,version=5.1.14.v200806031611,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.mortbay.jetty.server,6.1.15=p2IU,id=org.mortbay.jetty.server,version=6.1.15.v200905151201,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.mortbay.jetty.server.source,6.1.15=p2IU,id=org.mortbay.jetty.server.source,version=6.1.15.v200905151201,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.mortbay.jetty.util,6.1.15=p2IU,id=org.mortbay.jetty.util,version=6.1.15.v200905182336,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.mortbay.jetty.util.source,6.1.15=p2IU,id=org.mortbay.jetty.util.source,version=6.1.15.v200905182336,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite
# Bundles from Orbit for p2
-plugin at org.apache.xml.resolver,1.2.0=p2IU,id=org.apache.xml.resolver,version=1.2.0.v200902170519,repository=file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo
-plugin at org.apache.xerces,2.8.0=p2IU,id=org.apache.xerces,version=2.8.0.v200803070308,repository=file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo
-plugin at org.sat4j.core,2.1.0=p2IU,id=org.sat4j.core,version=2.1.0.v20090520,repository=file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo
-plugin at org.sat4j.pb,2.1.0=p2IU,id=org.sat4j.pb,version=2.1.0.v20090520,repository=file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo
+plugin at org.apache.xml.resolver,1.2.0=p2IU,id=org.apache.xml.resolver,version=1.2.0.v200902170519,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.apache.xerces,2.8.0=p2IU,id=org.apache.xerces,version=2.8.0.v200803070308,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.sat4j.core,2.1.1=p2IU,id=org.sat4j.core,version=2.1.1.v20090825,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.sat4j.pb,2.1.1=p2IU,id=org.sat4j.pb,version=2.1.1.v20090825,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite
# Orbit bundles for API tooling
-plugin at org.objectweb.asm,3.1.0=p2IU,id=org.objectweb.asm,version=3.1.0.v200803061910,repository=file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo
-plugin at org.objectweb.asm.source,3.1.0=p2IU,id=org.objectweb.asm.source,version=3.1.0.v200803061910,repository=file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo
+plugin at org.objectweb.asm,3.1.0=p2IU,id=org.objectweb.asm,version=3.1.0.v200803061910,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.objectweb.asm.source,3.1.0=p2IU,id=org.objectweb.asm.source,version=3.1.0.v200803061910,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite
plugin at org.eclipse.equinox.frameworkadmin=CVS,tag=v20090520-1905,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.frameworkadmin
-plugin at org.eclipse.equinox.frameworkadmin.equinox=CVS,tag=v20090520-1905,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.frameworkadmin.equinox
+plugin at org.eclipse.equinox.frameworkadmin.equinox=CVS,tag=R35x_v20091214,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.frameworkadmin.equinox
plugin at org.eclipse.equinox.frameworkadmin.test=CVS,tag=v20090520-1905,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.frameworkadmin.test
plugin at org.eclipse.equinox.p2.artifact.repository=CVS,tag=R35x_v20090721,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.artifact.repository
plugin at org.eclipse.equinox.p2.console=CVS,tag=v20090520-1905,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.console
plugin at org.eclipse.equinox.p2.core=CVS,tag=R35x_v20090819,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.core
-plugin at org.eclipse.equinox.p2.director=CVS,tag=v20090520-1905,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director
-plugin at org.eclipse.equinox.p2.director.app=CVS,tag=v20090521-1912,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director.app
+plugin at org.eclipse.equinox.p2.director=CVS,tag=R35x_v20100112,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director
+plugin at org.eclipse.equinox.p2.director.app=CVS,tag=R35x_v20091106,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director.app
plugin at org.eclipse.equinox.p2.directorywatcher=CVS,tag=v20090525,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.directorywatcher
-plugin at org.eclipse.equinox.p2.engine=CVS,tag=R35x_v20090825,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.engine
+plugin at org.eclipse.equinox.p2.engine=CVS,tag=R35x_v20091117,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.engine
plugin at org.eclipse.equinox.p2.exemplarysetup=CVS,tag=v20090520-1905,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.exemplarysetup
plugin at org.eclipse.equinox.p2.extensionlocation=CVS,tag=v20090520-1905,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.extensionlocation
plugin at org.eclipse.equinox.p2.garbagecollector=CVS,tag=v20090520-1905,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.garbagecollector
plugin at org.eclipse.equinox.p2.installer=CVS,tag=R35x_v20090717,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.installer
plugin at org.eclipse.equinox.p2.jarprocessor=CVS,tag=v20090520-1905,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.jarprocessor
-plugin at org.eclipse.equinox.p2.metadata=CVS,tag=v20090525,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata
-plugin at org.eclipse.equinox.p2.metadata.generator=CVS,tag=v20090520-1905,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata.generator
+plugin at org.eclipse.equinox.p2.metadata=CVS,tag=R35x_v20100112,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata
+plugin at org.eclipse.equinox.p2.metadata.generator=CVS,tag=R35x_20100114,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata.generator
plugin at org.eclipse.equinox.p2.metadata.repository=CVS,tag=R35x_v20090812,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata.repository
-plugin at org.eclipse.equinox.p2.publisher=CVS,tag=v20090527-1812,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.publisher
+plugin at org.eclipse.equinox.p2.publisher=CVS,tag=R35x_20100105,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.publisher
plugin at org.eclipse.equinox.p2.reconciler.dropins=CVS,tag=v20090520-1905,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.reconciler.dropins
-plugin at org.eclipse.equinox.p2.repository=CVS,tag=v20090901-1041,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.repository
-plugin at org.eclipse.equinox.p2.repository.tools=CVS,tag=R35x_v20090806,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.repository.tools
+plugin at org.eclipse.equinox.p2.repository=CVS,tag=R35x_v20100105,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.repository
+plugin at org.eclipse.equinox.p2.repository.tools=CVS,tag=R35x_20100111,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.repository.tools
plugin at org.eclipse.equinox.p2.selfhosting=CVS,tag=v20090520-1905,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.selfhosting
plugin at org.eclipse.equinox.p2.tools=CVS,tag=v20090525,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tools
plugin at org.eclipse.equinox.p2.touchpoint.eclipse=CVS,tag=R35x_20090820-1821,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.touchpoint.eclipse
@@ -396,44 +397,37 @@ plugin at org.eclipse.equinox.p2.ui.sdk=CVS,tag=v20090520-1905,cvsRoot=:pserver:ano
plugin at org.eclipse.equinox.p2.ui.sdk.scheduler=CVS,tag=v20090520-1905,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler
plugin at org.eclipse.equinox.p2.ui.admin.rcp=CVS,tag=v20090820,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui.admin.rcp
plugin at org.eclipse.equinox.p2.updatechecker=CVS,tag=v20090520-1905,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.updatechecker
-plugin at org.eclipse.equinox.p2.updatesite=CVS,tag=v20090525,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.updatesite
+plugin at org.eclipse.equinox.p2.updatesite=CVS,tag=R35x_20100105,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.updatesite
plugin at org.eclipse.equinox.simpleconfigurator=CVS,tag=R35x_v20090807-1100,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.simpleconfigurator
-plugin at org.eclipse.equinox.simpleconfigurator.manipulator=CVS,tag=v20090520-1905,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.simpleconfigurator.manipulator
+plugin at org.eclipse.equinox.simpleconfigurator.manipulator=CVS,tag=R35x_v20100209,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.simpleconfigurator.manipulator
plugin at org.eclipse.equinox.p2.tests=CVS,tag=R35x_v20090903,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests
plugin at org.eclipse.equinox.p2.tests.ui=CVS,tag=v20090527-1812,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests.ui
!# Bundles from ECF
-plugin at org.eclipse.ecf,3.0.0=GET,file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf_3.0.0.v20090831-1906.jar,usetimestamp=true
-plugin at org.eclipse.ecf.source,3.0.0=GET,file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf.source_3.0.0.v20090831-1906.jar,usetimestamp=true
-fragment at org.eclipse.ecf.ssl,1.0.0=GET,file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf.ssl_1.0.0.v20090831-1906.jar,usetimestamp=true
-fragment at org.eclipse.ecf.ssl.source,1.0.0=GET,file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf.ssl.source_1.0.0.v20090831-1906.jar,usetimestamp=true
-plugin at org.eclipse.ecf.identity,3.0.0=GET,file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf.identity_3.0.0.v20090831-1906.jar,usetimestamp=true
-plugin at org.eclipse.ecf.identity.source,3.0.0=GET,file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf.identity.source_3.0.0.v20090831-1906.jar,usetimestamp=true
-plugin at org.eclipse.ecf.filetransfer,3.0.0=GET,file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf.filetransfer_3.0.0.v20090831-1906.jar,usetimestamp=true
-plugin at org.eclipse.ecf.filetransfer.source,3.0.0=GET,file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf.filetransfer.source_3.0.0.v20090831-1906.jar,usetimestamp=true
-plugin at org.eclipse.ecf.provider.filetransfer,3.0.1=GET,file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf.provider.filetransfer_3.0.1.v20090831-1906.jar,usetimestamp=true
-plugin at org.eclipse.ecf.provider.filetransfer.source,3.0.1=GET,file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf.provider.filetransfer.source_3.0.1.v20090831-1906.jar,usetimestamp=true
-fragment at org.eclipse.ecf.provider.filetransfer.ssl,1.0.0=GET,file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf.provider.filetransfer.ssl_1.0.0.v20090831-1906.jar,usetimestamp=true
-fragment at org.eclipse.ecf.provider.filetransfer.ssl.source,1.0.0=GET,file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf.provider.filetransfer.ssl.source_1.0.0.v20090831-1906.jar,usetimestamp=true
-plugin at org.eclipse.ecf.provider.filetransfer.httpclient,3.0.1=GET,file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf.provider.filetransfer.httpclient_3.0.1.v20090831-1906.jar,usetimestamp=true
-plugin at org.eclipse.ecf.provider.filetransfer.httpclient.source,3.0.1=GET,file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf.provider.filetransfer.httpclient.source_3.0.1.v20090831-1906.jar,usetimestamp=true
-fragment at org.eclipse.ecf.provider.filetransfer.httpclient.ssl,1.0.0=GET,file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.v20090831-1906.jar,usetimestamp=true
-fragment at org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source,1.0.0=GET,file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source_1.0.0.v20090831-1906.jar,usetimestamp=true
-!# The following apache bundes are obtained from the orbit.map
-!#plugin at org.apache.commons.codec,1.3.0=GET,file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo/plugins/org.apache.commons.codec_1.3.0.v20080530-1600.jar
-!#plugin at org.apache.commons.codec.source,1.3.0=GET,file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo/plugins/org.apache.commons.codec.source_1.3.0.v20080530-1600.jar
-!#plugin at org.apache.commons.httpclient,3.1.0=GET,file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo/plugins/org.apache.commons.httpclient_3.1.0.v20080605-1935.jar
-!#plugin at org.apache.commons.httpclient.source,3.1.0=GET,file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo/plugins/org.apache.commons.httpclient.source_3.1.0.v20080605-1935.jar
-!#plugin at org.apache.commons.logging,1.0.4=GET,file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo/plugins/org.apache.commons.logging_1.0.4.v200904062259.jar
-!#plugin at org.apache.commons.logging.source,1.0.4=GET,file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo/plugins/org.apache.commons.logging.source_1.0.4.v200904062259.jar
+plugin at org.eclipse.ecf,3.0.0=GET,http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf_3.0.0.v20090831-1906.jar,usetimestamp=true
+plugin at org.eclipse.ecf.source,3.0.0=GET,http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.source_3.0.0.v20090831-1906.jar,usetimestamp=true
+fragment at org.eclipse.ecf.ssl,1.0.0=GET,http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.ssl_1.0.0.v20090831-1906.jar,usetimestamp=true
+fragment at org.eclipse.ecf.ssl.source,1.0.0=GET,http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.ssl.source_1.0.0.v20090831-1906.jar,usetimestamp=true
+plugin at org.eclipse.ecf.identity,3.0.0=GET,http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.identity_3.0.0.v20090831-1906.jar,usetimestamp=true
+plugin at org.eclipse.ecf.identity.source,3.0.0=GET,http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.identity.source_3.0.0.v20090831-1906.jar,usetimestamp=true
+plugin at org.eclipse.ecf.filetransfer,3.0.0=GET,http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.filetransfer_3.0.0.v20090831-1906.jar,usetimestamp=true
+plugin at org.eclipse.ecf.filetransfer.source,3.0.0=GET,http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.filetransfer.source_3.0.0.v20090831-1906.jar,usetimestamp=true
+plugin at org.eclipse.ecf.provider.filetransfer,3.0.1=GET,http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.provider.filetransfer_3.0.1.v20090831-1906.jar,usetimestamp=true
+plugin at org.eclipse.ecf.provider.filetransfer.source,3.0.1=GET,http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.provider.filetransfer.source_3.0.1.v20090831-1906.jar,usetimestamp=true
+fragment at org.eclipse.ecf.provider.filetransfer.ssl,1.0.0=GET,http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.provider.filetransfer.ssl_1.0.0.v20090831-1906.jar,usetimestamp=true
+fragment at org.eclipse.ecf.provider.filetransfer.ssl.source,1.0.0=GET,http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.provider.filetransfer.ssl.source_1.0.0.v20090831-1906.jar,usetimestamp=true
+plugin at org.eclipse.ecf.provider.filetransfer.httpclient,3.0.1=GET,http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.provider.filetransfer.httpclient_3.0.1.v20090831-1906.jar,usetimestamp=true
+plugin at org.eclipse.ecf.provider.filetransfer.httpclient.source,3.0.1=GET,http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.source_3.0.1.v20090831-1906.jar,usetimestamp=true
+fragment at org.eclipse.ecf.provider.filetransfer.httpclient.ssl,1.0.0=GET,http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.v20090831-1906.jar,usetimestamp=true
+fragment at org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source,1.0.0=GET,http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source_1.0.0.v20090831-1906.jar,usetimestamp=true
!*************** PDE CONTRIBUTION ********************************************************
plugin at org.eclipse.pde=v20090527,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde
-plugin at org.eclipse.pde.core=v20090821,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.core
+plugin at org.eclipse.pde.core=v20100104,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.core
plugin at org.eclipse.pde.junit.runtime=v20090527,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.junit.runtime
plugin at org.eclipse.pde.runtime=v20090731,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.runtime
-plugin at org.eclipse.pde.ui=v20090821,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.ui
+plugin at org.eclipse.pde.ui=v201001121200,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.ui
plugin at org.eclipse.pde.ui.templates=v20090527,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.ui.templates
plugin at org.eclipse.pde.ui.tests=v20090824a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.ui.tests
@@ -453,15 +447,15 @@ fragment at org.eclipse.pde.api.tools.ee.osgiminimum10=v20090407-1030,:pserver:anon
fragment at org.eclipse.pde.api.tools.ee.osgiminimum11=v20090407-1030,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11
fragment at org.eclipse.pde.api.tools.ee.osgiminimum12=v20090407-1030,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12
-plugin at org.eclipse.pde.ds.core=v20090429-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ds/org.eclipse.pde.ds.core
-plugin at org.eclipse.pde.ds.ui=v20090527,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ds/org.eclipse.pde.ds.ui
+plugin at org.eclipse.pde.ds.core=v20100118,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ds/org.eclipse.pde.ds.core
+plugin at org.eclipse.pde.ds.ui=v20100209-maintenance,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ds/org.eclipse.pde.ds.ui
plugin at org.eclipse.pde.ds.tests=v20090420,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ds/org.eclipse.pde.ds.tests
plugin at org.eclipse.pde.ua.core=v20090429-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ua/org.eclipse.pde.ua.core
plugin at org.eclipse.pde.ua.ui=v20090511,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ua/org.eclipse.pde.ua.ui
-feature at org.eclipse.rcp=R35x_v20090811,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.rcp
+feature at org.eclipse.rcp=R35x_v20100119,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.rcp
feature at org.eclipse.rcp.sdk=v20080507,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.rcp.sdk
-plugin at org.eclipse.rcp=v20090528,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/plugins/org.eclipse.rcp
+plugin at org.eclipse.rcp=R35x_v20100119,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/plugins/org.eclipse.rcp
!**************** RELENG CONTRIBUTION ********************************************************
feature at master=v20090425,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/master
feature at master-equinox=v20090413,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/master-equinox
@@ -475,7 +469,7 @@ feature at master-root=v20081208,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclips
feature at org.eclipse.releng.tools=v20090520,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.releng.tools
plugin at org.eclipse.releng.tools=R35x_v20090812,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.releng.tests=R35x_v20090831,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.releng.tests=R35x_v20100208,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.pde.tools.versioning=r20080922,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk.tests-feature/plugins/org.eclipse.pde.tools.versioning
@@ -484,27 +478,27 @@ feature at org.eclipse.jdt.test.feature.sample=HEAD,:pserver:anonymous at dev.eclipse.
!*************** SWT CONTRIBUTION ********************************************************
!*** SWT Plugin
-plugin at org.eclipse.swt=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt=v3557f,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
!*** SWT Platform Fragments
-fragment at org.eclipse.swt.carbon.macosx=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.cocoa.macosx=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.cocoa.macosx.x86_64=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.gtk.linux.ppc=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.gtk.linux.x86=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.gtk.linux.x86_64=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.gtk.solaris.sparc=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.gtk.solaris.x86=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.motif.aix.ppc=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.motif.hpux.ia64_32=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.motif.linux.x86=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.motif.solaris.sparc=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.photon.qnx.x86=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.win32.wce_ppc.arm=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.win32.win32.x86=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.wpf.win32.x86=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.win32.win32.x86_64=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.win32.win32.ia64=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.carbon.macosx=v3557f,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.cocoa.macosx=v3557f,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.cocoa.macosx.x86_64=v3557f,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.gtk.linux.ppc=v3557f,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.gtk.linux.x86=v3557f,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.gtk.linux.x86_64=v3557f,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.gtk.solaris.sparc=v3557f,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.gtk.solaris.x86=v3557f,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.motif.aix.ppc=v3557f,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.motif.hpux.ia64_32=v3557f,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.motif.linux.x86=v3557f,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.motif.solaris.sparc=v3557f,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.photon.qnx.x86=v3557f,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.win32.wce_ppc.arm=v3557f,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.win32.win32.x86=v3557f,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.wpf.win32.x86=v3557f,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.win32.win32.x86_64=v3557f,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.win32.win32.ia64=v3557f,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
fragment at org.eclipse.swt.gtk.linux.s390=v3550b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
fragment at org.eclipse.swt.gtk.linux.s390x=v3550b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
@@ -513,26 +507,26 @@ fragment at org.eclipse.swt.gtk.linux.ia64=R3_5,:pserver:anonymous at dev.eclipse.org:
fragment at org.eclipse.swt.motif.hpux.PA_RISC=R3_5,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
!*** SWT Examples
-plugin at org.eclipse.swt.examples=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.swt.examples.browser=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.swt.examples.browser.demos=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.swt.examples.controls=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.swt.examples.launcher=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.swt.examples.layouts=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.swt.examples.ole.win32=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.swt.examples.paint=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.examples=v3557f,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.examples.browser=v3557f,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.examples.browser.demos=v3557f,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.examples.controls=v3557f,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.examples.launcher=v3557f,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.examples.layouts=v3557f,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.examples.ole.win32=v3557f,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.examples.paint=v3557f,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
!*** SWT Tests and Tools
-plugin at org.eclipse.swt.tests=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.swt.tools=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.tests=v3557f,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.tools=v3557f,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
!*************** TEAM CONTRIBUTION ********************************************************
-plugin at org.eclipse.team.core=I20090527-0620,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.team.core=r35x_20100113-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.team.cvs.core=I20090430-0408,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.team.cvs.ssh=I20090508-2000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.team.cvs.ssh2=I20090508-2000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.team.ui=I20090430-0408,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.team.cvs.ui=R35x_v20090826-0905,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.team.cvs.ui=r35x_20090930-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.core.net=r35x_20090812-1200,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.ui.net=r35x_20090812-1200,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
@@ -563,8 +557,8 @@ plugin at org.eclipse.test.dispatcher=HEAD,:pserver:anonymous at dev.eclipse.org:/cvsr
!*************** TEXT CONTRIBUTION ********************************************************
plugin at org.eclipse.text=v20090513-2000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jface.text=r351_v20090708-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.workbench.texteditor=v20090603,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jface.text=r352_v20091118-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.workbench.texteditor=r352_v20100105,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.ui.editors=v20090527-2000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.core.filebuffers=v20090526-2000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
@@ -579,18 +573,18 @@ plugin at org.eclipse.jdt.text.tests=v20090526-2000,:pserver:anonymous at dev.eclipse.
!*************** UI CONTRIBUTION *********************************************************
plugin at org.eclipse.core.commands=I20090525-2000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jface=M20090826-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jface=M20100120-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.core.databinding=M20090819-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.core.databinding.observable=M20090902-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.core.databinding.property=M20090819-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.core.databinding.beans=I20090525-2000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.jface.databinding=M20090826-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui=M20090902-1000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.ide=M20090826-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui=M20100120-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.ide=M20100113-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.ui.ide.application=M20090826-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.presentations.r21=I20081007-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.presentations.r21=M20091015-0930,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.ui.views=M20090826-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.workbench=M20090826-0800a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.workbench=M20100113-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
fragment at org.eclipse.ui.workbench.compatibility=I20090429-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
fragment at org.eclipse.ui.win32=v20090429-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
fragment at org.eclipse.ui.carbon=I20090525-2000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
@@ -599,23 +593,23 @@ fragment at org.eclipse.ui.cocoa=I20090525-2000,:pserver:anonymous at dev.eclipse.org:
plugin at org.eclipse.jface.examples.databinding=M20090826-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.ui.examples.multipageeditor=I20070605-0010,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.examples.propertysheet=I20070319-0010,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.examples.propertysheet=M20100210-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.ui.examples.readmetool=I20090526-2000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.ui.examples.undo=I20080204-0800a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.ui.examples.views.properties.tabbed.article=I20060605-1400,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.article
plugin at org.eclipse.ui.examples.fieldassist=I20090526-2000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.ui.examples.contributions=I20090526-2000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.navigator=M20090911-1550,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.navigator=M20100120-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.ui.navigator.resources=M20090826-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.ui.views.properties.tabbed=I20090429-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.jface.tests.databinding=M20090909-1039,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.jface.tests.databinding.conformance=M20090819-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.tests=M20090812-0800a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.tests=M20100107-0100,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.ui.tests.rcp=I20090525-2000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.tests.navigator=M20090902-1000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.tests.navigator=M20100120-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.ui.tests.views.properties.tabbed=I20090525-2000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.ui.tests.performance=I20090527-2000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.ui.tests.harness=I20090525-2000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
@@ -637,17 +631,17 @@ plugin at org.eclipse.help=v20090805_35x,:pserver:anonymous at dev.eclipse.org:/cvsroo
plugin at org.eclipse.help.appserver=v20090429_1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.help.base=v20090526,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.help.ui=v20090819_35x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.help.webapp=v20090819_35x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.help.webapp=v20091009_35x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
!**** Welcome
-plugin at org.eclipse.ui.intro=v20090805_35x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.intro=v20100111_35x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.ui.intro.universal=v20090526,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
!**** Cheat sheets
plugin at org.eclipse.ui.cheatsheets=v20090526,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
!**** Browser
-plugin at org.eclipse.ui.browser=v20090526,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.browser=v20091215_35x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
!**** Forms
plugin at org.eclipse.ui.forms=v20090714_35x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
diff --git a/eclipse/featureVersions.properties b/eclipse/featureVersions.properties
index 04d39ab..70c431c 100644
--- a/eclipse/featureVersions.properties
+++ b/eclipse/featureVersions.properties
@@ -1,30 +1,30 @@
-#Fri Oct 02 11:19:22 EDT 2009
-org.eclipse.equinox.compendium.sdk,0.0.0=R35x_v20090811
+#Thu Feb 11 11:58:28 EST 2010
+org.eclipse.equinox.compendium.sdk,0.0.0=R35x_v20100105
org.eclipse.equinox.p2.director.feature,0.0.0=R35x_v20090811
-org.eclipse.platform,0.0.0=R35x_v20090910
+org.eclipse.platform,0.0.0=R35x_v20100210-0800
master-equinox,0.0.0=v20090413
-org.eclipse.rcp,0.0.0=R35x_v20090811
+org.eclipse.rcp,0.0.0=R35x_v20100119
org.eclipse.equinox.p2.sdk,0.0.0=R35x_v20090811
com.ibm.icu.base,0.0.0=v20090119
master,0.0.0=v20090425
-org.eclipse.cvs,0.0.0=R35x_v20090811
+org.eclipse.cvs,0.0.0=R35x_v20100125
org.eclipse.releng.tools,0.0.0=v20090520
-org.eclipse.equinox.core.sdk,0.0.0=R35x_v20090811
-org.eclipse.equinox.p2.user.ui,0.0.0=R35x_v20090811
-org.eclipse.sdk,0.0.0=R35x_v20090811
+org.eclipse.equinox.core.sdk,0.0.0=R35x_v20100105
+org.eclipse.equinox.p2.user.ui,0.0.0=R35x_v20091106
+org.eclipse.sdk,0.0.0=R35x_v20100119
master-jetty,0.0.0=v20090305
org.eclipse.equinox.p2.agent.feature,0.0.0=R35x_v20090811
-org.eclipse.jdt,0.0.0=r351_v20090810-0600
+org.eclipse.jdt,0.0.0=r352_v20100108
org.eclipse.equinox.jmx.server.feature,0.0.0=v20081124
org.eclipse.equinox.p2.generator.feature,0.0.0=R35x_v20090811
master-ecf,0.0.0=v20090316
org.eclipse.equinox.jmx.client.feature,0.0.0=v20081124
org.eclipse.sdk.examples,0.0.0=v20080717
org.eclipse.equinox.jmx.common.feature,0.0.0=v20070507
-org.eclipse.equinox.sdk,0.0.0=r351_v20090901
+org.eclipse.equinox.sdk,0.0.0=r352_v20100209
org.eclipse.pde.api.tools.ee.fragments,0.0.0=v20090512
-org.eclipse.pde,0.0.0=R35x_v20090811
+org.eclipse.pde,0.0.0=R35x_v20100119
org.eclipse.equinox.serverside.sdk,0.0.0=v20090505
-org.eclipse.equinox.executable,0.0.0=R35x_v20090724
-org.eclipse.help,0.0.0=R35x_v20090811
+org.eclipse.equinox.executable,0.0.0=R35x_v20091211
+org.eclipse.help,0.0.0=R35x_v20100119
master-equinox-p2,0.0.0=v20080506
diff --git a/eclipse/features/org.eclipse.equinox.compendium.sdk/feature.xml b/eclipse/features/org.eclipse.equinox.compendium.sdk/feature.xml
index 9014f78..8089b54 100644
--- a/eclipse/features/org.eclipse.equinox.compendium.sdk/feature.xml
+++ b/eclipse/features/org.eclipse.equinox.compendium.sdk/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.equinox.compendium.sdk"
label="%featureName"
- version="3.5.1.qualifier"
+ version="3.5.2.qualifier"
provider-name="%providerName">
<description>
@@ -16,7 +16,7 @@
<license url="%licenseURL">
%license
</license>
-
+
<plugin
id="org.eclipse.equinox.app"
download-size="0"
diff --git a/eclipse/features/org.eclipse.equinox.core.sdk/feature.xml b/eclipse/features/org.eclipse.equinox.core.sdk/feature.xml
index 446b6ef..1695458 100644
--- a/eclipse/features/org.eclipse.equinox.core.sdk/feature.xml
+++ b/eclipse/features/org.eclipse.equinox.core.sdk/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.equinox.core.sdk"
label="%featureName"
- version="3.5.1.qualifier"
+ version="3.5.2.qualifier"
provider-name="%providerName">
<description>
diff --git a/eclipse/features/org.eclipse.equinox.executable/feature.xml b/eclipse/features/org.eclipse.equinox.executable/feature.xml
index 0170b58..631a1b5 100644
--- a/eclipse/features/org.eclipse.equinox.executable/feature.xml
+++ b/eclipse/features/org.eclipse.equinox.executable/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.equinox.executable"
label="%featureName"
- version="3.3.200.qualifier">
+ version="3.3.201.qualifier">
<description>
%description
@@ -218,5 +218,4 @@
version="0.0.0"
fragment="true"/>
-
</feature>
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/eclipse.c b/eclipse/features/org.eclipse.equinox.executable/library/eclipse.c
index 5710aac..633dfef 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/eclipse.c
+++ b/eclipse/features/org.eclipse.equinox.executable/library/eclipse.c
@@ -255,6 +255,9 @@ static _TCHAR * startupArg = NULL; /* path of the startup.jar the user want
static _TCHAR* vmName = NULL; /* Java VM that the user wants to run */
static _TCHAR* name = NULL; /* program name */
static _TCHAR* library = NULL; /* the shared library */
+#ifdef AIX
+ _TCHAR* eclipseLibrary = NULL; /* global, eclipse shared library, same as library */
+#endif
static _TCHAR* permGen = NULL; /* perm gen size for sun */
/* variables for ee options */
@@ -329,6 +332,7 @@ static _TCHAR* getDefaultOfficialName();
static _TCHAR* findStartupJar();
static _TCHAR* findSplash(_TCHAR* splashArg);
static _TCHAR** getRelaunchCommand( _TCHAR **vmCommand );
+static const _TCHAR* getVMArch();
#ifdef _WIN32
static void createConsole();
@@ -339,6 +343,9 @@ JNIEXPORT void setInitialArgs(int argc, _TCHAR** argv, _TCHAR* lib) {
initialArgc = argc;
initialArgv = argv;
library = lib;
+#ifdef AIX
+ eclipseLibrary = lib;
+#endif
}
/* this method must match the RunMethod typedef in eclipseMain.c */
@@ -1459,8 +1466,9 @@ _TCHAR ** getVMLibrarySearchPath(_TCHAR * vmLibrary) {
_TCHAR * buffer = NULL;
_TCHAR * path, * entry, *c;
_TCHAR separator;
- int numPaths = 2;
+ int numPaths = 3;
int i;
+ struct _stat stats;
buffer = (eeLibPath != NULL) ? _tcsdup(eeLibPath) : _tcsdup(vmLibrary);
#ifdef WIN32
@@ -1489,7 +1497,7 @@ _TCHAR ** getVMLibrarySearchPath(_TCHAR * vmLibrary) {
/* We are either splitting eeLibPath (eg path1:path2), or we are extracting
* from libPath where we want the directory containing the library and the
- * parent directory of that */
+ * parent directory of that, and also grandparent/lib/arch */
for (i = 0; i < numPaths; i++) {
c = _tcsrchr(buffer, separator);
if (c != 0) {
@@ -1509,8 +1517,23 @@ _TCHAR ** getVMLibrarySearchPath(_TCHAR * vmLibrary) {
}
if (path != NULL) {
entry = resolveSymlinks(path); /* this may be a new string */
- paths[i] = malloc((_tcslen(entry) + 2) * sizeof(_TCHAR));
- _stprintf( paths[i], _T_ECLIPSE("%s%c"), entry, pathSeparator );
+ if (eeLibPath == NULL && i == 2) {
+ /* trying grandparent/lib/arch */
+ const _TCHAR * arch = getVMArch();
+ paths[i] = malloc((_tcslen(entry) + 7 + _tcslen(arch)) * sizeof(_TCHAR));
+ _stprintf(paths[i], _T_ECLIPSE("%s/lib/%s"), entry, arch);
+ /* only add if the path actually exists */
+ if (_tstat(paths[i], &stats) == 0) {
+ _TCHAR separatorString[] = { pathSeparator, 0 };
+ _tcscat(paths[i], separatorString);
+ } else {
+ free(paths[i]);
+ paths[i] = NULL;
+ }
+ } else {
+ paths[i] = malloc((_tcslen(entry) + 2) * sizeof(_TCHAR));
+ _stprintf( paths[i], _T_ECLIPSE("%s%c"), entry, pathSeparator );
+ }
if (entry != path)
free(entry);
path = NULL;
@@ -1520,3 +1543,13 @@ _TCHAR ** getVMLibrarySearchPath(_TCHAR * vmLibrary) {
free(buffer);
return paths;
}
+
+/* translate the osArchArg into the value that we expect the jre to use */
+const _TCHAR* getVMArch() {
+ if (_tcscmp(osArchArg, _T_ECLIPSE("x86_64")) == 0)
+ return _T_ECLIPSE("amd64");
+ else if (_tcscmp(osArchArg, _T_ECLIPSE("x86")) == 0)
+ return _T_ECLIPSE("i386");
+ else
+ return osArchArg;
+}
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/eclipseCommon.h b/eclipse/features/org.eclipse.equinox.executable/library/eclipseCommon.h
index df3aeb1..342a684 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/eclipseCommon.h
+++ b/eclipse/features/org.eclipse.equinox.executable/library/eclipseCommon.h
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
+ * Copyright (c) 2006, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -69,6 +69,10 @@ extern _TCHAR* wsArg;
extern _TCHAR dirSeparator; /* '/' or '\\' */
extern _TCHAR pathSeparator; /* separator used in PATH variable */
+#ifdef AIX
+extern _TCHAR* eclipseLibrary; /* the location of this eclipse_<ver>.so library */
+#endif
+
extern char *toNarrow(const _TCHAR* src);
/*
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/eclipseJNI.c b/eclipse/features/org.eclipse.equinox.executable/library/eclipseJNI.c
index f3c8392..226b5fb 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/eclipseJNI.c
+++ b/eclipse/features/org.eclipse.equinox.executable/library/eclipseJNI.c
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
+ * Copyright (c) 2006, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -38,6 +38,9 @@ static int shouldShutdown(JNIEnv *env);
static void JNI_ReleaseStringChars(JNIEnv *env, jstring s, const _TCHAR* data);
static const _TCHAR* JNI_GetStringChars(JNIEnv *env, jstring str);
static char * getMainClass(JNIEnv *env, _TCHAR * jarFile);
+#ifdef AIX
+static void setLibraryLocation(JNIEnv *env, jobject obj);
+#endif
void setExitData(JNIEnv *env, jstring id, jstring s);
@@ -92,6 +95,10 @@ JNIEXPORT jlong JNICALL get_splash_handle(JNIEnv * env, jobject obj){
}
JNIEXPORT void JNICALL show_splash(JNIEnv * env, jobject obj, jstring s){
+#ifdef AIX
+ setLibraryLocation(env, obj);
+#endif
+
if(showSplashHook != NULL)
showSplashHook(env, s);
else
@@ -106,6 +113,33 @@ JNIEXPORT void JNICALL takedown_splash(JNIEnv * env, jobject obj){
}
#endif
+
+#ifdef AIX
+/*
+ * On AIX we need the location of the eclipse shared library so that we
+ * can find the libeclipse-motif.so library. Reach into the JNIBridge
+ * object to get the "library" field.
+ */
+void setLibraryLocation(JNIEnv * env, jobject obj) {
+ jclass bridge = (*env)->FindClass(env, "org/eclipse/equinox/launcher/JNIBridge");
+ if (bridge != NULL) {
+ jfieldID libraryField = (*env)->GetFieldID(env, bridge, "library", "Ljava/lang/String;");
+ if (libraryField != NULL) {
+ jstring stringObject = (jstring) (*env)->GetObjectField(env, obj, libraryField);
+ if (stringObject != NULL) {
+ const char * str = JNI_GetStringChars(env, stringObject);
+ eclipseLibrary = strdup(str);
+ JNI_ReleaseStringChars(env, stringObject, str);
+ }
+ }
+ }
+ if( (*env)->ExceptionOccurred(env) != 0 ){
+ (*env)->ExceptionDescribe(env);
+ (*env)->ExceptionClear(env);
+ }
+}
+#endif
+
static void registerNatives(JNIEnv *env) {
jclass bridge = (*env)->FindClass(env, "org/eclipse/equinox/launcher/JNIBridge");
if(bridge != NULL) {
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/eclipseMain.c b/eclipse/features/org.eclipse.equinox.executable/library/eclipseMain.c
index f6adfa7..6265ed3 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/eclipseMain.c
+++ b/eclipse/features/org.eclipse.equinox.executable/library/eclipseMain.c
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
+ * Copyright (c) 2006, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -57,6 +57,10 @@ static _TCHAR* checkForIni(int argc, _TCHAR* argv[]);
static int initialArgc;
static _TCHAR** initialArgv;
+#ifdef AIX
+_TCHAR * eclipseLibrary = NULL;
+#endif
+
#if (defined(_WIN32) || defined(VISTA))
#ifdef UNICODE
extern int main(int, char**);
@@ -161,6 +165,9 @@ int main( int argc, _TCHAR* argv[] )
/* Find the eclipse library */
library = findLibrary(library, program);
+#ifdef AIX
+ eclipseLibrary = library;
+#endif
if(library != NULL)
handle = loadLibrary(library);
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/make_version.mak b/eclipse/features/org.eclipse.equinox.executable/library/make_version.mak
index 82f9ace..5626cf0 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/make_version.mak
+++ b/eclipse/features/org.eclipse.equinox.executable/library/make_version.mak
@@ -10,5 +10,5 @@
#*******************************************************************************
maj_ver=1
-min_ver=207
+min_ver=208
LIB_VERSION = $(maj_ver)$(min_ver)
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/motif/eclipseMotif.h b/eclipse/features/org.eclipse.equinox.executable/library/motif/eclipseMotif.h
index 92fa13d..26b807b 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/motif/eclipseMotif.h
+++ b/eclipse/features/org.eclipse.equinox.executable/library/motif/eclipseMotif.h
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2007, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -45,6 +45,9 @@ struct MOTIF_PTRS {
Boolean (*XtDispatchEvent) (XEvent*);
void (*XtGetValues) (Widget, ArgList, Cardinal);
Widget (*XtInitialize) (String, String, XrmOptionDescRec*, Cardinal, int*, char**);
+#ifdef AIX
+ Widget (*eclipseXtInitialize) (String, String, XrmOptionDescRec*, Cardinal, int*, char**);
+#endif
Boolean (*XtIsManaged) (Widget);
void (*XtManageChild) (Widget);
int (*XtMapWidget) (Widget);
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/motif/eclipseMotifCommon.c b/eclipse/features/org.eclipse.equinox.executable/library/motif/eclipseMotifCommon.c
index 041450d..93f21cb 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/motif/eclipseMotifCommon.c
+++ b/eclipse/features/org.eclipse.equinox.executable/library/motif/eclipseMotifCommon.c
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
+ * Copyright (c) 2006, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -50,6 +50,7 @@ void displayMessage( char* title, char* message )
if ( displayName == NULL || strlen(displayName) == 0 ||
(topWindow == 0 && initWindowSystem( &saveArgc, saveArgv, 1 ) != 0) )
{
+ printf("%s:\n%s\n", title, message);
return;
}
msg = motif.XmStringGenerate( message, NULL, XmCHARSET_TEXT, NULL );
@@ -107,7 +108,7 @@ int initWindowSystem( int* pArgc, char* argv[], int showSplash )
to initialize the application.
*/
#ifdef AIX
- topWindow = XtInitialize(NULL, officialName, NULL, 0, pArgc, argv);
+ topWindow = motif.eclipseXtInitialize(NULL, officialName, NULL, 0, pArgc, argv);
#else
topWindow = motif.XtInitialize(NULL, officialName, NULL, 0, pArgc, argv);
#endif
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/motif/eclipseMotifInit.c b/eclipse/features/org.eclipse.equinox.executable/library/motif/eclipseMotifInit.c
index 7943422..84e7295 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/motif/eclipseMotifInit.c
+++ b/eclipse/features/org.eclipse.equinox.executable/library/motif/eclipseMotifInit.c
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2007, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -62,6 +62,10 @@ static FN_TABLE xtFunctions[] = { FN_TABLE_ENTRY(XtAddCallback),
{ NULL, NULL }
};
+#ifdef AIX
+static FN_TABLE shimFunctions[] = { FN_TABLE_ENTRY(eclipseXtInitialize), {NULL, NULL} };
+#endif
+
/* functions from libX11 */
static FN_TABLE x11Functions[] = { FN_TABLE_ENTRY(XDefaultScreenOfDisplay),
FN_TABLE_ENTRY(XFree),
@@ -93,8 +97,31 @@ static int loadMotifSymbols( void * library, FN_TABLE * table) {
return 0;
}
+#ifdef AIX
+void * loadMotifShimLibrary() {
+ if (eclipseLibrary != NULL) {
+ /* library is the normal eclipse_<ver>.so, look for libeclipse-motif.so beside it */
+ _TCHAR* eclipseMotifLib = _T_ECLIPSE("libeclipse-motif.so");
+ _TCHAR* path = strdup(eclipseLibrary);
+ _TCHAR* c = strrchr(path, '/');
+ if (c == NULL)
+ return NULL;
+
+ *c = 0;
+ c = malloc((strlen(path) + 2 + strlen(eclipseMotifLib)) * sizeof(char));
+ _stprintf(c, _T_ECLIPSE("%s/%s"), path, eclipseMotifLib);
+
+ return dlopen(c, RTLD_LAZY);
+ }
+ return 0;
+}
+#endif
+
int loadMotif() {
void * xmLib = NULL, *xtLib = NULL, *x11Lib = NULL, *xinLib = NULL;
+#ifdef AIX
+ void * motifShim = NULL;
+#endif
char * path = getProgramDir();
int dlFlags = RTLD_LAZY;
@@ -111,7 +138,10 @@ int loadMotif() {
}
#else
dlFlags |= RTLD_MEMBER;
-#endif
+ motifShim = loadMotifShimLibrary();
+ if (motifShim == NULL)
+ return -1;
+#endif
if (xmLib == NULL) {
xmLib = dlopen(XM_LIB, dlFlags);
@@ -139,6 +169,9 @@ int loadMotif() {
if (loadMotifSymbols(xmLib, xmFunctions) != 0) return -1;
if (loadMotifSymbols(xtLib, xtFunctions) != 0) return -1;
if (loadMotifSymbols(x11Lib, x11Functions) != 0) return -1;
+#ifdef AIX
+ if (loadMotifSymbols(motifShim, shimFunctions) !=0) return -1;
+#endif
return 0;
}
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/motif/eclipseMotifShim.c b/eclipse/features/org.eclipse.equinox.executable/library/motif/eclipseMotifShim.c
new file mode 100644
index 0000000..2648ec6
--- /dev/null
+++ b/eclipse/features/org.eclipse.equinox.executable/library/motif/eclipseMotifShim.c
@@ -0,0 +1,17 @@
+/*******************************************************************************
+ * Copyright (c) 2009 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+#include <X11/X.h>
+#include <X11/Xlib.h>
+#include <Xm/XmAll.h>
+
+Widget eclipseXtInitialize(String shellName, String appClass, XrmOptionDescRec* options, Cardinal numOptions, int* argc, char** argv) {
+ return XtInitialize(shellName, appClass, options, numOptions, argc, argv);
+}
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/motif/make_aix.mak b/eclipse/features/org.eclipse.equinox.executable/library/motif/make_aix.mak
index 567c4d2..bb36612 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/motif/make_aix.mak
+++ b/eclipse/features/org.eclipse.equinox.executable/library/motif/make_aix.mak
@@ -1,5 +1,5 @@
#*******************************************************************************
-# Copyright (c) 2000, 2005 IBM Corporation and others.
+# Copyright (c) 2000, 2009 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -25,17 +25,20 @@ include ../make_version.mak
PROGRAM_OUTPUT=eclipse
PROGRAM_LIBRARY=eclipse_$(LIB_VERSION).so
+SHIM=libeclipse-motif.so
CC = gcc
# Define the object modules to be compiled and flags.
MAIN_OBJS = eclipseMain.o
+SHIM_OBJS = eclipseMotifShim.o
COMMON_OBJS = eclipseConfig.o eclipseCommon.o eclipseMotifCommon.o eclipseMotifInit.o
DLL_OBJS = eclipse.o eclipseMotif.o eclipseUtil.o eclipseJNI.o eclipseShm.o eclipseNix.o\
NgCommon.o NgImage.o NgImageData.o NgWinBMPFileFormat.o
EXEC = $(PROGRAM_OUTPUT)
DLL = $(PROGRAM_LIBRARY)
-LIBS = -L$(MOTIF_HOME)/lib -ldl -lXm -lXt -lX11
+LIBS = -L$(MOTIF_HOME)/lib -ldl
+SHIM_LIBS = -L$(MOTIF_HOME)/lib -lXm -lXt -lX11
MOTIF_LIBS = -DXM_LIB="\"libXm.a(shr_32.o)\"" -DXT_LIB="\"libXt.a(shr4.o)\"" -DX11_LIB="\"libX11.a(shr4.o)\""
LFLAGS = -G -bnoentry -bexpall -lm -lc_r -lC_r
CFLAGS = -O -s \
@@ -51,7 +54,7 @@ CFLAGS = -O -s \
-I$(MOTIF_HOME)/include \
-I/usr/java5/include
-all: $(EXEC) $(DLL)
+all: $(EXEC) $(DLL) $(SHIM)
.c.o:
$(CC) $(CFLAGS) -c $< -o $@
@@ -81,16 +84,21 @@ eclipseNix.o: ../eclipseNix.c
$(CC) $(CFLAGS) -c $< -o $@
$(EXEC): $(MAIN_OBJS) $(COMMON_OBJS)
- $(CC) -o $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS)
+ $(CC) -Wl,-bM:UR -o $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS)
+ sedmgr -c exempt $(EXEC)
$(DLL): $(DLL_OBJS) $(COMMON_OBJS)
ld $(LFLAGS) -o $(DLL) $(DLL_OBJS) $(COMMON_OBJS) $(LIBS)
-
+
+$(SHIM): $(SHIM_OBJS)
+ ld $(LFLAGS) -o $(SHIM) $(SHIM_OBJS) $(SHIM_LIBS)
+
install: all
cp $(EXEC) $(OUTPUT_DIR)
+ cp $(SHIM) $(LIBRARY_DIR)
cp $(DLL) $(LIBRARY_DIR)
rm -f $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(DLL_OBJS)
clean:
- rm -f $(EXEC) $(DLL) $(MAIN_OBJS) $(COMMON_OBJS) $(DLL_OBJS)
+ rm -f $(EXEC) $(DLL) $(SHIM) $(SHIM_OBJS) $(MAIN_OBJS) $(COMMON_OBJS) $(DLL_OBJS)
diff --git a/eclipse/features/org.eclipse.equinox.p2.user.ui/feature.xml b/eclipse/features/org.eclipse.equinox.p2.user.ui/feature.xml
index 8a34d35..7d2847f 100644
--- a/eclipse/features/org.eclipse.equinox.p2.user.ui/feature.xml
+++ b/eclipse/features/org.eclipse.equinox.p2.user.ui/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.equinox.p2.user.ui"
label="%featureName"
- version="1.1.1.qualifier"
+ version="1.1.2.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg">
diff --git a/eclipse/features/org.eclipse.equinox.sdk/feature.xml b/eclipse/features/org.eclipse.equinox.sdk/feature.xml
index 86ce336..7bc0829 100644
--- a/eclipse/features/org.eclipse.equinox.sdk/feature.xml
+++ b/eclipse/features/org.eclipse.equinox.sdk/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.equinox.sdk"
label="%featureName"
- version="3.5.1.qualifier"
+ version="3.5.2.qualifier"
provider-name="%providerName">
<description>
diff --git a/eclipse/features/org.eclipse.help/feature.xml b/eclipse/features/org.eclipse.help/feature.xml
index 6b0d872..b3a84a9 100644
--- a/eclipse/features/org.eclipse.help/feature.xml
+++ b/eclipse/features/org.eclipse.help/feature.xml
@@ -2,10 +2,10 @@
<feature
id="org.eclipse.help"
label="%featureName"
- version="1.1.1.qualifier"
+ version="1.1.2.qualifier"
provider-name="%providerName"
- plugin="org.eclipse.help.base">
-
+ plugin="org.eclipse.help.base">
+
<description>
%description
</description>
@@ -18,7 +18,6 @@
%license
</license>
-
<plugin
id="javax.servlet"
download-size="0"
@@ -32,7 +31,7 @@
install-size="0"
version="0.0.0"
unpack="false"/>
-
+
<plugin
id="org.apache.commons.el"
download-size="0"
@@ -123,19 +122,19 @@
install-size="0"
version="0.0.0"
unpack="false"/>
-
+
<plugin
id="org.mortbay.jetty.server"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
-
+
<plugin
id="org.mortbay.jetty.util"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
-
+
</feature>
diff --git a/eclipse/features/org.eclipse.jdt/feature.properties b/eclipse/features/org.eclipse.jdt/feature.properties
index 903b284..cd0917b 100644
--- a/eclipse/features/org.eclipse.jdt/feature.properties
+++ b/eclipse/features/org.eclipse.jdt/feature.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2000, 2009 IBM Corporation and others.
+# Copyright (c) 2000, 2010 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -28,7 +28,7 @@ description=Eclipse Java development tools. (Binary runtime and user documentati
# "copyright" property - text of the "Feature Update Copyright"
copyright=\
-Copyright (c) 2000, 2009 IBM Corporation and others.\n\
+Copyright (c) 2000, 2010 IBM Corporation and others.\n\
All rights reserved. This program and the accompanying materials\n\
are made available under the terms of the Eclipse Public License v1.0\n\
which accompanies this distribution, and is available at\n\
diff --git a/eclipse/features/org.eclipse.jdt/feature.xml b/eclipse/features/org.eclipse.jdt/feature.xml
index e9b9a48..4f2e0cb 100644
--- a/eclipse/features/org.eclipse.jdt/feature.xml
+++ b/eclipse/features/org.eclipse.jdt/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jdt"
label="%featureName"
- version="3.5.1.qualifier"
+ version="3.5.2.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg">
@@ -24,7 +24,7 @@
</url>
<requires>
- <import feature="org.eclipse.platform" version="3.5.0" match="compatible"/>
+ <import feature="org.eclipse.platform" version="3.5.1" match="compatible"/>
</requires>
<plugin
diff --git a/eclipse/features/org.eclipse.jdt/sourceTemplateFeature/feature.properties b/eclipse/features/org.eclipse.jdt/sourceTemplateFeature/feature.properties
index 7052e65..cad37a3 100644
--- a/eclipse/features/org.eclipse.jdt/sourceTemplateFeature/feature.properties
+++ b/eclipse/features/org.eclipse.jdt/sourceTemplateFeature/feature.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2000, 2007 IBM Corporation and others.
+# Copyright (c) 2000, 2010 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -28,7 +28,7 @@ description=API documentation and source code zips for Eclipse Java development
# "copyright" property - text of the "Feature Update Copyright"
copyright=\
-Copyright (c) 2000, 2009 IBM Corporation and others.\n\
+Copyright (c) 2000, 2010 IBM Corporation and others.\n\
All rights reserved. This program and the accompanying materials\n\
are made available under the terms of the Eclipse Public License v1.0\n\
which accompanies this distribution, and is available at\n\
diff --git a/eclipse/features/org.eclipse.pde/feature.xml b/eclipse/features/org.eclipse.pde/feature.xml
index 26e6650..670cc5b 100644
--- a/eclipse/features/org.eclipse.pde/feature.xml
+++ b/eclipse/features/org.eclipse.pde/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.pde"
label="%featureName"
- version="3.5.1.qualifier"
+ version="3.5.2.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg">
diff --git a/eclipse/features/org.eclipse.platform/about_files/linux.gtk.ppc/about.html b/eclipse/features/org.eclipse.platform/about_files/linux.gtk.ppc/about.html
index e102e6c..57d0b3c 100644
--- a/eclipse/features/org.eclipse.platform/about_files/linux.gtk.ppc/about.html
+++ b/eclipse/features/org.eclipse.platform/about_files/linux.gtk.ppc/about.html
@@ -107,7 +107,7 @@ conditions of the Mozilla Public License Version 1.1 ("MPL"). A copy
<h4>XULRunner 1.9 (subset, derivative work)</h4>
-The library swt-xulrunner-gtk-xxxx.dll (where "xxxx" is the version number) contains a small portion of XULRunner 1.9 content (header files) that have
+The library libswt-xulrunner-gtk-xxxx.so (where "xxxx" is the version number) contains a small portion of XULRunner 1.9 content (header files) that have
been modified from the Original Code provided by mozilla.org, and whose Initial Developer is Netscape Communications Corporation. Use of this code is governed by
the terms and conditions of the Mozilla Public License Version 1.1 ("MPL"). A copy of the MPL is provided with the Content (<a href="./about_files/mpl-v11.txt">mpl-v11.txt</a>)
and is also available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>.
diff --git a/eclipse/features/org.eclipse.platform/about_files/linux.gtk.x86/about.html b/eclipse/features/org.eclipse.platform/about_files/linux.gtk.x86/about.html
index ea2d22d..eab9b35 100644
--- a/eclipse/features/org.eclipse.platform/about_files/linux.gtk.x86/about.html
+++ b/eclipse/features/org.eclipse.platform/about_files/linux.gtk.x86/about.html
@@ -108,7 +108,7 @@ conditions of the Mozilla Public License Version 1.1 ("MPL"). A copy
<h4>XULRunner 1.9 (subset, derivative work)</h4>
-The libraries swt-xulrunner-gtk-xxxx.dll, swt-mozilla-gtk-xxxx.dll, and swt-mozilla-gcc3-gtk-xxxx.dll (where "xxxx" is the version number) contain a small portion of XULRunner 1.9 content (header files)
+The libraries libswt-xulrunner-gtk-xxxx.so, libswt-mozilla-gtk-xxxx.so, and libswt-mozilla-gcc3-gtk-xxxx.so (where "xxxx" is the version number) contain a small portion of XULRunner 1.9 content (header files)
that have been modified from the Original Code provided by mozilla.org, and whose Initial Developer is Netscape Communications Corporation. Use of this code is governed by
the terms and conditions of the Mozilla Public License Version 1.1 ("MPL"). A copy of the MPL is provided with the Content (<a href="./about_files/mpl-v11.txt">mpl-v11.txt</a>)
and is also available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>.
diff --git a/eclipse/features/org.eclipse.platform/about_files/linux.gtk.x86_64/about.html b/eclipse/features/org.eclipse.platform/about_files/linux.gtk.x86_64/about.html
index ea2d22d..eab9b35 100644
--- a/eclipse/features/org.eclipse.platform/about_files/linux.gtk.x86_64/about.html
+++ b/eclipse/features/org.eclipse.platform/about_files/linux.gtk.x86_64/about.html
@@ -108,7 +108,7 @@ conditions of the Mozilla Public License Version 1.1 ("MPL"). A copy
<h4>XULRunner 1.9 (subset, derivative work)</h4>
-The libraries swt-xulrunner-gtk-xxxx.dll, swt-mozilla-gtk-xxxx.dll, and swt-mozilla-gcc3-gtk-xxxx.dll (where "xxxx" is the version number) contain a small portion of XULRunner 1.9 content (header files)
+The libraries libswt-xulrunner-gtk-xxxx.so, libswt-mozilla-gtk-xxxx.so, and libswt-mozilla-gcc3-gtk-xxxx.so (where "xxxx" is the version number) contain a small portion of XULRunner 1.9 content (header files)
that have been modified from the Original Code provided by mozilla.org, and whose Initial Developer is Netscape Communications Corporation. Use of this code is governed by
the terms and conditions of the Mozilla Public License Version 1.1 ("MPL"). A copy of the MPL is provided with the Content (<a href="./about_files/mpl-v11.txt">mpl-v11.txt</a>)
and is also available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>.
diff --git a/eclipse/features/org.eclipse.platform/about_files/linux.motif.x86/about.html b/eclipse/features/org.eclipse.platform/about_files/linux.motif.x86/about.html
index c8a0c68..c06208a 100644
--- a/eclipse/features/org.eclipse.platform/about_files/linux.motif.x86/about.html
+++ b/eclipse/features/org.eclipse.platform/about_files/linux.motif.x86/about.html
@@ -106,7 +106,7 @@ conditions of the Mozilla Public License Version 1.1 ("MPL"). A copy
<h4>XULRunner 1.9 (subset, derivative work)</h4>
-The libraries swt-xulrunner-motif-xxxx.dll, swt-mozilla-motif-xxxx.dll, and swt-mozilla-gcc3-motif-xxxx.dll (where "xxxx" is the version number) contain a small portion of XULRunner 1.9 content (header files)
+The libraries libswt-xulrunner-motif-xxxx.so, libswt-mozilla-motif-xxxx.so, and libswt-mozilla-gcc3-motif-xxxx.so (where "xxxx" is the version number) contain a small portion of XULRunner 1.9 content (header files)
that have been modified from the Original Code provided by mozilla.org, and whose Initial Developer is Netscape Communications Corporation. Use of this code is governed by
the terms and conditions of the Mozilla Public License Version 1.1 ("MPL"). A copy of the MPL is provided with the Content (<a href="./about_files/mpl-v11.txt">mpl-v11.txt</a>)
and is also available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>.
diff --git a/eclipse/features/org.eclipse.platform/feature.properties b/eclipse/features/org.eclipse.platform/feature.properties
index 6ebb300..2710a62 100644
--- a/eclipse/features/org.eclipse.platform/feature.properties
+++ b/eclipse/features/org.eclipse.platform/feature.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
+# Copyright (c) 2000, 2010 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -32,7 +32,7 @@ description=Common OS-independent base of the Eclipse platform. (Binary runtime
# "copyright" property - text of the "Feature Update Copyright"
copyright=\
-Copyright (c) 2000, 2009 IBM Corporation and others.\n\
+Copyright (c) 2000, 2010 IBM Corporation and others.\n\
All rights reserved. This program and the accompanying materials\n\
are made available under the terms of the Eclipse Public License v1.0\n\
which accompanies this distribution, and is available at\n\
diff --git a/eclipse/features/org.eclipse.platform/feature.xml b/eclipse/features/org.eclipse.platform/feature.xml
index 50e15b3..a85e2dd 100644
--- a/eclipse/features/org.eclipse.platform/feature.xml
+++ b/eclipse/features/org.eclipse.platform/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.platform"
label="%featureName"
- version="3.5.1.qualifier"
+ version="3.5.2.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg">
@@ -411,6 +411,16 @@
version="0.0.0"
fragment="true"/>
+ <plugin
+ id="org.eclipse.core.filesystem.aix.ppc"
+ os="aix"
+ arch="ppc"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ fragment="true"
+ unpack="false"/>
+
<plugin
id="org.eclipse.core.filesystem.hpux.ia64_32"
os="hpux"
@@ -419,8 +429,8 @@
install-size="0"
version="0.0.0"
fragment="true"
- unpack="false"/>
-
+ unpack="false"/>
+
<plugin
id="org.eclipse.core.filesystem.hpux.PA_RISC"
os="hpux"
diff --git a/eclipse/features/org.eclipse.platform/rootfiles/readme/readme_eclipse.html b/eclipse/features/org.eclipse.platform/rootfiles/readme/readme_eclipse.html
index ecfa6f1..74def42 100644
--- a/eclipse/features/org.eclipse.platform/rootfiles/readme/readme_eclipse.html
+++ b/eclipse/features/org.eclipse.platform/rootfiles/readme/readme_eclipse.html
@@ -2,13 +2,13 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>Eclipse Project Release Notes 3.5.1</title>
+<title>Eclipse Project Release Notes 3.5.2</title>
</head>
<body>
<h1>Eclipse Project Release Notes</h1>
-<p>Release 3.5.1<br>
- Last revised September 8, 2009</p>
+<p>Release 3.5.2<br>
+ Last revised February 10, 2010</p>
<p align="left"><strong>This software is OSI Certified Open Source Software.<br>
OSI Certified is a certification mark of the Open Source Initiative. </strong></p>
<blockquote>
@@ -710,13 +710,6 @@ be accessed from the local help server.
</ol>
</blockquote>
-<p>If the above steps do not fix your problem, try changing the port and host
-properties on the <b>Help > Help Server</b> preference page. In general,
-setting <code>host</code> to <code>localhost</code> or <code>127.0.0.1</code>
-
-should work. Also, especially when running a firewall, you may want to specify
-port 80 or some other firewall-friendly value. (bugs <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=7036">7036</a>,
-<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=9418">9418</a>, <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=11394">11394</a>)</p>
<h4> Working disconnected from
the network (Windows only)</h4>
If you are experiencing problems when not connected to the network, you must
@@ -737,13 +730,6 @@ to set High Contrast as follows: Right click the desktop, chose properties,
select Windows Classic style from the Windows and buttons drop down on the
Appearance tab, and choose your scheme (for example High Contrast Black) from
Color Scheme drop down. (bug <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=28609">28609</a>)</p>
-<h4>Help browser displays a blank page</h4>
-
-<p>If you see a help launched with a blank page, and no errors displayed, it can
-be caused by a conflict between libraries in org.eclipse.tomcat plug-in and jars
-optionally installed in JRE jre/lib/ext directory. To fix the problem, ensure
-that the JRE used for running Eclipse does not contain any J2EE or Apache jars
-in the jre/lib/ext directory. (bug <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=63970">63970</a>)</p>
<h3>3.2.4 <a name="I-Platform-UI">Platform - UI</a></h3>
<h4>High contrast settings</h4>
@@ -1253,6 +1239,13 @@ some limitations. Java 6 processors are only executed during a build, not while
in the processing API are unimplemented when compiling within the IDE, and will throw
UnsupportedOperationException.
+<h4>Refactoring fails with invalid package name error when jaxb-xjc.jar is on build path</h4>
+This JAR contains some entries that start with "1.0/". This leads to an invalid package name error once
+this JAR has been added to the indexes. The problem is reported in bug
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=293861">293861</a> and it is fixed for 3.6. A patch for the <code>org.eclipse.jdt.core</code>
+bundle will be available on the JDT/Core update page after 3.5.2 is released to fix this issue.
+Check this <a href="http://www.eclipse.org/jdt/core/r3.5/index.php#UPDATES">link</a> for updates on this issue.
+
<h3>3.4 <a name="I-PDE">Plug-in Development Environment (PDE)</a></h3>
<h4>Feature manifest editor does not preserve all comments</h4>
@@ -1288,7 +1281,7 @@ plug-in Ids during binary project import. (bug <a href="https://bugs.eclipse.org
<h4>Export of plug-in may silently drop classes</h4>
<p>When exporting a plug-in using the plug-in, feature or product wizards, some classes
might be dropped from the resulting archive if their fully qualified name is too long.
-This typical path limitation can be worked around by creating the jar of the problematic
+This typical path limitation can be worked around by creating the JAR of the problematic
plug-in by using the Jar export wizard.
(bug <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=97150">97150</a>)</p>
@@ -1550,22 +1543,25 @@ Eclipse 3.5 and earlier 3.x releases:</p>
<h2>7. <a name="DefectsFixed"></a>Defects Fixed in Maintenance Releases</h2>
-<h3>7.1 Defects fixed in release 3.5.1 since 3.5.0</h3>
-<p>Release 3.5.1 is a maintenance release to fix serious defects present in
-release 3.5.0 These changes only affect some plug-ins and
+<h3>7.1 Defects fixed in release 3.5.2 since 3.5.1</h3>
+<p>Release 3.5.2 is a maintenance release to fix serious defects present in
+release 3.5.1 These changes only affect some plug-ins and
features.</p>
-<p>Maintenance release 3.5.1 contains fixes for the following defects and others:</p>
+<p>Maintenance release 3.5.2 contains fixes for the following defects and others:</p>
<p>
<p>
-Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bugzilla query: </p>
+Note: Bug fixes since the 3.5.1 release can be obtained by the following the Bugzilla query: </p>
<p>
-<a href="https://bugs.eclipse.org/bugs/buglist.cgi?bug_file_loc_type=allwordssubstr;bug_status=RESOLVED;bug_status=VERIFIED;bug_status=CLOSED;classification=Eclipse;classification=RT;field-1-0-0=bug_status;field-1-1-0=classification;field-1-2-0=product;field-1-3-0=resolution;field-1-4-0=target_milestone;field0-0-0=noop;keywords_type=allwords;long_desc_type=allwordssubstr;product=Equinox;product=JDT;product=PDE;product=Platform;query_format=advanced;remaction=;resolution=FIXED;short_desc=;short_desc_type=allwordssubstr;status_whiteboard=;status_whiteboard_type=allwordssubstr;target_milestone=3.5.1;type-1-0-0=anyexact;type-1-1-0=anyexact;type-1-2-0=anyexact;type-1-3-0=anyexact;type-1-4-0=anyexact;type0-0-0=noop;value-1-0-0=RESOLVED%2CVERIFIED%2CCLOSED;value-1-1-0=Eclipse%2CRT;value-1-2-0=Equinox%2CJDT%2CPDE%2CPlatform;value-1-3-0=FIXED;value-1-4-0=3.5.1;value0-0-0=|;query_based_on=">Bugs fixed in the 3.5.1 release</a>
+<a href="https://bugs.eclipse.org/bugs/buglist.cgi?bug_file_loc_type=allwordssubstr;bug_status=RESOLVED;bug_status=VERIFIED;bug_status=CLOSED;classification=Eclipse;classification=RT;field-1-0-0=bug_status;field-1-1-0=classification;field-1-2-0=product;field-1-3-0=resolution;field-1-4-0=target_milestone;field0-0-0=noop;keywords_type=allwords;long_desc_type=allwordssubstr;product=Equinox;product=JDT;product=PDE;product=Platform;query_format=advanced;remaction=;resolution=FIXED;short_desc=;short_desc_type=allwordssubstr;status_whiteboard=;status_whiteboard_type=allwordssubstr;target_milestone=3.5.2;type-1-0-0=anyexact;type-1-1-0=anyexact;type-1-2-0=anyexact;type-1-3-0=anyexact;type-1-4-0=anyexact;type0-0-0=noop;value-1-0-0=RESOLVED%2CVERIFIED%2CCLOSED;value-1-1-0=Eclipse%2CRT;value-1-2-0=Equinox%2CJDT%2CPDE%2CPlatform;value-1-3-0=FIXED;value-1-4-0=3.5.2;value0-0-0=|;query_based_on=">Bugs fixed in the 3.5.2 release</a>
</p>
-<p>
+
+ <span class="bz_result_count">149 bugs found.
+ </span>
+
@@ -1582,216 +1578,26 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_buglist_header bz_first_buglist_header" align="left">
<th colspan="1" class="first-child">
- <a href="buglist.cgi?bug_file_loc_type=allwordssubstr&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&classification=Eclipse&classification=RT&columnlist=short_desc&field0-0-0=noop&keywords_type=allwords&long_desc_type=allwordssubstr&product=Equinox&product=JDT&product=PDE&product=Platform&query_format=advanced&remaction=&resolution=FIXED&short_desc=&short_desc_type=allwordssubstr&status_whiteboard=&status_whiteboard_type=allwordssubstr&target_milestone=3.5.1&type0-0-0=noop&value0-0-0=%7C&order=bug_id%20DESC&query_based_on=">ID</a>
+ <a href="buglist.cgi?bug_file_loc_type=allwordssubstr&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&classification=Eclipse&classification=RT&columnlist=short_desc&field0-0-0=noop&keywords_type=allwords&long_desc_type=allwordssubstr&product=Equinox&product=JDT&product=PDE&product=Platform&query_format=advanced&remaction=&resolution=FIXED&short_desc=&short_desc_type=allwordssubstr&status_whiteboard=&status_whiteboard_type=allwordssubstr&target_milestone=3.5.2&type0-0-0=noop&value0-0-0=%7C&order=bug_id%20DESC&query_based_on=">ID</a>
</th>
<th colspan="1">
- <a href="buglist.cgi?bug_file_loc_type=allwordssubstr&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&classification=Eclipse&classification=RT&columnlist=short_desc&field0-0-0=noop&keywords_type=allwords&long_desc_type=allwordssubstr&product=Equinox&product=JDT&product=PDE&product=Platform&query_format=advanced&remaction=&resolution=FIXED&short_desc=&short_desc_type=allwordssubstr&status_whiteboard=&status_whiteboard_type=allwordssubstr&target_milestone=3.5.1&type0-0-0=noop&value0-0-0=%7C&order=short_desc%2Cbug_id&query_based_on=">Summary</a>
+ <a href="buglist.cgi?bug_file_loc_type=allwordssubstr&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&classification=Eclipse&classification=RT&columnlist=short_desc&field0-0-0=noop&keywords_type=allwords&long_desc_type=allwordssubstr&product=Equinox&product=JDT&product=PDE&product=Platform&query_format=advanced&remaction=&resolution=FIXED&short_desc=&short_desc_type=allwordssubstr&status_whiteboard=&status_whiteboard_type=allwordssubstr&target_milestone=3.5.2&type0-0-0=noop&value0-0-0=%7C&order=short_desc%2Cbug_id&query_based_on=">Summary</a>
</th>
</tr>
<tr class="bz_bugitem
- bz_enhancement bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b77217"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=77217">77217</a>
- <span style="display: none"></span>
- </td>
-
- <td >[browser] Support the Browser widget on Solaris SPARC
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b195183"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=195183">195183</a>
- <span style="display: none"></span>
- </td>
-
- <td >[launching] JavaClassPath.performApply() uses original instead of working copy causes NPE
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b196308"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=196308">196308</a>
- <span style="display: none"></span>
- </td>
-
- <td >[formatter] Don't escape entity when formatting in <pre> tags within javadoc comments
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b209333"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=209333">209333</a>
- <span style="display: none"></span>
- </td>
-
- <td >[Trim] [Trim] NPE in IWorkbenchPage.setPartState(IWorkbenchPartReference, IWorkbenchPage.STATE_RESTORED);
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b214807"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=214807">214807</a>
- <span style="display: none"></span>
- </td>
-
- <td >[browser] xulrunner 1.9 has changed invalid certificate behaviour
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b216901"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=216901">216901</a>
- <span style="display: none"></span>
- </td>
-
- <td >[Import/Export] Eclipse not responsive when export to archive a lot of projects
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_major bz_P2 bz_RESOLVED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b226595"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=226595">226595</a>
- <span style="display: none"></span>
- </td>
-
- <td >[Help] Help index cannot handle multiple files with same ID
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_enhancement bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b234872"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=234872">234872</a>
- <span style="display: none"></span>
- </td>
-
- <td >[relengtool] The "Fix copyrights" tool should not add rem statements that echo to the console
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P2 bz_VERIFIED bz_FIXED bz_secure bz_secure_mode_manual bz_row_odd ">
-
- <td class="first-child">
- <a name="b235526"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=235526">235526</a>
- <span style="display: none">[SEC]</span>
- </td>
-
- <td >[security] No prompt for installing unsigned content
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_major bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b235572"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=235572">235572</a>
- <span style="display: none"></span>
- </td>
-
- <td >[relengtool] "Fix copyrights" doesnt detect existing Copyright in Windows .bat files
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
+ bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b254738"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=254738">254738</a>
+ <a name="b160870"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=160870">160870</a>
<span style="display: none"></span>
</td>
- <td >NPE in HierarchyResolver.setFocusType
+ <td >[Contributions] ToolItem.setWidth fails when ToolItem on ViewPart toolbar
</td>
</tr>
@@ -1802,15 +1608,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_minor bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
+ bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b256942"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=256942">256942</a>
+ <a name="b205608"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=205608">205608</a>
<span style="display: none"></span>
</td>
- <td >Using file_prompt for Ant script produces confusing results
+ <td >[Launcher] AIX still requires motif libraries installed
</td>
</tr>
@@ -1821,15 +1627,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_enhancement bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
+ bz_major bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b259946"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=259946">259946</a>
+ <a name="b264398"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=264398">264398</a>
<span style="display: none"></span>
</td>
- <td >[ui][engine] p2 not cleaning up large .profile file
+ <td >[Browser] Arrow_Down does not scroll after tabbing into Browser
</td>
</tr>
@@ -1840,15 +1646,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_critical bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
+ bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b260968"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=260968">260968</a>
+ <a name="b277106"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=277106">277106</a>
<span style="display: none"></span>
</td>
- <td >Deadlock in UserLibraryManager
+ <td >[Browser] JVM crashes after closing several Browser control instances with PDF files opened
</td>
</tr>
@@ -1859,15 +1665,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_normal bz_P1 bz_RESOLVED bz_FIXED bz_row_odd ">
+ bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b262791"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=262791">262791</a>
+ <a name="b277323"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=277323">277323</a>
<span style="display: none"></span>
</td>
- <td >Compilation slow when APT is enabled
+ <td >Save dialog does not show filter extensions
</td>
</tr>
@@ -1878,15 +1684,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
+ bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b263702"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=263702">263702</a>
+ <a name="b277438"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=277438">277438</a>
<span style="display: none"></span>
</td>
- <td >Branch creation problem in CVS
+ <td >Korean Input text flickers in StyledText widget in case the sentence exceeds a row.
</td>
</tr>
@@ -1897,15 +1703,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
+ bz_blocker bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b264182"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=264182">264182</a>
+ <a name="b277643"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=277643">277643</a>
<span style="display: none"></span>
</td>
- <td >[Linked Resources] If .project file edit fails, linked resource shows up anyway under certain conditions.
+ <td >Generics compile error
</td>
</tr>
@@ -1916,15 +1722,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
+ bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b267046"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=267046">267046</a>
+ <a name="b278625"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=278625">278625</a>
<span style="display: none"></span>
</td>
- <td >SourceMapper infinite loop on primitive type in generic
+ <td >[DND] COM leak during drag and drop
</td>
</tr>
@@ -1938,12 +1744,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b268789"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=268789">268789</a>
+ <a name="b278817"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=278817">278817</a>
<span style="display: none"></span>
</td>
- <td >[OLE] Cannot create in-place editor for Microsoft Word documents in Windows Vista
+ <td >[block selection] Caret height wrong after enabling block selection
</td>
</tr>
@@ -1957,12 +1763,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b269172"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=269172">269172</a>
+ <a name="b278831"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=278831">278831</a>
<span style="display: none"></span>
</td>
- <td >[Contributions] WorkbenchMenuService calling Display.syncExec() on disposed Display
+ <td >[block selection] Block selection font size not honored
</td>
</tr>
@@ -1976,12 +1782,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b270229"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=270229">270229</a>
+ <a name="b280516"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=280516">280516</a>
<span style="display: none"></span>
</td>
- <td >[p2agent] Provisioning not working with proxy (workaround)
+ <td >[browser] Execue / evaluate crashes with out of memory error
</td>
</tr>
@@ -1995,12 +1801,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b271703"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=271703">271703</a>
+ <a name="b280806"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=280806">280806</a>
<span style="display: none"></span>
</td>
- <td >Cannot print from 64 bit eclipse
+ <td >workbench ant runner should not suspend the job manager
</td>
</tr>
@@ -2011,15 +1817,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
+ bz_major bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b272850"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=272850">272850</a>
+ <a name="b281224"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=281224">281224</a>
<span style="display: none"></span>
</td>
- <td >[Webapp] TOC expand too slow for when there are 3000+ sub topics
+ <td >[product] not added to feature based product without deltapack
</td>
</tr>
@@ -2033,12 +1839,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b273112"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=273112">273112</a>
+ <a name="b281565"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=281565">281565</a>
<span style="display: none"></span>
</td>
- <td >[Markers] Use 'bottom up' heap sort to optimize the Markers view
+ <td >[ds tooling] NPE in DSErrorReporter.reportIllegalPolicy(...)
</td>
</tr>
@@ -2052,50 +1858,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b273385"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=273385">273385</a>
+ <a name="b281575"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=281575">281575</a>
<span style="display: none"></span>
</td>
- <td >[model] NPE while closing project
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P2 bz_VERIFIED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b273495"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=273495">273495</a>
- <span style="display: none"></span>
- </td>
-
- <td >[ActionSets] Actionsets leak when opening/closing perspectives
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_minor bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b273619"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=273619">273619</a>
- <span style="display: none"></span>
- </td>
-
- <td >[formatter] Formatting repeats *} in javadoc
+ <td >Eclipse hangs in SourceMapper while doing java proposals
</td>
</tr>
@@ -2109,31 +1877,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b274898"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=274898">274898</a>
- <span style="display: none"></span>
- </td>
-
- <td >[recovery] IllegalArgumentException in ASTNode#setSourceRange()
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_blocker bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b275330"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=275330">275330</a>
+ <a name="b281867"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=281867">281867</a>
<span style="display: none"></span>
</td>
- <td >NPE from org.eclipse.jdt.internal.core.ClasspathChange.requestIndexing
+ <td >[jar exporter] JAR export not workspace relative if folder does not exist
</td>
</tr>
@@ -2144,72 +1893,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b275589"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=275589">275589</a>
- <span style="display: none"></span>
- </td>
-
- <td >can't see text cursor after setting dark background color
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b276110"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=276110">276110</a>
- <span style="display: none"></span>
- </td>
-
- <td >Label: SWT.CENTER is being ignored when used with SWT.WRAP
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_major bz_P2 bz_VERIFIED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b276111"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=276111">276111</a>
- <span style="display: none"></span>
- </td>
-
- <td >[JUnit] classpath container doesn't pick up JUnit jars in shared installations
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
+ bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b276162"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=276162">276162</a>
+ <a name="b282032"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=282032">282032</a>
<span style="display: none"></span>
</td>
- <td >[KeyBindings] Exporting key preferences to CSV does not warn of overwriting file
+ <td >Radio button group not read correctly by JAWS
</td>
</tr>
@@ -2220,15 +1912,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_minor bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
+ bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b276202"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=276202">276202</a>
+ <a name="b282581"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=282581">282581</a>
<span style="display: none"></span>
</td>
- <td >[Forms] NPE if dispose() called on FormToolkit more than once
+ <td >Launch External Tool does not save dirty editors regardless of preference setting
</td>
</tr>
@@ -2239,15 +1931,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
+ bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b276313"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=276313">276313</a>
+ <a name="b283147"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=283147">283147</a>
<span style="display: none"></span>
</td>
- <td >[ICU] consume updated Collator version
+ <td >[publisher] Mismatch between PDE and p2 interpretation of icon paths in .product file
</td>
</tr>
@@ -2258,15 +1950,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_major bz_P2 bz_VERIFIED bz_FIXED bz_row_even ">
+ bz_major bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b276319"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=276319">276319</a>
+ <a name="b283681"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=283681">283681</a>
<span style="display: none"></span>
</td>
- <td >Huge regression on BuilderPerformanceTest#testManualBuildWithAutobuildOn() test
+ <td >Regression: No longer possible to post an event to the Browser
</td>
</tr>
@@ -2277,15 +1969,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
+ bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b276373"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=276373">276373</a>
+ <a name="b284280"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=284280">284280</a>
<span style="display: none"></span>
</td>
- <td >Incorrect resource comparison with IJavaProject.isOnClasspath(IResource)
+ <td >[1.5][compiler] Error on use generic interface in abstract super class
</td>
</tr>
@@ -2296,15 +1988,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
+ bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b276938"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=276938">276938</a>
+ <a name="b284858"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=284858">284858</a>
<span style="display: none"></span>
</td>
- <td >Remove unreachable removes reachable logic in case statement.
+ <td >[Widgets] TableColumn.pack() results in a table that does not fit the header on SWT cocoa
</td>
</tr>
@@ -2315,15 +2007,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
+ bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b276969"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=276969">276969</a>
+ <a name="b285095"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=285095">285095</a>
<span style="display: none"></span>
</td>
- <td >[Help] HelpView does not create itself correctly in a multi window session that has been restarted, dynamic context help is disabled
+ <td >[Viewers] New column scrolling breaks on first cell selection if you have scrolled the table
</td>
</tr>
@@ -2334,15 +2026,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_critical bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
+ bz_enhancement bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b277064"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=277064">277064</a>
+ <a name="b285124"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=285124">285124</a>
<span style="display: none"></span>
</td>
- <td >[launcher] RCP app crashes on SplashHandler takedown
+ <td >serialVersionUID still causes error/warning
</td>
</tr>
@@ -2356,12 +2048,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b277120"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=277120">277120</a>
+ <a name="b285607"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=285607">285607</a>
<span style="display: none"></span>
</td>
- <td >[CommonNavigator] Project explorer does not reveal elements when linked to editor
+ <td >[performance] expensive inner loop in JavaSourceLookupUtil
</td>
</tr>
@@ -2372,53 +2064,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b277204"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=277204">277204</a>
- <span style="display: none"></span>
- </td>
-
- <td >IAE in SharedASTProvider for generic local class.
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_trivial bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b277303"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=277303">277303</a>
- <span style="display: none"></span>
- </td>
-
- <td >[clean up] Add ISV doc for the clean up extension point
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
+ bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b277315"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=277315">277315</a>
+ <a name="b286040"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=286040">286040</a>
<span style="display: none"></span>
</td>
- <td >Combo does not accept drag and drop
+ <td >[Image Saving] o.e.swt.internal.image.PngEncoder is very slow on writing large images
</td>
</tr>
@@ -2432,50 +2086,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b277356"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=277356">277356</a>
- <span style="display: none"></span>
- </td>
-
- <td >[cocoa] npe in Tree widget
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b277450"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=277450">277450</a>
- <span style="display: none"></span>
- </td>
-
- <td >[1.5][compiler] Problems with += and Autoboxing/Unboxing
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_trivial bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b277489"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=277489">277489</a>
+ <a name="b286107"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=286107">286107</a>
<span style="display: none"></span>
</td>
- <td >VM arg are wrong for the agent download
+ <td >[ViewMgmt] [GlobalActions] Closing project ignores Saveables
</td>
</tr>
@@ -2489,12 +2105,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b277547"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=277547">277547</a>
+ <a name="b286687"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=286687">286687</a>
<span style="display: none"></span>
</td>
- <td >[eclipse] StringIndexOutOfBoundException when setLauncherName is passed an empty string
+ <td >[Graphics][GTK2.18] clipping broken when setting a transform with Gtk 2.17.7
</td>
</tr>
@@ -2505,15 +2121,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
+ bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b277567"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=277567">277567</a>
+ <a name="b287119"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=287119">287119</a>
<span style="display: none"></span>
</td>
- <td >Path.close() method on results in different behavior on Cocoa
+ <td >[StyledText] styled text widget content can be shifted left with out scroll bar when line wraps
</td>
</tr>
@@ -2527,12 +2143,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b277783"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=277783">277783</a>
+ <a name="b287234"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=287234">287234</a>
<span style="display: none"></span>
</td>
- <td >Http service should not use 8859_1 alias on S60
+ <td >[DND] drag/drop onto empty table generates exception in SWT
</td>
</tr>
@@ -2543,15 +2159,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_major bz_P3 bz_CLOSED bz_FIXED bz_row_odd ">
+ bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b277926"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=277926">277926</a>
+ <a name="b287307"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=287307">287307</a>
<span style="display: none"></span>
</td>
- <td >[Commands] Command is not invoked when focus changes.
+ <td >[Widgets] [GTK2.18] Control.setZOrder broken on Gtk+ >= 2.17.3
</td>
</tr>
@@ -2562,15 +2178,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
+ bz_major bz_P3 bz_CLOSED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b277965"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=277965">277965</a>
+ <a name="b287458"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=287458">287458</a>
<span style="display: none"></span>
</td>
- <td >[compiler] NPE in canBeSeenBy due to illegal protected toplevel class
+ <td >[Browser] SWT crashes JVM when disposing of browser using XULRunner >=1.9.1 via XULRunnerPath
</td>
</tr>
@@ -2581,15 +2197,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
+ bz_critical bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b278305"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=278305">278305</a>
+ <a name="b287592"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=287592">287592</a>
<span style="display: none"></span>
</td>
- <td >[1.5][compiler] JDT accepts supertype parameterized with wildcard
+ <td >[1.5][compiler] Wrong ambiguous compilation error
</td>
</tr>
@@ -2603,12 +2219,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b278311"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=278311">278311</a>
+ <a name="b287761"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=287761">287761</a>
<span style="display: none"></span>
</td>
- <td >[DataBinding] INativePropertyListener methods should document that source may be null
+ <td >[Progress] Finished Tasks Still Show In Progress View
</td>
</tr>
@@ -2622,12 +2238,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b278370"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=278370">278370</a>
+ <a name="b287833"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=287833">287833</a>
<span style="display: none"></span>
</td>
- <td >[Mozilla] DOM is unavailable in completed event listener after setText()
+ <td >[formatter] Formatter removes the first character after the * in the <pre> tag
</td>
</tr>
@@ -2638,15 +2254,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_minor bz_P3 bz_CLOSED bz_FIXED bz_row_even ">
+ bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b278376"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=278376">278376</a>
+ <a name="b287871"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=287871">287871</a>
<span style="display: none"></span>
</td>
- <td >NPE in Shell.WM_ENTERIDLE
+ <td >[publisher] custom config.ini in product definition causes NPE
</td>
</tr>
@@ -2657,15 +2273,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
+ bz_major bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b278550"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=278550">278550</a>
+ <a name="b288140"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=288140">288140</a>
<span style="display: none"></span>
</td>
- <td >[Databinding] ObservablesManager, ObservableTracker and MapSimpleValueObservableMap lead to exception
+ <td >[IDE] [browser] Default external browser should be pre-configured on Solaris 10 sparc GTK
</td>
</tr>
@@ -2676,15 +2292,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
+ bz_normal bz_P2 bz_VERIFIED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b278562"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=278562">278562</a>
+ <a name="b288211"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=288211">288211</a>
<span style="display: none"></span>
</td>
- <td >[1.5][compiler] Generated code results in VerifyError
+ <td >APT uses a lot of memory
</td>
</tr>
@@ -2695,15 +2311,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
+ bz_critical bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b278734"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=278734">278734</a>
+ <a name="b288474"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=288474">288474</a>
<span style="display: none"></span>
</td>
- <td >[ActivityMgmt] WorkbenchActivityHelper restrictArray is returning NULL for objects failing the test "restrictUseOf(Object)"
+ <td >Saving a docx file fails silently due to not killing WINWORD process on close
</td>
</tr>
@@ -2714,15 +2330,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_major bz_P1 bz_VERIFIED bz_FIXED bz_row_even ">
+ bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b278745"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=278745">278745</a>
+ <a name="b288513"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=288513">288513</a>
<span style="display: none"></span>
</td>
- <td >Methods overloaded with unavailable types worked in 3.4 but give "indirectly referenced.." error in 3.5
+ <td >BundleContext#getServiceReference does not return highest ranked service
</td>
</tr>
@@ -2736,12 +2352,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b278781"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=278781">278781</a>
+ <a name="b288641"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=288641">288641</a>
<span style="display: none"></span>
</td>
- <td >Launching eclipse application fails when a vm arg in eclipse.ini contains a space
+ <td >NPE in NameVersionDescriptor hashCode() method when the version is null
</td>
</tr>
@@ -2752,15 +2368,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_trivial bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
+ bz_critical bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b278801"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=278801">278801</a>
+ <a name="b288857"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=288857">288857</a>
<span style="display: none"></span>
</td>
- <td >Export wizards have missing mnemonics
+ <td >GDI Handle Resource Leak
</td>
</tr>
@@ -2771,15 +2387,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_major bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
+ bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b278814"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=278814">278814</a>
+ <a name="b289401"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=289401">289401</a>
<span style="display: none"></span>
</td>
- <td >[composite] Relative child repository locations not working
+ <td >[Widgets] Black screen in windows 7 aero mode using Tracker
</td>
</tr>
@@ -2790,15 +2406,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
+ bz_major bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b278933"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=278933">278933</a>
+ <a name="b289670"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=289670">289670</a>
<span style="display: none"></span>
</td>
- <td >[Workbench] FileNotFoundException in test log makes it particularly unreadable
+ <td >Concurrency issues in XMLParser.acquireXMLParsing()
</td>
</tr>
@@ -2812,12 +2428,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b278943"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=278943">278943</a>
+ <a name="b289892"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=289892">289892</a>
<span style="display: none"></span>
</td>
- <td >[Cocoa] Incorrect colors while copying an image
+ <td >[compiler] NPE during binaryTypeBinding field initialization
</td>
</tr>
@@ -2828,15 +2444,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
+ bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b278944"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=278944">278944</a>
+ <a name="b290036"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=290036">290036</a>
<span style="display: none"></span>
</td>
- <td >Cocoa: Image transfer not working for images (randomly)
+ <td >JavaScript function on overview pages does not open in Help View
</td>
</tr>
@@ -2847,15 +2463,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
+ bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b279013"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=279013">279013</a>
+ <a name="b290064"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=290064">290064</a>
<span style="display: none"></span>
</td>
- <td >SWT: crash when calling setParent() on Linux
+ <td >[Webapp] TocToolbar in Help window shows 404 with org.apache.jasper from Tomcat 5.5.27
</td>
</tr>
@@ -2866,15 +2482,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
+ bz_blocker bz_P1 bz_VERIFIED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b279103"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=279103">279103</a>
+ <a name="b290273"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=290273">290273</a>
<span style="display: none"></span>
</td>
- <td >[Cocoa] SelectionChanged events behaviour broken
+ <td >R3_5_maintenance branch in inconsistent state
</td>
</tr>
@@ -2888,12 +2504,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b279169"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=279169">279169</a>
+ <a name="b290376"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=290376">290376</a>
<span style="display: none"></span>
</td>
- <td >[category def] Category help link brings up wrong help contents
+ <td >Errant "Comparing identical expressions" warning with assignment
</td>
</tr>
@@ -2904,15 +2520,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
+ bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b279183"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=279183">279183</a>
+ <a name="b290382"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=290382">290382</a>
<span style="display: none"></span>
</td>
- <td >[1.6][compiler] Inconsistent stackmap frames generated by JDT cause VerifyError
+ <td >ArrayIndexOutOfBoundsException in MarkerAttributeMap
</td>
</tr>
@@ -2926,12 +2542,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b279278"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=279278">279278</a>
+ <a name="b290395"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=290395">290395</a>
<span style="display: none"></span>
</td>
- <td >Add mac carbon x86 to build.properties in rcp.config builder
+ <td >[Widgets] [GTK2.18] Update problem in the Eclipse's "Install new software" dialog.
</td>
</tr>
@@ -2945,12 +2561,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b279295"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=279295">279295</a>
+ <a name="b290534"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=290534">290534</a>
<span style="display: none"></span>
</td>
- <td >[ip] imports servlet 2.2
+ <td >ServiceRegistry doesn't remove BundleContextImpl keys from publishedServicesByContext HashMap when list of services becomes empty
</td>
</tr>
@@ -2961,15 +2577,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
+ bz_major bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b279313"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=279313">279313</a>
+ <a name="b290544"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=290544">290544</a>
<span style="display: none"></span>
</td>
- <td >TreeItem.removeAll incorrectly implemented on Mac platform
+ <td >'Next Change' does not selected last small diff (button disabled)
</td>
</tr>
@@ -2980,15 +2596,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
+ bz_critical bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b279314"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=279314">279314</a>
+ <a name="b290653"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=290653">290653</a>
<span style="display: none"></span>
</td>
- <td >Typo in p2_metadata_generator.html
+ <td >The org.eclipse.equinox.executable feature has gone backwards in version numbering
</td>
</tr>
@@ -2999,15 +2615,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
+ bz_major bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b279326"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=279326">279326</a>
+ <a name="b290661"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=290661">290661</a>
<span style="display: none"></span>
</td>
- <td >[Help] Infinite loop possible in Toc
+ <td >SWT & Launcher fragments using 'HEAD' as qualifier
</td>
</tr>
@@ -3018,15 +2634,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
+ bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b279425"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=279425">279425</a>
+ <a name="b290721"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=290721">290721</a>
<span style="display: none"></span>
</td>
- <td >[organize imports] MultiElementListSelectionDialog has wrong button layout
+ <td >[launcher] motif.solaris.sparc has bad HEAD tag in map files
</td>
</tr>
@@ -3040,12 +2656,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b279509"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=279509">279509</a>
+ <a name="b290730"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=290730">290730</a>
<span style="display: none"></span>
</td>
- <td >BrowserInformationControl leaks TextLayout
+ <td >Rewriting SwitchStatement throws NPE
</td>
</tr>
@@ -3059,12 +2675,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b279514"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=279514">279514</a>
+ <a name="b290805"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=290805">290805</a>
<span style="display: none"></span>
</td>
- <td >[Metadata] UI bundles should depend on SWT 3.5, not 3.4
+ <td >[quick fix] BadLocationException (race condition with preview calculation)
</td>
</tr>
@@ -3078,12 +2694,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b279524"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=279524">279524</a>
+ <a name="b290877"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=290877">290877</a>
<span style="display: none"></span>
</td>
- <td >API compare for jar in PDE classpath container
+ <td >[DOM] If using a tag named @enum the ASTParser ignores this
</td>
</tr>
@@ -3094,15 +2710,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
+ bz_critical bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b279552"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=279552">279552</a>
+ <a name="b290905"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=290905">290905</a>
<span style="display: none"></span>
</td>
- <td >NPE running API use scan
+ <td >[formatter] Certain formatter pref constellation cause endless loop ==> OOME
</td>
</tr>
@@ -3113,15 +2729,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_trivial bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
+ bz_major bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b279611"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=279611">279611</a>
+ <a name="b291128"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=291128">291128</a>
<span style="display: none"></span>
</td>
- <td >[nls tooling] Add 'Find Broken NLS Strings' to Tips & Tricks
+ <td >[Widgets] eclipse >= 3.5 crash when closing a first level modal window (Install, Run Configurations)
</td>
</tr>
@@ -3135,50 +2751,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b279622"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=279622">279622</a>
- <span style="display: none"></span>
- </td>
-
- <td >The framework exports tracker package at 1.4.2 but should be 1.4.0
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b279671"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=279671">279671</a>
- <span style="display: none"></span>
- </td>
-
- <td >Preferences - PathEditor and DirectoryFieldEditor do not show all disk content on Mac OS X
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b279697"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=279697">279697</a>
+ <a name="b291194"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=291194">291194</a>
<span style="display: none"></span>
</td>
- <td >ArrayIndexOutOfBoundsException running use scan
+ <td >org.eclipse.platform-p2repo-3.5.1.zip missing IUs that were present in Galileo repository
</td>
</tr>
@@ -3189,15 +2767,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
+ bz_major bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b279715"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=279715">279715</a>
+ <a name="b291307"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=291307">291307</a>
<span style="display: none"></span>
</td>
- <td >[inline] Inline Constant and Inline Local Variable are missing parentheses for extended '-' chains
+ <td >Menu images (PNG) does not support semi-alpha-transparency on Windows Vista/7
</td>
</tr>
@@ -3211,12 +2789,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b279836"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=279836">279836</a>
+ <a name="b291322"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=291322">291322</a>
<span style="display: none"></span>
</td>
- <td >[1.5][compiler] Eclipse compiler shows error on javac-valid construct: raw types on overridden methods
+ <td >Test errors when running JDT Core tests on Windows 7
</td>
</tr>
@@ -3230,12 +2808,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b279947"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=279947">279947</a>
+ <a name="b291339"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=291339">291339</a>
<span style="display: none"></span>
</td>
- <td >SimpleArtifactRepository.delete does not delete Symbolic links
+ <td >validateEdit not called for launch configuration stored locally
</td>
</tr>
@@ -3246,15 +2824,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
+ bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b279957"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=279957">279957</a>
+ <a name="b291354"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=291354">291354</a>
<span style="display: none"></span>
</td>
- <td >[doc] property osgi.noshutdown and option -noRestart
+ <td >[Widgets] Windows 7: small indeterminate ProgressBar looks broken
</td>
</tr>
@@ -3268,12 +2846,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b280026"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=280026">280026</a>
+ <a name="b291382"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=291382">291382</a>
<span style="display: none"></span>
</td>
- <td >Create the link in the root of the SDK / platform with a p2 action
+ <td >Cocoa should defer window creation
</td>
</tr>
@@ -3284,15 +2862,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
+ bz_critical bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b280061"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=280061">280061</a>
+ <a name="b291472"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=291472">291472</a>
<span style="display: none"></span>
</td>
- <td >[formatter] AIOOBE while formatting javadoc comment
+ <td >[1.5][compiler] Access to a generic method is compiled incorrectly
</td>
</tr>
@@ -3303,15 +2881,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
+ bz_critical bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b280063"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=280063">280063</a>
+ <a name="b291486"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=291486">291486</a>
<span style="display: none"></span>
</td>
- <td >org.eclipse.jdt.internal.compiler.parser.Parser.parseClassBodyDeclarations(char[], int, int, CompilationUnitDeclaration) should return consistent results
+ <td >[Browser] Browser widget crashes VM after failed Ctrl+L in hover
</td>
</tr>
@@ -3325,12 +2903,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b280068"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=280068">280068</a>
+ <a name="b291716"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=291716">291716</a>
<span style="display: none"></span>
</td>
- <td >[rename] Rename/Refactor package breaks plugin.xml when pressing Back on Preview
+ <td >[package explorer] hides jars non-java resources when working set is selected
</td>
</tr>
@@ -3344,12 +2922,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b280079"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=280079">280079</a>
+ <a name="b291775"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=291775">291775</a>
<span style="display: none"></span>
</td>
- <td >NPE while parsing K_CLASS_BODY_DECLARATIONS
+ <td >[formatter] Backport fixes for known issues around 'Never Join Lines' preference to 3.5 maintenance stream
</td>
</tr>
@@ -3360,15 +2938,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
+ bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b280156"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=280156">280156</a>
+ <a name="b291985"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=291985">291985</a>
<span style="display: none"></span>
</td>
- <td >Delta pack doesn't contain all platform pieces
+ <td >[compiler][jsr14] Translating Enum with jsr14 target: ECJ causes a runtime error while Sun compiler works fine
</td>
</tr>
@@ -3379,15 +2957,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
+ bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b280255"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=280255">280255</a>
+ <a name="b292068"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=292068">292068</a>
<span style="display: none"></span>
</td>
- <td >[formatter] Format edited lines adds two new lines on each save
+ <td >[target] Target environment settings not persisted on Mac OS
</td>
</tr>
@@ -3398,15 +2976,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
+ bz_major bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b280259"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=280259">280259</a>
+ <a name="b292227"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=292227">292227</a>
<span style="display: none"></span>
</td>
- <td >[regression] All resources missing when importing plugin as source project
+ <td >plug window lost focus when create a NO_FOCUS shell from socket
</td>
</tr>
@@ -3420,12 +2998,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b280276"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=280276">280276</a>
+ <a name="b292240"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=292240">292240</a>
<span style="display: none"></span>
</td>
- <td >executeCommand('org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.pde.ui.TargetPlatformPreferencePage)') do not open Target Platform page
+ <td >Compiler error on implementation of raw sub interface
</td>
</tr>
@@ -3436,15 +3014,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
+ bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b280285"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=280285">280285</a>
+ <a name="b292290"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=292290">292290</a>
<span style="display: none"></span>
</td>
- <td >[native touchpoint] LinkAction undo does not calculate paths correctly
+ <td >[Presentations] need to tag org.eclipse.ui.presentations.r21 bundle in 3.5.2 stream
</td>
</tr>
@@ -3458,12 +3036,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b280303"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=280303">280303</a>
+ <a name="b292292"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=292292">292292</a>
<span style="display: none"></span>
</td>
- <td >ServiceEvent.MODIFIED_ENDMATCH is not sent in all cases
+ <td >org.eclipse.core.resources.compatibility needs to be tagged in the 3.5.2 stream
</td>
</tr>
@@ -3474,50 +3052,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_minor bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b280427"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=280427">280427</a>
- <span style="display: none"></span>
- </td>
-
- <td >"Configuring accessibility options for textual editors" is not in TOC
- </td>
-
- </tr>
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b280458"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=280458">280458</a>
- <span style="display: none"></span>
- </td>
-
- <td >[DataBinding] New API is not showing up in Galileo javadocs
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
+ bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b280497"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=280497">280497</a>
+ <a name="b292350"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=292350">292350</a>
<span style="display: none"></span>
</td>
- <td >Incorrect null result for IJavaProject.getClasspathEntryFor(IPath)
+ <td >[1.5][compiler] Compiler error: ambiguous method since 3.5.1 using generics and interface inheritance
</td>
</tr>
@@ -3528,15 +3071,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
+ bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b280615"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=280615">280615</a>
+ <a name="b292821"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=292821">292821</a>
<span style="display: none"></span>
</td>
- <td >CCE when changing sort order in file search result page
+ <td >NPE during Export -> Product
</td>
</tr>
@@ -3547,15 +3090,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
+ bz_major bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b280616"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=280616">280616</a>
+ <a name="b292885"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=292885">292885</a>
<span style="display: none"></span>
</td>
- <td >[formatter] Valid 1.5 code is not formatted inside <pre> tag
+ <td >Plugin export creates faulty bundle when using custom target platform and junit4 dependency
</td>
</tr>
@@ -3569,12 +3112,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b280678"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=280678">280678</a>
+ <a name="b293001"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=293001">293001</a>
<span style="display: none"></span>
</td>
- <td >[schema] SchemaTransformer doesn't generate help for "API Information" sections
+ <td >[Doc] Bad link in Export Preferences Wizard help page
</td>
</tr>
@@ -3585,15 +3128,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
+ bz_normal bz_P2 bz_VERIFIED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b280708"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=280708">280708</a>
+ <a name="b293176"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=293176">293176</a>
<span style="display: none"></span>
</td>
- <td >Second call to setFont produces incorrect text
+ <td >[content assist] Esc Tab on additional info does not bring back the additional info
</td>
</tr>
@@ -3604,15 +3147,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
+ bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b280755"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=280755">280755</a>
+ <a name="b293218"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=293218">293218</a>
<span style="display: none"></span>
</td>
- <td >[working sets] Check out into new working set results into strange working set
+ <td >unpack="true" doesn't work for customBuildCallbacks
</td>
</tr>
@@ -3626,12 +3169,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b280888"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=280888">280888</a>
+ <a name="b293235"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=293235">293235</a>
<span style="display: none"></span>
</td>
- <td >change a java file in one plug-in will compile all related plugin projects
+ <td >[backport][Import/Export] Timestamps updated on archive export and on project import
</td>
</tr>
@@ -3645,12 +3188,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b280917"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=280917">280917</a>
+ <a name="b293302"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=293302">293302</a>
<span style="display: none"></span>
</td>
- <td >[target] Target platform created with 3.4 doesn't work with 3.5
+ <td >LocalFile#move fails when a link with nonexistent target is moved
</td>
</tr>
@@ -3661,53 +3204,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b280921"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=280921">280921</a>
- <span style="display: none"></span>
- </td>
-
- <td >Tree.select() sets selection instead of adding to selection
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b280929"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=280929">280929</a>
- <span style="display: none"></span>
- </td>
-
- <td >Deadlock possible between refreshPackages and BundleLoader initialization
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
+ bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b281053"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=281053">281053</a>
+ <a name="b293443"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=293443">293443</a>
<span style="display: none"></span>
</td>
- <td >Non thread safe use of static member gives NPE in ResolverImpl
+ <td >AbortCompilation when invoking content assist
</td>
</tr>
@@ -3718,15 +3223,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
+ bz_major bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b281075"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=281075">281075</a>
+ <a name="b293519"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=293519">293519</a>
<span style="display: none"></span>
</td>
- <td >Bundle-NativeCode can't work on Windows Server 2008/Windows 7
+ <td >[backport] OutOfMemoryError during workspace refresh due to leak in UnifiedTree
</td>
</tr>
@@ -3740,12 +3245,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b281088"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=281088">281088</a>
+ <a name="b293713"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=293713">293713</a>
<span style="display: none"></span>
</td>
- <td >BrandingIron compares String to File
+ <td >Remove Google search from help system in 3.5.2
</td>
</tr>
@@ -3756,15 +3261,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
+ bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b281125"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=281125">281125</a>
+ <a name="b293820"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=293820">293820</a>
<span style="display: none"></span>
</td>
- <td >[doc] typo whats new section: OSGi service registry enhancements
+ <td >[prefs] Thread safety problem in InstancePreferences
</td>
</tr>
@@ -3775,15 +3280,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
+ bz_critical bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b281150"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=281150">281150</a>
+ <a name="b293831"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=293831">293831</a>
<span style="display: none"></span>
</td>
- <td >product qualifier substitution broken for p2.generate.metadata
+ <td >[launcher] AIX needs jre/lib/<arch> on library search path
</td>
</tr>
@@ -3797,12 +3302,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b281290"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=281290">281290</a>
+ <a name="b293928"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=293928">293928</a>
<span style="display: none"></span>
</td>
- <td >Timer Leak when executing external tool actions
+ <td >Need ability to disable status handlers
</td>
</tr>
@@ -3816,50 +3321,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b281317"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=281317">281317</a>
- <span style="display: none"></span>
- </td>
-
- <td >[search] An internal error occurred during: "Java Search".
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_critical bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b281348"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=281348">281348</a>
- <span style="display: none"></span>
- </td>
-
- <td >[Net] Eclipse Galileo crashes under Japanese version of Windows XP
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b281372"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=281372">281372</a>
+ <a name="b294000"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=294000">294000</a>
<span style="display: none"></span>
</td>
- <td >RCP Product Export wizard copies over wrong Mac icon to launcher
+ <td >[import] Import holding on to import streams longer than it should be
</td>
</tr>
@@ -3873,12 +3340,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b281409"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=281409">281409</a>
+ <a name="b294313"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=294313">294313</a>
<span style="display: none"></span>
</td>
- <td >Create repository zip for org.eclipse.platform
+ <td >bundle versions have decreased in 3.5.x stream
</td>
</tr>
@@ -3892,12 +3359,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b281426"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=281426">281426</a>
+ <a name="b294404"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=294404">294404</a>
<span style="display: none"></span>
</td>
- <td >Race condition: IModelProxy.installed() is called after IModelProxy.disposed()
+ <td >-target jsr14 flags error on foreach over Collection that does not implement Iterable
</td>
</tr>
@@ -3911,12 +3378,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b281446"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=281446">281446</a>
+ <a name="b294462"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=294462">294462</a>
<span style="display: none"></span>
</td>
- <td >[typing] "Cut" did not complete normally
+ <td >[FieldAssist] ControlDecoration#showHoverText doesn't check if the widget is visible
</td>
</tr>
@@ -3930,12 +3397,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b281533"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=281533">281533</a>
+ <a name="b294502"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=294502">294502</a>
<span style="display: none"></span>
</td>
- <td >[formatter] ArithmeticException: / by zero at Scribe.printLineComment(Scribe.java:2161)
+ <td >Handling of unknown arguments/targets
</td>
</tr>
@@ -3949,12 +3416,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b281546"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=281546">281546</a>
+ <a name="b294662"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=294662">294662</a>
<span style="display: none"></span>
</td>
- <td >NPE in PublisherUtil
+ <td >ClassCastException while invoking quick assist
</td>
</tr>
@@ -3965,15 +3432,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
+ bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b281598"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=281598">281598</a>
+ <a name="b294702"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=294702">294702</a>
<span style="display: none"></span>
</td>
- <td >[assist] Problems during content assist - if project has empty zip file in classpath
+ <td >Backport of bug 283283 into 3.5.x is required
</td>
</tr>
@@ -3984,15 +3451,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
+ bz_critical bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b281609"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=281609">281609</a>
+ <a name="b294707"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=294707">294707</a>
<span style="display: none"></span>
</td>
- <td >[javadoc] "Javadoc: Invalid reference" warning for @link to Java package
+ <td >[Backport] OutOfMemoryError during workspace refresh due to FileInfo carrying substring baggage
</td>
</tr>
@@ -4003,72 +3470,30 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
+ bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b281623"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=281623">281623</a>
+ <a name="b294721"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=294721">294721</a>
<span style="display: none"></span>
</td>
- <td >[FastView] NPE in FastViewPane$2.setState (was: File Search doesn't work in 3.5.0)
+ <td >[Backport] Symbolic link support doesn't work on the AIX
</td>
</tr>
-
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b281628"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=281628">281628</a>
- <span style="display: none"></span>
- </td>
-
- <td >[Net] Should be impossible to edit native proxy setting by double-clicking the entry
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b281691"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=281691">281691</a>
+ <a name="b294722"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=294722">294722</a>
<span style="display: none"></span>
</td>
- <td >RCP application does not launch when having an own config.ini with generic bundle URLs
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b281723"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=281723">281723</a>
- <span style="display: none"></span>
- </td>
-
- <td >[Databinding] SWTException: Invalid thread access when binding in non-UI thread
+ <td >[Backport] Symbolic link support doesn't work on the Mac
</td>
</tr>
@@ -4082,50 +3507,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b281727"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=281727">281727</a>
- <span style="display: none"></span>
- </td>
-
- <td >[DataBinding] observing delegating value property of observable list/set/map returns null if master element's hash code has changed
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_minor bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b281750"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=281750">281750</a>
- <span style="display: none"></span>
- </td>
-
- <td >Dead link in description
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b281871"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=281871">281871</a>
+ <a name="b295126"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=295126">295126</a>
<span style="display: none"></span>
</td>
- <td >[content assist] The extension took too long to return from the 'computeCompletionProposals()' operation
+ <td >[launcher] AIX build of eclipse binary needs adjusting.
</td>
</tr>
@@ -4136,15 +3523,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_minor bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
+ bz_critical bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b281917"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=281917">281917</a>
+ <a name="b295185"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=295185">295185</a>
<span style="display: none"></span>
</td>
- <td >[Doc] Bad link in Ant Editor help page
+ <td >[Browser] Refresh of PDF in SWT browser leads to jvm crash
</td>
</tr>
@@ -4155,15 +3542,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
+ bz_major bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b281933"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=281933">281933</a>
+ <a name="b295483"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=295483">295483</a>
<span style="display: none"></span>
</td>
- <td >[Dialogs] Show Views Dialog and Windows Preference Dialog fail to open if SHOW_FILTERED_TEXTS is set to false
+ <td >3.5.x regression: UI randomly freezes
</td>
</tr>
@@ -4177,12 +3564,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b282001"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=282001">282001</a>
+ <a name="b295557"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=295557">295557</a>
<span style="display: none"></span>
</td>
- <td >SWT 64 Libraries on AIX built with wrong compiler options
+ <td >[KeyBindings] Exporting key preferences to CSV does not allow context being null
</td>
</tr>
@@ -4196,12 +3583,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b282046"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=282046">282046</a>
+ <a name="b295698"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=295698">295698</a>
<span style="display: none"></span>
</td>
- <td >[MPE] MultiPageEditorSite does not remove properly its KeyBindingService
+ <td >[1.5][compiler] ClassCastException in unchecked warning report
</td>
</tr>
@@ -4212,15 +3599,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
+ bz_major bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b282321"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=282321">282321</a>
+ <a name="b295803"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=295803">295803</a>
<span style="display: none"></span>
</td>
- <td >No indication that help dialog tray opens (for accessibility)
+ <td >[CommonNavigator] Source of Contribution set to lowest priority NCE, not the NCE providing the children
</td>
</tr>
@@ -4231,15 +3618,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_blocker bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
+ bz_major bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b282427"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=282427">282427</a>
+ <a name="b295959"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=295959">295959</a>
<span style="display: none"></span>
</td>
- <td >P2 Installer 3.5 fails with "An error occurred while collecting items to be installed"
+ <td >[Widgets] Embedded native view can not receive Enter key event on Mac.
</td>
</tr>
@@ -4250,15 +3637,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
+ bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b282563"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=282563">282563</a>
+ <a name="b296142"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=296142">296142</a>
<span style="display: none"></span>
</td>
- <td >[ds] RCP using declarative services (occasionally) hangs for 30 secs on start-up
+ <td >[KeyBindings] Set extension point "org.eclipse.ui.bindings" 's element 'sequenceModifier' becomes disabled key bindings.
</td>
</tr>
@@ -4269,15 +3656,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
+ bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b282680"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=282680">282680</a>
+ <a name="b296223"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=296223">296223</a>
<span style="display: none"></span>
</td>
- <td >name of win32 x86_64 drop is incorrect in sdk.tests\testScripts\test.xml
+ <td >org.eclipse.core.filesystem.aix.ppc should be added to 3.5.2 build
</td>
</tr>
@@ -4288,15 +3675,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
+ bz_major bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b282690"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=282690">282690</a>
+ <a name="b296253"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=296253">296253</a>
<span style="display: none"></span>
</td>
- <td >[DataBinding] problems with disposed observables
+ <td >[CommonNavigator] An empty label is not properly shown when it is the only contributed label
</td>
</tr>
@@ -4310,12 +3697,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b282704"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=282704">282704</a>
+ <a name="b296284"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=296284">296284</a>
<span style="display: none"></span>
</td>
- <td >[launcher] EclipsePolicy assumes non-null CodeSource
+ <td >[browser] xulrunner 1.9.2 changes
</td>
</tr>
@@ -4329,12 +3716,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b282739"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=282739">282739</a>
+ <a name="b296343"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=296343">296343</a>
<span style="display: none"></span>
</td>
- <td >performance hit on workspace start to build problem detectors
+ <td >OOM error caused by java indexing referencing classloader from threadLocal
</td>
</tr>
@@ -4348,12 +3735,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b282747"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=282747">282747</a>
+ <a name="b296467"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=296467">296467</a>
<span style="display: none"></span>
</td>
- <td >The library.extensions configuration property does not require leading '.' dots
+ <td >[Widgets] FileDialog can not open a directory correctly on linux gtk swt
</td>
</tr>
@@ -4367,88 +3754,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b282850"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=282850">282850</a>
+ <a name="b296728"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=296728">296728</a>
<span style="display: none"></span>
</td>
- <td >runtests should allow aix.motif.ppc
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b282851"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=282851">282851</a>
- <span style="display: none"></span>
- </td>
-
- <td >Default version of Ant Runtime set to Ant 1.6.5 instead of more recent 1.7.0
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b282874"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=282874">282874</a>
- <span style="display: none"></span>
- </td>
-
- <td >[ViewMgmt] [ActivityMgmt] NullpointerException during saving state of view registry with disabled xp based activities
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b282891"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=282891">282891</a>
- <span style="display: none"></span>
- </td>
-
- <td >[compiler] "Comparing identical expressions" warning sometimes invalid
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b283078"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=283078">283078</a>
- <span style="display: none"></span>
- </td>
-
- <td >customAssembly not set for assemble.p2 script
+ <td >[CommonNavigator] Problem with enablement on navigatorContent extension point
</td>
</tr>
@@ -4462,12 +3773,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b283136"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=283136">283136</a>
+ <a name="b296851"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=296851">296851</a>
<span style="display: none"></span>
</td>
- <td >[Intro] AlwaysWelcomeCheckbox - incorrect URL when creating HTML content
+ <td >pluginCustomization argument should be removed from nonFrameworkArgs after being processed
</td>
</tr>
@@ -4478,15 +3789,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
+ bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b283162"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=283162">283162</a>
+ <a name="b297039"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=297039">297039</a>
<span style="display: none"></span>
</td>
- <td >[DataBinding] 3.4 org.eclipse.jface.tests.databinding bundle has a higher version than 3.5
+ <td >Debugger opens ".java" files instead of ".class" files if target platform is inside the workspace
</td>
</tr>
@@ -4497,15 +3808,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
+ bz_major bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b283163"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=283163">283163</a>
+ <a name="b297243"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=297243">297243</a>
<span style="display: none"></span>
</td>
- <td >[Content Type] ContentTypeCatalog causes deadlock (regression from 269158)
+ <td >missing bundles in 3.5.2 stream sdk.examples features
</td>
</tr>
@@ -4519,12 +3830,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_major bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b283185"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=283185">283185</a>
+ <a name="b297663"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=297663">297663</a>
<span style="display: none"></span>
</td>
- <td >product mirroring from context should be non-greedy
+ <td >[JUnit] JUnit not found when JDT installed as dropin
</td>
</tr>
@@ -4538,50 +3849,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b283186"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=283186">283186</a>
- <span style="display: none"></span>
- </td>
-
- <td >Context repositories not passed to the product publisher
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b283204"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=283204">283204</a>
- <span style="display: none"></span>
- </td>
-
- <td >[DataBinding] CheckableCheckedElementsObservableSet#clear can cause ConcurrentModificationException
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b283207"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=283207">283207</a>
+ <a name="b297758"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=297758">297758</a>
<span style="display: none"></span>
</td>
- <td >Plugin org.eclipse.swt.tests has a higher version in the Eclipse 3.4.2 release than the one in Eclipse 35
+ <td >[fwkAdmin] fail to check for null causes NPE when eclipse is installed in the root folder
</td>
</tr>
@@ -4592,129 +3865,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_critical bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b283297"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=283297">283297</a>
- <span style="display: none"></span>
- </td>
-
- <td >Installation path containing square brackets prevents eclipse startup
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b283313"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=283313">283313</a>
- <span style="display: none"></span>
- </td>
-
- <td >[Cocoa] Deleting TableViewer elements and calling refresh() causes major crash
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b283346"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=283346">283346</a>
- <span style="display: none"></span>
- </td>
-
- <td >"Hide Eclipse" doesn't work properly
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_minor bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b283351"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=283351">283351</a>
- <span style="display: none"></span>
- </td>
-
- <td >[DataBinding] Document ObservableListTreeContentProvider ObservableCollectionTreeContentProvider constructor realm restriction
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b283428"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=283428">283428</a>
- <span style="display: none"></span>
- </td>
-
- <td >[DataBinding] ViewerSupport.bind() cannot be called multiple times
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b283467"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=283467">283467</a>
- <span style="display: none"></span>
- </td>
-
- <td >[formatter] wrong indentation with 'Never join lines' selected
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
+ bz_major bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b283475"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=283475">283475</a>
+ <a name="b297950"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=297950">297950</a>
<span style="display: none"></span>
</td>
- <td >[launcher] Eclipse cannot be launched on Solaris 9 because of libc.so library version dependency
+ <td >CompareEditorInputs are leaked when reusing editors
</td>
</tr>
@@ -4728,50 +3887,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b283529"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=283529">283529</a>
+ <a name="b297991"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=297991">297991</a>
<span style="display: none"></span>
</td>
- <td >Eclipse application freeze
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b283682"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=283682">283682</a>
- <span style="display: none"></span>
- </td>
-
- <td >NPE when product does not want to show filter
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b283688"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=283688">283688</a>
- <span style="display: none"></span>
- </td>
-
- <td >No drag/drop feedback selection on Table if using OwnerDrawLabelProvider on Windows
+ <td >Documentation has incorrect default for osgi.bundlefile.limit
</td>
</tr>
@@ -4785,12 +3906,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b283797"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=283797">283797</a>
+ <a name="b298325"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=298325">298325</a>
<span style="display: none"></span>
</td>
- <td >Classloading fails when org.eclipse.osgi.framework.eventmgr.EventManager is closed
+ <td >Wrong version attribute for the self provided capability of a category IU
</td>
</tr>
@@ -4801,15 +3922,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
+ bz_critical bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b283958"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=283958">283958</a>
+ <a name="b298805"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=298805">298805</a>
<span style="display: none"></span>
</td>
- <td >SWT.MULTI does not work for SWT Text control using Mac OS X Cocoa.
+ <td >[widgets] gtk2.18 - Blank pages in the install wizard
</td>
</tr>
@@ -4823,12 +3944,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b284031"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=284031">284031</a>
+ <a name="b298823"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=298823">298823</a>
<span style="display: none"></span>
</td>
- <td >Error while parsing manifest
+ <td >Problem applying multiple patches to the same IU
</td>
</tr>
@@ -4842,12 +3963,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b284303"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=284303">284303</a>
+ <a name="b298826"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=298826">298826</a>
<span style="display: none"></span>
</td>
- <td >Update loses launcher.ini arguments
+ <td >getRequirements on a ResolverIU is incorrect
</td>
</tr>
@@ -4861,12 +3982,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b284366"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=284366">284366</a>
+ <a name="b298828"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=298828">298828</a>
<span style="display: none"></span>
</td>
- <td >[DataBinding] ObservableValueEditingSupport sets model value 1st time even if not changed
+ <td >UpdateQuery does not account for version properly
</td>
</tr>
@@ -4880,50 +4001,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b284431"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=284431">284431</a>
- <span style="display: none"></span>
- </td>
-
- <td >Different inherited thrown exception clauses are not properly handled
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b284482"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=284482">284482</a>
+ <a name="b298879"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=298879">298879</a>
<span style="display: none"></span>
</td>
- <td >[compiler] Collision cases not detected
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_critical bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b284520"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=284520">284520</a>
- <span style="display: none"></span>
- </td>
-
- <td >Class org.osgi.framework.Bundle.loadClass(String name) throws ClassNotFoundException for Array Types
+ <td >[Graphics] Eclipse 2010 splash screen
</td>
</tr>
@@ -4937,88 +4020,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b284650"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=284650">284650</a>
- <span style="display: none"></span>
- </td>
-
- <td >[CommonNavigator] Misleading JavaDoc of the INavigatorContentService
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b284728"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=284728">284728</a>
- <span style="display: none"></span>
- </td>
-
- <td >[misc] Javadoc view stays empty if browser widget is not available
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b284785"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=284785">284785</a>
- <span style="display: none"></span>
- </td>
-
- <td >[1.5][compiler] Eclipse compiler shows error on javac-valid construct: varargs plus overload
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_minor bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b284872"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=284872">284872</a>
- <span style="display: none"></span>
- </td>
-
- <td >TVT35:TCT313: CHS: Duplicate Mnemonic Keys
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_critical bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b284948"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=284948">284948</a>
+ <a name="b298894"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=298894">298894</a>
<span style="display: none"></span>
</td>
- <td >[1.6][compiler] Java annotations are broken in editor when used on interface methods
+ <td >IllegalArgumentException can occur during PackagePermission check
</td>
</tr>
@@ -5032,12 +4039,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b284993"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=284993">284993</a>
+ <a name="b299082"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=299082">299082</a>
<span style="display: none"></span>
</td>
- <td >GC#setAlpha() not respected by GC#drawImage()
+ <td >[Intro] label attribute of tag link doesn't substitute variables like $varName$
</td>
</tr>
@@ -5048,15 +4055,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_normal bz_P3 bz_CLOSED bz_FIXED bz_row_odd ">
+ bz_critical bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b285045"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=285045">285045</a>
+ <a name="b299094"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=299094">299094</a>
<span style="display: none"></span>
</td>
- <td >[IDE] TVT35:TCT330: CHS: Duplicate Mnemonic Keys on workspace pref page
+ <td >[Program] org.eclipse.swt.program.Program.launch() will add prefix "file://" before fileName
</td>
</tr>
@@ -5070,50 +4077,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b285094"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=285094">285094</a>
- <span style="display: none"></span>
- </td>
-
- <td >[DS] Tracing throws Null Pointer Exception (NPE)
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b285215"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=285215">285215</a>
- <span style="display: none"></span>
- </td>
-
- <td >Cannot change breakpoint type using RulerBreakpointTypesActionDelegate
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b285277"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=285277">285277</a>
+ <a name="b299290"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=299290">299290</a>
<span style="display: none"></span>
</td>
- <td >ACTIVE_EDITOR_INPUT_NAME does not contribute to source priority
+ <td >Bad memory performance with multiple p2.repo2runnable calls
</td>
</tr>
@@ -5124,53 +4093,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
+ bz_enhancement bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b285292"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=285292">285292</a>
+ <a name="b299345"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=299345">299345</a>
<span style="display: none"></span>
</td>
- <td >Trace fails to determine class/method/line number when using a tracing class
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_minor bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b285322"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=285322">285322</a>
- <span style="display: none"></span>
- </td>
-
- <td >[ui] TVT35:TCT328: CHS: Duplicate Mnemonic Keys
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b285437"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=285437">285437</a>
- <span style="display: none"></span>
- </td>
-
- <td >[extract superclass] action not enabled any more when class is selected
+ <td >[CommonNavigator] Move expanded HEAD CNF tests to 3.5.2
</td>
</tr>
@@ -5184,183 +4115,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b285443"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=285443">285443</a>
- <span style="display: none"></span>
- </td>
-
- <td >[transport] UpdateSite doesn't handle 403 errors properly
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_blocker bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b285464"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=285464">285464</a>
- <span style="display: none"></span>
- </td>
-
- <td >[DS] dependency injection does not work when starting more than one instance of a service
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b285466"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=285466">285466</a>
- <span style="display: none"></span>
- </td>
-
- <td >[3.5 regression] fails to build IcedTea, works with 3.4.x
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b285585"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=285585">285585</a>
- <span style="display: none"></span>
- </td>
-
- <td >Broken links to PRODUCT_PLUGIN/book.css in platform.doc.user
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b285701"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=285701">285701</a>
- <span style="display: none"></span>
- </td>
-
- <td >[1.5][compiler] Internal Compiler Error - ArrayIndexOutOfBoundsException
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b285727"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=285727">285727</a>
- <span style="display: none"></span>
- </td>
-
- <td >[junit] default auto start setting doesn't work
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b285750"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=285750">285750</a>
- <span style="display: none"></span>
- </td>
-
- <td >[Widgets] Combo - No selection event when selection changed with keyboard
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_major bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b285774"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=285774">285774</a>
- <span style="display: none"></span>
- </td>
-
- <td >p2 director.app is generating compressed profile files by default.
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b285799"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=285799">285799</a>
- <span style="display: none"></span>
- </td>
-
- <td >HashtableOfObject rehashes and grows buffer on removeKey()
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b285804"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=285804">285804</a>
+ <a name="b299373"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=299373">299373</a>
<span style="display: none"></span>
</td>
- <td >[Import/Export] File -> Import filesystem w/cyclical symbolic folder links causes OOME
+ <td >several bundles in the 3.5.2 stream need to have their versions incremented
</td>
</tr>
@@ -5371,31 +4131,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_normal bz_P2 bz_VERIFIED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b285838"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=285838">285838</a>
- <span style="display: none"></span>
- </td>
-
- <td >[apt] IdeFilerImpl breaks javax.annotation.processing.Filer contract
- </td>
-
- </tr>
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
+ bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b285909"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=285909">285909</a>
+ <a name="b299375"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=299375">299375</a>
<span style="display: none"></span>
</td>
- <td >Increment product version numbers for 3.5.1
+ <td >version of org.eclipse.core.resources.compatibility bundle in 3.5.2 stream needs to be updated
</td>
</tr>
@@ -5409,12 +4153,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b285938"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=285938">285938</a>
+ <a name="b299381"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=299381">299381</a>
<span style="display: none"></span>
</td>
- <td >Update org.osgi classes to latest v4.2
+ <td >change perf baselines to run with extssh vs pserver
</td>
</tr>
@@ -5428,12 +4172,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b285996"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=285996">285996</a>
+ <a name="b299438"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=299438">299438</a>
<span style="display: none"></span>
</td>
- <td >[EditorMgmt] [Patch] Reloading of bundles does not discard all editor descriptors
+ <td >[CommonNavigator] CNF viewer state non properly reset when NCEs are activated or deactivated
</td>
</tr>
@@ -5444,53 +4188,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b286028"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=286028">286028</a>
- <span style="display: none"></span>
- </td>
-
- <td >Organize Manifest: Do not remove lazy Bundle-ActivationPolicy header for DS bundles
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b286030"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=286030">286030</a>
- <span style="display: none"></span>
- </td>
-
- <td >[import] [regression] Import as source
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_critical bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
+ bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b286047"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=286047">286047</a>
+ <a name="b299551"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=299551">299551</a>
<span style="display: none"></span>
</td>
- <td >GZipped profile format not understood by 3.5.0
+ <td >[publisher] Category not exported from update wizard with IBM 1.6 VM
</td>
</tr>
@@ -5504,88 +4210,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b286117"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=286117">286117</a>
+ <a name="b299589"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=299589">299589</a>
<span style="display: none"></span>
</td>
- <td >[tranport] Transfer Exception on subsequent download resume
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b286243"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=286243">286243</a>
- <span style="display: none"></span>
- </td>
-
- <td >p2.user.ui feature version should be incremented in 3.5.1 stream
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b286307"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=286307">286307</a>
- <span style="display: none"></span>
- </td>
-
- <td >FilePermission with "<<ALL FILES>>" in permissions.perm
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b286391"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=286391">286391</a>
- <span style="display: none"></span>
- </td>
-
- <td >[compiler] jsr14 target behavior changed between ECJ 3.4.2 and ECJ 3.5
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b286407"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=286407">286407</a>
- <span style="display: none"></span>
- </td>
-
- <td >[Model] IMemberValuePair don't return the right value for java.lang.annotation.RetentionPolicy annotations
+ <td >EventManager.EventThread.run holding excess memory
</td>
</tr>
@@ -5599,12 +4229,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b286505"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=286505">286505</a>
+ <a name="b299704"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=299704">299704</a>
<span style="display: none"></span>
</td>
- <td >version of org.eclipse.equinox.p2.repository should be incremented in 3.5.x maintenance stream
+ <td >org.eclipse.pde.ds.core service version needs to be incremented in 3.5.2 stream builds
</td>
</tr>
@@ -5615,15 +4245,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_normal bz_P3 bz_CLOSED bz_FIXED bz_row_odd ">
+ bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b286518"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=286518">286518</a>
+ <a name="b299705"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=299705">299705</a>
<span style="display: none"></span>
</td>
- <td >DVT35:TCT558: CHS - Help Contents - Incorrect number
+ <td >service version of org.eclipse.pde.build needs to be incremented in 3.5.2 stream
</td>
</tr>
@@ -5637,50 +4267,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b286533"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=286533">286533</a>
- <span style="display: none"></span>
- </td>
-
- <td >[DataBinding] Test failure in build N20090812-2000
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b286581"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=286581">286581</a>
+ <a name="b299706"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=299706">299706</a>
<span style="display: none"></span>
</td>
- <td >FeatureGeneralPropertyPage message collation
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b286600"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=286600">286600</a>
- <span style="display: none"></span>
- </td>
-
- <td >[Markers] DVT35:TCT580: CHT: Descriptions the same as for Problem view
+ <td >[CommonNavigator] org.eclipse.ui.navigator bundle needs to be incremented in 3.5.2 stream
</td>
</tr>
@@ -5694,88 +4286,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b286645"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=286645">286645</a>
- <span style="display: none"></span>
- </td>
-
- <td >Fix for bug 155465 doesn't take security into account.
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b286682"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=286682">286682</a>
- <span style="display: none"></span>
- </td>
-
- <td >SwitchStatement traverses this.expression with incorrect scope
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_minor bz_P3 bz_CLOSED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b286720"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=286720">286720</a>
- <span style="display: none"></span>
- </td>
-
- <td >DVT35:TCT601: FRA - Access Rules title should be in bold
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_CLOSED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b286721"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=286721">286721</a>
- <span style="display: none"></span>
- </td>
-
- <td >DVT35:TCT599: FRA - PDE - Link not working
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b286755"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=286755">286755</a>
+ <a name="b300384"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=300384">300384</a>
<span style="display: none"></span>
</td>
- <td >[Help] The dialog font is not applied to the Help Content preference pages.
+ <td >Update copyright in Help > About
</td>
</tr>
@@ -5786,53 +4302,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b286779"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=286779">286779</a>
- <span style="display: none"></span>
- </td>
-
- <td >[Browser] Xulrunner >= 1.9 Embedding: need to call "XRE_NotifyProfile"
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b286840"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=286840">286840</a>
- <span style="display: none"></span>
- </td>
-
- <td >ClasspathJar getPath() should return a unique path
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
+ bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b286956"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=286956">286956</a>
+ <a name="b300439"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=300439">300439</a>
<span style="display: none"></span>
</td>
- <td >NPE when asking to externalize constant
+ <td >Tracker contains a println()
</td>
</tr>
@@ -5846,88 +4324,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b286968"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=286968">286968</a>
+ <a name="b300579"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=300579">300579</a>
<span style="display: none"></span>
</td>
- <td >Backport to 3.5.1 fix for Bug 103301
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_enhancement bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b287138"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=287138">287138</a>
- <span style="display: none"></span>
- </td>
-
- <td >[CommonNavigator] Add tests simulating CDT/JDT to CNF
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b287208"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=287208">287208</a>
- <span style="display: none"></span>
- </td>
-
- <td >TVT35:TCT669: DEU: Defunct. buttons in Preferences API Errors/Warnings
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b287323"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=287323">287323</a>
- <span style="display: none"></span>
- </td>
-
- <td >[compiler][apt] Error type detection is too conservative
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b287424"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=287424">287424</a>
- <span style="display: none"></span>
- </td>
-
- <td >[JUnit] Update license for 4.5
+ <td >Filter does not allow !, | or & as first character of attr names
</td>
</tr>
@@ -5941,12 +4343,12 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b287449"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=287449">287449</a>
+ <a name="b301284"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=301284">301284</a>
<span style="display: none"></span>
</td>
- <td >Behavior change between 3.4.2 and 3.5 around TCCL management when a Bundle is started
+ <td >Eclipse 3.5.2: readme_eclipse.html refers to a missing preference page: Help -> Help Server
</td>
</tr>
@@ -5957,15 +4359,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
+ bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b287590"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=287590">287590</a>
+ <a name="b301719"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=301719">301719</a>
<span style="display: none"></span>
</td>
- <td >core.resources bundle version needs to be incremented in 3.5.x stream
+ <td >update to Galielo Orbit SR2 build for 3.5.2
</td>
</tr>
@@ -5976,15 +4378,15 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
<tr class="bz_bugitem
- bz_major bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
+ bz_blocker bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
<td class="first-child">
- <a name="b287601"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=287601">287601</a>
+ <a name="b301827"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=301827">301827</a>
<span style="display: none"></span>
</td>
- <td >[DataBinding][Regression] NullpointerException if observables are disposed while masterdetail running
+ <td >Incorrect version number and copyright year About dialog
</td>
</tr>
@@ -5998,82 +4400,37 @@ Note: Bug fixes since the 3.4.2 release can be obtained by the following the Bug
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
<td class="first-child">
- <a name="b287621"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=287621">287621</a>
- <span style="display: none"></span>
- </td>
-
- <td >[CommonNavigator] Add more tracing
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b287746"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=287746">287746</a>
+ <a name="b302271"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=302271">302271</a>
<span style="display: none"></span>
</td>
- <td >Adopt ECF support on NTLM2
+ <td >org.eclipse.equinox.sdk needs to be tagged in 3.5.2 stream
</td>
</tr>
+ </table>
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b287850"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=287850">287850</a>
- <span style="display: none"></span>
- </td>
-
- <td >EventManager must protect thread creation with proper doPriv
- </td>
- </tr>
-
+<span class="bz_result_count">149 bugs found.
+</span>
-
+<br>
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
- <td class="first-child">
- <a name="b288374"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=288374">288374</a>
- <span style="display: none"></span>
- </td>
- <td >[CommonNavigator] Compile error in tests
- </td>
- </tr>
-
-
- </table>
- <span class="bz_result_count">236 bugs found.
- </span>
+<p>
@@ -6104,7 +4461,7 @@ U.S. and other countries.</p>
Software Systems Ltd.</p>
<p>Other company, product, and service names may be trademarks or service marks
of others.</p>
-<p>(c) Copyright IBM Corp. and others 2009</p>
+<p>(c) Copyright IBM Corp. and others 2010</p>
<h2><a name="Appendix1">Appendix 1: Execution Environment by Bundle</a></h2>
diff --git a/eclipse/features/org.eclipse.platform/sourceTemplateFeature/feature.properties b/eclipse/features/org.eclipse.platform/sourceTemplateFeature/feature.properties
index fd1b3bd..57b9627 100644
--- a/eclipse/features/org.eclipse.platform/sourceTemplateFeature/feature.properties
+++ b/eclipse/features/org.eclipse.platform/sourceTemplateFeature/feature.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
+# Copyright (c) 2000, 2010 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -28,7 +28,7 @@ description=Common OS-independent API documentation and source code zips for the
# "copyright" property - text of the "Feature Update Copyright"
copyright=\
-Copyright (c) 2000, 2009 IBM Corporation and others.\n\
+Copyright (c) 2000, 2010 IBM Corporation and others.\n\
All rights reserved. This program and the accompanying materials\n\
are made available under the terms of the Eclipse Public License v1.0\n\
which accompanies this distribution, and is available at\n\
diff --git a/eclipse/features/org.eclipse.rcp/feature.xml b/eclipse/features/org.eclipse.rcp/feature.xml
index 8b3d867..3f34bcd 100644
--- a/eclipse/features/org.eclipse.rcp/feature.xml
+++ b/eclipse/features/org.eclipse.rcp/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.rcp"
label="%featureName"
- version="3.5.1.qualifier"
+ version="3.5.2.qualifier"
provider-name="%providerName"
plugin="org.eclipse.rcp"
image="eclipse_update_120.jpg">
diff --git a/eclipse/features/org.eclipse.sdk/feature.xml b/eclipse/features/org.eclipse.sdk/feature.xml
index 02d27d7..9f3c0d8 100644
--- a/eclipse/features/org.eclipse.sdk/feature.xml
+++ b/eclipse/features/org.eclipse.sdk/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.sdk"
label="%featureName"
- version="3.5.1.qualifier"
+ version="3.5.2.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg">
@@ -54,16 +54,16 @@
<includes
id="org.eclipse.pde.source"
- version="0.0.0"/>
-
+ version="0.0.0"/>
+
<includes
id="org.eclipse.help"
version="0.0.0"/>
-
+
<includes
id="org.eclipse.help.source"
version="0.0.0"/>
-
+
<plugin
id="org.eclipse.sdk"
download-size="0"
diff --git a/eclipse/fetch_com.ibm.icu.base.xml b/eclipse/fetch_com.ibm.icu.base.xml
index 32a534c..ae8aa40 100644
--- a/eclipse/fetch_com.ibm.icu.base.xml
+++ b/eclipse/fetch_com.ibm.icu.base.xml
@@ -25,12 +25,12 @@
</target>
<target name="fetch.plugins" if="featureAndPlugins">
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="com.ibm.icu.base" version="4.0.1.v20090822" />
</p2.repo2runnable>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="com.ibm.icu.base.source" version="4.0.1.v20090822" />
</p2.repo2runnable>
diff --git a/eclipse/fetch_master-ecf.xml b/eclipse/fetch_master-ecf.xml
index 0afff45..e71ce73 100644
--- a/eclipse/fetch_master-ecf.xml
+++ b/eclipse/fetch_master-ecf.xml
@@ -24,39 +24,39 @@
</antcall>
</target>
<target name="fetch.plugins" if="featureAndPlugins">
- <get src="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf_3.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf_3.0.0.v20090831-1906.jar" usetimestamp="true"/>
- <get src="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf.source_3.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.source_3.0.0.v20090831-1906.jar" usetimestamp="true"/>
- <get src="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf.filetransfer_3.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.filetransfer_3.0.0.v20090831-1906.jar" usetimestamp="true"/>
- <get src="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf.filetransfer.source_3.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.filetransfer.source_3.0.0.v20090831-1906.jar" usetimestamp="true"/>
- <get src="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf.identity_3.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.identity_3.0.0.v20090831-1906.jar" usetimestamp="true"/>
- <get src="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf.identity.source_3.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.identity.source_3.0.0.v20090831-1906.jar" usetimestamp="true"/>
- <get src="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf.provider.filetransfer_3.0.1.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.provider.filetransfer_3.0.1.v20090831-1906.jar" usetimestamp="true"/>
- <get src="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf.provider.filetransfer.source_3.0.1.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.provider.filetransfer.source_3.0.1.v20090831-1906.jar" usetimestamp="true"/>
- <get src="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf.provider.filetransfer.ssl_1.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.provider.filetransfer.ssl_1.0.0.v20090831-1906.jar" usetimestamp="true"/>
- <get src="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf.provider.filetransfer.ssl.source_1.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.provider.filetransfer.ssl.source_1.0.0.v20090831-1906.jar" usetimestamp="true"/>
- <get src="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf.ssl_1.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.ssl_1.0.0.v20090831-1906.jar" usetimestamp="true"/>
- <get src="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf.ssl.source_1.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.ssl.source_1.0.0.v20090831-1906.jar" usetimestamp="true"/>
- <get src="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf.provider.filetransfer.httpclient_3.0.1.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.provider.filetransfer.httpclient_3.0.1.v20090831-1906.jar" usetimestamp="true"/>
- <get src="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf.provider.filetransfer.httpclient.source_3.0.1.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.source_3.0.1.v20090831-1906.jar" usetimestamp="true"/>
- <get src="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.v20090831-1906.jar" usetimestamp="true"/>
- <get src="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source_1.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source_1.0.0.v20090831-1906.jar" usetimestamp="true"/>
+ <get src="http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf_3.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf_3.0.0.v20090831-1906.jar" usetimestamp="true"/>
+ <get src="http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.source_3.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.source_3.0.0.v20090831-1906.jar" usetimestamp="true"/>
+ <get src="http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.filetransfer_3.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.filetransfer_3.0.0.v20090831-1906.jar" usetimestamp="true"/>
+ <get src="http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.filetransfer.source_3.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.filetransfer.source_3.0.0.v20090831-1906.jar" usetimestamp="true"/>
+ <get src="http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.identity_3.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.identity_3.0.0.v20090831-1906.jar" usetimestamp="true"/>
+ <get src="http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.identity.source_3.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.identity.source_3.0.0.v20090831-1906.jar" usetimestamp="true"/>
+ <get src="http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.provider.filetransfer_3.0.1.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.provider.filetransfer_3.0.1.v20090831-1906.jar" usetimestamp="true"/>
+ <get src="http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.provider.filetransfer.source_3.0.1.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.provider.filetransfer.source_3.0.1.v20090831-1906.jar" usetimestamp="true"/>
+ <get src="http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.provider.filetransfer.ssl_1.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.provider.filetransfer.ssl_1.0.0.v20090831-1906.jar" usetimestamp="true"/>
+ <get src="http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.provider.filetransfer.ssl.source_1.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.provider.filetransfer.ssl.source_1.0.0.v20090831-1906.jar" usetimestamp="true"/>
+ <get src="http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.ssl_1.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.ssl_1.0.0.v20090831-1906.jar" usetimestamp="true"/>
+ <get src="http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.ssl.source_1.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.ssl.source_1.0.0.v20090831-1906.jar" usetimestamp="true"/>
+ <get src="http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.provider.filetransfer.httpclient_3.0.1.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.provider.filetransfer.httpclient_3.0.1.v20090831-1906.jar" usetimestamp="true"/>
+ <get src="http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.source_3.0.1.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.source_3.0.1.v20090831-1906.jar" usetimestamp="true"/>
+ <get src="http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.v20090831-1906.jar" usetimestamp="true"/>
+ <get src="http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source_1.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source_1.0.0.v20090831-1906.jar" usetimestamp="true"/>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="org.apache.commons.codec" version="1.3.0.v20080530-1600" />
</p2.repo2runnable>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="org.apache.commons.codec.source" version="1.3.0.v20080530-1600" />
</p2.repo2runnable>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="org.apache.commons.httpclient" version="3.1.0.v20080605-1935" />
</p2.repo2runnable>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="org.apache.commons.httpclient.source" version="3.1.0.v20080605-1935" />
</p2.repo2runnable>
diff --git a/eclipse/fetch_master-equinox.xml b/eclipse/fetch_master-equinox.xml
index 6eab1d9..ac0eea3 100644
--- a/eclipse/fetch_master-equinox.xml
+++ b/eclipse/fetch_master-equinox.xml
@@ -132,32 +132,32 @@
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="javax.servlet" version="2.4.0.v200806031604" />
</p2.repo2runnable>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="javax.servlet" version="2.5.0.v200806031605" />
</p2.repo2runnable>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="org.apache.commons.logging" version="1.0.4.v200904062259" />
</p2.repo2runnable>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="org.mortbay.jetty" version="5.1.14.v200806031611" />
</p2.repo2runnable>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="org.mortbay.jetty.server" version="6.1.15.v200905151201" />
</p2.repo2runnable>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="org.mortbay.jetty.util" version="6.1.15.v200905182336" />
</p2.repo2runnable>
diff --git a/eclipse/fetch_master-jetty.xml b/eclipse/fetch_master-jetty.xml
index 58a6f2c..6c1c58a 100644
--- a/eclipse/fetch_master-jetty.xml
+++ b/eclipse/fetch_master-jetty.xml
@@ -32,7 +32,7 @@
<param name="elementName" value="org.eclipse.osgi"/>
<param name="module" value="org.eclipse.equinox/framework/bundles/org.eclipse.osgi"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="R35x_v20090827"/>
+ <param name="tag" value="R35x_v20100126"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
diff --git a/eclipse/fetch_master.xml b/eclipse/fetch_master.xml
index 64bb7a5..19e884e 100644
--- a/eclipse/fetch_master.xml
+++ b/eclipse/fetch_master.xml
@@ -32,12 +32,12 @@
<param name="elementName" value="org.eclipse.swt.tools"/>
<param name="module" value="org.eclipse.swt.tools"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v3555a"/>
+ <param name="tag" value="v3557f"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="com.ibm.icu.source" version="4.0.1.v20090822" />
</p2.repo2runnable>
@@ -49,7 +49,7 @@
<param name="elementName" value="org.eclipse.swt.win32.wce_ppc.arm"/>
<param name="module" value="org.eclipse.swt.win32.wce_ppc.arm"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v3555a"/>
+ <param name="tag" value="v3557f"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -61,7 +61,7 @@
<param name="elementName" value="org.eclipse.swt.motif.solaris.sparc"/>
<param name="module" value="org.eclipse.swt.motif.solaris.sparc"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v3555a"/>
+ <param name="tag" value="v3557f"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
diff --git a/eclipse/fetch_org.eclipse.cvs.xml b/eclipse/fetch_org.eclipse.cvs.xml
index 4a4bcc6..52a2242 100644
--- a/eclipse/fetch_org.eclipse.cvs.xml
+++ b/eclipse/fetch_org.eclipse.cvs.xml
@@ -18,7 +18,7 @@
<param name="elementName" value="org.eclipse.cvs"/>
<param name="module" value="org.eclipse.cvs-feature"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="R35x_v20090811"/>
+ <param name="tag" value="R35x_v20100125"/>
<param name="destinationFolder" value="${buildDirectory}/features"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -32,7 +32,7 @@
<param name="elementName" value="org.eclipse.cvs"/>
<param name="module" value="org.eclipse.sdk-feature/plugins/org.eclipse.cvs"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090520"/>
+ <param name="tag" value="R35x_v20100119"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -80,7 +80,7 @@
<param name="elementName" value="org.eclipse.team.cvs.ui"/>
<param name="module" value="org.eclipse.team.cvs.ui"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="R35x_v20090826-0905"/>
+ <param name="tag" value="r35x_20090930-0800"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
diff --git a/eclipse/fetch_org.eclipse.equinox.compendium.sdk.xml b/eclipse/fetch_org.eclipse.equinox.compendium.sdk.xml
index 2a73af6..61596c3 100644
--- a/eclipse/fetch_org.eclipse.equinox.compendium.sdk.xml
+++ b/eclipse/fetch_org.eclipse.equinox.compendium.sdk.xml
@@ -18,7 +18,7 @@
<param name="elementName" value="org.eclipse.equinox.compendium.sdk"/>
<param name="module" value="org.eclipse.equinox/compendium/features/org.eclipse.equinox.compendium.sdk"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="R35x_v20090811"/>
+ <param name="tag" value="R35x_v20100105"/>
<param name="destinationFolder" value="${buildDirectory}/features"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -32,7 +32,7 @@
<param name="elementName" value="org.eclipse.equinox.app"/>
<param name="module" value="org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.app"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090520-1800"/>
+ <param name="tag" value="R35x_v20091203"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -80,7 +80,7 @@
<param name="elementName" value="org.eclipse.equinox.event"/>
<param name="module" value="org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.event"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090520-1800"/>
+ <param name="tag" value="R35x_v20100209"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -140,7 +140,7 @@
<param name="elementName" value="org.eclipse.equinox.preferences"/>
<param name="module" value="org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.preferences"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090520-1800"/>
+ <param name="tag" value="R35x_v20091117"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
diff --git a/eclipse/fetch_org.eclipse.equinox.core.sdk.xml b/eclipse/fetch_org.eclipse.equinox.core.sdk.xml
index b2dea1b..4321fdd 100644
--- a/eclipse/fetch_org.eclipse.equinox.core.sdk.xml
+++ b/eclipse/fetch_org.eclipse.equinox.core.sdk.xml
@@ -18,7 +18,7 @@
<param name="elementName" value="org.eclipse.equinox.core.sdk"/>
<param name="module" value="org.eclipse.equinox/framework/features/org.eclipse.equinox.core.sdk"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="R35x_v20090811"/>
+ <param name="tag" value="R35x_v20100105"/>
<param name="destinationFolder" value="${buildDirectory}/features"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -32,7 +32,7 @@
<param name="elementName" value="org.eclipse.osgi"/>
<param name="module" value="org.eclipse.equinox/framework/bundles/org.eclipse.osgi"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="R35x_v20090827"/>
+ <param name="tag" value="R35x_v20100126"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -104,7 +104,7 @@
<param name="elementName" value="org.eclipse.equinox.transforms.xslt"/>
<param name="module" value="org.eclipse.equinox/components/bundles/org.eclipse.equinox.transforms.xslt"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090520-1800"/>
+ <param name="tag" value="R35x_v20100209"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -140,7 +140,7 @@
<param name="elementName" value="org.eclipse.equinox.concurrent"/>
<param name="module" value="org.eclipse.equinox/components/bundles/org.eclipse.equinox.concurrent"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090520-1800"/>
+ <param name="tag" value="R35x_v20100209"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
diff --git a/eclipse/fetch_org.eclipse.equinox.executable.xml b/eclipse/fetch_org.eclipse.equinox.executable.xml
index 77bec41..e19a1f4 100644
--- a/eclipse/fetch_org.eclipse.equinox.executable.xml
+++ b/eclipse/fetch_org.eclipse.equinox.executable.xml
@@ -18,7 +18,7 @@
<param name="elementName" value="org.eclipse.equinox.executable"/>
<param name="module" value="org.eclipse.equinox/framework/bundles/org.eclipse.equinox.executable"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="R35x_v20090724"/>
+ <param name="tag" value="R35x_v20091211"/>
<param name="destinationFolder" value="${buildDirectory}/features"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -68,7 +68,7 @@
<param name="elementName" value="org.eclipse.equinox.launcher.motif.solaris.sparc"/>
<param name="module" value="org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.solaris.sparc"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="HEAD"/>
+ <param name="tag" value="R35x_20090929"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -164,7 +164,7 @@
<param name="elementName" value="org.eclipse.equinox.launcher.motif.aix.ppc"/>
<param name="module" value="org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.aix.ppc"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090519"/>
+ <param name="tag" value="R35x_v20091211"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -200,7 +200,7 @@
<param name="elementName" value="org.eclipse.equinox.launcher.motif.linux.x86"/>
<param name="module" value="org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.linux.x86"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090520"/>
+ <param name="tag" value="R35x_v20100209"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
diff --git a/eclipse/fetch_org.eclipse.equinox.jmx.common.feature.xml b/eclipse/fetch_org.eclipse.equinox.jmx.common.feature.xml
index 35fe846..8550fac 100644
--- a/eclipse/fetch_org.eclipse.equinox.jmx.common.feature.xml
+++ b/eclipse/fetch_org.eclipse.equinox.jmx.common.feature.xml
@@ -25,32 +25,32 @@
</target>
<target name="fetch.plugins" if="featureAndPlugins">
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="org.apache.commons.codec" version="1.3.0.v20080530-1600" />
</p2.repo2runnable>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="org.apache.commons.httpclient" version="3.1.0.v20080605-1935" />
</p2.repo2runnable>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="org.apache.commons.logging" version="1.0.4.v200904062259" />
</p2.repo2runnable>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="org.apache.ws.commons.util" version="1.0.0.v20081204" />
</p2.repo2runnable>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="org.apache.ws.jaxme" version="0.5.1.v20080530-1550" />
</p2.repo2runnable>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="org.apache.xmlrpc" version="3.0.0.v20080530-1550" />
</p2.repo2runnable>
@@ -62,17 +62,17 @@
<param name="elementName" value="org.eclipse.equinox.jmx.common"/>
<param name="module" value="org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.common"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20070510"/>
+ <param name="tag" value="R35x_v20100209"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="javax.management" version="1.2.0.v200803061811" />
</p2.repo2runnable>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="javax.management.remote" version="1.0.0.v200803061811" />
</p2.repo2runnable>
diff --git a/eclipse/fetch_org.eclipse.equinox.jmx.server.feature.xml b/eclipse/fetch_org.eclipse.equinox.jmx.server.feature.xml
index 9c0cbb8..ce1ee9c 100644
--- a/eclipse/fetch_org.eclipse.equinox.jmx.server.feature.xml
+++ b/eclipse/fetch_org.eclipse.equinox.jmx.server.feature.xml
@@ -133,12 +133,12 @@
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="org.mortbay.jetty" version="5.1.14.v200806031611" />
</p2.repo2runnable>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="javax.servlet" version="2.4.0.v200806031604" />
</p2.repo2runnable>
diff --git a/eclipse/fetch_org.eclipse.equinox.p2.agent.feature.xml b/eclipse/fetch_org.eclipse.equinox.p2.agent.feature.xml
index 78a0682..68d4b2a 100644
--- a/eclipse/fetch_org.eclipse.equinox.p2.agent.feature.xml
+++ b/eclipse/fetch_org.eclipse.equinox.p2.agent.feature.xml
@@ -32,7 +32,7 @@
<param name="elementName" value="org.eclipse.equinox.p2.director"/>
<param name="module" value="org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090520-1905"/>
+ <param name="tag" value="R35x_v20100112"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -56,7 +56,7 @@
<param name="elementName" value="org.eclipse.equinox.p2.engine"/>
<param name="module" value="org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.engine"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="R35x_v20090825"/>
+ <param name="tag" value="R35x_v20091117"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -80,7 +80,7 @@
<param name="elementName" value="org.eclipse.equinox.p2.metadata"/>
<param name="module" value="org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090525"/>
+ <param name="tag" value="R35x_v20100112"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -176,7 +176,7 @@
<param name="elementName" value="org.eclipse.equinox.frameworkadmin.equinox"/>
<param name="module" value="org.eclipse.equinox/p2/bundles/org.eclipse.equinox.frameworkadmin.equinox"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090520-1905"/>
+ <param name="tag" value="R35x_v20091214"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -200,7 +200,7 @@
<param name="elementName" value="org.eclipse.equinox.simpleconfigurator.manipulator"/>
<param name="module" value="org.eclipse.equinox/p2/bundles/org.eclipse.equinox.simpleconfigurator.manipulator"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090520-1905"/>
+ <param name="tag" value="R35x_v20100209"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -272,7 +272,7 @@
<param name="elementName" value="org.eclipse.equinox.p2.metadata.generator"/>
<param name="module" value="org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata.generator"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090520-1905"/>
+ <param name="tag" value="R35x_20100114"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -284,18 +284,18 @@
<param name="elementName" value="org.eclipse.equinox.p2.updatesite"/>
<param name="module" value="org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.updatesite"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090525"/>
+ <param name="tag" value="R35x_20100105"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
-<iu id="org.sat4j.core" version="2.1.0.v20090520" />
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
+<iu id="org.sat4j.core" version="2.1.1.v20090825" />
</p2.repo2runnable>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
-<iu id="org.sat4j.pb" version="2.1.0.v20090520" />
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
+<iu id="org.sat4j.pb" version="2.1.1.v20090825" />
</p2.repo2runnable>
<available property="${buildDirectory}/plugins/org.eclipse.equinox.security/plugin.xml" file="${buildDirectory}/plugins/org.eclipse.equinox.security/plugin.xml" />
@@ -318,7 +318,7 @@
<param name="elementName" value="org.eclipse.equinox.p2.publisher"/>
<param name="module" value="org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.publisher"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090527-1812"/>
+ <param name="tag" value="R35x_20100105"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -330,7 +330,7 @@
<param name="elementName" value="org.eclipse.equinox.p2.repository.tools"/>
<param name="module" value="org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.repository.tools"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="R35x_v20090806"/>
+ <param name="tag" value="R35x_20100111"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -342,7 +342,7 @@
<param name="elementName" value="org.eclipse.equinox.p2.repository"/>
<param name="module" value="org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.repository"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090901-1041"/>
+ <param name="tag" value="R35x_v20100105"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
diff --git a/eclipse/fetch_org.eclipse.equinox.p2.director.feature.xml b/eclipse/fetch_org.eclipse.equinox.p2.director.feature.xml
index 16bc006..87b87da 100644
--- a/eclipse/fetch_org.eclipse.equinox.p2.director.feature.xml
+++ b/eclipse/fetch_org.eclipse.equinox.p2.director.feature.xml
@@ -32,7 +32,7 @@
<param name="elementName" value="org.eclipse.equinox.p2.director"/>
<param name="module" value="org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090520-1905"/>
+ <param name="tag" value="R35x_v20100112"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -44,7 +44,7 @@
<param name="elementName" value="org.eclipse.equinox.p2.director.app"/>
<param name="module" value="org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director.app"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090521-1912"/>
+ <param name="tag" value="R35x_v20091106"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -68,7 +68,7 @@
<param name="elementName" value="org.eclipse.equinox.p2.engine"/>
<param name="module" value="org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.engine"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="R35x_v20090825"/>
+ <param name="tag" value="R35x_v20091117"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -92,7 +92,7 @@
<param name="elementName" value="org.eclipse.equinox.p2.metadata"/>
<param name="module" value="org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090525"/>
+ <param name="tag" value="R35x_v20100112"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -120,9 +120,9 @@
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
- <get src="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf_3.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf_3.0.0.v20090831-1906.jar" usetimestamp="true"/>
- <get src="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf.filetransfer_3.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.filetransfer_3.0.0.v20090831-1906.jar" usetimestamp="true"/>
- <get src="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf.identity_3.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.identity_3.0.0.v20090831-1906.jar" usetimestamp="true"/>
+ <get src="http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf_3.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf_3.0.0.v20090831-1906.jar" usetimestamp="true"/>
+ <get src="http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.filetransfer_3.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.filetransfer_3.0.0.v20090831-1906.jar" usetimestamp="true"/>
+ <get src="http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.identity_3.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.identity_3.0.0.v20090831-1906.jar" usetimestamp="true"/>
<available property="${buildDirectory}/plugins/org.eclipse.equinox.p2.exemplarysetup/plugin.xml" file="${buildDirectory}/plugins/org.eclipse.equinox.p2.exemplarysetup/plugin.xml" />
<available property="${buildDirectory}/plugins/org.eclipse.equinox.p2.exemplarysetup/plugin.xml" file="${buildDirectory}/plugins/org.eclipse.equinox.p2.exemplarysetup/META-INF/MANIFEST.MF" />
<antcall target="FetchFromCVS">
@@ -191,7 +191,7 @@
<param name="elementName" value="org.eclipse.equinox.frameworkadmin.equinox"/>
<param name="module" value="org.eclipse.equinox/p2/bundles/org.eclipse.equinox.frameworkadmin.equinox"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090520-1905"/>
+ <param name="tag" value="R35x_v20091214"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -207,7 +207,7 @@
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
- <get src="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf.provider.filetransfer_3.0.1.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.provider.filetransfer_3.0.1.v20090831-1906.jar" usetimestamp="true"/>
+ <get src="http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.provider.filetransfer_3.0.1.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.provider.filetransfer_3.0.1.v20090831-1906.jar" usetimestamp="true"/>
<available property="${buildDirectory}/plugins/org.eclipse.equinox.simpleconfigurator.manipulator/plugin.xml" file="${buildDirectory}/plugins/org.eclipse.equinox.simpleconfigurator.manipulator/plugin.xml" />
<available property="${buildDirectory}/plugins/org.eclipse.equinox.simpleconfigurator.manipulator/plugin.xml" file="${buildDirectory}/plugins/org.eclipse.equinox.simpleconfigurator.manipulator/META-INF/MANIFEST.MF" />
<antcall target="FetchFromCVS">
@@ -216,7 +216,7 @@
<param name="elementName" value="org.eclipse.equinox.simpleconfigurator.manipulator"/>
<param name="module" value="org.eclipse.equinox/p2/bundles/org.eclipse.equinox.simpleconfigurator.manipulator"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090520-1905"/>
+ <param name="tag" value="R35x_v20100209"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -233,13 +233,13 @@
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
-<iu id="org.sat4j.core" version="2.1.0.v20090520" />
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
+<iu id="org.sat4j.core" version="2.1.1.v20090825" />
</p2.repo2runnable>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
-<iu id="org.sat4j.pb" version="2.1.0.v20090520" />
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
+<iu id="org.sat4j.pb" version="2.1.1.v20090825" />
</p2.repo2runnable>
<available property="${buildDirectory}/plugins/org.eclipse.equinox.security/plugin.xml" file="${buildDirectory}/plugins/org.eclipse.equinox.security/plugin.xml" />
diff --git a/eclipse/fetch_org.eclipse.equinox.p2.generator.feature.xml b/eclipse/fetch_org.eclipse.equinox.p2.generator.feature.xml
index 7cae55c..a5bb378 100644
--- a/eclipse/fetch_org.eclipse.equinox.p2.generator.feature.xml
+++ b/eclipse/fetch_org.eclipse.equinox.p2.generator.feature.xml
@@ -68,7 +68,7 @@
<param name="elementName" value="org.eclipse.equinox.p2.director"/>
<param name="module" value="org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090520-1905"/>
+ <param name="tag" value="R35x_v20100112"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -80,7 +80,7 @@
<param name="elementName" value="org.eclipse.equinox.p2.engine"/>
<param name="module" value="org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.engine"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="R35x_v20090825"/>
+ <param name="tag" value="R35x_v20091117"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -116,7 +116,7 @@
<param name="elementName" value="org.eclipse.equinox.p2.metadata"/>
<param name="module" value="org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090525"/>
+ <param name="tag" value="R35x_v20100112"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -128,7 +128,7 @@
<param name="elementName" value="org.eclipse.equinox.p2.metadata.generator"/>
<param name="module" value="org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata.generator"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090520-1905"/>
+ <param name="tag" value="R35x_20100114"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -168,10 +168,10 @@
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
- <get src="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf_3.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf_3.0.0.v20090831-1906.jar" usetimestamp="true"/>
- <get src="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf.filetransfer_3.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.filetransfer_3.0.0.v20090831-1906.jar" usetimestamp="true"/>
- <get src="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf.identity_3.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.identity_3.0.0.v20090831-1906.jar" usetimestamp="true"/>
- <get src="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf.provider.filetransfer_3.0.1.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.provider.filetransfer_3.0.1.v20090831-1906.jar" usetimestamp="true"/>
+ <get src="http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf_3.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf_3.0.0.v20090831-1906.jar" usetimestamp="true"/>
+ <get src="http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.filetransfer_3.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.filetransfer_3.0.0.v20090831-1906.jar" usetimestamp="true"/>
+ <get src="http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.identity_3.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.identity_3.0.0.v20090831-1906.jar" usetimestamp="true"/>
+ <get src="http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.provider.filetransfer_3.0.1.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.provider.filetransfer_3.0.1.v20090831-1906.jar" usetimestamp="true"/>
<available property="${buildDirectory}/plugins/org.eclipse.equinox.frameworkadmin/plugin.xml" file="${buildDirectory}/plugins/org.eclipse.equinox.frameworkadmin/plugin.xml" />
<available property="${buildDirectory}/plugins/org.eclipse.equinox.frameworkadmin/plugin.xml" file="${buildDirectory}/plugins/org.eclipse.equinox.frameworkadmin/META-INF/MANIFEST.MF" />
<antcall target="FetchFromCVS">
@@ -192,7 +192,7 @@
<param name="elementName" value="org.eclipse.equinox.frameworkadmin.equinox"/>
<param name="module" value="org.eclipse.equinox/p2/bundles/org.eclipse.equinox.frameworkadmin.equinox"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090520-1905"/>
+ <param name="tag" value="R35x_v20091214"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -216,7 +216,7 @@
<param name="elementName" value="org.eclipse.equinox.simpleconfigurator.manipulator"/>
<param name="module" value="org.eclipse.equinox/p2/bundles/org.eclipse.equinox.simpleconfigurator.manipulator"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090520-1905"/>
+ <param name="tag" value="R35x_v20100209"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -233,13 +233,13 @@
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
-<iu id="org.sat4j.core" version="2.1.0.v20090520" />
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
+<iu id="org.sat4j.core" version="2.1.1.v20090825" />
</p2.repo2runnable>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
-<iu id="org.sat4j.pb" version="2.1.0.v20090520" />
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
+<iu id="org.sat4j.pb" version="2.1.1.v20090825" />
</p2.repo2runnable>
<available property="${buildDirectory}/plugins/org.eclipse.equinox.security/plugin.xml" file="${buildDirectory}/plugins/org.eclipse.equinox.security/plugin.xml" />
@@ -262,7 +262,7 @@
<param name="elementName" value="org.eclipse.equinox.p2.publisher"/>
<param name="module" value="org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.publisher"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090527-1812"/>
+ <param name="tag" value="R35x_20100105"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
diff --git a/eclipse/fetch_org.eclipse.equinox.p2.sdk.xml b/eclipse/fetch_org.eclipse.equinox.p2.sdk.xml
index 518150f..df3f79c 100644
--- a/eclipse/fetch_org.eclipse.equinox.p2.sdk.xml
+++ b/eclipse/fetch_org.eclipse.equinox.p2.sdk.xml
@@ -25,17 +25,17 @@
</target>
<target name="fetch.plugins" if="featureAndPlugins">
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="org.apache.commons.codec" version="1.3.0.v20080530-1600" />
</p2.repo2runnable>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="org.apache.commons.httpclient" version="3.1.0.v20080605-1935" />
</p2.repo2runnable>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="org.apache.commons.logging" version="1.0.4.v200904062259" />
</p2.repo2runnable>
@@ -83,7 +83,7 @@
<param name="elementName" value="org.eclipse.equinox.p2.director"/>
<param name="module" value="org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090520-1905"/>
+ <param name="tag" value="R35x_v20100112"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -95,7 +95,7 @@
<param name="elementName" value="org.eclipse.equinox.p2.director.app"/>
<param name="module" value="org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director.app"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090521-1912"/>
+ <param name="tag" value="R35x_v20091106"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -119,7 +119,7 @@
<param name="elementName" value="org.eclipse.equinox.p2.engine"/>
<param name="module" value="org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.engine"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="R35x_v20090825"/>
+ <param name="tag" value="R35x_v20091117"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -191,7 +191,7 @@
<param name="elementName" value="org.eclipse.equinox.p2.metadata"/>
<param name="module" value="org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090525"/>
+ <param name="tag" value="R35x_v20100112"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -203,7 +203,7 @@
<param name="elementName" value="org.eclipse.equinox.p2.metadata.generator"/>
<param name="module" value="org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata.generator"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090520-1905"/>
+ <param name="tag" value="R35x_20100114"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -227,7 +227,7 @@
<param name="elementName" value="org.eclipse.equinox.p2.publisher"/>
<param name="module" value="org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.publisher"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090527-1812"/>
+ <param name="tag" value="R35x_20100105"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -251,7 +251,7 @@
<param name="elementName" value="org.eclipse.equinox.p2.repository"/>
<param name="module" value="org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.repository"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090901-1041"/>
+ <param name="tag" value="R35x_v20100105"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -263,7 +263,7 @@
<param name="elementName" value="org.eclipse.equinox.p2.repository.tools"/>
<param name="module" value="org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.repository.tools"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="R35x_v20090806"/>
+ <param name="tag" value="R35x_20100111"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -383,18 +383,18 @@
<param name="elementName" value="org.eclipse.equinox.p2.updatesite"/>
<param name="module" value="org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.updatesite"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090525"/>
+ <param name="tag" value="R35x_20100105"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
- <get src="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf_3.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf_3.0.0.v20090831-1906.jar" usetimestamp="true"/>
- <get src="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf.filetransfer_3.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.filetransfer_3.0.0.v20090831-1906.jar" usetimestamp="true"/>
- <get src="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf.identity_3.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.identity_3.0.0.v20090831-1906.jar" usetimestamp="true"/>
- <get src="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf.provider.filetransfer_3.0.1.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.provider.filetransfer_3.0.1.v20090831-1906.jar" usetimestamp="true"/>
- <get src="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf.provider.filetransfer.httpclient_3.0.1.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.provider.filetransfer.httpclient_3.0.1.v20090831-1906.jar" usetimestamp="true"/>
- <get src="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.v20090831-1906.jar" usetimestamp="true"/>
- <get src="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf.provider.filetransfer.ssl_1.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.provider.filetransfer.ssl_1.0.0.v20090831-1906.jar" usetimestamp="true"/>
- <get src="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf.ssl_1.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.ssl_1.0.0.v20090831-1906.jar" usetimestamp="true"/>
+ <get src="http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf_3.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf_3.0.0.v20090831-1906.jar" usetimestamp="true"/>
+ <get src="http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.filetransfer_3.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.filetransfer_3.0.0.v20090831-1906.jar" usetimestamp="true"/>
+ <get src="http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.identity_3.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.identity_3.0.0.v20090831-1906.jar" usetimestamp="true"/>
+ <get src="http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.provider.filetransfer_3.0.1.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.provider.filetransfer_3.0.1.v20090831-1906.jar" usetimestamp="true"/>
+ <get src="http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.provider.filetransfer.httpclient_3.0.1.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.provider.filetransfer.httpclient_3.0.1.v20090831-1906.jar" usetimestamp="true"/>
+ <get src="http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.v20090831-1906.jar" usetimestamp="true"/>
+ <get src="http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.provider.filetransfer.ssl_1.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.provider.filetransfer.ssl_1.0.0.v20090831-1906.jar" usetimestamp="true"/>
+ <get src="http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.ssl_1.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.ssl_1.0.0.v20090831-1906.jar" usetimestamp="true"/>
<available property="${buildDirectory}/plugins/org.eclipse.equinox.simpleconfigurator/plugin.xml" file="${buildDirectory}/plugins/org.eclipse.equinox.simpleconfigurator/plugin.xml" />
<available property="${buildDirectory}/plugins/org.eclipse.equinox.simpleconfigurator/plugin.xml" file="${buildDirectory}/plugins/org.eclipse.equinox.simpleconfigurator/META-INF/MANIFEST.MF" />
<antcall target="FetchFromCVS">
@@ -415,7 +415,7 @@
<param name="elementName" value="org.eclipse.equinox.simpleconfigurator.manipulator"/>
<param name="module" value="org.eclipse.equinox/p2/bundles/org.eclipse.equinox.simpleconfigurator.manipulator"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090520-1905"/>
+ <param name="tag" value="R35x_v20100209"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -439,18 +439,18 @@
<param name="elementName" value="org.eclipse.equinox.frameworkadmin.equinox"/>
<param name="module" value="org.eclipse.equinox/p2/bundles/org.eclipse.equinox.frameworkadmin.equinox"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090520-1905"/>
+ <param name="tag" value="R35x_v20091214"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
-<iu id="org.sat4j.core" version="2.1.0.v20090520" />
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
+<iu id="org.sat4j.core" version="2.1.1.v20090825" />
</p2.repo2runnable>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
-<iu id="org.sat4j.pb" version="2.1.0.v20090520" />
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
+<iu id="org.sat4j.pb" version="2.1.1.v20090825" />
</p2.repo2runnable>
</target>
diff --git a/eclipse/fetch_org.eclipse.equinox.p2.user.ui.xml b/eclipse/fetch_org.eclipse.equinox.p2.user.ui.xml
index d75762d..46da30d 100644
--- a/eclipse/fetch_org.eclipse.equinox.p2.user.ui.xml
+++ b/eclipse/fetch_org.eclipse.equinox.p2.user.ui.xml
@@ -18,7 +18,7 @@
<param name="elementName" value="org.eclipse.equinox.p2.user.ui"/>
<param name="module" value="org.eclipse.equinox/p2/org.eclipse.equinox.p2.releng/buildtime-features/org.eclipse.equinox.p2.user.ui"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="R35x_v20090811"/>
+ <param name="tag" value="R35x_v20091106"/>
<param name="destinationFolder" value="${buildDirectory}/features"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -32,7 +32,7 @@
<param name="elementName" value="org.eclipse.equinox.p2.director"/>
<param name="module" value="org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090520-1905"/>
+ <param name="tag" value="R35x_v20100112"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -56,7 +56,7 @@
<param name="elementName" value="org.eclipse.equinox.p2.engine"/>
<param name="module" value="org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.engine"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="R35x_v20090825"/>
+ <param name="tag" value="R35x_v20091117"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -80,7 +80,7 @@
<param name="elementName" value="org.eclipse.equinox.p2.metadata"/>
<param name="module" value="org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090525"/>
+ <param name="tag" value="R35x_v20100112"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -164,7 +164,7 @@
<param name="elementName" value="org.eclipse.equinox.frameworkadmin.equinox"/>
<param name="module" value="org.eclipse.equinox/p2/bundles/org.eclipse.equinox.frameworkadmin.equinox"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090520-1905"/>
+ <param name="tag" value="R35x_v20091214"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -188,7 +188,7 @@
<param name="elementName" value="org.eclipse.equinox.simpleconfigurator.manipulator"/>
<param name="module" value="org.eclipse.equinox/p2/bundles/org.eclipse.equinox.simpleconfigurator.manipulator"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090520-1905"/>
+ <param name="tag" value="R35x_v20100209"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -284,7 +284,7 @@
<param name="elementName" value="org.eclipse.equinox.p2.metadata.generator"/>
<param name="module" value="org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata.generator"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090520-1905"/>
+ <param name="tag" value="R35x_20100114"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -296,18 +296,18 @@
<param name="elementName" value="org.eclipse.equinox.p2.updatesite"/>
<param name="module" value="org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.updatesite"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090525"/>
+ <param name="tag" value="R35x_20100105"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
-<iu id="org.sat4j.core" version="2.1.0.v20090520" />
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
+<iu id="org.sat4j.core" version="2.1.1.v20090825" />
</p2.repo2runnable>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
-<iu id="org.sat4j.pb" version="2.1.0.v20090520" />
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
+<iu id="org.sat4j.pb" version="2.1.1.v20090825" />
</p2.repo2runnable>
<available property="${buildDirectory}/plugins/org.eclipse.equinox.security/plugin.xml" file="${buildDirectory}/plugins/org.eclipse.equinox.security/plugin.xml" />
@@ -354,7 +354,7 @@
<param name="elementName" value="org.eclipse.equinox.p2.director.app"/>
<param name="module" value="org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director.app"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090521-1912"/>
+ <param name="tag" value="R35x_v20091106"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -366,7 +366,7 @@
<param name="elementName" value="org.eclipse.equinox.p2.publisher"/>
<param name="module" value="org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.publisher"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090527-1812"/>
+ <param name="tag" value="R35x_20100105"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -378,7 +378,7 @@
<param name="elementName" value="org.eclipse.equinox.p2.repository.tools"/>
<param name="module" value="org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.repository.tools"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="R35x_v20090806"/>
+ <param name="tag" value="R35x_20100111"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -390,25 +390,25 @@
<param name="elementName" value="org.eclipse.equinox.p2.repository"/>
<param name="module" value="org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.repository"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090901-1041"/>
+ <param name="tag" value="R35x_v20100105"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
- <get src="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf_3.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf_3.0.0.v20090831-1906.jar" usetimestamp="true"/>
- <get src="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf.filetransfer_3.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.filetransfer_3.0.0.v20090831-1906.jar" usetimestamp="true"/>
- <get src="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf.identity_3.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.identity_3.0.0.v20090831-1906.jar" usetimestamp="true"/>
- <get src="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf.provider.filetransfer_3.0.1.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.provider.filetransfer_3.0.1.v20090831-1906.jar" usetimestamp="true"/>
- <get src="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf.provider.filetransfer.ssl_1.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.provider.filetransfer.ssl_1.0.0.v20090831-1906.jar" usetimestamp="true"/>
- <get src="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf.provider.filetransfer.httpclient_3.0.1.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.provider.filetransfer.httpclient_3.0.1.v20090831-1906.jar" usetimestamp="true"/>
- <get src="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.v20090831-1906.jar" usetimestamp="true"/>
- <get src="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/ecfBundles/org.eclipse.ecf.ssl_1.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.ssl_1.0.0.v20090831-1906.jar" usetimestamp="true"/>
+ <get src="http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf_3.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf_3.0.0.v20090831-1906.jar" usetimestamp="true"/>
+ <get src="http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.filetransfer_3.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.filetransfer_3.0.0.v20090831-1906.jar" usetimestamp="true"/>
+ <get src="http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.identity_3.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.identity_3.0.0.v20090831-1906.jar" usetimestamp="true"/>
+ <get src="http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.provider.filetransfer_3.0.1.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.provider.filetransfer_3.0.1.v20090831-1906.jar" usetimestamp="true"/>
+ <get src="http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.provider.filetransfer.ssl_1.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.provider.filetransfer.ssl_1.0.0.v20090831-1906.jar" usetimestamp="true"/>
+ <get src="http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.provider.filetransfer.httpclient_3.0.1.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.provider.filetransfer.httpclient_3.0.1.v20090831-1906.jar" usetimestamp="true"/>
+ <get src="http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.v20090831-1906.jar" usetimestamp="true"/>
+ <get src="http://download.eclipse.org/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.ssl_1.0.0.v20090831-1906.jar" dest="${buildDirectory}/plugins/org.eclipse.ecf.ssl_1.0.0.v20090831-1906.jar" usetimestamp="true"/>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="org.apache.commons.codec" version="1.3.0.v20080530-1600" />
</p2.repo2runnable>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="org.apache.commons.httpclient" version="3.1.0.v20080605-1935" />
</p2.repo2runnable>
diff --git a/eclipse/fetch_org.eclipse.equinox.sdk.xml b/eclipse/fetch_org.eclipse.equinox.sdk.xml
index b7d8660..2dadfd7 100644
--- a/eclipse/fetch_org.eclipse.equinox.sdk.xml
+++ b/eclipse/fetch_org.eclipse.equinox.sdk.xml
@@ -18,7 +18,7 @@
<param name="elementName" value="org.eclipse.equinox.sdk"/>
<param name="module" value="org.eclipse.sdk-feature/features/org.eclipse.equinox.sdk"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="r351_v20090901"/>
+ <param name="tag" value="r352_v20100209"/>
<param name="destinationFolder" value="${buildDirectory}/features"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
diff --git a/eclipse/fetch_org.eclipse.equinox.serverside.sdk.xml b/eclipse/fetch_org.eclipse.equinox.serverside.sdk.xml
index f75d210..01b57d5 100644
--- a/eclipse/fetch_org.eclipse.equinox.serverside.sdk.xml
+++ b/eclipse/fetch_org.eclipse.equinox.serverside.sdk.xml
@@ -25,12 +25,12 @@
</target>
<target name="fetch.plugins" if="featureAndPlugins">
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="javax.servlet" version="2.5.0.v200806031605" />
</p2.repo2runnable>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="javax.servlet.jsp" version="2.0.0.v200806031607" />
</p2.repo2runnable>
@@ -106,12 +106,12 @@
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="org.mortbay.jetty.server" version="6.1.15.v200905151201" />
</p2.repo2runnable>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="org.mortbay.jetty.util" version="6.1.15.v200905182336" />
</p2.repo2runnable>
diff --git a/eclipse/fetch_org.eclipse.help.xml b/eclipse/fetch_org.eclipse.help.xml
index 6b49182..188e926 100644
--- a/eclipse/fetch_org.eclipse.help.xml
+++ b/eclipse/fetch_org.eclipse.help.xml
@@ -18,44 +18,44 @@
<param name="elementName" value="org.eclipse.help"/>
<param name="module" value="org.eclipse.sdk-feature/features/org.eclipse.help-feature"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="R35x_v20090811"/>
+ <param name="tag" value="R35x_v20100119"/>
<param name="destinationFolder" value="${buildDirectory}/features"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
</target>
<target name="fetch.plugins" if="featureAndPlugins">
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="javax.servlet" version="2.5.0.v200806031605" />
</p2.repo2runnable>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="javax.servlet.jsp" version="2.0.0.v200806031607" />
</p2.repo2runnable>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="org.apache.commons.el" version="1.0.0.v200806031608" />
</p2.repo2runnable>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="org.apache.commons.logging" version="1.0.4.v200904062259" />
</p2.repo2runnable>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="org.apache.jasper" version="5.5.17.v200903231320" />
</p2.repo2runnable>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="org.apache.lucene" version="1.9.1.v20080530-1600" />
</p2.repo2runnable>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="org.apache.lucene.analysis" version="1.9.1.v20080530-1600" />
</p2.repo2runnable>
@@ -149,17 +149,17 @@
<param name="elementName" value="org.eclipse.help.webapp"/>
<param name="module" value="org.eclipse.help.webapp"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090819_35x"/>
+ <param name="tag" value="v20091009_35x"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="org.mortbay.jetty.server" version="6.1.15.v200905151201" />
</p2.repo2runnable>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="org.mortbay.jetty.util" version="6.1.15.v200905182336" />
</p2.repo2runnable>
diff --git a/eclipse/fetch_org.eclipse.jdt.xml b/eclipse/fetch_org.eclipse.jdt.xml
index 1355cfe..4682130 100644
--- a/eclipse/fetch_org.eclipse.jdt.xml
+++ b/eclipse/fetch_org.eclipse.jdt.xml
@@ -18,7 +18,7 @@
<param name="elementName" value="org.eclipse.jdt"/>
<param name="module" value="org.eclipse.jdt-feature"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="r351_v20090810-0600"/>
+ <param name="tag" value="r352_v20100108"/>
<param name="destinationFolder" value="${buildDirectory}/features"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -32,7 +32,7 @@
<param name="elementName" value="org.eclipse.jdt"/>
<param name="module" value="org.eclipse.jdt"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="r351_v20090810-0600"/>
+ <param name="tag" value="r352_v20100106-0800"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -44,7 +44,7 @@
<param name="elementName" value="org.eclipse.ant.ui"/>
<param name="module" value="org.eclipse.ant.ui"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090901_r351"/>
+ <param name="tag" value="v20091204_r352"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -56,7 +56,7 @@
<param name="elementName" value="org.eclipse.jdt.apt.core"/>
<param name="module" value="org.eclipse.jdt.apt.core"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="R35x_v20090818-0235"/>
+ <param name="tag" value="R35x_v20091130-2300"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -68,7 +68,7 @@
<param name="elementName" value="org.eclipse.jdt.apt.ui"/>
<param name="module" value="org.eclipse.jdt.apt.ui"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090528-1135"/>
+ <param name="tag" value="v20090930-2100_R35x"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -80,7 +80,7 @@
<param name="elementName" value="org.eclipse.jdt.apt.pluggable.core"/>
<param name="module" value="org.eclipse.jdt.apt.pluggable.core"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="R35x_v20090818-0225"/>
+ <param name="tag" value="R35x_v20090925-1100"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -92,7 +92,7 @@
<param name="elementName" value="org.eclipse.jdt.compiler.apt"/>
<param name="module" value="org.eclipse.jdt.compiler.apt"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="R35x_v20090825-1530"/>
+ <param name="tag" value="R35x_v20090925-1100"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -104,7 +104,7 @@
<param name="elementName" value="org.eclipse.jdt.compiler.tool"/>
<param name="module" value="org.eclipse.jdt.compiler.tool"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v_972_R35x"/>
+ <param name="tag" value="v_980_R35x"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -116,7 +116,7 @@
<param name="elementName" value="org.eclipse.jdt.core"/>
<param name="module" value="org.eclipse.jdt.core"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v_972_R35x"/>
+ <param name="tag" value="v_980_R35x"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -164,7 +164,7 @@
<param name="elementName" value="org.eclipse.jdt.junit"/>
<param name="module" value="org.eclipse.jdt.junit"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="r351_v20090708-0800"/>
+ <param name="tag" value="r352_v20100113-0800"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -200,7 +200,7 @@
<param name="elementName" value="org.eclipse.jdt.launching"/>
<param name="module" value="org.eclipse.jdt.launching"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090527"/>
+ <param name="tag" value="v20100108_r352"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -212,12 +212,12 @@
<param name="elementName" value="org.eclipse.jdt.ui"/>
<param name="module" value="org.eclipse.jdt.ui"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="r351_v20090821-0800"/>
+ <param name="tag" value="r352_v20100106-0800"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="org.junit" version="3.8.2.v20090203-1005" />
</p2.repo2runnable>
@@ -234,7 +234,7 @@
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="org.hamcrest.core" version="1.1.0.v20090501071000" />
</p2.repo2runnable>
@@ -246,7 +246,7 @@
<param name="elementName" value="org.eclipse.jdt.doc.user"/>
<param name="module" value="org.eclipse.jdt.doc.user"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="r351_v20090821-0800"/>
+ <param name="tag" value="r352_v20091015"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
diff --git a/eclipse/fetch_org.eclipse.pde.xml b/eclipse/fetch_org.eclipse.pde.xml
index 91b2056..13af0de 100644
--- a/eclipse/fetch_org.eclipse.pde.xml
+++ b/eclipse/fetch_org.eclipse.pde.xml
@@ -18,7 +18,7 @@
<param name="elementName" value="org.eclipse.pde"/>
<param name="module" value="org.eclipse.pde-feature"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="R35x_v20090811"/>
+ <param name="tag" value="R35x_v20100119"/>
<param name="destinationFolder" value="${buildDirectory}/features"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -44,7 +44,7 @@
<param name="elementName" value="org.eclipse.pde.build"/>
<param name="module" value="pde/build/org.eclipse.pde.build"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="R35x_20090820"/>
+ <param name="tag" value="R35x_20100114"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -56,7 +56,7 @@
<param name="elementName" value="org.eclipse.pde.core"/>
<param name="module" value="pde/ui/org.eclipse.pde.core"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090821"/>
+ <param name="tag" value="v20100104"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -92,7 +92,7 @@
<param name="elementName" value="org.eclipse.pde.ui"/>
<param name="module" value="pde/ui/org.eclipse.pde.ui"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090821"/>
+ <param name="tag" value="v201001121200"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -133,7 +133,7 @@
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="org.objectweb.asm" version="3.1.0.v200803061910" />
</p2.repo2runnable>
@@ -169,7 +169,7 @@
<param name="elementName" value="org.eclipse.pde.ds.core"/>
<param name="module" value="pde/ds/org.eclipse.pde.ds.core"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090429-1800"/>
+ <param name="tag" value="v20100118"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -181,7 +181,7 @@
<param name="elementName" value="org.eclipse.pde.ds.ui"/>
<param name="module" value="pde/ds/org.eclipse.pde.ds.ui"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090527"/>
+ <param name="tag" value="v20100209-maintenance"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
diff --git a/eclipse/fetch_org.eclipse.platform.xml b/eclipse/fetch_org.eclipse.platform.xml
index dab6fb2..786001e 100644
--- a/eclipse/fetch_org.eclipse.platform.xml
+++ b/eclipse/fetch_org.eclipse.platform.xml
@@ -18,14 +18,14 @@
<param name="elementName" value="org.eclipse.platform"/>
<param name="module" value="org.eclipse.platform-feature"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="R35x_v20090910"/>
+ <param name="tag" value="R35x_v20100210-0800"/>
<param name="destinationFolder" value="${buildDirectory}/features"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
</target>
<target name="fetch.plugins" if="featureAndPlugins">
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="org.apache.ant" version="1.7.1.v20090120-1145" />
</p2.repo2runnable>
@@ -37,12 +37,12 @@
<param name="elementName" value="org.eclipse.ant.core"/>
<param name="module" value="org.eclipse.ant.core"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090817_r351"/>
+ <param name="tag" value="v20091110_r352"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="com.jcraft.jsch" version="0.1.41.v200903070017" />
</p2.repo2runnable>
@@ -66,7 +66,7 @@
<param name="elementName" value="org.eclipse.compare"/>
<param name="module" value="org.eclipse.compare/plugins/org.eclipse.compare"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="I20090514-0808"/>
+ <param name="tag" value="r35x_20100113-0800"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -114,7 +114,7 @@
<param name="elementName" value="org.eclipse.core.filesystem"/>
<param name="module" value="org.eclipse.core.filesystem"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090507"/>
+ <param name="tag" value="R35x_v20091203-1235"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -174,7 +174,7 @@
<param name="elementName" value="org.eclipse.core.resources"/>
<param name="module" value="org.eclipse.core.resources"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="R35x_v20090826-0451"/>
+ <param name="tag" value="R35x_v20091203-1235"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -186,7 +186,7 @@
<param name="elementName" value="org.eclipse.core.resources.compatibility"/>
<param name="module" value="org.eclipse.core.resources.compatibility"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090505"/>
+ <param name="tag" value="R35x_v20100113-0530"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -234,7 +234,7 @@
<param name="elementName" value="org.eclipse.debug.core"/>
<param name="module" value="org.eclipse.debug.core"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090526-1600"/>
+ <param name="tag" value="v20091103_r352"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -246,7 +246,7 @@
<param name="elementName" value="org.eclipse.debug.ui"/>
<param name="module" value="org.eclipse.debug.ui"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090811_r351"/>
+ <param name="tag" value="v20091028_r352"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -282,7 +282,7 @@
<param name="elementName" value="org.eclipse.ltk.ui.refactoring"/>
<param name="module" value="org.eclipse.ltk.ui.refactoring"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090604"/>
+ <param name="tag" value="r352_v20100209"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -294,7 +294,7 @@
<param name="elementName" value="org.eclipse.platform"/>
<param name="module" value="org.eclipse.platform"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="R35x_v20090813"/>
+ <param name="tag" value="R35x_v20100121"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -306,7 +306,7 @@
<param name="elementName" value="org.eclipse.platform.doc.user"/>
<param name="module" value="org.eclipse.platform.doc.user"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="r351_v20090821-0800"/>
+ <param name="tag" value="r352_v20091111-0800"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -330,7 +330,7 @@
<param name="elementName" value="org.eclipse.team.core"/>
<param name="module" value="org.eclipse.team.core"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="I20090527-0620"/>
+ <param name="tag" value="r35x_20100113-0800"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -366,7 +366,7 @@
<param name="elementName" value="org.eclipse.jface.text"/>
<param name="module" value="org.eclipse.jface.text"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="r351_v20090708-0800"/>
+ <param name="tag" value="r352_v20091118-0800"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -414,7 +414,7 @@
<param name="elementName" value="org.eclipse.ui.presentations.r21"/>
<param name="module" value="org.eclipse.ui.presentations.r21"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="I20081007-0800"/>
+ <param name="tag" value="M20091015-0930"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -426,7 +426,7 @@
<param name="elementName" value="org.eclipse.ui.intro"/>
<param name="module" value="org.eclipse.ui.intro"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090805_35x"/>
+ <param name="tag" value="v20100111_35x"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -462,7 +462,7 @@
<param name="elementName" value="org.eclipse.ui.browser"/>
<param name="module" value="org.eclipse.ui.browser"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090526"/>
+ <param name="tag" value="v20091215_35x"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -474,7 +474,7 @@
<param name="elementName" value="org.eclipse.ui.navigator"/>
<param name="module" value="org.eclipse.ui.navigator"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="M20090911-1550"/>
+ <param name="tag" value="M20100120-0800"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -510,7 +510,7 @@
<param name="elementName" value="org.eclipse.ui.workbench.texteditor"/>
<param name="module" value="org.eclipse.ui.workbench.texteditor"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090603"/>
+ <param name="tag" value="r352_v20100105"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -558,7 +558,7 @@
<param name="elementName" value="org.eclipse.ui.ide"/>
<param name="module" value="org.eclipse.ui.ide"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="M20090826-0800"/>
+ <param name="tag" value="M20100113-0800"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -634,6 +634,18 @@
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
+ <available property="${buildDirectory}/plugins/org.eclipse.core.filesystem.aix.ppc/fragment.xml" file="${buildDirectory}/plugins/org.eclipse.core.filesystem.aix.ppc/fragment.xml" />
+ <available property="${buildDirectory}/plugins/org.eclipse.core.filesystem.aix.ppc/fragment.xml" file="${buildDirectory}/plugins/org.eclipse.core.filesystem.aix.ppc/META-INF/MANIFEST.MF" />
+ <antcall target="FetchFromCVS">
+ <param name="cvsRoot" value=":pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse"/>
+ <param name="fileToCheck" value="${buildDirectory}/plugins/org.eclipse.core.filesystem.aix.ppc/fragment.xml"/>
+ <param name="elementName" value="org.eclipse.core.filesystem.aix.ppc"/>
+ <param name="module" value="org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.aix.ppc"/>
+ <param name="reallyquiet" value="${cvs.reallyquiet}"/>
+ <param name="tag" value="R35x_v20091203-1235"/>
+ <param name="destinationFolder" value="${buildDirectory}/plugins"/>
+ <param name="quiet" value="${cvs.quiet}"/>
+ </antcall>
<available property="${buildDirectory}/plugins/org.eclipse.core.filesystem.hpux.ia64_32/fragment.xml" file="${buildDirectory}/plugins/org.eclipse.core.filesystem.hpux.ia64_32/fragment.xml" />
<available property="${buildDirectory}/plugins/org.eclipse.core.filesystem.hpux.ia64_32/fragment.xml" file="${buildDirectory}/plugins/org.eclipse.core.filesystem.hpux.ia64_32/META-INF/MANIFEST.MF" />
<antcall target="FetchFromCVS">
@@ -678,7 +690,7 @@
<param name="elementName" value="org.eclipse.core.filesystem.linux.x86"/>
<param name="module" value="org.eclipse.core.filesystem.linux.x86"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20080604-1400"/>
+ <param name="tag" value="R35x_v20091203-1235"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -690,7 +702,7 @@
<param name="elementName" value="org.eclipse.core.filesystem.linux.x86_64"/>
<param name="module" value="org.eclipse.core.filesystem.linux.x86_64"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20080604-1400"/>
+ <param name="tag" value="R35x_v20091203-1235"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -702,7 +714,7 @@
<param name="elementName" value="org.eclipse.core.filesystem.solaris.sparc"/>
<param name="module" value="org.eclipse.core.filesystem.solaris.sparc"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20080604-1400"/>
+ <param name="tag" value="R35x_v20091203-1235"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -714,7 +726,7 @@
<param name="elementName" value="org.eclipse.core.filesystem.macosx"/>
<param name="module" value="org.eclipse.core.filesystem.macosx"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090112"/>
+ <param name="tag" value="R35x_v20091203-1235"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
diff --git a/eclipse/fetch_org.eclipse.rcp.xml b/eclipse/fetch_org.eclipse.rcp.xml
index e57de4e..795ed91 100644
--- a/eclipse/fetch_org.eclipse.rcp.xml
+++ b/eclipse/fetch_org.eclipse.rcp.xml
@@ -18,14 +18,14 @@
<param name="elementName" value="org.eclipse.rcp"/>
<param name="module" value="org.eclipse.sdk-feature/features/org.eclipse.rcp"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="R35x_v20090811"/>
+ <param name="tag" value="R35x_v20100119"/>
<param name="destinationFolder" value="${buildDirectory}/features"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
</target>
<target name="fetch.plugins" if="featureAndPlugins">
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="com.ibm.icu" version="4.0.1.v20090822" />
</p2.repo2runnable>
@@ -109,7 +109,7 @@
<param name="elementName" value="org.eclipse.core.expressions"/>
<param name="module" value="org.eclipse.core.expressions"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090429-1800"/>
+ <param name="tag" value="R35x_v20100209"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -145,7 +145,7 @@
<param name="elementName" value="org.eclipse.osgi"/>
<param name="module" value="org.eclipse.equinox/framework/bundles/org.eclipse.osgi"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="R35x_v20090827"/>
+ <param name="tag" value="R35x_v20100126"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -181,7 +181,7 @@
<param name="elementName" value="org.eclipse.swt"/>
<param name="module" value="org.eclipse.swt"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v3555a"/>
+ <param name="tag" value="v3557f"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -193,7 +193,7 @@
<param name="elementName" value="org.eclipse.jface"/>
<param name="module" value="org.eclipse.jface"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="M20090826-0800"/>
+ <param name="tag" value="M20100120-0800"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -217,7 +217,7 @@
<param name="elementName" value="org.eclipse.ui"/>
<param name="module" value="org.eclipse.ui"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="M20090902-1000"/>
+ <param name="tag" value="M20100120-0800"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -229,7 +229,7 @@
<param name="elementName" value="org.eclipse.ui.workbench"/>
<param name="module" value="org.eclipse.ui.workbench"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="M20090826-0800a"/>
+ <param name="tag" value="M20100113-0800"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -289,7 +289,7 @@
<param name="elementName" value="org.eclipse.swt.win32.win32.x86"/>
<param name="module" value="org.eclipse.swt.win32.win32.x86"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v3555a"/>
+ <param name="tag" value="v3557f"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -301,7 +301,7 @@
<param name="elementName" value="org.eclipse.swt.win32.win32.x86_64"/>
<param name="module" value="org.eclipse.swt.win32.win32.x86_64"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v3555a"/>
+ <param name="tag" value="v3557f"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -313,7 +313,7 @@
<param name="elementName" value="org.eclipse.swt.wpf.win32.x86"/>
<param name="module" value="org.eclipse.swt.wpf.win32.x86"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v3555a"/>
+ <param name="tag" value="v3557f"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -325,7 +325,7 @@
<param name="elementName" value="org.eclipse.swt.gtk.linux.x86"/>
<param name="module" value="org.eclipse.swt.gtk.linux.x86"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v3555a"/>
+ <param name="tag" value="v3557f"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -361,7 +361,7 @@
<param name="elementName" value="org.eclipse.swt.gtk.solaris.sparc"/>
<param name="module" value="org.eclipse.swt.gtk.solaris.sparc"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v3555a"/>
+ <param name="tag" value="v3557f"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -373,7 +373,7 @@
<param name="elementName" value="org.eclipse.swt.gtk.solaris.x86"/>
<param name="module" value="org.eclipse.swt.gtk.solaris.x86"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v3555a"/>
+ <param name="tag" value="v3557f"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -385,7 +385,7 @@
<param name="elementName" value="org.eclipse.swt.gtk.linux.ppc"/>
<param name="module" value="org.eclipse.swt.gtk.linux.ppc"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v3555a"/>
+ <param name="tag" value="v3557f"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -397,7 +397,7 @@
<param name="elementName" value="org.eclipse.swt.gtk.linux.x86_64"/>
<param name="module" value="org.eclipse.swt.gtk.linux.x86_64"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v3555a"/>
+ <param name="tag" value="v3557f"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -409,7 +409,7 @@
<param name="elementName" value="org.eclipse.swt.carbon.macosx"/>
<param name="module" value="org.eclipse.swt.carbon.macosx"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v3555a"/>
+ <param name="tag" value="v3557f"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -421,7 +421,7 @@
<param name="elementName" value="org.eclipse.swt.carbon.macosx"/>
<param name="module" value="org.eclipse.swt.carbon.macosx"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v3555a"/>
+ <param name="tag" value="v3557f"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -433,7 +433,7 @@
<param name="elementName" value="org.eclipse.swt.cocoa.macosx"/>
<param name="module" value="org.eclipse.swt.cocoa.macosx"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v3555a"/>
+ <param name="tag" value="v3557f"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -445,7 +445,7 @@
<param name="elementName" value="org.eclipse.swt.cocoa.macosx"/>
<param name="module" value="org.eclipse.swt.cocoa.macosx"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v3555a"/>
+ <param name="tag" value="v3557f"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -457,7 +457,7 @@
<param name="elementName" value="org.eclipse.swt.cocoa.macosx.x86_64"/>
<param name="module" value="org.eclipse.swt.cocoa.macosx.x86_64"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v3555a"/>
+ <param name="tag" value="v3557f"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -469,7 +469,7 @@
<param name="elementName" value="org.eclipse.swt.motif.aix.ppc"/>
<param name="module" value="org.eclipse.swt.motif.aix.ppc"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v3555a"/>
+ <param name="tag" value="v3557f"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -493,7 +493,7 @@
<param name="elementName" value="org.eclipse.swt.motif.hpux.ia64_32"/>
<param name="module" value="org.eclipse.swt.motif.hpux.ia64_32"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v3555a"/>
+ <param name="tag" value="v3557f"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -505,7 +505,7 @@
<param name="elementName" value="org.eclipse.swt.motif.linux.x86"/>
<param name="module" value="org.eclipse.swt.motif.linux.x86"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v3555a"/>
+ <param name="tag" value="v3557f"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -517,7 +517,7 @@
<param name="elementName" value="org.eclipse.swt.motif.solaris.sparc"/>
<param name="module" value="org.eclipse.swt.motif.solaris.sparc"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v3555a"/>
+ <param name="tag" value="v3557f"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -529,7 +529,7 @@
<param name="elementName" value="org.eclipse.swt.photon.qnx.x86"/>
<param name="module" value="org.eclipse.swt.photon.qnx.x86"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v3555a"/>
+ <param name="tag" value="v3557f"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -541,7 +541,7 @@
<param name="elementName" value="org.eclipse.rcp"/>
<param name="module" value="org.eclipse.sdk-feature/plugins/org.eclipse.rcp"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090528"/>
+ <param name="tag" value="R35x_v20100119"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -565,7 +565,7 @@
<param name="elementName" value="org.eclipse.equinox.app"/>
<param name="module" value="org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.app"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090520-1800"/>
+ <param name="tag" value="R35x_v20091203"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -613,7 +613,7 @@
<param name="elementName" value="org.eclipse.equinox.preferences"/>
<param name="module" value="org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.preferences"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090520-1800"/>
+ <param name="tag" value="R35x_v20091117"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -781,7 +781,7 @@
<param name="elementName" value="org.eclipse.equinox.launcher.motif.linux.x86"/>
<param name="module" value="org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.linux.x86"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090520"/>
+ <param name="tag" value="R35x_v20100209"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -805,7 +805,7 @@
<param name="elementName" value="org.eclipse.equinox.launcher.motif.aix.ppc"/>
<param name="module" value="org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.aix.ppc"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v20090519"/>
+ <param name="tag" value="R35x_v20091211"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
diff --git a/eclipse/fetch_org.eclipse.sdk.examples.xml b/eclipse/fetch_org.eclipse.sdk.examples.xml
index 633df0f..badaa2a 100644
--- a/eclipse/fetch_org.eclipse.sdk.examples.xml
+++ b/eclipse/fetch_org.eclipse.sdk.examples.xml
@@ -104,7 +104,7 @@
<param name="elementName" value="org.eclipse.swt.examples"/>
<param name="module" value="org.eclipse.swt.examples"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v3555a"/>
+ <param name="tag" value="v3557f"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -116,7 +116,7 @@
<param name="elementName" value="org.eclipse.swt.examples.browser"/>
<param name="module" value="org.eclipse.swt.examples.browser"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v3555a"/>
+ <param name="tag" value="v3557f"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -128,7 +128,7 @@
<param name="elementName" value="org.eclipse.swt.examples.browser.demos"/>
<param name="module" value="org.eclipse.swt.examples.browser.demos"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v3555a"/>
+ <param name="tag" value="v3557f"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -140,7 +140,7 @@
<param name="elementName" value="org.eclipse.swt.examples.controls"/>
<param name="module" value="org.eclipse.swt.examples.controls"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v3555a"/>
+ <param name="tag" value="v3557f"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -152,7 +152,7 @@
<param name="elementName" value="org.eclipse.swt.examples.launcher"/>
<param name="module" value="org.eclipse.swt.examples.launcher"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v3555a"/>
+ <param name="tag" value="v3557f"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -164,7 +164,7 @@
<param name="elementName" value="org.eclipse.swt.examples.layouts"/>
<param name="module" value="org.eclipse.swt.examples.layouts"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v3555a"/>
+ <param name="tag" value="v3557f"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -176,7 +176,7 @@
<param name="elementName" value="org.eclipse.swt.examples.paint"/>
<param name="module" value="org.eclipse.swt.examples.paint"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v3555a"/>
+ <param name="tag" value="v3557f"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -212,7 +212,7 @@
<param name="elementName" value="org.eclipse.ui.examples.propertysheet"/>
<param name="module" value="org.eclipse.ui.examples.propertysheet"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="I20070319-0010"/>
+ <param name="tag" value="M20100210-0800"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -296,7 +296,7 @@
<param name="elementName" value="org.eclipse.swt.examples.ole.win32"/>
<param name="module" value="org.eclipse.swt.examples.ole.win32"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="v3555a"/>
+ <param name="tag" value="v3557f"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
diff --git a/eclipse/fetch_org.eclipse.sdk.xml b/eclipse/fetch_org.eclipse.sdk.xml
index b4d4bea..6baa326 100644
--- a/eclipse/fetch_org.eclipse.sdk.xml
+++ b/eclipse/fetch_org.eclipse.sdk.xml
@@ -18,7 +18,7 @@
<param name="elementName" value="org.eclipse.sdk"/>
<param name="module" value="org.eclipse.sdk-feature/features/org.eclipse.sdk"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="R35x_v20090811"/>
+ <param name="tag" value="R35x_v20100119"/>
<param name="destinationFolder" value="${buildDirectory}/features"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -32,7 +32,7 @@
<param name="elementName" value="org.eclipse.sdk"/>
<param name="module" value="org.eclipse.sdk"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="R35x_v20090827"/>
+ <param name="tag" value="R35x_v20100204"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
@@ -47,17 +47,17 @@
<param name="elementName" value="org.eclipse.platform.doc.isv"/>
<param name="module" value="org.eclipse.platform.doc.isv"/>
<param name="reallyquiet" value="${cvs.reallyquiet}"/>
- <param name="tag" value="r351_v20090831"/>
+ <param name="tag" value="r352_v20100119"/>
<param name="destinationFolder" value="${buildDirectory}/plugins"/>
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="org.apache.ant.source" version="1.7.1.v20090120-1145" />
</p2.repo2runnable>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="com.jcraft.jsch.source" version="0.1.41.v200903070017" />
</p2.repo2runnable>
@@ -76,59 +76,59 @@
<param name="quiet" value="${cvs.quiet}"/>
</antcall>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="org.junit.source" version="3.8.2.v20090203-1005" />
</p2.repo2runnable>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="org.hamcrest.core.source" version="1.1.0.v20090501071000" />
</p2.repo2runnable>
<ant antfile="${buildDirectory}/fetch_org.eclipse.pde.xml" target="fetch"/>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="org.objectweb.asm.source" version="3.1.0.v200803061910" />
</p2.repo2runnable>
<ant antfile="${buildDirectory}/fetch_org.eclipse.help.xml" target="fetch"/>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="javax.servlet.source" version="2.5.0.v200806031605" />
</p2.repo2runnable>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="javax.servlet.jsp.source" version="2.0.0.v200806031607" />
</p2.repo2runnable>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="org.apache.jasper.source" version="5.5.17.v200903231320" />
</p2.repo2runnable>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="org.apache.commons.el.source" version="1.0.0.v200806031608" />
</p2.repo2runnable>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="org.apache.commons.logging.source" version="1.0.4.v200904062259" />
</p2.repo2runnable>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="org.apache.lucene.analysis.source" version="1.9.1.v20080530-1600" />
</p2.repo2runnable>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="org.mortbay.jetty.util.source" version="6.1.15.v200905182336" />
</p2.repo2runnable>
-<p2.repo2runnable destination="${transformedRepoLocation}" source="file:///notnfs/overholt/workspaces/sdk/eclipse-build/fetch/orbitRepo" >
+<p2.repo2runnable destination="${transformedRepoLocation}" source="http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/updateSite" >
<iu id="org.mortbay.jetty.server.source" version="6.1.15.v200905151201" />
</p2.repo2runnable>
diff --git a/eclipse/label.properties b/eclipse/label.properties
index 79ed298..0f52cb9 100644
--- a/eclipse/label.properties
+++ b/eclipse/label.properties
@@ -1,6 +1,6 @@
- timestamp=20091002-0952
+ timestamp=20100211-1120
buildType=I
- buildId=I20091002-0952
- buildLabel=I20091002-0952
+ buildId=I20100211-1120
+ buildLabel=I20100211-1120
\ No newline at end of file
diff --git a/eclipse/maps/org.eclipse.releng/maps/ant.map b/eclipse/maps/org.eclipse.releng/maps/ant.map
index d639fe2..50847f9 100644
--- a/eclipse/maps/org.eclipse.releng/maps/ant.map
+++ b/eclipse/maps/org.eclipse.releng/maps/ant.map
@@ -1,11 +1,11 @@
!*************** ANT CONTRIBUTION ********************************************************
-#plugin at org.apache.ant=v20070416,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ant.core=v20090817_r351,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+#plugin at org.apache.ant=v20070416,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ant.core=v20091110_r352,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ant.ui=v20090901_r351,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ant.ui=v20091204_r352,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.externaltools=v20090504,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.externaltools=v20090504,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ant.tests.core=v20090504,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ant.tests.ui=v20090504,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
+plugin at org.eclipse.ant.tests.core=v20091110_r352,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ant.tests.ui=v20090504,kmoir at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
diff --git a/eclipse/maps/org.eclipse.releng/maps/base.map b/eclipse/maps/org.eclipse.releng/maps/base.map
index fe47704..e6cfba8 100644
--- a/eclipse/maps/org.eclipse.releng/maps/base.map
+++ b/eclipse/maps/org.eclipse.releng/maps/base.map
@@ -1,8 +1,8 @@
! map file used as input to custom Ant task <fetch.base> implemented in org.eclipse.releng.basebuilder.
! Generates a fetch script which populates a baseLocation with prebuilt plug-ins or features.
-#base.plugin at com.ibm.icu=v20070123,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/plugins/com.ibm.icu/com.ibm.icu_3.6.0.20061215.jar
-#base.plugin at com.ibm.icu.source=v20070123,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/plugins/com.ibm.icu/com.ibm.icu.source_3.6.0.20061215
+#base.plugin at com.ibm.icu=v20070123,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/plugins/com.ibm.icu/com.ibm.icu_3.6.0.20061215.jar
+#base.plugin at com.ibm.icu.source=v20070123,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/plugins/com.ibm.icu/com.ibm.icu.source_3.6.0.20061215
-#base.plugin at com.ibm.icu.base=v20070123,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/plugins/com.ibm.icu/com.ibm.icu.base_3.6.0.20061215.jar
-#base.plugin at com.ibm.icu.base.source=v20070123,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/plugins/com.ibm.icu/com.ibm.icu.base.source_3.6.0.20061215
+#base.plugin at com.ibm.icu.base=v20070123,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/plugins/com.ibm.icu/com.ibm.icu.base_3.6.0.20061215.jar
+#base.plugin at com.ibm.icu.base.source=v20070123,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/plugins/com.ibm.icu/com.ibm.icu.base.source_3.6.0.20061215
diff --git a/eclipse/maps/org.eclipse.releng/maps/compare.map b/eclipse/maps/org.eclipse.releng/maps/compare.map
index c1169ec..32e286a 100644
--- a/eclipse/maps/org.eclipse.releng/maps/compare.map
+++ b/eclipse/maps/org.eclipse.releng/maps/compare.map
@@ -1,10 +1,10 @@
!*************** COMPARE CONTRIBUTION ********************************************************
-plugin at org.eclipse.compare=I20090514-0808,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.compare/plugins/org.eclipse.compare
-plugin at org.eclipse.compare.core=I20090430-0408,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.compare/plugins/org.eclipse.compare.core
-plugin at org.eclipse.compare.win32=I20090430-0408,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.compare/plugins/org.eclipse.compare.win32
+plugin at org.eclipse.compare=r35x_20100113-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.compare/plugins/org.eclipse.compare
+plugin at org.eclipse.compare.core=I20090430-0408,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.compare/plugins/org.eclipse.compare.core
+plugin at org.eclipse.compare.win32=I20090430-0408,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.compare/plugins/org.eclipse.compare.win32
-plugin at org.eclipse.compare.examples=v20060606,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.compare.examples.xml=I20080604,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.compare.examples=v20060606,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.compare.examples.xml=I20080604,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.compare.tests=I20090527-0620,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
+plugin at org.eclipse.compare.tests=I20090527-0620,kmoir at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
diff --git a/eclipse/maps/org.eclipse.releng/maps/core-hpux.map b/eclipse/maps/org.eclipse.releng/maps/core-hpux.map
index bf303d3..71ca549 100644
--- a/eclipse/maps/org.eclipse.releng/maps/core-hpux.map
+++ b/eclipse/maps/org.eclipse.releng/maps/core-hpux.map
@@ -1,4 +1,4 @@
!*************** CORE (HP-UX) CONTRIBUTION ************************************************
-fragment at org.eclipse.core.filesystem.hpux.ia64_32=v20080604-1400,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.core.filesystem.hpux.PA_RISC=v20080604-1400,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
+fragment at org.eclipse.core.filesystem.hpux.ia64_32=v20080604-1400,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.core.filesystem.hpux.PA_RISC=v20080604-1400,kmoir at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
diff --git a/eclipse/maps/org.eclipse.releng/maps/core-macosx.map b/eclipse/maps/org.eclipse.releng/maps/core-macosx.map
index ce2c635..371f106 100644
--- a/eclipse/maps/org.eclipse.releng/maps/core-macosx.map
+++ b/eclipse/maps/org.eclipse.releng/maps/core-macosx.map
@@ -1,3 +1,3 @@
!*************** CORE (MacOSX) CONTRIBUTION ************************************************
-fragment at org.eclipse.core.filesystem.macosx=v20090112,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
+fragment at org.eclipse.core.filesystem.macosx=R35x_v20091203-1235,kmoir at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
diff --git a/eclipse/maps/org.eclipse.releng/maps/core-qnx.map b/eclipse/maps/org.eclipse.releng/maps/core-qnx.map
index cbcf812..cbbda03 100644
--- a/eclipse/maps/org.eclipse.releng/maps/core-qnx.map
+++ b/eclipse/maps/org.eclipse.releng/maps/core-qnx.map
@@ -1,3 +1,3 @@
!*************** CORE (QNX) CONTRIBUTION ***************************************************
-fragment at org.eclipse.core.filesystem.qnx.x86=v20080604-1400,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
+fragment at org.eclipse.core.filesystem.qnx.x86=v20080604-1400,kmoir at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
diff --git a/eclipse/maps/org.eclipse.releng/maps/core-variables.map b/eclipse/maps/org.eclipse.releng/maps/core-variables.map
index 03392e6..673ab35 100644
--- a/eclipse/maps/org.eclipse.releng/maps/core-variables.map
+++ b/eclipse/maps/org.eclipse.releng/maps/core-variables.map
@@ -1,3 +1,3 @@
!*************** CORE VARIABLES CONTRIBUTION ********************************************************
-plugin at org.eclipse.core.variables=v20090521,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
+plugin at org.eclipse.core.variables=v20090521,kmoir at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
diff --git a/eclipse/maps/org.eclipse.releng/maps/core.map b/eclipse/maps/org.eclipse.releng/maps/core.map
index b6a9ca0..36c454c 100644
--- a/eclipse/maps/org.eclipse.releng/maps/core.map
+++ b/eclipse/maps/org.eclipse.releng/maps/core.map
@@ -1,116 +1,117 @@
!*************** CORE CONTRIBUTION ********************************************************
!**** OSGi
-plugin at org.eclipse.osgi=R35x_v20090827,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.osgi
-plugin at org.eclipse.osgi.services=v20090520-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.osgi.services
-plugin at org.eclipse.osgi.util=v20090520-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.osgi.util
+plugin at org.eclipse.osgi=R35x_v20100126,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.osgi
+plugin at org.eclipse.osgi.services=v20090520-1800,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.osgi.services
+plugin at org.eclipse.osgi.util=v20090520-1800,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.osgi.util
!**** Equinox
-plugin at org.eclipse.equinox.common=R35x_v20090807-1100,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/components/bundles/org.eclipse.equinox.common
-plugin at org.eclipse.equinox.preferences=v20090520-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.preferences
-plugin at org.eclipse.equinox.registry=v20090520-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/components/bundles/org.eclipse.equinox.registry
-plugin at org.eclipse.equinox.supplement=v20090518,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.osgi/supplement
-plugin at org.eclipse.equinox.app=v20090520-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.app
-plugin at org.eclipse.equinox.device=v20090520-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.device
-plugin at org.eclipse.equinox.event=v20090520-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.event
-plugin at org.eclipse.equinox.http=R35x_v20090728,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.http
-plugin at org.eclipse.equinox.log=v20090520-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.log
-plugin at org.eclipse.equinox.metatype=v20090520-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.metatype
-plugin at org.eclipse.equinox.useradmin=v20090520-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.useradmin
-plugin at org.eclipse.equinox.http.jetty,2.0.0=v20090520-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.http.jetty6
-plugin at org.eclipse.equinox.http.jetty,1.1.100=v20090520-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.http.jetty5
-plugin at org.eclipse.equinox.http.servlet=v20090520-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.http.servlet
-plugin at org.eclipse.equinox.http.servletbridge=v20090520-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/server-side/bundles/org.eclipse.equinox.http.servletbridge
-plugin at org.eclipse.equinox.http.registry=v20090520-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/server-side/bundles/org.eclipse.equinox.http.registry
-plugin at org.eclipse.equinox.servletbridge=v20090520-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/server-side/bundles/org.eclipse.equinox.servletbridge
-bundle at org.eclipse.equinox.jsp.jasper=v20090520-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/server-side/bundles/org.eclipse.equinox.jsp.jasper
-bundle at org.eclipse.equinox.jsp.jasper.registry=v20090520-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/server-side/bundles/org.eclipse.equinox.jsp.jasper.registry
-plugin at org.eclipse.equinox.cm=v20090520-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.cm
-plugin at org.eclipse.equinox.concurrent=v20090520-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/components/bundles/org.eclipse.equinox.concurrent
+plugin at org.eclipse.equinox.common=R35x_v20090807-1100,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/components/bundles/org.eclipse.equinox.common
+plugin at org.eclipse.equinox.preferences=R35x_v20091117,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.preferences
+plugin at org.eclipse.equinox.registry=v20090520-1800,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/components/bundles/org.eclipse.equinox.registry
+plugin at org.eclipse.equinox.supplement=v20090518,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.osgi/supplement
+plugin at org.eclipse.equinox.app=R35x_v20091203,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.app
+plugin at org.eclipse.equinox.device=v20090520-1800,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.device
+plugin at org.eclipse.equinox.event=R35x_v20100209,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.event
+plugin at org.eclipse.equinox.http=R35x_v20090728,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.http
+plugin at org.eclipse.equinox.log=v20090520-1800,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.log
+plugin at org.eclipse.equinox.metatype=v20090520-1800,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.metatype
+plugin at org.eclipse.equinox.useradmin=v20090520-1800,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.useradmin
+plugin at org.eclipse.equinox.http.jetty,2.0.0=v20090520-1800,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.http.jetty6
+plugin at org.eclipse.equinox.http.jetty,1.1.100=v20090520-1800,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.http.jetty5
+plugin at org.eclipse.equinox.http.servlet=v20090520-1800,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.http.servlet
+plugin at org.eclipse.equinox.http.servletbridge=v20090520-1800,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/server-side/bundles/org.eclipse.equinox.http.servletbridge
+plugin at org.eclipse.equinox.http.registry=v20090520-1800,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/server-side/bundles/org.eclipse.equinox.http.registry
+plugin at org.eclipse.equinox.servletbridge=v20090520-1800,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/server-side/bundles/org.eclipse.equinox.servletbridge
+bundle at org.eclipse.equinox.jsp.jasper=v20090520-1800,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/server-side/bundles/org.eclipse.equinox.jsp.jasper
+bundle at org.eclipse.equinox.jsp.jasper.registry=v20090520-1800,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/server-side/bundles/org.eclipse.equinox.jsp.jasper.registry
+plugin at org.eclipse.equinox.cm=v20090520-1800,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.cm
+plugin at org.eclipse.equinox.concurrent=R35x_v20100209,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/components/bundles/org.eclipse.equinox.concurrent
!**** Prosyst Contributions
-plugin at org.eclipse.equinox.ds=R35x_v20090806,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.ds
-plugin at org.eclipse.equinox.io=v20090520-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.io
-plugin at org.eclipse.equinox.ip=R35x_v20090803,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.ip
-plugin at org.eclipse.equinox.util=v20090520-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.util
-plugin at org.eclipse.equinox.wireadmin=v20090520-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.wireadmin
+plugin at org.eclipse.equinox.ds=R35x_v20090806,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.ds
+plugin at org.eclipse.equinox.io=v20090520-1800,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.io
+plugin at org.eclipse.equinox.ip=R35x_v20090803,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.ip
+plugin at org.eclipse.equinox.util=v20090520-1800,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.util
+plugin at org.eclipse.equinox.wireadmin=v20090520-1800,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.wireadmin
!**** Security Contributions
-plugin at org.eclipse.equinox.security=v20090520-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/security/bundles/org.eclipse.equinox.security
-plugin at org.eclipse.equinox.security.tests=v20080722-0430,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/security/bundles/org.eclipse.equinox.security.tests
-plugin at org.eclipse.equinox.security.ui=v20090520-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/security/bundles/org.eclipse.equinox.security.ui
-fragment at org.eclipse.equinox.security.win32.x86=v20090520-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/security/bundles/org.eclipse.equinox.security.win32.x86
-fragment at org.eclipse.equinox.security.macosx=v20090520-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/security/bundles/org.eclipse.equinox.security.macosx
+plugin at org.eclipse.equinox.security=v20090520-1800,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/security/bundles/org.eclipse.equinox.security
+plugin at org.eclipse.equinox.security.tests=v20080722-0430,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/security/bundles/org.eclipse.equinox.security.tests
+plugin at org.eclipse.equinox.security.ui=v20090520-1800,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/security/bundles/org.eclipse.equinox.security.ui
+fragment at org.eclipse.equinox.security.win32.x86=v20090520-1800,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/security/bundles/org.eclipse.equinox.security.win32.x86
+fragment at org.eclipse.equinox.security.macosx=v20090520-1800,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/security/bundles/org.eclipse.equinox.security.macosx
!**** Transforms
-plugin at org.eclipse.equinox.transforms.xslt=v20090520-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/components/bundles/org.eclipse.equinox.transforms.xslt
-fragment at org.eclipse.equinox.transforms.hook=v20090520-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/components/bundles/org.eclipse.equinox.transforms.hook
+plugin at org.eclipse.equinox.transforms.xslt=R35x_v20100209,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/components/bundles/org.eclipse.equinox.transforms.xslt
+fragment at org.eclipse.equinox.transforms.hook=v20090520-1800,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/components/bundles/org.eclipse.equinox.transforms.hook
!****launcher, startup.jar
-plugin at org.eclipse.equinox.launcher=R35x_v20090715,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher
-fragment at org.eclipse.equinox.launcher.win32.win32.x86=v20090519,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.x86
-fragment at org.eclipse.equinox.launcher.win32.win32.x86_64=v20090519,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.x86_64
-fragment at org.eclipse.equinox.launcher.win32.win32.ia64=v20090519,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.ia64
-fragment at org.eclipse.equinox.launcher.wpf.win32.x86=v20090519,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.wpf.win32.x86
-fragment at org.eclipse.equinox.launcher.carbon.macosx=v20090520-1835,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.carbon.macosx
-fragment at org.eclipse.equinox.launcher.cocoa.macosx=R35x_v20090707,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.cocoa.macosx
-fragment at org.eclipse.equinox.launcher.cocoa.macosx.x86_64=R35x_v20090707,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.cocoa.macosx.x86_64
-fragment at org.eclipse.equinox.launcher.gtk.linux.x86=v20090520,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.x86
-fragment at org.eclipse.equinox.launcher.gtk.linux.x86_64=v20090519,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.x86_64
-fragment at org.eclipse.equinox.launcher.gtk.linux.ppc=v20090519,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.ppc
-fragment at org.eclipse.equinox.launcher.motif.hpux.PA_RISC=v20090306-1900,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.hpux.PA_RISC
-fragment at org.eclipse.equinox.launcher.motif.hpux.ia64_32=v20090519,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.hpux.ia64_32
-fragment at org.eclipse.equinox.launcher.motif.aix.ppc=v20090519,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.aix.ppc
-fragment at org.eclipse.equinox.launcher.motif.linux.x86=v20090520,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.linux.x86
-fragment at org.eclipse.equinox.launcher.gtk.solaris.sparc=R35x_v20090720,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.solaris.sparc
+plugin at org.eclipse.equinox.launcher=R35x_v20090715,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher
+fragment at org.eclipse.equinox.launcher.win32.win32.x86=v20090519,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.x86
+fragment at org.eclipse.equinox.launcher.win32.win32.x86_64=v20090519,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.x86_64
+fragment at org.eclipse.equinox.launcher.win32.win32.ia64=v20090519,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.ia64
+fragment at org.eclipse.equinox.launcher.wpf.win32.x86=v20090519,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.wpf.win32.x86
+fragment at org.eclipse.equinox.launcher.carbon.macosx=v20090520-1835,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.carbon.macosx
+fragment at org.eclipse.equinox.launcher.cocoa.macosx=R35x_v20090707,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.cocoa.macosx
+fragment at org.eclipse.equinox.launcher.cocoa.macosx.x86_64=R35x_v20090707,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.cocoa.macosx.x86_64
+fragment at org.eclipse.equinox.launcher.gtk.linux.x86=v20090520,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.x86
+fragment at org.eclipse.equinox.launcher.gtk.linux.x86_64=v20090519,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.x86_64
+fragment at org.eclipse.equinox.launcher.gtk.linux.ppc=v20090519,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.ppc
+fragment at org.eclipse.equinox.launcher.motif.hpux.PA_RISC=v20090306-1900,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.hpux.PA_RISC
+fragment at org.eclipse.equinox.launcher.motif.hpux.ia64_32=v20090519,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.hpux.ia64_32
+fragment at org.eclipse.equinox.launcher.motif.aix.ppc=R35x_v20091211,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.aix.ppc
+fragment at org.eclipse.equinox.launcher.motif.linux.x86=R35x_v20100209,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.linux.x86
+fragment at org.eclipse.equinox.launcher.gtk.solaris.sparc=R35x_v20090720,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.solaris.sparc
!****contributed fragments
-fragment at org.eclipse.equinox.launcher.gtk.linux.s390=v20090426-1530,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.linux.s390
-fragment at org.eclipse.equinox.launcher.gtk.linux.s390x=v20090426-1530,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.linux.s390x
-fragment at org.eclipse.equinox.launcher.gtk.solaris.x86=R35x_v20090720,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.solaris.x86
-fragment at org.eclipse.equinox.launcher.motif.solaris.sparc=HEAD,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.solaris.sparc
+fragment at org.eclipse.equinox.launcher.gtk.linux.s390=v20090426-1530,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.linux.s390
+fragment at org.eclipse.equinox.launcher.gtk.linux.s390x=v20090426-1530,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.linux.s390x
+fragment at org.eclipse.equinox.launcher.gtk.solaris.x86=R35x_v20090720,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.solaris.x86
+fragment at org.eclipse.equinox.launcher.motif.solaris.sparc=R35x_20090929,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.solaris.sparc
-feature at org.eclipse.equinox.executable=R35x_v20090724,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.executable
+feature at org.eclipse.equinox.executable=R35x_v20091211,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.executable
!**** Runtime
-plugin at org.eclipse.core.runtime=v20090525,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.core.contenttype=R35x_v20090826-0451,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.core.jobs=v20090429-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.runtime=v20090525,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.contenttype=R35x_v20090826-0451,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.jobs=v20090429-1800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
!**** Expressions
-plugin at org.eclipse.core.expressions=v20090429-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.core.expressions.tests=v20090324-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.expressions=R35x_v20100209,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.expressions.tests=v20090324-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
!**** Resources
-plugin at org.eclipse.core.resources=R35x_v20090826-0451,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.core.resources.win32=v20080508,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.core.resources.win32.x86=v20081020,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.core.resources.win32.ia64=v20081020,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.core.resources.compatibility=v20090505,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.resources=R35x_v20091203-1235,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.core.resources.win32=v20080508,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.core.resources.win32.x86=v20081020,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.core.resources.win32.ia64=v20081020,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.core.resources.compatibility=R35x_v20100113-0530,kmoir at dev.eclipse.org:/cvsroot/eclipse,
!**** File System
-plugin at org.eclipse.core.filesystem=v20090507,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.core.filesystem.win32.x86=v20080604-1400,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.core.filesystem.win32.x86_64=v20090316-0910,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.core.filesystem.win32.ia64=v20071121,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.core.filesystem.linux.x86=v20080604-1400,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.core.filesystem.linux.x86_64=v20080604-1400,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.core.filesystem.linux.ppc=v20080604-1400,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.core.filesystem.solaris.sparc=v20080604-1400,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.filesystem=R35x_v20091203-1235,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.core.filesystem.win32.x86=v20080604-1400,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.core.filesystem.win32.x86_64=v20090316-0910,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.core.filesystem.win32.ia64=v20071121,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.core.filesystem.linux.x86=R35x_v20091203-1235,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.core.filesystem.linux.x86_64=R35x_v20091203-1235,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.core.filesystem.linux.ppc=v20080604-1400,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.core.filesystem.solaris.sparc=R35x_v20091203-1235,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.core.filesystem.aix.ppc=R35x_v20091203-1235,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.aix.ppc
!**** Legacy Runtime
-plugin at org.eclipse.core.boot=v20080218,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.core.runtime.compatibility=v20090413,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.core.runtime.compatibility.auth=v20090413,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.core.runtime.compatibility.registry=v20090429-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.boot=v20080218,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.runtime.compatibility=v20090413,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.runtime.compatibility.auth=v20090413,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.core.runtime.compatibility.registry=v20090429-1800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
!**** Other Core Code
-plugin at org.eclipse.pde.build=R35x_20090820,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/build/org.eclipse.pde.build
-plugin at org.eclipse.pde.build.tests=R35x_20090721,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/build/org.eclipse.pde.build.tests
-feature at org.eclipse.pde.builder=v20040624a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/build/org.eclipse.pde.build/feature
+plugin at org.eclipse.pde.build=R35x_20100114,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/build/org.eclipse.pde.build
+plugin at org.eclipse.pde.build.tests=R35x_20091105,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/build/org.eclipse.pde.build.tests
+feature at org.eclipse.pde.builder=v20040624a,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/build/org.eclipse.pde.build/feature
!**** Test Suites
-plugin at org.eclipse.core.tests.harness=v20090525,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.core.tests.resources=R35x_v20090826-0451,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.core.tests.runtime=R35x_v20090807-1100,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.osgi.tests=R35x_v20090827,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.osgi.tests
\ No newline at end of file
+plugin at org.eclipse.core.tests.harness=R35x_v20091203-1235,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.tests.resources=R35x_v20091203-1235,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.tests.runtime=R35x_v20090807-1100,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.osgi.tests=R35x_v20100126,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.osgi.tests
\ No newline at end of file
diff --git a/eclipse/maps/org.eclipse.releng/maps/doc.map b/eclipse/maps/org.eclipse.releng/maps/doc.map
index 6e9f9a7..6b6109f 100644
--- a/eclipse/maps/org.eclipse.releng/maps/doc.map
+++ b/eclipse/maps/org.eclipse.releng/maps/doc.map
@@ -1,9 +1,9 @@
!*************** DOC CONTRIBUTION ********************************************************
-plugin at org.eclipse.platform.doc.user=r351_v20090821-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.platform.doc.isv=r351_v20090831,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.platform.doc.user=r352_v20091111-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.platform.doc.isv=r352_v20100119,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.doc.user=r351_v20090821-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.doc.isv=r351_v20090831,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.doc.user=r352_v20091015,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.doc.isv=r351_v20090831,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.pde.doc.user=v20090818,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/doc/org.eclipse.pde.doc.user
\ No newline at end of file
+plugin at org.eclipse.pde.doc.user=v20090818,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/doc/org.eclipse.pde.doc.user
\ No newline at end of file
diff --git a/eclipse/maps/org.eclipse.releng/maps/equinox-incubator.map b/eclipse/maps/org.eclipse.releng/maps/equinox-incubator.map
index 5bb4b5e..bcc4fe6 100644
--- a/eclipse/maps/org.eclipse.releng/maps/equinox-incubator.map
+++ b/eclipse/maps/org.eclipse.releng/maps/equinox-incubator.map
@@ -1,28 +1,28 @@
!*************** Equinox Incubator Contribution ***************************
!**** Initializer bundle
-bundle at org.eclipse.equinox.initializer=v20071015,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/framework/bundles/org.eclipse.equinox.initializer
+bundle at org.eclipse.equinox.initializer=v20071015,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/framework/bundles/org.eclipse.equinox.initializer
!**** Resource Monitoring ****
!** Client **
-plugin at org.eclipse.equinox.jmx.client=v20070515,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.client
-plugin at org.eclipse.equinox.jmx.client.rmi=v20080610-1530,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.client.rmi
-plugin at org.eclipse.equinox.jmx.client.xmlrpc=v20070515,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc
-feature at org.eclipse.equinox.jmx.client.feature=v20081124,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.client.feature
+plugin at org.eclipse.equinox.jmx.client=v20070515,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.client
+plugin at org.eclipse.equinox.jmx.client.rmi=v20080610-1530,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.client.rmi
+plugin at org.eclipse.equinox.jmx.client.xmlrpc=v20070515,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc
+feature at org.eclipse.equinox.jmx.client.feature=v20081124,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.client.feature
!** Common **
-plugin at org.eclipse.equinox.jmx.common=v20070510,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.common
-feature at org.eclipse.equinox.jmx.common.feature=v20070507,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.common.feature
+plugin at org.eclipse.equinox.jmx.common=R35x_v20100209,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.common
+feature at org.eclipse.equinox.jmx.common.feature=v20070507,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.common.feature
!** Server **
-plugin at org.eclipse.equinox.jmx.server=v20071015,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.server
-plugin at org.eclipse.equinox.jmx.server.rmi=v20070510,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.server.rmi
-plugin at org.eclipse.equinox.jmx.server.xmlrpc=v20070608,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.server.xmlrpc
-plugin at org.eclipse.equinox.jmx.vm=v20070515,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.vm
-plugin at org.eclipse.equinox.preferences.jmx=v20070510,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.preferences.jmx
-plugin at org.eclipse.equinox.registry.jmx=v20080610-1530,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.registry.jmx
-plugin at org.eclipse.osgi.jmx=v20080610-1530,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.osgi.jmx
-plugin at org.eclipse.swt.jmx=v20090331,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.swt.jmx
-plugin at org.eclipse.core.resources.jmx=v20070510,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.core.resources.jmx
-feature at org.eclipse.equinox.jmx.server.feature=v20081124,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.server.feature
\ No newline at end of file
+plugin at org.eclipse.equinox.jmx.server=v20071015,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.server
+plugin at org.eclipse.equinox.jmx.server.rmi=v20070510,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.server.rmi
+plugin at org.eclipse.equinox.jmx.server.xmlrpc=v20070608,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.server.xmlrpc
+plugin at org.eclipse.equinox.jmx.vm=v20070515,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.vm
+plugin at org.eclipse.equinox.preferences.jmx=v20070510,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.preferences.jmx
+plugin at org.eclipse.equinox.registry.jmx=v20080610-1530,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.registry.jmx
+plugin at org.eclipse.osgi.jmx=v20080610-1530,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.osgi.jmx
+plugin at org.eclipse.swt.jmx=v20090331,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.swt.jmx
+plugin at org.eclipse.core.resources.jmx=v20070510,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.core.resources.jmx
+feature at org.eclipse.equinox.jmx.server.feature=v20081124,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.server.feature
\ No newline at end of file
diff --git a/eclipse/maps/org.eclipse.releng/maps/feature.map b/eclipse/maps/org.eclipse.releng/maps/feature.map
index 3fe92b1..49885e9 100644
--- a/eclipse/maps/org.eclipse.releng/maps/feature.map
+++ b/eclipse/maps/org.eclipse.releng/maps/feature.map
@@ -1,53 +1,53 @@
!*************** FEATURE CONTRIBUTION ******************************************************
-feature at org.eclipse.sdk=R35x_v20090811,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.sdk
-plugin at org.eclipse.sdk=R35x_v20090827,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-
-feature at org.eclipse.jdt=r351_v20090810-0600,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.jdt-feature
-feature at org.eclipse.jdt.sdk=v20080507,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.jdt.sdk
-
-feature at org.eclipse.pde=R35x_v20090811,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.pde-feature
-feature at org.eclipse.pde.sdk=v20080313a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.pde.sdk
-feature at org.eclipse.pde.api.tools.ee.cdcfoundation10_feature=v20090407-1030,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10-feature
-feature at org.eclipse.pde.api.tools.ee.cdcfoundation11_feature=v20090407-1030,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11-feature
-feature at org.eclipse.pde.api.tools.ee.j2se12_feature=v20090407-1030,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.j2se12-feature
-feature at org.eclipse.pde.api.tools.ee.j2se13_feature=v20090407-1030,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.j2se13-feature
-feature at org.eclipse.pde.api.tools.ee.j2se14_feature=v20090407-1030,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.j2se14-feature
-feature at org.eclipse.pde.api.tools.ee.j2se15_feature=v20090407-1030,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.j2se15-feature
-feature at org.eclipse.pde.api.tools.ee.javase16_feature=v20090407-1030,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.javase16-feature
-feature at org.eclipse.pde.api.tools.ee.jre11_feature=v20090407-1030,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.jre11-feature
-feature at org.eclipse.pde.api.tools.ee.osgiminimum10_feature=v20090407-1030,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10-feature
-feature at org.eclipse.pde.api.tools.ee.osgiminimum11_feature=v20090407-1030,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11-feature
-feature at org.eclipse.pde.api.tools.ee.osgiminimum12_feature=v20090407-1030,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12-feature
-
-feature at org.eclipse.platform=R35x_v20090910,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.platform-feature
-feature at org.eclipse.platform.sdk=v20080314,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.platform.sdk
-
-plugin at org.eclipse.platform=R35x_v20090813,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-
-feature at org.eclipse.sdk.examples=v20080717,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk.examples-feature
-plugin at org.eclipse.sdk.examples=v20080612,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-
-feature at org.eclipse.sdk.tests=v20090227,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk.tests-feature/features/org.eclipse.sdk.tests
-plugin at org.eclipse.sdk.tests=v20060605,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-
-feature at org.eclipse.equinox=v20090407,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.equinox
-feature at org.eclipse.equinox.sdk=r351_v20090901,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.equinox.sdk
-
-feature at org.eclipse.cvs=R35x_v20090811,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.cvs-feature
-feature at org.eclipse.cvs.sdk=v20080507,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.cvs.sdk
-plugin at org.eclipse.cvs=v20090520,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/plugins/org.eclipse.cvs
-
-feature at org.eclipse.help=R35x_v20090811,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.help-feature
-feature at org.eclipse.help.sdk=v20080314,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.help.sdk
-
-feature at org.eclipse.equinox.p2.user.ui=R35x_v20090811,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/p2/org.eclipse.equinox.p2.releng/buildtime-features/org.eclipse.equinox.p2.user.ui
-feature at org.eclipse.equinox.p2.agent.feature=CVS,tag=R35x_v20090811,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/org.eclipse.equinox.p2.releng/buildtime-features/org.eclipse.equinox.p2.agent.feature
-feature at org.eclipse.equinox.p2.generator.feature=CVS,tag=R35x_v20090811,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/org.eclipse.equinox.p2.releng/buildtime-features/org.eclipse.equinox.p2.generator.feature
-feature at org.eclipse.equinox.p2.director.feature=CVS,tag=R35x_v20090811,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/org.eclipse.equinox.p2.releng/buildtime-features/org.eclipse.equinox.p2.director.feature
-
-feature at org.eclipse.equinox.p2.sdk=CVS,tag=R35x_v20090811,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/features/org.eclipse.equinox.p2.sdk
-feature at org.eclipse.equinox.core.sdk=CVS,tag=R35x_v20090811,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/framework/features/org.eclipse.equinox.core.sdk
-feature at org.eclipse.equinox.compendium.sdk=CVS,tag=R35x_v20090811,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/compendium/features/org.eclipse.equinox.compendium.sdk
-feature at org.eclipse.equinox.serverside.sdk=CVS,tag=v20090505,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/server-side/features/org.eclipse.equinox.serverside.sdk
-
-feature at org.eclipse.pde.api.tools.ee.fragments=v20090512,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.pde.api.tools.ee.fragments
\ No newline at end of file
+feature at org.eclipse.sdk=R35x_v20100119,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.sdk
+plugin at org.eclipse.sdk=R35x_v20100204,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+
+feature at org.eclipse.jdt=r352_v20100108,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.jdt-feature
+feature at org.eclipse.jdt.sdk=v20080507,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.jdt.sdk
+
+feature at org.eclipse.pde=R35x_v20100119,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.pde-feature
+feature at org.eclipse.pde.sdk=v20080313a,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.pde.sdk
+feature at org.eclipse.pde.api.tools.ee.cdcfoundation10_feature=v20090407-1030,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10-feature
+feature at org.eclipse.pde.api.tools.ee.cdcfoundation11_feature=v20090407-1030,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11-feature
+feature at org.eclipse.pde.api.tools.ee.j2se12_feature=v20090407-1030,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.j2se12-feature
+feature at org.eclipse.pde.api.tools.ee.j2se13_feature=v20090407-1030,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.j2se13-feature
+feature at org.eclipse.pde.api.tools.ee.j2se14_feature=v20090407-1030,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.j2se14-feature
+feature at org.eclipse.pde.api.tools.ee.j2se15_feature=v20090407-1030,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.j2se15-feature
+feature at org.eclipse.pde.api.tools.ee.javase16_feature=v20090407-1030,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.javase16-feature
+feature at org.eclipse.pde.api.tools.ee.jre11_feature=v20090407-1030,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.jre11-feature
+feature at org.eclipse.pde.api.tools.ee.osgiminimum10_feature=v20090407-1030,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10-feature
+feature at org.eclipse.pde.api.tools.ee.osgiminimum11_feature=v20090407-1030,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11-feature
+feature at org.eclipse.pde.api.tools.ee.osgiminimum12_feature=v20090407-1030,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12-feature
+
+feature at org.eclipse.platform=R35x_v20100210-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.platform-feature
+feature at org.eclipse.platform.sdk=v20080314,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.platform.sdk
+
+plugin at org.eclipse.platform=R35x_v20100121,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+
+feature at org.eclipse.sdk.examples=v20080717,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk.examples-feature
+plugin at org.eclipse.sdk.examples=v20080612,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+
+feature at org.eclipse.sdk.tests=v20090227,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk.tests-feature/features/org.eclipse.sdk.tests
+plugin at org.eclipse.sdk.tests=v20060605,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+
+feature at org.eclipse.equinox=v20090407,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.equinox
+feature at org.eclipse.equinox.sdk=r352_v20100209,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.equinox.sdk
+
+feature at org.eclipse.cvs=R35x_v20100125,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.cvs-feature
+feature at org.eclipse.cvs.sdk=v20080507,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.cvs.sdk
+plugin at org.eclipse.cvs=R35x_v20100119,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/plugins/org.eclipse.cvs
+
+feature at org.eclipse.help=R35x_v20100119,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.help-feature
+feature at org.eclipse.help.sdk=v20080314,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.help.sdk
+
+feature at org.eclipse.equinox.p2.user.ui=R35x_v20091106,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/p2/org.eclipse.equinox.p2.releng/buildtime-features/org.eclipse.equinox.p2.user.ui
+feature at org.eclipse.equinox.p2.agent.feature=CVS,tag=R35x_v20090811,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/org.eclipse.equinox.p2.releng/buildtime-features/org.eclipse.equinox.p2.agent.feature
+feature at org.eclipse.equinox.p2.generator.feature=CVS,tag=R35x_v20090811,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/org.eclipse.equinox.p2.releng/buildtime-features/org.eclipse.equinox.p2.generator.feature
+feature at org.eclipse.equinox.p2.director.feature=CVS,tag=R35x_v20090811,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/org.eclipse.equinox.p2.releng/buildtime-features/org.eclipse.equinox.p2.director.feature
+
+feature at org.eclipse.equinox.p2.sdk=CVS,tag=R35x_v20090811,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/features/org.eclipse.equinox.p2.sdk
+feature at org.eclipse.equinox.core.sdk=CVS,tag=R35x_v20100105,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/framework/features/org.eclipse.equinox.core.sdk
+feature at org.eclipse.equinox.compendium.sdk=CVS,tag=R35x_v20100105,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/compendium/features/org.eclipse.equinox.compendium.sdk
+feature at org.eclipse.equinox.serverside.sdk=CVS,tag=v20090505,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/server-side/features/org.eclipse.equinox.serverside.sdk
+
+feature at org.eclipse.pde.api.tools.ee.fragments=v20090512,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.pde.api.tools.ee.fragments
\ No newline at end of file
diff --git a/eclipse/maps/org.eclipse.releng/maps/jdtapt.map b/eclipse/maps/org.eclipse.releng/maps/jdtapt.map
index 6eaf04c..15b2942 100644
--- a/eclipse/maps/org.eclipse.releng/maps/jdtapt.map
+++ b/eclipse/maps/org.eclipse.releng/maps/jdtapt.map
@@ -1,10 +1,10 @@
!*************** JDT APT CONTRIBUTION [R3_5_maintenance] *******************************************
-plugin at org.eclipse.jdt.apt.core=R35x_v20090818-0235,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.apt.ui=v20090528-1135,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.apt.tests=v20090528-1135,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.jdt.compiler.apt=R35x_v20090825-1530,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.compiler.apt.tests=R35x_v20090825-1530,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.apt.pluggable.core=R35x_v20090818-0225,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.apt.pluggable.tests=R35x_v20090818-0225,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
+plugin at org.eclipse.jdt.apt.core=R35x_v20091130-2300,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.apt.ui=v20090930-2100_R35x,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.apt.tests=R35x_v20091130-2300,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.jdt.compiler.apt=R35x_v20090925-1100,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.compiler.apt.tests=R35x_v20090925-1100,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.apt.pluggable.core=R35x_v20090925-1100,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.apt.pluggable.tests=R35x_v20090925-1100,kmoir at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
diff --git a/eclipse/maps/org.eclipse.releng/maps/jdtcore.map b/eclipse/maps/org.eclipse.releng/maps/jdtcore.map
index 228a3f4..43bd060 100644
--- a/eclipse/maps/org.eclipse.releng/maps/jdtcore.map
+++ b/eclipse/maps/org.eclipse.releng/maps/jdtcore.map
@@ -1,11 +1,11 @@
-!*************** JDT CORE CONTRIBUTION [20090902-0800] *******************************************
+!*************** JDT CORE CONTRIBUTION [20100113-0800] *******************************************
-plugin at org.eclipse.jdt.core=v_972_R35x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.jdt.compiler.tool=v_972_R35x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.core=v_980_R35x,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.jdt.compiler.tool=v_980_R35x,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.core.tests.builder=v_972_R35x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.core.tests.compiler=v_972_R35x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.core.tests.model=v_972_R35x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.core.tests.performance=v_972_R35x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.compiler.tool.tests=v_972_R35x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
+plugin at org.eclipse.jdt.core.tests.builder=v_980_R35x,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.core.tests.compiler=v_980_R35x,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.core.tests.model=v_980_R35x,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.core.tests.performance=v_980_R35x,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.compiler.tool.tests=v_980_R35x,kmoir at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
diff --git a/eclipse/maps/org.eclipse.releng/maps/jdtdebug.map b/eclipse/maps/org.eclipse.releng/maps/jdtdebug.map
index fd70810..2c199aa 100644
--- a/eclipse/maps/org.eclipse.releng/maps/jdtdebug.map
+++ b/eclipse/maps/org.eclipse.releng/maps/jdtdebug.map
@@ -1,16 +1,16 @@
!*************** DEBUG CONTRIBUTION ********************************************************
-plugin at org.eclipse.debug.core=v20090526-1600,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.debug.ui=v20090811_r351,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.debug=v20090526,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.debug.ui=v20090811_r351,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.launching=v20090527,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.launching.macosx=v20090527,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.launching.ui.macosx=v20090527,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.debug.core=v20091103_r352,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.debug.ui=v20091028_r352,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.debug=v20090526,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.debug.ui=v20090811_r351,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.launching=v20100108_r352,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.launching.macosx=v20090527,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.launching.ui.macosx=v20090527,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.console=v20090513,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.console=v20090513,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.debug.tests=v20090527,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.debug.tests=v20090527,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.debug.examples.core=v20090504,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.debug.examples.ui=v20090519,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
+plugin at org.eclipse.debug.examples.core=v20090504,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.debug.examples.ui=v20090519,kmoir at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
diff --git a/eclipse/maps/org.eclipse.releng/maps/jdtui.map b/eclipse/maps/org.eclipse.releng/maps/jdtui.map
index 88a4f0f..c92e4e6 100644
--- a/eclipse/maps/org.eclipse.releng/maps/jdtui.map
+++ b/eclipse/maps/org.eclipse.releng/maps/jdtui.map
@@ -1,23 +1,23 @@
!*************** JDT UI CONTRIBUTION ********************************************************
-plugin at org.eclipse.search=r351_v20090708-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.search.tests=v20090513-2000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.search=r351_v20090708-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.search.tests=v20090513-2000,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ltk.core.refactoring=v20090513-2000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ltk.core.refactoring.tests=v20090513-2000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ltk.ui.refactoring=v20090604,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ltk.ui.refactoring.tests=v20090513-2000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ltk.core.refactoring=v20090513-2000,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ltk.core.refactoring.tests=v20090513-2000,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ltk.ui.refactoring=r352_v20100209,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ltk.ui.refactoring.tests=v20090513-2000,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt=r351_v20090810-0600,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt=r352_v20100106-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.core.manipulation=v20090603,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.core.manipulation=v20090603,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.ui=r351_v20090821-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.ui.examples.projects=v20090603,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.ui.tests=v20090526-2000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.ui.tests.refactoring=r351_v20090708-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.ui=r352_v20100106-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.ui.examples.projects=v20090603,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.ui.tests=v20090526-2000,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.ui.tests.refactoring=r351_v20090708-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.junit=r351_v20090708-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.junit.runtime=v20090513-2000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.junit4.runtime=v20090513-2000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.junit=r352_v20100113-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.junit.runtime=v20090513-2000,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.junit4.runtime=v20090513-2000,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.junit4=v20090824,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
+plugin at org.junit4=v20090824,kmoir at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
diff --git a/eclipse/maps/org.eclipse.releng/maps/orbit.map b/eclipse/maps/org.eclipse.releng/maps/orbit.map
index 4b30d95..196f490 100644
--- a/eclipse/maps/org.eclipse.releng/maps/orbit.map
+++ b/eclipse/maps/org.eclipse.releng/maps/orbit.map
@@ -1,58 +1,58 @@
!*************** ORBIT CONTRIBUTION ********************************************************
-plugin at com.ibm.icu,4.0.1=p2IU,id=com.ibm.icu,version=4.0.1.v20090822,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite
-plugin at com.ibm.icu.base,4.0.1=p2IU,id=com.ibm.icu.base,version=4.0.1.v20090822,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite
-plugin at com.ibm.icu.base.source,4.0.1=p2IU,id=com.ibm.icu.base.source,version=4.0.1.v20090822,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite
-plugin at com.ibm.icu.source,4.0.1=p2IU,id=com.ibm.icu.source,version=4.0.1.v20090822,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite
-plugin at com.jcraft.jsch,0.1.41=p2IU,id=com.jcraft.jsch,version=0.1.41.v200903070017,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite
-plugin at com.jcraft.jsch.source,0.1.41=p2IU,id=com.jcraft.jsch.source,version=0.1.41.v200903070017,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite
-plugin at javax.management,1.2.0=p2IU,id=javax.management,version=1.2.0.v200803061811,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite
-plugin at javax.management.remote,1.0.0=p2IU,id=javax.management.remote,version=1.0.0.v200803061811,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite
-plugin at javax.servlet,2.4.0=p2IU,id=javax.servlet,version=2.4.0.v200806031604,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite
-plugin at javax.servlet,2.5.0=p2IU,id=javax.servlet,version=2.5.0.v200806031605,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite
-plugin at javax.servlet.source,2.4.0=p2IU,id=javax.servlet.source,version=2.4.0.v200806031604,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite
-plugin at javax.servlet.source,2.5.0=p2IU,id=javax.servlet.source,version=2.5.0.v200806031605,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite
-plugin at javax.servlet.jsp,2.0.0=p2IU,id=javax.servlet.jsp,version=2.0.0.v200806031607,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite
-plugin at javax.servlet.jsp.source,2.0.0=p2IU,id=javax.servlet.jsp.source,version=2.0.0.v200806031607,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite
-plugin at net.sourceforge.mx4j,3.0.1=p2IU,id=net.sourceforge.mx4j,version=3.0.1.v200803061811,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite
-plugin at net.sourceforge.mx4j.remote,3.0.1=p2IU,id=net.sourceforge.mx4j.remote,version=3.0.1.v200803061811,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite
-plugin at org.apache.ant,1.7.1=p2IU,id=org.apache.ant,version=1.7.1.v20090120-1145,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite
-plugin at org.apache.ant.source,1.7.1=p2IU,id=org.apache.ant.source,version=1.7.1.v20090120-1145,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite
-plugin at org.apache.commons.codec,1.3.0=p2IU,id=org.apache.commons.codec,version=1.3.0.v20080530-1600,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite
-plugin at org.apache.commons.codec.source,1.3.0=p2IU,id=org.apache.commons.codec.source,version=1.3.0.v20080530-1600,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite
-plugin at org.apache.commons.el,1.0.0=p2IU,id=org.apache.commons.el,version=1.0.0.v200806031608,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite
-plugin at org.apache.commons.el.source,1.0.0=p2IU,id=org.apache.commons.el.source,version=1.0.0.v200806031608,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite
-plugin at org.apache.commons.httpclient,3.1.0=p2IU,id=org.apache.commons.httpclient,version=3.1.0.v20080605-1935,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite
-plugin at org.apache.commons.httpclient.source,3.1.0=p2IU,id=org.apache.commons.httpclient.source,version=3.1.0.v20080605-1935,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite
-plugin at org.apache.commons.logging,1.0.4=p2IU,id=org.apache.commons.logging,version=1.0.4.v200904062259,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite
-plugin at org.apache.commons.logging.source,1.0.4=p2IU,id=org.apache.commons.logging.source,version=1.0.4.v200904062259,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite
-plugin at org.apache.jasper,5.5.17=p2IU,id=org.apache.jasper,version=5.5.17.v200903231320,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite
-plugin at org.apache.jasper.source,5.5.17=p2IU,id=org.apache.jasper.source,version=5.5.17.v200903231320,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite
-plugin at org.apache.lucene,1.9.1=p2IU,id=org.apache.lucene,version=1.9.1.v20080530-1600,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite
-plugin at org.apache.lucene.analysis,1.9.1=p2IU,id=org.apache.lucene.analysis,version=1.9.1.v20080530-1600,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite
-plugin at org.apache.lucene.analysis.source,1.9.1=p2IU,id=org.apache.lucene.analysis.source,version=1.9.1.v20080530-1600,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite
-plugin at org.apache.ws.commons.util,1.0.0=p2IU,id=org.apache.ws.commons.util,version=1.0.0.v20081204,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite
-plugin at org.apache.ws.jaxme,0.5.1=p2IU,id=org.apache.ws.jaxme,version=0.5.1.v20080530-1550,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite
-plugin at org.apache.xmlrpc,3.0.0=p2IU,id=org.apache.xmlrpc,version=3.0.0.v20080530-1550,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite
-plugin at org.easymock,2.4.0=p2IU,id=org.easymock,version=2.4.0.v20090202-0900,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite
-plugin at org.easymock.source,2.4.0=p2IU,id=org.easymock.source,version=2.4.0.v20090202-0900,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite
-plugin at org.hamcrest.core,1.1.0=p2IU,id=org.hamcrest.core,version=1.1.0.v20090501071000,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite
-plugin at org.hamcrest.core.source,1.1.0=p2IU,id=org.hamcrest.core.source,version=1.1.0.v20090501071000,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite
-plugin at org.junit,3.8.2=p2IU,id=org.junit,version=3.8.2.v20090203-1005,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite
-plugin at org.junit.source,3.8.2=p2IU,id=org.junit.source,version=3.8.2.v20090203-1005,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite
-plugin at org.mortbay.jetty,5.1.14=p2IU,id=org.mortbay.jetty,version=5.1.14.v200806031611,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite
-plugin at org.mortbay.jetty.source,5.1.14=p2IU,id=org.mortbay.jetty.source,version=5.1.14.v200806031611,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite
-plugin at org.mortbay.jetty.server,6.1.15=p2IU,id=org.mortbay.jetty.server,version=6.1.15.v200905151201,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite
-plugin at org.mortbay.jetty.server.source,6.1.15=p2IU,id=org.mortbay.jetty.server.source,version=6.1.15.v200905151201,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite
-plugin at org.mortbay.jetty.util,6.1.15=p2IU,id=org.mortbay.jetty.util,version=6.1.15.v200905182336,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite
-plugin at org.mortbay.jetty.util.source,6.1.15=p2IU,id=org.mortbay.jetty.util.source,version=6.1.15.v200905182336,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite
+plugin at com.ibm.icu,4.0.1=p2IU,id=com.ibm.icu,version=4.0.1.v20090822,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at com.ibm.icu.base,4.0.1=p2IU,id=com.ibm.icu.base,version=4.0.1.v20090822,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at com.ibm.icu.base.source,4.0.1=p2IU,id=com.ibm.icu.base.source,version=4.0.1.v20090822,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at com.ibm.icu.source,4.0.1=p2IU,id=com.ibm.icu.source,version=4.0.1.v20090822,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at com.jcraft.jsch,0.1.41=p2IU,id=com.jcraft.jsch,version=0.1.41.v200903070017,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at com.jcraft.jsch.source,0.1.41=p2IU,id=com.jcraft.jsch.source,version=0.1.41.v200903070017,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at javax.management,1.2.0=p2IU,id=javax.management,version=1.2.0.v200803061811,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at javax.management.remote,1.0.0=p2IU,id=javax.management.remote,version=1.0.0.v200803061811,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at javax.servlet,2.4.0=p2IU,id=javax.servlet,version=2.4.0.v200806031604,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at javax.servlet,2.5.0=p2IU,id=javax.servlet,version=2.5.0.v200806031605,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at javax.servlet.source,2.4.0=p2IU,id=javax.servlet.source,version=2.4.0.v200806031604,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at javax.servlet.source,2.5.0=p2IU,id=javax.servlet.source,version=2.5.0.v200806031605,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at javax.servlet.jsp,2.0.0=p2IU,id=javax.servlet.jsp,version=2.0.0.v200806031607,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at javax.servlet.jsp.source,2.0.0=p2IU,id=javax.servlet.jsp.source,version=2.0.0.v200806031607,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at net.sourceforge.mx4j,3.0.1=p2IU,id=net.sourceforge.mx4j,version=3.0.1.v200803061811,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at net.sourceforge.mx4j.remote,3.0.1=p2IU,id=net.sourceforge.mx4j.remote,version=3.0.1.v200803061811,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.apache.ant,1.7.1=p2IU,id=org.apache.ant,version=1.7.1.v20090120-1145,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.apache.ant.source,1.7.1=p2IU,id=org.apache.ant.source,version=1.7.1.v20090120-1145,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.apache.commons.codec,1.3.0=p2IU,id=org.apache.commons.codec,version=1.3.0.v20080530-1600,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.apache.commons.codec.source,1.3.0=p2IU,id=org.apache.commons.codec.source,version=1.3.0.v20080530-1600,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.apache.commons.el,1.0.0=p2IU,id=org.apache.commons.el,version=1.0.0.v200806031608,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.apache.commons.el.source,1.0.0=p2IU,id=org.apache.commons.el.source,version=1.0.0.v200806031608,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.apache.commons.httpclient,3.1.0=p2IU,id=org.apache.commons.httpclient,version=3.1.0.v20080605-1935,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.apache.commons.httpclient.source,3.1.0=p2IU,id=org.apache.commons.httpclient.source,version=3.1.0.v20080605-1935,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.apache.commons.logging,1.0.4=p2IU,id=org.apache.commons.logging,version=1.0.4.v200904062259,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.apache.commons.logging.source,1.0.4=p2IU,id=org.apache.commons.logging.source,version=1.0.4.v200904062259,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.apache.jasper,5.5.17=p2IU,id=org.apache.jasper,version=5.5.17.v200903231320,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.apache.jasper.source,5.5.17=p2IU,id=org.apache.jasper.source,version=5.5.17.v200903231320,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.apache.lucene,1.9.1=p2IU,id=org.apache.lucene,version=1.9.1.v20080530-1600,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.apache.lucene.analysis,1.9.1=p2IU,id=org.apache.lucene.analysis,version=1.9.1.v20080530-1600,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.apache.lucene.analysis.source,1.9.1=p2IU,id=org.apache.lucene.analysis.source,version=1.9.1.v20080530-1600,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.apache.ws.commons.util,1.0.0=p2IU,id=org.apache.ws.commons.util,version=1.0.0.v20081204,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.apache.ws.jaxme,0.5.1=p2IU,id=org.apache.ws.jaxme,version=0.5.1.v20080530-1550,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.apache.xmlrpc,3.0.0=p2IU,id=org.apache.xmlrpc,version=3.0.0.v20080530-1550,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.easymock,2.4.0=p2IU,id=org.easymock,version=2.4.0.v20090202-0900,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.easymock.source,2.4.0=p2IU,id=org.easymock.source,version=2.4.0.v20090202-0900,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.hamcrest.core,1.1.0=p2IU,id=org.hamcrest.core,version=1.1.0.v20090501071000,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.hamcrest.core.source,1.1.0=p2IU,id=org.hamcrest.core.source,version=1.1.0.v20090501071000,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.junit,3.8.2=p2IU,id=org.junit,version=3.8.2.v20090203-1005,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.junit.source,3.8.2=p2IU,id=org.junit.source,version=3.8.2.v20090203-1005,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.mortbay.jetty,5.1.14=p2IU,id=org.mortbay.jetty,version=5.1.14.v200806031611,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.mortbay.jetty.source,5.1.14=p2IU,id=org.mortbay.jetty.source,version=5.1.14.v200806031611,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.mortbay.jetty.server,6.1.15=p2IU,id=org.mortbay.jetty.server,version=6.1.15.v200905151201,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.mortbay.jetty.server.source,6.1.15=p2IU,id=org.mortbay.jetty.server.source,version=6.1.15.v200905151201,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.mortbay.jetty.util,6.1.15=p2IU,id=org.mortbay.jetty.util,version=6.1.15.v200905182336,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.mortbay.jetty.util.source,6.1.15=p2IU,id=org.mortbay.jetty.util.source,version=6.1.15.v200905182336,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100114021427/updateSite
# Bundles from Orbit for p2
-plugin at org.apache.xml.resolver,1.2.0=p2IU,id=org.apache.xml.resolver,version=1.2.0.v200902170519,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite
-plugin at org.apache.xerces,2.8.0=p2IU,id=org.apache.xerces,version=2.8.0.v200803070308,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite
-plugin at org.sat4j.core,2.1.0=p2IU,id=org.sat4j.core,version=2.1.0.v20090520,repository=http://www.eclipse.org/external/tools/orbit/downloads/drops/R20090825191606/updateSite
-plugin at org.sat4j.pb,2.1.0=p2IU,id=org.sat4j.pb,version=2.1.0.v20090520,repository=http://www.eclipse.org/external/tools/orbit/downloads/drops/R20090825191606/updateSite
+plugin at org.apache.xml.resolver,1.2.0=p2IU,id=org.apache.xml.resolver,version=1.2.0.v200902170519,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.apache.xerces,2.8.0=p2IU,id=org.apache.xerces,version=2.8.0.v200803070308,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.sat4j.core,2.1.1=p2IU,id=org.sat4j.core,version=2.1.1.v20090825,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.sat4j.pb,2.1.1=p2IU,id=org.sat4j.pb,version=2.1.1.v20090825,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100114021427/updateSite
# Orbit bundles for API tooling
-plugin at org.objectweb.asm,3.1.0=p2IU,id=org.objectweb.asm,version=3.1.0.v200803061910,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite
-plugin at org.objectweb.asm.source,3.1.0=p2IU,id=org.objectweb.asm.source,version=3.1.0.v200803061910,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite
+plugin at org.objectweb.asm,3.1.0=p2IU,id=org.objectweb.asm,version=3.1.0.v200803061910,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100114021427/updateSite
+plugin at org.objectweb.asm.source,3.1.0=p2IU,id=org.objectweb.asm.source,version=3.1.0.v200803061910,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100114021427/updateSite
diff --git a/eclipse/maps/org.eclipse.releng/maps/p2.map b/eclipse/maps/org.eclipse.releng/maps/p2.map
index 780a53a..6ad6e24 100644
--- a/eclipse/maps/org.eclipse.releng/maps/p2.map
+++ b/eclipse/maps/org.eclipse.releng/maps/p2.map
@@ -1,62 +1,55 @@
-plugin at org.eclipse.equinox.frameworkadmin=CVS,tag=v20090520-1905,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.frameworkadmin
-plugin at org.eclipse.equinox.frameworkadmin.equinox=CVS,tag=v20090520-1905,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.frameworkadmin.equinox
-plugin at org.eclipse.equinox.frameworkadmin.test=CVS,tag=v20090520-1905,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.frameworkadmin.test
-plugin at org.eclipse.equinox.p2.artifact.repository=CVS,tag=R35x_v20090721,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.artifact.repository
-plugin at org.eclipse.equinox.p2.console=CVS,tag=v20090520-1905,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.console
-plugin at org.eclipse.equinox.p2.core=CVS,tag=R35x_v20090819,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.core
-plugin at org.eclipse.equinox.p2.director=CVS,tag=v20090520-1905,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director
-plugin at org.eclipse.equinox.p2.director.app=CVS,tag=v20090521-1912,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director.app
-plugin at org.eclipse.equinox.p2.directorywatcher=CVS,tag=v20090525,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.directorywatcher
-plugin at org.eclipse.equinox.p2.engine=CVS,tag=R35x_v20090825,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.engine
-plugin at org.eclipse.equinox.p2.exemplarysetup=CVS,tag=v20090520-1905,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.exemplarysetup
-plugin at org.eclipse.equinox.p2.extensionlocation=CVS,tag=v20090520-1905,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.extensionlocation
-plugin at org.eclipse.equinox.p2.garbagecollector=CVS,tag=v20090520-1905,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.garbagecollector
-plugin at org.eclipse.equinox.p2.installer=CVS,tag=R35x_v20090717,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.installer
-plugin at org.eclipse.equinox.p2.jarprocessor=CVS,tag=v20090520-1905,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.jarprocessor
-plugin at org.eclipse.equinox.p2.metadata=CVS,tag=v20090525,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata
-plugin at org.eclipse.equinox.p2.metadata.generator=CVS,tag=v20090520-1905,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata.generator
-plugin at org.eclipse.equinox.p2.metadata.repository=CVS,tag=R35x_v20090812,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata.repository
-plugin at org.eclipse.equinox.p2.publisher=CVS,tag=v20090527-1812,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.publisher
-plugin at org.eclipse.equinox.p2.reconciler.dropins=CVS,tag=v20090520-1905,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.reconciler.dropins
-plugin at org.eclipse.equinox.p2.repository=CVS,tag=v20090901-1041,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.repository
-plugin at org.eclipse.equinox.p2.repository.tools=CVS,tag=R35x_v20090806,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.repository.tools
-plugin at org.eclipse.equinox.p2.selfhosting=CVS,tag=v20090520-1905,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.selfhosting
-plugin at org.eclipse.equinox.p2.tools=CVS,tag=v20090525,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tools
-plugin at org.eclipse.equinox.p2.touchpoint.eclipse=CVS,tag=R35x_20090820-1821,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.touchpoint.eclipse
-plugin at org.eclipse.equinox.p2.touchpoint.natives=CVS,tag=R35x_v20090806,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.touchpoint.natives
-plugin at org.eclipse.equinox.p2.ui=CVS,tag=R35x_v20090819,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui
-plugin at org.eclipse.equinox.p2.ui.admin=CVS,tag=v20090520-1905,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui.admin
-plugin at org.eclipse.equinox.p2.ui.sdk=CVS,tag=v20090520-1905,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui.sdk
-plugin at org.eclipse.equinox.p2.ui.sdk.scheduler=CVS,tag=v20090520-1905,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler
-plugin at org.eclipse.equinox.p2.ui.admin.rcp=CVS,tag=v20090820,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui.admin.rcp
-plugin at org.eclipse.equinox.p2.updatechecker=CVS,tag=v20090520-1905,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.updatechecker
-plugin at org.eclipse.equinox.p2.updatesite=CVS,tag=v20090525,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.updatesite
-plugin at org.eclipse.equinox.simpleconfigurator=CVS,tag=R35x_v20090807-1100,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.simpleconfigurator
-plugin at org.eclipse.equinox.simpleconfigurator.manipulator=CVS,tag=v20090520-1905,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.simpleconfigurator.manipulator
-plugin at org.eclipse.equinox.p2.tests=CVS,tag=R35x_v20090903,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests
-plugin at org.eclipse.equinox.p2.tests.ui=CVS,tag=v20090527-1812,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests.ui
+plugin at org.eclipse.equinox.frameworkadmin=CVS,tag=v20090520-1905,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.frameworkadmin
+plugin at org.eclipse.equinox.frameworkadmin.equinox=CVS,tag=R35x_v20091214,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.frameworkadmin.equinox
+plugin at org.eclipse.equinox.frameworkadmin.test=CVS,tag=v20090520-1905,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.frameworkadmin.test
+plugin at org.eclipse.equinox.p2.artifact.repository=CVS,tag=R35x_v20090721,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.artifact.repository
+plugin at org.eclipse.equinox.p2.console=CVS,tag=v20090520-1905,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.console
+plugin at org.eclipse.equinox.p2.core=CVS,tag=R35x_v20090819,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.core
+plugin at org.eclipse.equinox.p2.director=CVS,tag=R35x_v20100112,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director
+plugin at org.eclipse.equinox.p2.director.app=CVS,tag=R35x_v20091106,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director.app
+plugin at org.eclipse.equinox.p2.directorywatcher=CVS,tag=v20090525,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.directorywatcher
+plugin at org.eclipse.equinox.p2.engine=CVS,tag=R35x_v20091117,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.engine
+plugin at org.eclipse.equinox.p2.exemplarysetup=CVS,tag=v20090520-1905,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.exemplarysetup
+plugin at org.eclipse.equinox.p2.extensionlocation=CVS,tag=v20090520-1905,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.extensionlocation
+plugin at org.eclipse.equinox.p2.garbagecollector=CVS,tag=v20090520-1905,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.garbagecollector
+plugin at org.eclipse.equinox.p2.installer=CVS,tag=R35x_v20090717,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.installer
+plugin at org.eclipse.equinox.p2.jarprocessor=CVS,tag=v20090520-1905,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.jarprocessor
+plugin at org.eclipse.equinox.p2.metadata=CVS,tag=R35x_v20100112,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata
+plugin at org.eclipse.equinox.p2.metadata.generator=CVS,tag=R35x_20100114,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata.generator
+plugin at org.eclipse.equinox.p2.metadata.repository=CVS,tag=R35x_v20090812,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata.repository
+plugin at org.eclipse.equinox.p2.publisher=CVS,tag=R35x_20100105,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.publisher
+plugin at org.eclipse.equinox.p2.reconciler.dropins=CVS,tag=v20090520-1905,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.reconciler.dropins
+plugin at org.eclipse.equinox.p2.repository=CVS,tag=R35x_v20100105,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.repository
+plugin at org.eclipse.equinox.p2.repository.tools=CVS,tag=R35x_20100111,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.repository.tools
+plugin at org.eclipse.equinox.p2.selfhosting=CVS,tag=v20090520-1905,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.selfhosting
+plugin at org.eclipse.equinox.p2.tools=CVS,tag=v20090525,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tools
+plugin at org.eclipse.equinox.p2.touchpoint.eclipse=CVS,tag=R35x_20090820-1821,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.touchpoint.eclipse
+plugin at org.eclipse.equinox.p2.touchpoint.natives=CVS,tag=R35x_v20090806,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.touchpoint.natives
+plugin at org.eclipse.equinox.p2.ui=CVS,tag=R35x_v20090819,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui
+plugin at org.eclipse.equinox.p2.ui.admin=CVS,tag=v20090520-1905,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui.admin
+plugin at org.eclipse.equinox.p2.ui.sdk=CVS,tag=v20090520-1905,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui.sdk
+plugin at org.eclipse.equinox.p2.ui.sdk.scheduler=CVS,tag=v20090520-1905,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler
+plugin at org.eclipse.equinox.p2.ui.admin.rcp=CVS,tag=v20090820,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui.admin.rcp
+plugin at org.eclipse.equinox.p2.updatechecker=CVS,tag=v20090520-1905,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.updatechecker
+plugin at org.eclipse.equinox.p2.updatesite=CVS,tag=R35x_20100105,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.updatesite
+plugin at org.eclipse.equinox.simpleconfigurator=CVS,tag=R35x_v20090807-1100,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.simpleconfigurator
+plugin at org.eclipse.equinox.simpleconfigurator.manipulator=CVS,tag=R35x_v20100209,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.simpleconfigurator.manipulator
+plugin at org.eclipse.equinox.p2.tests=CVS,tag=R35x_v20090903,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests
+plugin at org.eclipse.equinox.p2.tests.ui=CVS,tag=v20090527-1812,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests.ui
!# Bundles from ECF
-plugin at org.eclipse.ecf,3.0.0=GET,http://www.eclipse.org/external/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf_3.0.0.v20090831-1906.jar,usetimestamp=true
-plugin at org.eclipse.ecf.source,3.0.0=GET,http://www.eclipse.org/external/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.source_3.0.0.v20090831-1906.jar,usetimestamp=true
-fragment at org.eclipse.ecf.ssl,1.0.0=GET,http://www.eclipse.org/external/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.ssl_1.0.0.v20090831-1906.jar,usetimestamp=true
-fragment at org.eclipse.ecf.ssl.source,1.0.0=GET,http://www.eclipse.org/external/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.ssl.source_1.0.0.v20090831-1906.jar,usetimestamp=true
-plugin at org.eclipse.ecf.identity,3.0.0=GET,http://www.eclipse.org/external/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.identity_3.0.0.v20090831-1906.jar,usetimestamp=true
-plugin at org.eclipse.ecf.identity.source,3.0.0=GET,http://www.eclipse.org/external/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.identity.source_3.0.0.v20090831-1906.jar,usetimestamp=true
-plugin at org.eclipse.ecf.filetransfer,3.0.0=GET,http://www.eclipse.org/external/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.filetransfer_3.0.0.v20090831-1906.jar,usetimestamp=true
-plugin at org.eclipse.ecf.filetransfer.source,3.0.0=GET,http://www.eclipse.org/external/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.filetransfer.source_3.0.0.v20090831-1906.jar,usetimestamp=true
-plugin at org.eclipse.ecf.provider.filetransfer,3.0.1=GET,http://www.eclipse.org/external/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.provider.filetransfer_3.0.1.v20090831-1906.jar,usetimestamp=true
-plugin at org.eclipse.ecf.provider.filetransfer.source,3.0.1=GET,http://www.eclipse.org/external/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.provider.filetransfer.source_3.0.1.v20090831-1906.jar,usetimestamp=true
-fragment at org.eclipse.ecf.provider.filetransfer.ssl,1.0.0=GET,http://www.eclipse.org/external/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.provider.filetransfer.ssl_1.0.0.v20090831-1906.jar,usetimestamp=true
-fragment at org.eclipse.ecf.provider.filetransfer.ssl.source,1.0.0=GET,http://www.eclipse.org/external/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.provider.filetransfer.ssl.source_1.0.0.v20090831-1906.jar,usetimestamp=true
-plugin at org.eclipse.ecf.provider.filetransfer.httpclient,3.0.1=GET,http://www.eclipse.org/external/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.provider.filetransfer.httpclient_3.0.1.v20090831-1906.jar,usetimestamp=true
-plugin at org.eclipse.ecf.provider.filetransfer.httpclient.source,3.0.1=GET,http://www.eclipse.org/external/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.source_3.0.1.v20090831-1906.jar,usetimestamp=true
-fragment at org.eclipse.ecf.provider.filetransfer.httpclient.ssl,1.0.0=GET,http://www.eclipse.org/external/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.v20090831-1906.jar,usetimestamp=true
-fragment at org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source,1.0.0=GET,http://www.eclipse.org/external/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source_1.0.0.v20090831-1906.jar,usetimestamp=true
-!# The following apache bundes are obtained from the orbit.map
-!#plugin at org.apache.commons.codec,1.3.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S20090426201227/bundles/org.apache.commons.codec_1.3.0.v20080530-1600.jar
-!#plugin at org.apache.commons.codec.source,1.3.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S20090426201227/bundles/org.apache.commons.codec.source_1.3.0.v20080530-1600.jar
-!#plugin at org.apache.commons.httpclient,3.1.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S20090426201227/bundles/org.apache.commons.httpclient_3.1.0.v20080605-1935.jar
-!#plugin at org.apache.commons.httpclient.source,3.1.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S20090426201227/bundles/org.apache.commons.httpclient.source_3.1.0.v20080605-1935.jar
-!#plugin at org.apache.commons.logging,1.0.4=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S20090426201227/bundles/org.apache.commons.logging_1.0.4.v200904062259.jar
-!#plugin at org.apache.commons.logging.source,1.0.4=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S20090426201227/bundles/org.apache.commons.logging.source_1.0.4.v200904062259.jar
\ No newline at end of file
+plugin at org.eclipse.ecf,3.0.0=GET,http://fullmoon.ottawa.ibm.com/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf_3.0.0.v20090831-1906.jar,usetimestamp=true
+plugin at org.eclipse.ecf.source,3.0.0=GET,http://fullmoon.ottawa.ibm.com/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.source_3.0.0.v20090831-1906.jar,usetimestamp=true
+fragment at org.eclipse.ecf.ssl,1.0.0=GET,http://fullmoon.ottawa.ibm.com/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.ssl_1.0.0.v20090831-1906.jar,usetimestamp=true
+fragment at org.eclipse.ecf.ssl.source,1.0.0=GET,http://fullmoon.ottawa.ibm.com/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.ssl.source_1.0.0.v20090831-1906.jar,usetimestamp=true
+plugin at org.eclipse.ecf.identity,3.0.0=GET,http://fullmoon.ottawa.ibm.com/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.identity_3.0.0.v20090831-1906.jar,usetimestamp=true
+plugin at org.eclipse.ecf.identity.source,3.0.0=GET,http://fullmoon.ottawa.ibm.com/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.identity.source_3.0.0.v20090831-1906.jar,usetimestamp=true
+plugin at org.eclipse.ecf.filetransfer,3.0.0=GET,http://fullmoon.ottawa.ibm.com/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.filetransfer_3.0.0.v20090831-1906.jar,usetimestamp=true
+plugin at org.eclipse.ecf.filetransfer.source,3.0.0=GET,http://fullmoon.ottawa.ibm.com/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.filetransfer.source_3.0.0.v20090831-1906.jar,usetimestamp=true
+plugin at org.eclipse.ecf.provider.filetransfer,3.0.1=GET,http://fullmoon.ottawa.ibm.com/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.provider.filetransfer_3.0.1.v20090831-1906.jar,usetimestamp=true
+plugin at org.eclipse.ecf.provider.filetransfer.source,3.0.1=GET,http://fullmoon.ottawa.ibm.com/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.provider.filetransfer.source_3.0.1.v20090831-1906.jar,usetimestamp=true
+fragment at org.eclipse.ecf.provider.filetransfer.ssl,1.0.0=GET,http://fullmoon.ottawa.ibm.com/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.provider.filetransfer.ssl_1.0.0.v20090831-1906.jar,usetimestamp=true
+fragment at org.eclipse.ecf.provider.filetransfer.ssl.source,1.0.0=GET,http://fullmoon.ottawa.ibm.com/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.provider.filetransfer.ssl.source_1.0.0.v20090831-1906.jar,usetimestamp=true
+plugin at org.eclipse.ecf.provider.filetransfer.httpclient,3.0.1=GET,http://fullmoon.ottawa.ibm.com/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.provider.filetransfer.httpclient_3.0.1.v20090831-1906.jar,usetimestamp=true
+plugin at org.eclipse.ecf.provider.filetransfer.httpclient.source,3.0.1=GET,http://fullmoon.ottawa.ibm.com/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.source_3.0.1.v20090831-1906.jar,usetimestamp=true
+fragment at org.eclipse.ecf.provider.filetransfer.httpclient.ssl,1.0.0=GET,http://fullmoon.ottawa.ibm.com/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.v20090831-1906.jar,usetimestamp=true
+fragment at org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source,1.0.0=GET,http://fullmoon.ottawa.ibm.com/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source_1.0.0.v20090831-1906.jar,usetimestamp=true
diff --git a/eclipse/maps/org.eclipse.releng/maps/pde.map b/eclipse/maps/org.eclipse.releng/maps/pde.map
index ecbab32..20bb038 100644
--- a/eclipse/maps/org.eclipse.releng/maps/pde.map
+++ b/eclipse/maps/org.eclipse.releng/maps/pde.map
@@ -1,33 +1,33 @@
!*************** PDE CONTRIBUTION ********************************************************
-plugin at org.eclipse.pde=v20090527,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde
-plugin at org.eclipse.pde.core=v20090821,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.core
-plugin at org.eclipse.pde.junit.runtime=v20090527,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.junit.runtime
-plugin at org.eclipse.pde.runtime=v20090731,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.runtime
-plugin at org.eclipse.pde.ui=v20090821,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.ui
-plugin at org.eclipse.pde.ui.templates=v20090527,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.ui.templates
-plugin at org.eclipse.pde.ui.tests=v20090824a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.ui.tests
+plugin at org.eclipse.pde=v20090527,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde
+plugin at org.eclipse.pde.core=v20100104,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.core
+plugin at org.eclipse.pde.junit.runtime=v20090527,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.junit.runtime
+plugin at org.eclipse.pde.runtime=v20090731,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.runtime
+plugin at org.eclipse.pde.ui=v201001121200,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.ui
+plugin at org.eclipse.pde.ui.templates=v20090527,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.ui.templates
+plugin at org.eclipse.pde.ui.tests=v20090824a,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.ui.tests
-plugin at org.eclipse.ui.views.log=v20090731,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.ui.views.log
-plugin at org.eclipse.pde.api.tools=v20090714,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools
-plugin at org.eclipse.pde.api.tools.ui=v20090820,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ui
-plugin at org.eclipse.pde.api.tools.tests=v20090714,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.tests
-fragment at org.eclipse.pde.api.tools.ee.cdcfoundation10=v20090407-1030,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10
-fragment at org.eclipse.pde.api.tools.ee.cdcfoundation11=v20090407-1030,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11
-fragment at org.eclipse.pde.api.tools.ee.j2se12=v20090407-1030,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.j2se12
-fragment at org.eclipse.pde.api.tools.ee.j2se13=v20090407-1030,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.j2se13
-fragment at org.eclipse.pde.api.tools.ee.j2se14=v20090407-1030,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.j2se14
-fragment at org.eclipse.pde.api.tools.ee.j2se15=v20090407-1030,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.j2se15
-fragment at org.eclipse.pde.api.tools.ee.javase16=v20090407-1030,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.javase16
-fragment at org.eclipse.pde.api.tools.ee.jre11=v20090407-1030,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.jre11
-fragment at org.eclipse.pde.api.tools.ee.osgiminimum10=v20090407-1030,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10
-fragment at org.eclipse.pde.api.tools.ee.osgiminimum11=v20090407-1030,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11
-fragment at org.eclipse.pde.api.tools.ee.osgiminimum12=v20090407-1030,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12
+plugin at org.eclipse.ui.views.log=v20090731,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.ui.views.log
+plugin at org.eclipse.pde.api.tools=v20090714,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools
+plugin at org.eclipse.pde.api.tools.ui=v20090820,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ui
+plugin at org.eclipse.pde.api.tools.tests=v20090714,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.tests
+fragment at org.eclipse.pde.api.tools.ee.cdcfoundation10=v20090407-1030,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10
+fragment at org.eclipse.pde.api.tools.ee.cdcfoundation11=v20090407-1030,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11
+fragment at org.eclipse.pde.api.tools.ee.j2se12=v20090407-1030,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.j2se12
+fragment at org.eclipse.pde.api.tools.ee.j2se13=v20090407-1030,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.j2se13
+fragment at org.eclipse.pde.api.tools.ee.j2se14=v20090407-1030,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.j2se14
+fragment at org.eclipse.pde.api.tools.ee.j2se15=v20090407-1030,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.j2se15
+fragment at org.eclipse.pde.api.tools.ee.javase16=v20090407-1030,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.javase16
+fragment at org.eclipse.pde.api.tools.ee.jre11=v20090407-1030,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.jre11
+fragment at org.eclipse.pde.api.tools.ee.osgiminimum10=v20090407-1030,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10
+fragment at org.eclipse.pde.api.tools.ee.osgiminimum11=v20090407-1030,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11
+fragment at org.eclipse.pde.api.tools.ee.osgiminimum12=v20090407-1030,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12
-plugin at org.eclipse.pde.ds.core=v20090429-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ds/org.eclipse.pde.ds.core
-plugin at org.eclipse.pde.ds.ui=v20090527,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ds/org.eclipse.pde.ds.ui
-plugin at org.eclipse.pde.ds.tests=v20090420,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ds/org.eclipse.pde.ds.tests
+plugin at org.eclipse.pde.ds.core=v20100118,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/ds/org.eclipse.pde.ds.core
+plugin at org.eclipse.pde.ds.ui=v20100209-maintenance,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/ds/org.eclipse.pde.ds.ui
+plugin at org.eclipse.pde.ds.tests=v20090420,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/ds/org.eclipse.pde.ds.tests
-plugin at org.eclipse.pde.ua.core=v20090429-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ua/org.eclipse.pde.ua.core
-plugin at org.eclipse.pde.ua.ui=v20090511,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ua/org.eclipse.pde.ua.ui
\ No newline at end of file
+plugin at org.eclipse.pde.ua.core=v20090429-1800,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/ua/org.eclipse.pde.ua.core
+plugin at org.eclipse.pde.ua.ui=v20090511,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/ua/org.eclipse.pde.ua.ui
\ No newline at end of file
diff --git a/eclipse/maps/org.eclipse.releng/maps/rcp.map b/eclipse/maps/org.eclipse.releng/maps/rcp.map
index 76e754c..000a771 100644
--- a/eclipse/maps/org.eclipse.releng/maps/rcp.map
+++ b/eclipse/maps/org.eclipse.releng/maps/rcp.map
@@ -1,3 +1,3 @@
-feature at org.eclipse.rcp=R35x_v20090811,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.rcp
-feature at org.eclipse.rcp.sdk=v20080507,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.rcp.sdk
-plugin at org.eclipse.rcp=v20090528,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/plugins/org.eclipse.rcp
\ No newline at end of file
+feature at org.eclipse.rcp=R35x_v20100119,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.rcp
+feature at org.eclipse.rcp.sdk=v20080507,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.rcp.sdk
+plugin at org.eclipse.rcp=R35x_v20100119,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/plugins/org.eclipse.rcp
\ No newline at end of file
diff --git a/eclipse/maps/org.eclipse.releng/maps/releng.map b/eclipse/maps/org.eclipse.releng/maps/releng.map
index 44b4e78..e36164b 100644
--- a/eclipse/maps/org.eclipse.releng/maps/releng.map
+++ b/eclipse/maps/org.eclipse.releng/maps/releng.map
@@ -1,19 +1,19 @@
!**************** RELENG CONTRIBUTION ********************************************************
-feature at master=v20090425,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/master
-feature at master-equinox=v20090413,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/master-equinox
-feature at master-equinox-p2=v20080506,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/master-equinox-p2
-feature at master-jetty=v20090305,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/master-jetty
-feature at master-ecf=v20090316,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/master-ecf
+feature at master=v20090425,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/master
+feature at master-equinox=v20090413,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/master-equinox
+feature at master-equinox-p2=v20080506,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/master-equinox-p2
+feature at master-jetty=v20090305,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/master-jetty
+feature at master-ecf=v20090316,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/master-ecf
-feature at com.ibm.icu.base=v20090119,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/com.ibm.icu.base
+feature at com.ibm.icu.base=v20090119,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/com.ibm.icu.base
-feature at master-root=v20081208,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/master-root
-feature at org.eclipse.releng.tools=v20090520,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.releng.tools
+feature at master-root=v20081208,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/master-root
+feature at org.eclipse.releng.tools=v20090520,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.releng.tools
-plugin at org.eclipse.releng.tools=R35x_v20090812,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.releng.tests=R35x_v20090831,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.releng.tools=R35x_v20090812,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.releng.tests=R35x_v20100208,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.pde.tools.versioning=r20080922,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk.tests-feature/plugins/org.eclipse.pde.tools.versioning
+plugin at org.eclipse.pde.tools.versioning=r20080922,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk.tests-feature/plugins/org.eclipse.pde.tools.versioning
!sample projects
-feature at org.eclipse.jdt.test.feature.sample=HEAD,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,platform-releng-home/examples/org.eclipse.jdt.test.feature.sample
\ No newline at end of file
+feature at org.eclipse.jdt.test.feature.sample=HEAD,kmoir at dev.eclipse.org:/cvsroot/eclipse,,platform-releng-home/examples/org.eclipse.jdt.test.feature.sample
\ No newline at end of file
diff --git a/eclipse/maps/org.eclipse.releng/maps/swt.map b/eclipse/maps/org.eclipse.releng/maps/swt.map
index 9da5e0c..b8287ee 100644
--- a/eclipse/maps/org.eclipse.releng/maps/swt.map
+++ b/eclipse/maps/org.eclipse.releng/maps/swt.map
@@ -1,44 +1,44 @@
!*************** SWT CONTRIBUTION ********************************************************
!*** SWT Plugin
-plugin at org.eclipse.swt=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt=v3557f,kmoir at dev.eclipse.org:/cvsroot/eclipse,
!*** SWT Platform Fragments
-fragment at org.eclipse.swt.carbon.macosx=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.cocoa.macosx=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.cocoa.macosx.x86_64=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.gtk.linux.ppc=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.gtk.linux.x86=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.gtk.linux.x86_64=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.gtk.solaris.sparc=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.gtk.solaris.x86=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.motif.aix.ppc=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.motif.hpux.ia64_32=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.motif.linux.x86=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.motif.solaris.sparc=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.photon.qnx.x86=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.win32.wce_ppc.arm=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.win32.win32.x86=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.wpf.win32.x86=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.win32.win32.x86_64=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.win32.win32.ia64=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.carbon.macosx=v3557f,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.cocoa.macosx=v3557f,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.cocoa.macosx.x86_64=v3557f,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.gtk.linux.ppc=v3557f,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.gtk.linux.x86=v3557f,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.gtk.linux.x86_64=v3557f,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.gtk.solaris.sparc=v3557f,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.gtk.solaris.x86=v3557f,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.motif.aix.ppc=v3557f,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.motif.hpux.ia64_32=v3557f,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.motif.linux.x86=v3557f,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.motif.solaris.sparc=v3557f,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.photon.qnx.x86=v3557f,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.win32.wce_ppc.arm=v3557f,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.win32.win32.x86=v3557f,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.wpf.win32.x86=v3557f,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.win32.win32.x86_64=v3557f,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.win32.win32.ia64=v3557f,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.gtk.linux.s390=v3550b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.gtk.linux.s390x=v3550b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.gtk.linux.s390=v3550b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.gtk.linux.s390x=v3550b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.gtk.linux.ia64=R3_5,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.motif.hpux.PA_RISC=R3_5,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.gtk.linux.ia64=R3_5,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.motif.hpux.PA_RISC=R3_5,kmoir at dev.eclipse.org:/cvsroot/eclipse,
!*** SWT Examples
-plugin at org.eclipse.swt.examples=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.swt.examples.browser=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.swt.examples.browser.demos=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.swt.examples.controls=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.swt.examples.launcher=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.swt.examples.layouts=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.swt.examples.ole.win32=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.swt.examples.paint=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.examples=v3557f,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.examples.browser=v3557f,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.examples.browser.demos=v3557f,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.examples.controls=v3557f,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.examples.launcher=v3557f,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.examples.layouts=v3557f,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.examples.ole.win32=v3557f,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.examples.paint=v3557f,kmoir at dev.eclipse.org:/cvsroot/eclipse,
!*** SWT Tests and Tools
-plugin at org.eclipse.swt.tests=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.swt.tools=v3555a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
+plugin at org.eclipse.swt.tests=v3557f,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.tools=v3557f,kmoir at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
diff --git a/eclipse/maps/org.eclipse.releng/maps/team.map b/eclipse/maps/org.eclipse.releng/maps/team.map
index bf5d378..224defa 100644
--- a/eclipse/maps/org.eclipse.releng/maps/team.map
+++ b/eclipse/maps/org.eclipse.releng/maps/team.map
@@ -1,23 +1,23 @@
!*************** TEAM CONTRIBUTION ********************************************************
-plugin at org.eclipse.team.core=I20090527-0620,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.team.cvs.core=I20090430-0408,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.team.cvs.ssh=I20090508-2000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.team.cvs.ssh2=I20090508-2000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.team.ui=I20090430-0408,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.team.cvs.ui=R35x_v20090826-0905,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.team.core=r35x_20100113-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.team.cvs.core=I20090430-0408,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.team.cvs.ssh=I20090508-2000,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.team.cvs.ssh2=I20090508-2000,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.team.ui=I20090430-0408,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.team.cvs.ui=r35x_20090930-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.core.net=r35x_20090812-1200,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.net=r35x_20090812-1200,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.core.tests.net=I20090126-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jsch.core=I20090430-0408,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jsch.ui=I20090430-0408,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jsch.tests=I20080604,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.net=r35x_20090812-1200,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.net=r35x_20090812-1200,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.tests.net=I20090126-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jsch.core=I20090430-0408,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jsch.ui=I20090430-0408,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jsch.tests=I20080604,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.team.examples.filesystem=I20090210-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.team.examples.filesystem=I20090210-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.team.tests.core=I20090304-1015,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.team.tests.cvs.core=I20090527-0620,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.core.net.win32.x86=I20080909,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86
-fragment at org.eclipse.core.net.linux.x86=I20081021,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86
-fragment at org.eclipse.core.net.win32.x86_64=I20090306-1030,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64
\ No newline at end of file
+plugin at org.eclipse.team.tests.core=I20090304-1015,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.team.tests.cvs.core=I20090527-0620,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.core.net.win32.x86=I20080909,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86
+fragment at org.eclipse.core.net.linux.x86=I20081021,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86
+fragment at org.eclipse.core.net.win32.x86_64=I20090306-1030,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64
\ No newline at end of file
diff --git a/eclipse/maps/org.eclipse.releng/maps/testframework.map b/eclipse/maps/org.eclipse.releng/maps/testframework.map
index 3c05032..3c38c09 100644
--- a/eclipse/maps/org.eclipse.releng/maps/testframework.map
+++ b/eclipse/maps/org.eclipse.releng/maps/testframework.map
@@ -1,12 +1,12 @@
!*************** Test Framework CONTRIBUTION ********************************************************
-feature at org.eclipse.test=r20080925,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.test-feature
+feature at org.eclipse.test=r20080925,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.test-feature
-plugin at org.eclipse.test=v20081002,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.ant.optional.junit=v20080717,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.test=v20081002,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.ant.optional.junit=v20080717,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.test.performance=v20090511,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.test.performance.win32=v20070530,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.test.performance=v20090511,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.test.performance.win32=v20070530,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.test.performance.data=v20050415,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.test.performance.data=v20050415,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.test.dispatcher=HEAD,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/plugins/org.eclipse.test.dispatcher
\ No newline at end of file
+plugin at org.eclipse.test.dispatcher=HEAD,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/plugins/org.eclipse.test.dispatcher
\ No newline at end of file
diff --git a/eclipse/maps/org.eclipse.releng/maps/text.map b/eclipse/maps/org.eclipse.releng/maps/text.map
index 1718fa7..673290b 100644
--- a/eclipse/maps/org.eclipse.releng/maps/text.map
+++ b/eclipse/maps/org.eclipse.releng/maps/text.map
@@ -1,16 +1,16 @@
!*************** TEXT CONTRIBUTION ********************************************************
-plugin at org.eclipse.text=v20090513-2000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jface.text=r351_v20090708-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.workbench.texteditor=v20090603,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.editors=v20090527-2000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.core.filebuffers=v20090526-2000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.text=v20090513-2000,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jface.text=r352_v20091118-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.workbench.texteditor=r352_v20100105,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.editors=v20090527-2000,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.filebuffers=v20090526-2000,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.examples.javaeditor=v20090528-2000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.examples.javaeditor=v20090528-2000,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.text.tests=v20090513-2000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jface.text.tests=v20090513-2000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.core.filebuffers.tests=v20090513-2000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.workbench.texteditor.tests=v20090513-2000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.editors.tests=v20090513-2000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.text.tests=v20090526-2000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
+plugin at org.eclipse.text.tests=v20090513-2000,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jface.text.tests=v20090513-2000,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.filebuffers.tests=v20090513-2000,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.workbench.texteditor.tests=v20090513-2000,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.editors.tests=v20090513-2000,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.text.tests=v20090526-2000,kmoir at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
diff --git a/eclipse/maps/org.eclipse.releng/maps/ui.map b/eclipse/maps/org.eclipse.releng/maps/ui.map
index fb679a1..9ca72e5 100644
--- a/eclipse/maps/org.eclipse.releng/maps/ui.map
+++ b/eclipse/maps/org.eclipse.releng/maps/ui.map
@@ -1,43 +1,43 @@
!*************** UI CONTRIBUTION *********************************************************
-plugin at org.eclipse.core.commands=I20090525-2000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jface=M20090826-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.core.databinding=M20090819-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.core.databinding.observable=M20090902-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.core.databinding.property=M20090819-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.core.databinding.beans=I20090525-2000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jface.databinding=M20090826-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui=M20090902-1000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.ide=M20090826-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.ide.application=M20090826-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.presentations.r21=I20081007-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.views=M20090826-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.workbench=M20090826-0800a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.ui.workbench.compatibility=I20090429-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.ui.win32=v20090429-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.ui.carbon=I20090525-2000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.ui.cocoa=I20090525-2000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.commands=I20090525-2000,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jface=M20100120-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.databinding=M20090819-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.databinding.observable=M20090902-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.databinding.property=M20090819-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.databinding.beans=I20090525-2000,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jface.databinding=M20090826-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui=M20100120-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.ide=M20100113-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.ide.application=M20090826-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.presentations.r21=M20091015-0930,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.views=M20090826-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.workbench=M20100113-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.ui.workbench.compatibility=I20090429-1800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.ui.win32=v20090429-1800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.ui.carbon=I20090525-2000,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.ui.cocoa=I20090525-2000,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jface.examples.databinding=M20090826-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.examples.multipageeditor=I20070605-0010,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.examples.propertysheet=I20070319-0010,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.examples.readmetool=I20090526-2000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.examples.undo=I20080204-0800a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.examples.views.properties.tabbed.article=I20060605-1400,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.article
-plugin at org.eclipse.ui.examples.fieldassist=I20090526-2000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.examples.contributions=I20090526-2000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jface.examples.databinding=M20090826-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.examples.multipageeditor=I20070605-0010,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.examples.propertysheet=M20100210-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.examples.readmetool=I20090526-2000,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.examples.undo=I20080204-0800a,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.examples.views.properties.tabbed.article=I20060605-1400,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.article
+plugin at org.eclipse.ui.examples.fieldassist=I20090526-2000,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.examples.contributions=I20090526-2000,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.navigator=M20090911-1550,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.navigator.resources=M20090826-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.navigator=M20100120-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.navigator.resources=M20090826-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.views.properties.tabbed=I20090429-1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.views.properties.tabbed=I20090429-1800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jface.tests.databinding=M20090909-1039,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jface.tests.databinding.conformance=M20090819-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.tests=M20090812-0800a,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.tests.rcp=I20090525-2000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.tests.navigator=M20090902-1000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.tests.views.properties.tabbed=I20090525-2000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.tests.performance=I20090527-2000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.tests.harness=I20090525-2000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
+plugin at org.eclipse.jface.tests.databinding=M20090909-1039,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jface.tests.databinding.conformance=M20090819-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.tests=M20100107-0100,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.tests.rcp=I20090525-2000,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.tests.navigator=M20100120-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.tests.views.properties.tabbed=I20090525-2000,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.tests.performance=I20090527-2000,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.tests.harness=I20090525-2000,kmoir at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
diff --git a/eclipse/maps/org.eclipse.releng/maps/update.map b/eclipse/maps/org.eclipse.releng/maps/update.map
index a734363..4955f4e 100644
--- a/eclipse/maps/org.eclipse.releng/maps/update.map
+++ b/eclipse/maps/org.eclipse.releng/maps/update.map
@@ -1,11 +1,11 @@
!*************** UPDATE CONTRIBUTION ********************************************************
-plugin at org.eclipse.update.configurator=v20090312,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.update.core=v20090525,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.update.scheduler=v20081127,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.update.ui=R35x_v20090813,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.update.configurator=v20090312,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.update.core=v20090525,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.update.scheduler=v20081127,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.update.ui=R35x_v20090813,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.update.core.win32=v20080107,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.update.core.linux=v20081008,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.update.core.win32=v20080107,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.update.core.linux=v20081008,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.update.tests.core=v20090525,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
+plugin at org.eclipse.update.tests.core=v20090525,kmoir at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
diff --git a/eclipse/maps/org.eclipse.releng/maps/userassist.map b/eclipse/maps/org.eclipse.releng/maps/userassist.map
index f7a26ef..d8240a3 100644
--- a/eclipse/maps/org.eclipse.releng/maps/userassist.map
+++ b/eclipse/maps/org.eclipse.releng/maps/userassist.map
@@ -1,25 +1,25 @@
!*************** UA CONTRIBUTION *********************************************
!**** Help
-plugin at org.eclipse.help=v20090805_35x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.help.appserver=v20090429_1800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.help.base=v20090526,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.help.ui=v20090819_35x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.help.webapp=v20090819_35x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.help=v20090805_35x,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.help.appserver=v20090429_1800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.help.base=v20090526,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.help.ui=v20090819_35x,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.help.webapp=v20091009_35x,kmoir at dev.eclipse.org:/cvsroot/eclipse,
!**** Welcome
-plugin at org.eclipse.ui.intro=v20090805_35x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.intro.universal=v20090526,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.intro=v20100111_35x,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.intro.universal=v20090526,kmoir at dev.eclipse.org:/cvsroot/eclipse,
!**** Cheat sheets
-plugin at org.eclipse.ui.cheatsheets=v20090526,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.cheatsheets=v20090526,kmoir at dev.eclipse.org:/cvsroot/eclipse,
!**** Browser
-plugin at org.eclipse.ui.browser=v20090526,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.browser=v20091215_35x,kmoir at dev.eclipse.org:/cvsroot/eclipse,
!**** Forms
-plugin at org.eclipse.ui.forms=v20090714_35x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.forms=v20090714_35x,kmoir at dev.eclipse.org:/cvsroot/eclipse,
!**** Tests
-plugin at org.eclipse.ua.tests=v20090805_35x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.tests.forms=v20090714_35x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
+plugin at org.eclipse.ua.tests=v20090805_35x,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.tests.forms=v20090714_35x,kmoir at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
diff --git a/eclipse/pluginVersions.properties b/eclipse/pluginVersions.properties
index ec0ba90..92c33be 100644
--- a/eclipse/pluginVersions.properties
+++ b/eclipse/pluginVersions.properties
@@ -1,4 +1,4 @@
-#Fri Oct 02 11:19:22 EDT 2009
+#Thu Feb 11 11:58:28 EST 2010
org.eclipse.swt.motif.hpux.PA_RISC,0.0.0=R3_5
org.eclipse.help.appserver,0.0.0=v20090429_1800
org.eclipse.ui.forms,0.0.0=v20090714_35x
@@ -6,53 +6,53 @@ org.eclipse.swt.gtk.linux.s390x,0.0.0=v3550b
org.eclipse.jdt.debug.ui,0.0.0=v20090811_r351
org.eclipse.jdt.launching.macosx,0.0.0=v20090527
org.eclipse.equinox.jmx.server.xmlrpc,0.0.0=v20070608
-org.eclipse.equinox.launcher.motif.solaris.sparc,0.0.0=HEAD
+org.eclipse.equinox.launcher.motif.solaris.sparc,0.0.0=R35x_20090929
org.eclipse.core.boot,0.0.0=v20080218
org.eclipse.ui.net,0.0.0=r35x_20090812-1200
org.eclipse.equinox.launcher.gtk.solaris.x86,0.0.0=R35x_v20090720
-org.eclipse.jdt.apt.pluggable.core,0.0.0=R35x_v20090818-0225
-org.eclipse.swt.examples.paint,0.0.0=v3555a
+org.eclipse.jdt.apt.pluggable.core,0.0.0=R35x_v20090925-1100
+org.eclipse.swt.examples.paint,0.0.0=v3557f
org.eclipse.core.net.win32.x86,0.0.0=I20080909
-org.eclipse.core.filesystem.macosx,0.0.0=v20090112
-org.eclipse.equinox.launcher.motif.linux.x86,0.0.0=v20090520
+org.eclipse.core.filesystem.macosx,0.0.0=R35x_v20091203-1235
+org.eclipse.equinox.launcher.motif.linux.x86,0.0.0=R35x_v20100209
org.eclipse.ui.navigator.resources,0.0.0=M20090826-0800
org.eclipse.equinox.p2.metadata.repository,0.0.0=R35x_v20090812
-org.eclipse.swt,0.0.0=v3555a
-org.eclipse.swt.win32.win32.x86,0.0.0=v3555a
+org.eclipse.swt,0.0.0=v3557f
+org.eclipse.swt.win32.win32.x86,0.0.0=v3557f
org.eclipse.update.ui,0.0.0=R35x_v20090813
-org.eclipse.core.filesystem,0.0.0=v20090507
+org.eclipse.core.filesystem,0.0.0=R35x_v20091203-1235
org.eclipse.equinox.registry.jmx,0.0.0=v20080610-1530
org.eclipse.equinox.io,0.0.0=v20090520-1800
-org.eclipse.equinox.simpleconfigurator.manipulator,0.0.0=v20090520-1905
+org.eclipse.equinox.simpleconfigurator.manipulator,0.0.0=R35x_v20100209
org.eclipse.pde.api.tools.ui,0.0.0=v20090820
org.eclipse.jdt.debug,0.0.0=v20090526
org.eclipse.sdk.examples,0.0.0=v20080612
org.eclipse.pde,0.0.0=v20090527
org.eclipse.compare.core,0.0.0=I20090430-0408
-org.eclipse.equinox.p2.engine,0.0.0=R35x_v20090825
+org.eclipse.equinox.p2.engine,0.0.0=R35x_v20091117
org.eclipse.equinox.launcher.motif.hpux.ia64_32,0.0.0=v20090519
org.eclipse.equinox.http,0.0.0=R35x_v20090728
-org.eclipse.swt.gtk.linux.x86_64,0.0.0=v3555a
-org.eclipse.swt.photon.qnx.x86,0.0.0=v3555a
+org.eclipse.swt.gtk.linux.x86_64,0.0.0=v3557f
+org.eclipse.swt.photon.qnx.x86,0.0.0=v3557f
org.eclipse.equinox.p2.ui.admin,0.0.0=v20090520-1905
-org.eclipse.equinox.transforms.xslt,0.0.0=v20090520-1800
+org.eclipse.equinox.transforms.xslt,0.0.0=R35x_v20100209
org.eclipse.jface.databinding,0.0.0=M20090826-0800
org.eclipse.equinox.p2.touchpoint.eclipse,0.0.0=R35x_20090820-1821
org.eclipse.help.base,0.0.0=v20090526
-org.eclipse.ui.presentations.r21,0.0.0=I20081007-0800
+org.eclipse.ui.presentations.r21,0.0.0=M20091015-0930
org.eclipse.equinox.frameworkadmin,0.0.0=v20090520-1905
-org.eclipse.ui.intro,0.0.0=v20090805_35x
-org.eclipse.ltk.ui.refactoring,0.0.0=v20090604
-org.eclipse.swt.examples.ole.win32,0.0.0=v3555a
-org.eclipse.ui.workbench.texteditor,0.0.0=v20090603
+org.eclipse.ui.intro,0.0.0=v20100111_35x
+org.eclipse.ltk.ui.refactoring,0.0.0=r352_v20100209
+org.eclipse.swt.examples.ole.win32,0.0.0=v3557f
+org.eclipse.ui.workbench.texteditor,0.0.0=r352_v20100105
org.eclipse.ui.examples.multipageeditor,0.0.0=I20070605-0010
-org.eclipse.swt.wpf.win32.x86,0.0.0=v3555a
-org.eclipse.core.filesystem.linux.x86,0.0.0=v20080604-1400
+org.eclipse.swt.wpf.win32.x86,0.0.0=v3557f
+org.eclipse.core.filesystem.linux.x86,0.0.0=R35x_v20091203-1235
org.eclipse.ui.examples.javaeditor,0.0.0=v20090528-2000
-org.eclipse.ant.core,0.0.0=v20090817_r351
+org.eclipse.ant.core,0.0.0=v20091110_r352
org.eclipse.equinox.p2.ui.admin.rcp,0.0.0=v20090820
org.eclipse.equinox.p2.updatechecker,0.0.0=v20090520-1905
-org.eclipse.debug.core,0.0.0=v20090526-1600
+org.eclipse.debug.core,0.0.0=v20091103_r352
org.eclipse.ui.examples.views.properties.tabbed.article,0.0.0=I20060605-1400
org.eclipse.core.databinding,0.0.0=M20090819-0800
org.eclipse.equinox.transforms.hook,0.0.0=v20090520-1800
@@ -61,26 +61,26 @@ org.eclipse.core.contenttype,0.0.0=R35x_v20090826-0451
org.eclipse.text,0.0.0=v20090513-2000
org.eclipse.help.ui,0.0.0=v20090819_35x
org.eclipse.equinox.servletbridge,0.0.0=v20090520-1800
-org.eclipse.jdt.apt.core,0.0.0=R35x_v20090818-0235
-org.eclipse.swt.win32.win32.x86_64,0.0.0=v3555a
+org.eclipse.jdt.apt.core,0.0.0=R35x_v20091130-2300
+org.eclipse.swt.win32.win32.x86_64,0.0.0=v3557f
org.eclipse.equinox.metatype,0.0.0=v20090520-1800
org.eclipse.pde.ua.ui,0.0.0=v20090511
org.eclipse.equinox.initializer,0.0.0=v20071015
org.eclipse.jsch.core,0.0.0=I20090430-0408
-org.eclipse.equinox.frameworkadmin.equinox,0.0.0=v20090520-1905
+org.eclipse.equinox.frameworkadmin.equinox,0.0.0=R35x_v20091214
org.eclipse.osgi.util,0.0.0=v20090520-1800
org.eclipse.search,0.0.0=r351_v20090708-0800
org.eclipse.ui.views,0.0.0=M20090826-0800
org.eclipse.equinox.simpleconfigurator,0.0.0=R35x_v20090807-1100
org.eclipse.team.ui,0.0.0=I20090430-0408
-org.eclipse.equinox.p2.metadata,0.0.0=v20090525
-org.eclipse.swt.cocoa.macosx.x86_64,0.0.0=v3555a
-org.eclipse.jdt.compiler.tool,0.0.0=v_972_R35x
-org.eclipse.platform,0.0.0=R35x_v20090813
+org.eclipse.equinox.p2.metadata,0.0.0=R35x_v20100112
+org.eclipse.swt.cocoa.macosx.x86_64,0.0.0=v3557f
+org.eclipse.jdt.compiler.tool,0.0.0=v_980_R35x
+org.eclipse.platform,0.0.0=R35x_v20100121
org.eclipse.core.databinding.observable,0.0.0=M20090902-0800
org.eclipse.team.examples.filesystem,0.0.0=I20090210-0800
-org.eclipse.pde.core,0.0.0=v20090821
-org.eclipse.ui.workbench,0.0.0=M20090826-0800a
+org.eclipse.pde.core,0.0.0=v20100104
+org.eclipse.ui.workbench,0.0.0=M20100113-0800
org.eclipse.core.runtime,0.0.0=v20090525
org.eclipse.core.resources.win32.x86,0.0.0=v20081020
org.eclipse.equinox.launcher.gtk.linux.x86_64,0.0.0=v20090519
@@ -91,31 +91,31 @@ org.eclipse.update.scheduler,0.0.0=v20081127
org.eclipse.equinox.launcher.gtk.linux.s390,0.0.0=v20090426-1530
org.eclipse.pde.junit.runtime,0.0.0=v20090527
org.eclipse.osgi.services,0.0.0=v20090520-1800
-org.eclipse.swt.examples.layouts,0.0.0=v3555a
-org.eclipse.jface,0.0.0=M20090826-0800
+org.eclipse.swt.examples.layouts,0.0.0=v3557f
+org.eclipse.jface,0.0.0=M20100120-0800
org.eclipse.pde.api.tools.ee.osgiminimum10,0.0.0=v20090407-1030
org.eclipse.equinox.jmx.server,0.0.0=v20071015
org.eclipse.equinox.jmx.server.rmi,0.0.0=v20070510
-org.eclipse.jdt.ui,0.0.0=r351_v20090821-0800
+org.eclipse.jdt.ui,0.0.0=r352_v20100106-0800
org.eclipse.equinox.security,0.0.0=v20090520-1800
org.eclipse.equinox.launcher,0.0.0=R35x_v20090715
org.eclipse.core.runtime.compatibility.registry,0.0.0=v20090429-1800
org.eclipse.equinox.http.jetty,2.0.0=v20090520-1800
-org.eclipse.jdt.launching,0.0.0=v20090527
+org.eclipse.jdt.launching,0.0.0=v20100108_r352
org.eclipse.ui.console,0.0.0=v20090513
org.eclipse.swt.gtk.linux.s390,0.0.0=v3550b
-org.eclipse.jdt.apt.ui,0.0.0=v20090528-1135
+org.eclipse.jdt.apt.ui,0.0.0=v20090930-2100_R35x
org.eclipse.ui.examples.fieldassist,0.0.0=I20090526-2000
org.eclipse.ui.ide.application,0.0.0=M20090826-0800
org.eclipse.equinox.launcher.gtk.linux.ppc,0.0.0=v20090519
org.eclipse.equinox.launcher.carbon.macosx,0.0.0=v20090520-1835
-org.eclipse.jdt.junit,0.0.0=r351_v20090708-0800
+org.eclipse.jdt.junit,0.0.0=r352_v20100113-0800
org.eclipse.pde.api.tools,0.0.0=v20090714
org.eclipse.core.runtime.compatibility,0.0.0=v20090413
org.eclipse.equinox.p2.directorywatcher,0.0.0=v20090525
org.eclipse.equinox.launcher.gtk.solaris.sparc,0.0.0=R35x_v20090720
org.eclipse.core.filesystem.hpux.ia64_32,0.0.0=v20080604-1400
-org.eclipse.swt.motif.aix.ppc,0.0.0=v3555a
+org.eclipse.swt.motif.aix.ppc,0.0.0=v3557f
org.eclipse.ui.examples.undo,0.0.0=I20080204-0800a
org.eclipse.ui.cocoa,0.0.0=I20090525-2000
org.eclipse.core.filesystem.qnx.x86,0.0.0=v20080604-1400
@@ -128,71 +128,71 @@ org.eclipse.jdt.launching.ui.macosx,0.0.0=v20090527
org.eclipse.equinox.p2.ui.sdk,0.0.0=v20090520-1905
org.eclipse.compare.examples,0.0.0=v20060606
org.eclipse.pde.ua.core,0.0.0=v20090429-1800
-org.eclipse.platform.doc.isv,0.0.0=r351_v20090831
+org.eclipse.platform.doc.isv,0.0.0=r352_v20100119
org.eclipse.equinox.p2.tools,0.0.0=v20090525
-org.eclipse.compare,0.0.0=I20090514-0808
+org.eclipse.compare,0.0.0=r35x_20100113-0800
org.eclipse.equinox.http.servletbridge,0.0.0=v20090520-1800
-org.eclipse.jdt.compiler.apt,0.0.0=R35x_v20090825-1530
-org.eclipse.help.webapp,0.0.0=v20090819_35x
+org.eclipse.jdt.compiler.apt,0.0.0=R35x_v20090925-1100
+org.eclipse.help.webapp,0.0.0=v20091009_35x
org.eclipse.pde.ui.templates,0.0.0=v20090527
-org.eclipse.equinox.p2.repository,0.0.0=v20090901-1041
-org.eclipse.equinox.p2.metadata.generator,0.0.0=v20090520-1905
-org.eclipse.equinox.p2.director.app,0.0.0=v20090521-1912
-org.eclipse.equinox.launcher.motif.aix.ppc,0.0.0=v20090519
-org.eclipse.equinox.app,0.0.0=v20090520-1800
-org.eclipse.swt.motif.hpux.ia64_32,0.0.0=v3555a
-org.eclipse.swt.gtk.solaris.x86,0.0.0=v3555a
-org.eclipse.pde.ds.ui,0.0.0=v20090527
+org.eclipse.equinox.p2.repository,0.0.0=R35x_v20100105
+org.eclipse.equinox.p2.metadata.generator,0.0.0=R35x_20100114
+org.eclipse.equinox.p2.director.app,0.0.0=R35x_v20091106
+org.eclipse.equinox.launcher.motif.aix.ppc,0.0.0=R35x_v20091211
+org.eclipse.equinox.app,0.0.0=R35x_v20091203
+org.eclipse.swt.motif.hpux.ia64_32,0.0.0=v3557f
+org.eclipse.swt.gtk.solaris.x86,0.0.0=v3557f
+org.eclipse.pde.ds.ui,0.0.0=v20100209-maintenance
org.eclipse.core.net.linux.x86,0.0.0=I20081021
org.eclipse.equinox.p2.console,0.0.0=v20090520-1905
-org.eclipse.swt.examples.browser.demos,0.0.0=v3555a
+org.eclipse.swt.examples.browser.demos,0.0.0=v3557f
org.eclipse.equinox.launcher.cocoa.macosx.x86_64,0.0.0=R35x_v20090707
org.eclipse.releng.tools,0.0.0=R35x_v20090812
org.eclipse.pde.doc.user,0.0.0=v20090818
-org.eclipse.swt.motif.linux.x86,0.0.0=v3555a
+org.eclipse.swt.motif.linux.x86,0.0.0=v3557f
org.eclipse.jface.examples.databinding,0.0.0=M20090826-0800
org.eclipse.equinox.jmx.client.rmi,0.0.0=v20080610-1530
-org.eclipse.debug.ui,0.0.0=v20090811_r351
+org.eclipse.debug.ui,0.0.0=v20091028_r352
org.eclipse.core.net,0.0.0=r35x_20090812-1200
-org.eclipse.core.filesystem.solaris.sparc,0.0.0=v20080604-1400
+org.eclipse.core.filesystem.solaris.sparc,0.0.0=R35x_v20091203-1235
org.eclipse.equinox.p2.touchpoint.natives,0.0.0=R35x_v20090806
org.eclipse.pde.api.tools.ee.cdcfoundation11,0.0.0=v20090407-1030
org.eclipse.equinox.launcher.win32.win32.ia64,0.0.0=v20090519
-org.eclipse.swt.examples.browser,0.0.0=v3555a
-org.eclipse.core.filesystem.linux.x86_64,0.0.0=v20080604-1400
-org.eclipse.equinox.event,0.0.0=v20090520-1800
-org.eclipse.ui.ide,0.0.0=M20090826-0800
+org.eclipse.swt.examples.browser,0.0.0=v3557f
+org.eclipse.core.filesystem.linux.x86_64,0.0.0=R35x_v20091203-1235
+org.eclipse.equinox.event,0.0.0=R35x_v20100209
+org.eclipse.ui.ide,0.0.0=M20100113-0800
org.eclipse.ui.views.log,0.0.0=v20090731
org.eclipse.equinox.p2.jarprocessor,0.0.0=v20090520-1905
-org.eclipse.ui.browser,0.0.0=v20090526
-org.eclipse.core.expressions,0.0.0=v20090429-1800
+org.eclipse.ui.browser,0.0.0=v20091215_35x
+org.eclipse.core.expressions,0.0.0=R35x_v20100209
org.eclipse.core.databinding.beans,0.0.0=I20090525-2000
org.eclipse.equinox.ds,0.0.0=R35x_v20090806
org.eclipse.equinox.launcher.win32.win32.x86_64,0.0.0=v20090519
org.eclipse.equinox.launcher.gtk.linux.x86,0.0.0=v20090520
org.eclipse.update.core.linux,0.0.0=v20081008
org.eclipse.core.databinding.property,0.0.0=M20090819-0800
-org.eclipse.ui.examples.propertysheet,0.0.0=I20070319-0010
+org.eclipse.ui.examples.propertysheet,0.0.0=M20100210-0800
org.eclipse.core.jobs,0.0.0=v20090429-1800
-org.eclipse.swt.gtk.linux.ppc,0.0.0=v3555a
-org.eclipse.swt.carbon.macosx,0.0.0=v3555a
+org.eclipse.swt.gtk.linux.ppc,0.0.0=v3557f
+org.eclipse.swt.carbon.macosx,0.0.0=v3557f
org.eclipse.jdt.ui.examples.projects,0.0.0=v20090603
org.eclipse.pde.runtime,0.0.0=v20090731
-org.eclipse.pde.build,0.0.0=R35x_20090820
+org.eclipse.pde.build,0.0.0=R35x_20100114
org.eclipse.equinox.p2.reconciler.dropins,0.0.0=v20090520-1905
org.eclipse.equinox.device,0.0.0=v20090520-1800
org.eclipse.core.commands,0.0.0=I20090525-2000
-org.eclipse.equinox.p2.repository.tools,0.0.0=R35x_v20090806
+org.eclipse.equinox.p2.repository.tools,0.0.0=R35x_20100111
org.eclipse.equinox.launcher.gtk.linux.s390x,0.0.0=v20090426-1530
org.eclipse.update.core,0.0.0=v20090525
-org.eclipse.team.core,0.0.0=I20090527-0620
+org.eclipse.team.core,0.0.0=r35x_20100113-0800
org.eclipse.debug.examples.ui,0.0.0=v20090519
org.eclipse.pde.api.tools.ee.javase16,0.0.0=v20090407-1030
org.eclipse.compare.win32,0.0.0=I20090430-0408
org.eclipse.equinox.p2.installer,0.0.0=R35x_v20090717
org.eclipse.debug.examples.core,0.0.0=v20090504
-org.eclipse.rcp,0.0.0=v20090528
-org.eclipse.pde.ds.core,0.0.0=v20090429-1800
+org.eclipse.rcp,0.0.0=R35x_v20100119
+org.eclipse.pde.ds.core,0.0.0=v20100118
org.eclipse.equinox.registry,0.0.0=v20090520-1800
org.eclipse.ui.examples.readmetool,0.0.0=I20090526-2000
org.eclipse.jdt.core.manipulation,0.0.0=v20090603
@@ -200,92 +200,93 @@ org.eclipse.equinox.http.servlet,0.0.0=v20090520-1800
org.eclipse.equinox.launcher.win32.win32.x86,0.0.0=v20090519
org.eclipse.equinox.launcher.motif.hpux.PA_RISC,0.0.0=v20090306-1900
org.eclipse.jdt.junit.runtime,0.0.0=v20090513-2000
-org.eclipse.swt.examples.controls,0.0.0=v3555a
+org.eclipse.swt.examples.controls,0.0.0=v3557f
org.eclipse.core.filesystem.linux.ppc,0.0.0=v20080604-1400
org.eclipse.osgi.jmx,0.0.0=v20080610-1530
org.eclipse.ui.workbench.compatibility,0.0.0=I20090429-1800
org.eclipse.equinox.p2.exemplarysetup,0.0.0=v20090520-1905
-org.eclipse.swt.cocoa.macosx,0.0.0=v3555a
-org.eclipse.ui,0.0.0=M20090902-1000
+org.eclipse.core.filesystem.aix.ppc,0.0.0=R35x_v20091203-1235
+org.eclipse.swt.cocoa.macosx,0.0.0=v3557f
+org.eclipse.ui,0.0.0=M20100120-0800
org.eclipse.equinox.jmx.client.xmlrpc,0.0.0=v20070515
-org.eclipse.swt.win32.wce_ppc.arm,0.0.0=v3555a
+org.eclipse.swt.win32.wce_ppc.arm,0.0.0=v3557f
org.eclipse.compare.examples.xml,0.0.0=I20080604
org.eclipse.equinox.jsp.jasper.registry,0.0.0=v20090520-1800
-org.eclipse.core.resources,0.0.0=R35x_v20090826-0451
+org.eclipse.core.resources,0.0.0=R35x_v20091203-1235
org.eclipse.team.cvs.ssh2,0.0.0=I20090508-2000
org.eclipse.equinox.wireadmin,0.0.0=v20090520-1800
-org.eclipse.ant.ui,0.0.0=v20090901_r351
-org.eclipse.swt.gtk.solaris.sparc,0.0.0=v3555a
+org.eclipse.ant.ui,0.0.0=v20091204_r352
+org.eclipse.swt.gtk.solaris.sparc,0.0.0=v3557f
org.eclipse.core.net.win32.x86_64,0.0.0=I20090306-1030
-org.eclipse.swt.examples.launcher,0.0.0=v3555a
+org.eclipse.swt.examples.launcher,0.0.0=v3557f
org.eclipse.equinox.preferences.jmx,0.0.0=v20070510
org.eclipse.equinox.p2.garbagecollector,0.0.0=v20090520-1905
org.eclipse.equinox.cm,0.0.0=v20090520-1800
org.eclipse.equinox.common,0.0.0=R35x_v20090807-1100
-org.eclipse.equinox.p2.director,0.0.0=v20090520-1905
-org.eclipse.equinox.p2.publisher,0.0.0=v20090527-1812
+org.eclipse.equinox.p2.director,0.0.0=R35x_v20100112
+org.eclipse.equinox.p2.publisher,0.0.0=R35x_20100105
org.eclipse.jdt.doc.isv,0.0.0=r351_v20090831
org.eclipse.ltk.core.refactoring,0.0.0=v20090513-2000
-org.eclipse.jdt.core,0.0.0=v_972_R35x
-org.eclipse.equinox.p2.updatesite,0.0.0=v20090525
+org.eclipse.jdt.core,0.0.0=v_980_R35x
+org.eclipse.equinox.p2.updatesite,0.0.0=R35x_20100105
org.eclipse.update.configurator,0.0.0=v20090312
org.eclipse.core.filesystem.win32.x86,0.0.0=v20080604-1400
org.eclipse.equinox.p2.core,0.0.0=R35x_v20090819
-org.eclipse.swt.examples,0.0.0=v3555a
-org.eclipse.cvs,0.0.0=v20090520
-org.eclipse.swt.gtk.linux.x86,0.0.0=v3555a
+org.eclipse.swt.examples,0.0.0=v3557f
+org.eclipse.cvs,0.0.0=R35x_v20100119
+org.eclipse.swt.gtk.linux.x86,0.0.0=v3557f
org.eclipse.equinox.log,0.0.0=v20090520-1800
org.eclipse.equinox.jmx.client,0.0.0=v20070515
org.eclipse.ui.win32,0.0.0=v20090429-1800
org.eclipse.ui.views.properties.tabbed,0.0.0=I20090429-1800
org.eclipse.equinox.security.ui,0.0.0=v20090520-1800
org.eclipse.pde.api.tools.ee.j2se13,0.0.0=v20090407-1030
-org.eclipse.swt.motif.solaris.sparc,0.0.0=v3555a
+org.eclipse.swt.motif.solaris.sparc,0.0.0=v3557f
org.eclipse.equinox.util,0.0.0=v20090520-1800
org.eclipse.equinox.p2.extensionlocation,0.0.0=v20090520-1905
org.eclipse.pde.api.tools.ee.osgiminimum12,0.0.0=v20090407-1030
-org.eclipse.equinox.concurrent,0.0.0=v20090520-1800
-org.eclipse.platform.doc.user,0.0.0=r351_v20090821-0800
+org.eclipse.equinox.concurrent,0.0.0=R35x_v20100209
+org.eclipse.platform.doc.user,0.0.0=r352_v20091111-0800
org.eclipse.equinox.security.macosx,0.0.0=v20090520-1800
org.eclipse.equinox.supplement,0.0.0=v20090518
org.eclipse.team.cvs.ssh,0.0.0=I20090508-2000
-org.eclipse.sdk,0.0.0=R35x_v20090827
+org.eclipse.sdk,0.0.0=R35x_v20100204
org.eclipse.jsch.ui,0.0.0=I20090430-0408
org.eclipse.core.filesystem.win32.x86_64,0.0.0=v20090316-0910
org.eclipse.equinox.security.win32.x86,0.0.0=v20090520-1800
org.eclipse.core.variables,0.0.0=v20090521
-org.eclipse.pde.ui,0.0.0=v20090821
+org.eclipse.pde.ui,0.0.0=v201001121200
org.eclipse.equinox.p2.artifact.repository,0.0.0=R35x_v20090721
org.eclipse.core.runtime.compatibility.auth,0.0.0=v20090413
-org.eclipse.osgi,0.0.0=R35x_v20090827
+org.eclipse.osgi,0.0.0=R35x_v20100126
org.eclipse.ui.intro.universal,0.0.0=v20090526
org.eclipse.swt.jmx,0.0.0=v20090331
-org.eclipse.swt.tools,0.0.0=v3555a
+org.eclipse.swt.tools,0.0.0=v3557f
org.eclipse.equinox.launcher.cocoa.macosx,0.0.0=R35x_v20090707
org.eclipse.ui.examples.contributions,0.0.0=I20090526-2000
-org.eclipse.team.cvs.ui,0.0.0=R35x_v20090826-0905
+org.eclipse.team.cvs.ui,0.0.0=r35x_20090930-0800
org.eclipse.ui.cheatsheets,0.0.0=v20090526
-org.eclipse.jdt.doc.user,0.0.0=r351_v20090821-0800
+org.eclipse.jdt.doc.user,0.0.0=r352_v20091015
org.eclipse.equinox.useradmin,0.0.0=v20090520-1800
-org.eclipse.jface.text,0.0.0=r351_v20090708-0800
+org.eclipse.jface.text,0.0.0=r352_v20091118-0800
org.eclipse.core.resources.jmx,0.0.0=v20070510
org.eclipse.update.core.win32,0.0.0=v20080107
org.eclipse.ui.externaltools,0.0.0=v20090504
org.eclipse.jdt.junit4.runtime,0.0.0=v20090513-2000
org.eclipse.pde.api.tools.ee.j2se12,0.0.0=v20090407-1030
org.eclipse.pde.api.tools.ee.osgiminimum11,0.0.0=v20090407-1030
-org.eclipse.ui.navigator,0.0.0=M20090911-1550
+org.eclipse.ui.navigator,0.0.0=M20100120-0800
org.eclipse.equinox.http.jetty,1.1.100=v20090520-1800
-org.eclipse.core.resources.compatibility,0.0.0=v20090505
+org.eclipse.core.resources.compatibility,0.0.0=R35x_v20100113-0530
org.eclipse.team.cvs.core,0.0.0=I20090430-0408
org.eclipse.core.filesystem.hpux.PA_RISC,0.0.0=v20080604-1400
org.eclipse.pde.api.tools.ee.cdcfoundation10,0.0.0=v20090407-1030
org.eclipse.equinox.launcher.wpf.win32.x86,0.0.0=v20090519
-org.eclipse.equinox.preferences,0.0.0=v20090520-1800
-org.eclipse.equinox.jmx.common,0.0.0=v20070510
+org.eclipse.equinox.preferences,0.0.0=R35x_v20091117
+org.eclipse.equinox.jmx.common,0.0.0=R35x_v20100209
org.eclipse.equinox.jmx.vm,0.0.0=v20070515
org.eclipse.equinox.p2.ui.sdk.scheduler,0.0.0=v20090520-1905
org.eclipse.ui.editors,0.0.0=v20090527-2000
org.eclipse.core.filebuffers,0.0.0=v20090526-2000
org.eclipse.equinox.ip,0.0.0=R35x_v20090803
-org.eclipse.jdt,0.0.0=r351_v20090810-0600
+org.eclipse.jdt,0.0.0=r352_v20100106-0800
diff --git a/eclipse/plugins/com.ibm.icu.base.source_4.0.1.v20090822.jar b/eclipse/plugins/com.ibm.icu.base.source_4.0.1.v20090822.jar
index 9f33aba..8630a9f 100644
Binary files a/eclipse/plugins/com.ibm.icu.base.source_4.0.1.v20090822.jar and b/eclipse/plugins/com.ibm.icu.base.source_4.0.1.v20090822.jar differ
diff --git a/eclipse/plugins/com.ibm.icu.source_4.0.1.v20090822.jar b/eclipse/plugins/com.ibm.icu.source_4.0.1.v20090822.jar
index b2806b7..dea12e5 100644
Binary files a/eclipse/plugins/com.ibm.icu.source_4.0.1.v20090822.jar and b/eclipse/plugins/com.ibm.icu.source_4.0.1.v20090822.jar differ
diff --git a/eclipse/plugins/com.jcraft.jsch.source_0.1.41.v200903070017.jar b/eclipse/plugins/com.jcraft.jsch.source_0.1.41.v200903070017.jar
index 5345ab2..7af53c3 100644
Binary files a/eclipse/plugins/com.jcraft.jsch.source_0.1.41.v200903070017.jar and b/eclipse/plugins/com.jcraft.jsch.source_0.1.41.v200903070017.jar differ
diff --git a/eclipse/plugins/javax.servlet.jsp.source_2.0.0.v200806031607.jar b/eclipse/plugins/javax.servlet.jsp.source_2.0.0.v200806031607.jar
index d6242c0..51f9f01 100644
Binary files a/eclipse/plugins/javax.servlet.jsp.source_2.0.0.v200806031607.jar and b/eclipse/plugins/javax.servlet.jsp.source_2.0.0.v200806031607.jar differ
diff --git a/eclipse/plugins/javax.servlet.source_2.5.0.v200806031605.jar b/eclipse/plugins/javax.servlet.source_2.5.0.v200806031605.jar
index 23f9b45..3a132a8 100644
Binary files a/eclipse/plugins/javax.servlet.source_2.5.0.v200806031605.jar and b/eclipse/plugins/javax.servlet.source_2.5.0.v200806031605.jar differ
diff --git a/eclipse/plugins/org.apache.ant.source_1.7.1.v20090120-1145.jar b/eclipse/plugins/org.apache.ant.source_1.7.1.v20090120-1145.jar
index d0b56f1..0fdca66 100644
Binary files a/eclipse/plugins/org.apache.ant.source_1.7.1.v20090120-1145.jar and b/eclipse/plugins/org.apache.ant.source_1.7.1.v20090120-1145.jar differ
diff --git a/eclipse/plugins/org.apache.ant_1.7.1.v20090120-1145/META-INF/ECLIPSEF.RSA b/eclipse/plugins/org.apache.ant_1.7.1.v20090120-1145/META-INF/ECLIPSEF.RSA
index 9d8a2d6..53f377b 100644
Binary files a/eclipse/plugins/org.apache.ant_1.7.1.v20090120-1145/META-INF/ECLIPSEF.RSA and b/eclipse/plugins/org.apache.ant_1.7.1.v20090120-1145/META-INF/ECLIPSEF.RSA differ
diff --git a/eclipse/plugins/org.apache.ant_1.7.1.v20090120-1145/META-INF/ECLIPSEF.SF b/eclipse/plugins/org.apache.ant_1.7.1.v20090120-1145/META-INF/ECLIPSEF.SF
index 0888fc1..8dc9b98 100644
--- a/eclipse/plugins/org.apache.ant_1.7.1.v20090120-1145/META-INF/ECLIPSEF.SF
+++ b/eclipse/plugins/org.apache.ant_1.7.1.v20090120-1145/META-INF/ECLIPSEF.SF
@@ -1,10 +1,10 @@
Signature-Version: 1.0
-SHA1-Digest-Manifest: 6AuBC9DF0n2C5Ox/ajkX/vZG9e4=
+SHA1-Digest-Manifest: mz2hhywHcBdLT5/njjX7Zvk3jDg=
Created-By: 1.6.0 (IBM Corporation)
SHA1-Digest-Manifest-Main-Attributes: MrkSD3jxUThhRkvxibmezdKD9k8=
Name: lib/ant-apache-bcel.jar
-SHA1-Digest: Fp15UkCmCd6ceYSGTmOxsWz3cb0=
+SHA1-Digest: nAcDkk/KA0nD+aHY5orh5CwHDXs=
Name: etc/mmetrics-frames.xsl
SHA1-Digest: APiAPtADgoYGSwEquxQdQx5NN0A=
@@ -16,13 +16,13 @@ Name: etc/tagdiff.xsl
SHA1-Digest: oQK6F+rUwsdxfJl58vbKAmtTs3Y=
Name: lib/ant.jar
-SHA1-Digest: ZdzPhbB0Wj8W1lQm3VkDsxtDWig=
+SHA1-Digest: iLwdJsPA3RlkAz60NYwuWZTyvrM=
Name: lib/ant-apache-oro.jar
-SHA1-Digest: fQp9/NNe+SPYqYeLSxve5wYdctc=
+SHA1-Digest: EfLaCOYX2cZ54FTDmz+XfS5PX9I=
Name: lib/ant-jsch.jar
-SHA1-Digest: THQeeLx4xyrcfNI8rmqsTXOSBLY=
+SHA1-Digest: WBH28A6KgSywMvCF7KOY9WMKB+8=
Name: about_files/LICENSE.dom.html
SHA1-Digest: xK0He1PkoQXdHC48ROEqZRNXTL4=
@@ -31,25 +31,25 @@ Name: etc/coverage-frames.xsl
SHA1-Digest: Lk7Vo06ABrH7brbJkP1hKRxLkMg=
Name: lib/ant-jdepend.jar
-SHA1-Digest: t1QCEV/L1a9mXGvxx20fyFZU39Y=
+SHA1-Digest: il/vX3Y2MzYUD4SVms8NMtPOy7w=
Name: about_files/asl-v20.txt
SHA1-Digest: pJO0L/tUizs1vz2W9gV2VmGJsDs=
Name: lib/ant-nodeps.jar
-SHA1-Digest: x6K1wqmd9KLDBQw/E8diMJdjb8M=
+SHA1-Digest: bNVH+pM/c8wmrDboMTkDpUegKiU=
Name: META-INF/eclipse.inf
SHA1-Digest: Z+e4UrhAmTCBR1UpP/RqMf9OX00=
Name: lib/ant-apache-regexp.jar
-SHA1-Digest: aQKwkNRu0TzailFrrcmSwZWRbto=
+SHA1-Digest: 576cnXLiolc8vR9GgmfKNp8Nqu4=
Name: bin/runant.pl
SHA1-Digest: 4EKNYCEcyO/SMqxm79fnts8/Q1c=
Name: lib/ant-weblogic.jar
-SHA1-Digest: Sgm76sq28hbit10TNC3m7YFWUMw=
+SHA1-Digest: gDPQp4tJzX2DS1yWRwF+hxY+oBA=
Name: bin/envset.cmd
SHA1-Digest: anGgepI9TTUvD6W73h+kGQrc2d0=
@@ -58,7 +58,7 @@ Name: etc/checkstyle/checkstyle-text.xsl
SHA1-Digest: Jzub6NSrWxS9hYda+Wy/SP49SeI=
Name: lib/ant-junit.jar
-SHA1-Digest: VqMFMoNqR9UUPvxaJsOZk6AQOYo=
+SHA1-Digest: m5hlRT4jgNdrwFd87cScKqfFzq8=
Name: bin/ant.cmd
SHA1-Digest: fKm5e7CiWr2UH61jbx6Yol3cQZo=
@@ -73,10 +73,10 @@ Name: bin/runant.py
SHA1-Digest: uMviIJaN6y/k6xUbjXhmUd6TN8E=
Name: lib/ant-commons-logging.jar
-SHA1-Digest: LXWWMEgIUvwVuil6aBhcux0n/4Q=
+SHA1-Digest: mWE9p+mUOYY6aSH9ef8Ahp0ZB9Q=
Name: lib/ant-swing.jar
-SHA1-Digest: m3myDnransLGDxsQmaL6uObUwvA=
+SHA1-Digest: 5Eo7LM3g4UZhBLXi3v0mFnM1Xbo=
Name: etc/jdepend-frames.xsl
SHA1-Digest: OEsPHq3PIr185ocUtm81ULkmobs=
@@ -88,7 +88,7 @@ Name: etc/changelog.xsl
SHA1-Digest: 9ZFS8fHSvz42GLs2NDnqzLFo5G8=
Name: lib/ant-launcher.jar
-SHA1-Digest: 8O/evXJ2/5hUflA8b6s4HcVfMCQ=
+SHA1-Digest: qYkHwss31xdglxfWJ+eKVrDCOEc=
Name: etc/jdepend.xsl
SHA1-Digest: M6boZHWa9+JeDhCjXtq5Z9Y61dY=
@@ -97,37 +97,37 @@ Name: bin/runrc.cmd
SHA1-Digest: aq6+dBb+jdiXyrvDNmLIOzj21N8=
Name: lib/ant-jmf.jar
-SHA1-Digest: S9PgEm+IdJNY8ogV/9q4l5USPlU=
+SHA1-Digest: ksLbfLMM5SAHh/R+gHdJazpVL3o=
Name: lib/ant-starteam.jar
-SHA1-Digest: deQ/8DubWAcfd7yL1tekuOn1UkI=
+SHA1-Digest: MfTpvL6RE4IpbQQXqicmTTenXV0=
Name: lib/ant-netrexx.jar
-SHA1-Digest: au9QgnW1bwkcsJFIiH2ruXiMqr0=
+SHA1-Digest: R4NztTC64/RcG5wiJbi39IVBdyU=
Name: plugin.properties
SHA1-Digest: tNIh5OEXJJxtqSciwBvjmG5gUGg=
Name: lib/ant-jai.jar
-SHA1-Digest: 41YkyRyNGKx8Xirmu8DnorxVoLE=
+SHA1-Digest: xX/eACE028fVCcIU6wJ5BNNQ55I=
Name: lib/ant-trax.jar
-SHA1-Digest: Pq9VESg+STR0y2BzorcAOmq6EU4=
+SHA1-Digest: oaylmaVuNt7ZDalXmlvhK4Z9+bc=
Name: bin/antRun.bat
SHA1-Digest: KX8SW+sZ8gtQYr3boWRpl2DkWrE=
Name: lib/ant-apache-bsf.jar
-SHA1-Digest: 3OWc1TEIrWXOZfZph48X5f9BUiA=
+SHA1-Digest: LaSs+3xCdQ6HbJ1MEf/w2T3cy64=
Name: about_files/LICENSE.sax.txt
SHA1-Digest: CnKqzCUI0E0NUSlVIAfUd8gctxU=
Name: lib/ant-stylebook.jar
-SHA1-Digest: N0IjhVqUGm3bEs0tpRIzMSeQF/Y=
+SHA1-Digest: YaNlOMFYlmO6o+UWUO0iut4X9ug=
Name: lib/ant-apache-log4j.jar
-SHA1-Digest: RfYzAwf/0D0V3LRLpjIh13PI94Q=
+SHA1-Digest: qEMNkG9wWw0jBP0l5WJHJ4/XJyc=
Name: bin/ant
SHA1-Digest: bnS5vQF5wYnqXs8zr+3LORKIA0U=
@@ -142,7 +142,7 @@ Name: about_files/NOTICE
SHA1-Digest: g5R8FDyNNir6o/tFVnDNSlcP+z0=
Name: lib/ant-apache-resolver.jar
-SHA1-Digest: 52eznTXdY5faDl/pLuiEhmKpX+A=
+SHA1-Digest: DwA3cQWtEVwBNU5UTPKQghI9AuA=
Name: etc/junit-frames.xsl
SHA1-Digest: 2hTCiaPp95X9ZjX8ZDwjvqwfT6U=
@@ -151,7 +151,7 @@ Name: etc/junit-noframes.xsl
SHA1-Digest: M4u7091ckN+zoCaRvjal1SDwJQE=
Name: lib/ant-antlr.jar
-SHA1-Digest: 7LaTe9TJZftJl5Nt3SQBwbbEvJE=
+SHA1-Digest: kW+TfOLRp96xdnBMvfa9CWMPv90=
Name: about.html
SHA1-Digest: tujWEJAt+/IKSC26IMuUh48ercA=
@@ -163,10 +163,10 @@ Name: etc/junit-frames-xalan1.xsl
SHA1-Digest: Bvmst1NiMllcc+sricG/3Eyszc0=
Name: lib/ant-commons-net.jar
-SHA1-Digest: vAYQkim8gUUrJfdCA8+3QMjcWOg=
+SHA1-Digest: EJVVV+F9gd7fEg85Sjm1qP6c9ms=
Name: lib/ant-javamail.jar
-SHA1-Digest: spWtBTDg1wRglogEb4/TNUQTG64=
+SHA1-Digest: dONtBXDrB646aBvPNGKyZy1CP98=
Name: bin/lcp.bat
SHA1-Digest: EA5m2+HfGFLhb6ForQdjnlvl3cU=
diff --git a/eclipse/plugins/org.apache.ant_1.7.1.v20090120-1145/META-INF/MANIFEST.MF b/eclipse/plugins/org.apache.ant_1.7.1.v20090120-1145/META-INF/MANIFEST.MF
index 06b37fa..034febc 100644
--- a/eclipse/plugins/org.apache.ant_1.7.1.v20090120-1145/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.apache.ant_1.7.1.v20090120-1145/META-INF/MANIFEST.MF
@@ -59,7 +59,7 @@ Bundle-Version: 1.7.1.v20090120-1145
Bundle-ManifestVersion: 2
Name: lib/ant-apache-bcel.jar
-SHA1-Digest: rvIaCoN3WIhhzG5W8wwUt5iwb6E=
+SHA1-Digest: fP83jr24ji6x7ayjHjTuWLXSiR4=
Name: etc/mmetrics-frames.xsl
SHA1-Digest: cQnziGYZC2FrO0zwFE92P1bP2v8=
@@ -71,13 +71,13 @@ Name: etc/tagdiff.xsl
SHA1-Digest: ddaegkBkww5CoIlRpSR8RDUI1bQ=
Name: lib/ant.jar
-SHA1-Digest: wBufI5pWYbEwy1sFt8gzY53NPxA=
+SHA1-Digest: ZQpcRN8ZJLM9pBBIpBQFuM0ibuY=
Name: lib/ant-apache-oro.jar
-SHA1-Digest: l9FAvp3UUHEvNkwTBTerzqncWEc=
+SHA1-Digest: SkR2zfuPavoZ9GqVbGBEjNPtkxM=
Name: lib/ant-jsch.jar
-SHA1-Digest: 4rb4phVFOxTeRASpuMmwAcutsfU=
+SHA1-Digest: QlqyI8b1IjMJCkLa/dNZG2Sz5c0=
Name: about_files/LICENSE.dom.html
SHA1-Digest: 9F8cZaCgriCte0T6Mt5hAFumadk=
@@ -86,25 +86,25 @@ Name: etc/coverage-frames.xsl
SHA1-Digest: 5SE/NhPWEbqzGDGL58dwEbkhwRs=
Name: lib/ant-jdepend.jar
-SHA1-Digest: NHsujQSCMkhLM6f4dWiiDFpFx3Y=
+SHA1-Digest: BoXnsH9wf6tfjPGKoEDE1bbhiFQ=
Name: about_files/asl-v20.txt
SHA1-Digest: K4uBUimqimHkg/tLoFiLi2xJGJA=
Name: lib/ant-nodeps.jar
-SHA1-Digest: ZBOOve9Kwl5wXM/pN0Mdq7l5xcI=
+SHA1-Digest: lMaWhSGfl7EWI8B3JTQ7FoC2pZE=
Name: META-INF/eclipse.inf
SHA1-Digest: u+F8j/GAE8tzrDry9+wT3Cvg81Y=
Name: lib/ant-apache-regexp.jar
-SHA1-Digest: mQVwV4PMJm1oit0sse1z758k4W0=
+SHA1-Digest: skQ/xAVhT+/w6PPiiT+ZDU0YjoY=
Name: bin/runant.pl
SHA1-Digest: tynYaGh8+BtWDsZ6PljZdoi+egU=
Name: lib/ant-weblogic.jar
-SHA1-Digest: QR73w+pyh6xdT1uL1M9RaShzDg0=
+SHA1-Digest: 6GaGfXa3nyytHEO+27I8IsCj5jI=
Name: etc/checkstyle/checkstyle-text.xsl
SHA1-Digest: CqSzAXEeeV20DtFpeujwjL9FEW8=
@@ -116,7 +116,7 @@ Name: bin/ant.cmd
SHA1-Digest: 4jPJI7nJO+v3oPpbi5GbrT7x9qk=
Name: lib/ant-junit.jar
-SHA1-Digest: rF2oAgIs34Kxx9CLgJ+wHHJaEcs=
+SHA1-Digest: vdXknfEYkc32sq3MKlS2KfI9un8=
Name: bin/antRun
SHA1-Digest: S63QT5F5EI1BCpIj59nosT3lVTw=
@@ -128,10 +128,10 @@ Name: bin/runant.py
SHA1-Digest: Kg3iFzRnZW6PVIFmbj7Eyuo72cM=
Name: lib/ant-commons-logging.jar
-SHA1-Digest: BBEZyayrlB8ck/igmnx7uWPvtHo=
+SHA1-Digest: IsOx/VYnZBWwvxVZ8uv2pFubyiQ=
Name: lib/ant-swing.jar
-SHA1-Digest: LCCsncyVNokkxhnkccJ+0+aq63Y=
+SHA1-Digest: BknMW9F2tr+lvbLPAs/K2f+kFcI=
Name: etc/jdepend-frames.xsl
SHA1-Digest: U2Bb6aMxgbEYqXkCm2sujeLP7Zo=
@@ -143,7 +143,7 @@ Name: etc/changelog.xsl
SHA1-Digest: 2EZZ+jSTt1TTlBYPN4vGUAX7cTQ=
Name: lib/ant-launcher.jar
-SHA1-Digest: g34+RwGMqZinDmj1ABloG6jl45U=
+SHA1-Digest: 8LKF5B/M2JhvatoFD8kVLtbgdrA=
Name: etc/jdepend.xsl
SHA1-Digest: 0rf14aLzhLsun24uUsXVVvkHM6I=
@@ -152,37 +152,37 @@ Name: bin/runrc.cmd
SHA1-Digest: eNo+cuYQicndcc56FVkRScD5w30=
Name: lib/ant-jmf.jar
-SHA1-Digest: mLlhHcul/bE9uPMJ6nBuTwrY9Zw=
+SHA1-Digest: nBdKPkU6UNToVNyTDw9VxsCiQe8=
Name: lib/ant-starteam.jar
-SHA1-Digest: E1nZ9obd2W2DO0wQdyLimWpQ8/k=
+SHA1-Digest: 8o1FVZnlPjlzpkVzvrxgTsUZbwY=
Name: lib/ant-netrexx.jar
-SHA1-Digest: d4nviw9QNaEi/V0DHx4E66JHquY=
+SHA1-Digest: vlNfca1y6dQb0aQjEFo5V1l3e2g=
Name: plugin.properties
SHA1-Digest: oZ8G+d0YZCeLv5mafw0x2OwbwOY=
Name: lib/ant-jai.jar
-SHA1-Digest: yNIA0SDq4zjg3Khk8NaA4N7VUxE=
+SHA1-Digest: aVM04eDtFdeZlShHcwTv4+GqgGU=
Name: lib/ant-trax.jar
-SHA1-Digest: krlTcSOezZvShg9uWqV/2GbbSK4=
+SHA1-Digest: vDgjuNuYI0A9nrpWa2wLYyqdIjA=
Name: bin/antRun.bat
SHA1-Digest: zB9JbFFhlXTVgwaJlw61wNELj6k=
Name: lib/ant-apache-bsf.jar
-SHA1-Digest: 56DP202fkH9xE8KzDxR2KzUVL9A=
+SHA1-Digest: yfbQCzu1pvS1j8O44gkxuTgc1pU=
Name: about_files/LICENSE.sax.txt
SHA1-Digest: uLnQn2qwT77aJ6MThuLeWz1I5ek=
Name: lib/ant-stylebook.jar
-SHA1-Digest: phr1D6Z7ypGlxDuCduyYZMECnH8=
+SHA1-Digest: AZfiFXJ2YTKqurNdaT98LLG8NC4=
Name: lib/ant-apache-log4j.jar
-SHA1-Digest: dR+Bb8mWE4krxIzhlFo+q2WHoQU=
+SHA1-Digest: hDeGHiO2qTDtJNGSE8+23m4LVH0=
Name: bin/ant
SHA1-Digest: jK7w10Hy+BIiSimUAhjgizdaBuY=
@@ -197,7 +197,7 @@ Name: about_files/NOTICE
SHA1-Digest: v3XrGNGv2sQGqBe+ObJZnq9915g=
Name: lib/ant-apache-resolver.jar
-SHA1-Digest: EUuhztNbIIZ3t9dyDSuhcxhX9BM=
+SHA1-Digest: 6FDrND4Oez4S/p4PizLo2CTph2Q=
Name: etc/junit-frames.xsl
SHA1-Digest: XIcHcYoM8I5hzTkhdiy5iskupIM=
@@ -206,7 +206,7 @@ Name: etc/junit-noframes.xsl
SHA1-Digest: zmgmTYDnXS0QZvMd3wUarjPR7aE=
Name: lib/ant-antlr.jar
-SHA1-Digest: v20lWaAzEfsRhHgk7MUloDoZauQ=
+SHA1-Digest: TNv/vwBM0Co1rX6LFuh+h0OTqGA=
Name: about.html
SHA1-Digest: cPPs9diR9VPNDzWrCs1FLNOdJEo=
@@ -218,10 +218,10 @@ Name: etc/junit-frames-xalan1.xsl
SHA1-Digest: ME/2vW22HRXG87EwVJ9LFfkfyEI=
Name: lib/ant-commons-net.jar
-SHA1-Digest: 7QqZbnxS0KeuBUdosZg/t8VUYDk=
+SHA1-Digest: SLmc5Y3ve5V8ShfWIQ2Yz8cXig8=
Name: lib/ant-javamail.jar
-SHA1-Digest: tyvkUaz3cgwzJhDcIoqu7hO+he0=
+SHA1-Digest: RUoVCaD/GCPpZoOaldyoxpYrCDc=
Name: bin/lcp.bat
SHA1-Digest: eX7ICcBsanATsaEDkn5+oTA4QaQ=
diff --git a/eclipse/plugins/org.apache.commons.codec.source_1.3.0.v20080530-1600.jar b/eclipse/plugins/org.apache.commons.codec.source_1.3.0.v20080530-1600.jar
index bd118f7..b1387f8 100644
Binary files a/eclipse/plugins/org.apache.commons.codec.source_1.3.0.v20080530-1600.jar and b/eclipse/plugins/org.apache.commons.codec.source_1.3.0.v20080530-1600.jar differ
diff --git a/eclipse/plugins/org.apache.commons.el.source_1.0.0.v200806031608.jar b/eclipse/plugins/org.apache.commons.el.source_1.0.0.v200806031608.jar
index 5c8ede3..72925ba 100644
Binary files a/eclipse/plugins/org.apache.commons.el.source_1.0.0.v200806031608.jar and b/eclipse/plugins/org.apache.commons.el.source_1.0.0.v200806031608.jar differ
diff --git a/eclipse/plugins/org.apache.commons.httpclient.source_3.1.0.v20080605-1935.jar b/eclipse/plugins/org.apache.commons.httpclient.source_3.1.0.v20080605-1935.jar
index adccbcc..b5065f4 100644
Binary files a/eclipse/plugins/org.apache.commons.httpclient.source_3.1.0.v20080605-1935.jar and b/eclipse/plugins/org.apache.commons.httpclient.source_3.1.0.v20080605-1935.jar differ
diff --git a/eclipse/plugins/org.apache.commons.logging.source_1.0.4.v200904062259.jar b/eclipse/plugins/org.apache.commons.logging.source_1.0.4.v200904062259.jar
index 16ac890..3f1e2ad 100644
Binary files a/eclipse/plugins/org.apache.commons.logging.source_1.0.4.v200904062259.jar and b/eclipse/plugins/org.apache.commons.logging.source_1.0.4.v200904062259.jar differ
diff --git a/eclipse/plugins/org.apache.jasper.source_5.5.17.v200903231320.jar b/eclipse/plugins/org.apache.jasper.source_5.5.17.v200903231320.jar
index 469e2d6..933c5c6 100644
Binary files a/eclipse/plugins/org.apache.jasper.source_5.5.17.v200903231320.jar and b/eclipse/plugins/org.apache.jasper.source_5.5.17.v200903231320.jar differ
diff --git a/eclipse/plugins/org.apache.lucene.analysis.source_1.9.1.v20080530-1600.jar b/eclipse/plugins/org.apache.lucene.analysis.source_1.9.1.v20080530-1600.jar
index b7abf3e..3405843 100644
Binary files a/eclipse/plugins/org.apache.lucene.analysis.source_1.9.1.v20080530-1600.jar and b/eclipse/plugins/org.apache.lucene.analysis.source_1.9.1.v20080530-1600.jar differ
diff --git a/eclipse/plugins/org.eclipse.ant.core/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.ant.core/META-INF/MANIFEST.MF
index 7f97980..04369e6 100644
--- a/eclipse/plugins/org.eclipse.ant.core/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.ant.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.ant.core; singleton:=true
-Bundle-Version: 3.2.100.qualifier
+Bundle-Version: 3.2.101.qualifier
Bundle-Activator: org.eclipse.ant.core.AntCorePlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/eclipse/plugins/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/InternalAntMessages.java b/eclipse/plugins/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/InternalAntMessages.java
index 2becbad..e504e48 100644
--- a/eclipse/plugins/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/InternalAntMessages.java
+++ b/eclipse/plugins/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/InternalAntMessages.java
@@ -53,6 +53,8 @@ public class InternalAntMessages extends NLS {
public static String InternalAntRunner_Error_setting_Ant_task;
public static String InternalAntRunner_Missing_Class;
public static String InternalAntRunner_157;
+
+ public static String InternalAntRunner_unknown_target;
public static String ProgressBuildListener_Build_cancelled;
diff --git a/eclipse/plugins/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/InternalAntMessages.properties b/eclipse/plugins/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/InternalAntMessages.properties
index 226cd18..70b885d 100644
--- a/eclipse/plugins/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/InternalAntMessages.properties
+++ b/eclipse/plugins/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/InternalAntMessages.properties
@@ -45,5 +45,6 @@ InternalAntRunner_find_not_supported=-find not supported.\nCan be emulated using
InternalAntRunner_Error_setting_Ant_task=Error setting Ant task {0}
InternalAntRunner_Missing_Class=Could not load a class required for parsing targets
InternalAntRunner_157=-lib not supported\nConfigure the Ant runtime classpath using either the\nglobal Ant runtime classpath or the Ant runtime classpath\n for this particular build
+InternalAntRunner_unknown_target=Unknown target: {0}
ProgressBuildListener_Build_cancelled=Build cancelled.
InternalProject_could_not_create_type=Could not create type {0} due to {1}
diff --git a/eclipse/plugins/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/InternalAntRunner.java b/eclipse/plugins/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/InternalAntRunner.java
index e8be446..4b69c48 100644
--- a/eclipse/plugins/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/InternalAntRunner.java
+++ b/eclipse/plugins/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/InternalAntRunner.java
@@ -19,13 +19,14 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.PrintStream;
import java.net.URL;
-import java.text.MessageFormat; // don't use ICU in ant builder
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
+import java.util.ListIterator;
import java.util.Map;
import java.util.Properties;
import java.util.Vector;
@@ -423,6 +424,45 @@ public class InternalAntRunner {
processAntHome(true);
}
}
+
+ /**
+ * Returns a list of target names in the build script.
+ *
+ * @return a list of target names
+ */
+ private List getTargetNames() {
+ try {
+ setJavaClassPath();
+ Project antProject;
+
+ antProject = getProject();
+ processAntHome(false);
+ antProject.init();
+ setTypes(antProject);
+ processProperties(AntCoreUtil.getArrayList(extraArguments));
+
+ setProperties(antProject, false);
+ if (isVersionCompatible("1.5")) { //$NON-NLS-1$
+ new InputHandlerSetter().setInputHandler(antProject, "org.eclipse.ant.internal.core.ant.NullInputHandler"); //$NON-NLS-1$
+ }
+ parseBuildFile(antProject);
+ Enumeration projectTargets = antProject.getTargets().elements();
+ List names = new ArrayList();
+ Target target;
+ while (projectTargets.hasMoreElements()) {
+ target = (Target) projectTargets.nextElement();
+ String name= target.getName();
+ if (name.length() == 0) {
+ //"no name" implicit target of Ant 1.6
+ continue;
+ }
+ names.add(name);
+ }
+ return names;
+ } finally {
+ processAntHome(true);
+ }
+ }
private Project getProject() {
Project antProject;
@@ -1068,6 +1108,10 @@ public class InternalAntRunner {
processUnrecognizedCommands(commands);
}
+ if(!commands.isEmpty()) {
+ processUnrecognizedTargets(commands);
+ }
+
if (!commands.isEmpty()) {
processTargets(commands);
}
@@ -1075,9 +1119,30 @@ public class InternalAntRunner {
return true;
}
+ /**
+ * Checks for unrecognized targets on the command line and
+ * removes them.
+ *
+ * @since 3.6
+ */
+ private void processUnrecognizedTargets(List commands) {
+ List names = getTargetNames();
+ ListIterator iterator = commands.listIterator();
+
+ while (iterator.hasNext()) {
+ String target = (String) iterator.next();
+ if (!names.contains(target)) {
+ iterator.remove();
+ String message = MessageFormat.format(InternalAntMessages.InternalAntRunner_unknown_target, new Object[]{target});
+ logMessage(currentProject, message, Project.MSG_WARN);
+ }
+ }
+ }
+
+
/*
* Checks for unrecognized arguments on the command line.
- * Since there is no syntactic way to distingush between
+ * Since there is no syntactic way to distinguish between
* ant -foo target1 target2
* ant -foo fooarg target
* we remove everything up to the last argument that
@@ -1090,7 +1155,7 @@ public class InternalAntRunner {
// find the last arg that begins with '-'
for (int i = commands.size() - 1; i >= 0; i--) {
- if (((String) commands.get(0)).startsWith("-")) { //$NON-NLS-1$
+ if (((String) commands.get(i)).startsWith("-")) { //$NON-NLS-1$
p = i;
break;
}
diff --git a/eclipse/plugins/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/AntRunnerWorkbenchAdvisor.java b/eclipse/plugins/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/AntRunnerWorkbenchAdvisor.java
index 1e4fa74..3b6fc55 100644
--- a/eclipse/plugins/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/AntRunnerWorkbenchAdvisor.java
+++ b/eclipse/plugins/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/AntRunnerWorkbenchAdvisor.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
+ * Copyright (c) 2008, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -13,7 +13,6 @@ package org.eclipse.ant.internal.ui;
import org.eclipse.ant.core.AntRunner;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.ui.application.WorkbenchAdvisor;
/**
@@ -41,7 +40,6 @@ public class AntRunnerWorkbenchAdvisor extends WorkbenchAdvisor {
* @see org.eclipse.ui.application.WorkbenchAdvisor#preStartup()
*/
public void preStartup() {
- Job.getJobManager().suspend();
try {
new AntRunner().run(fContext);
} catch (Exception e) {
diff --git a/eclipse/plugins/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntLaunchDelegate.java b/eclipse/plugins/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntLaunchDelegate.java
index 407d466..b7e35e9 100644
--- a/eclipse/plugins/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntLaunchDelegate.java
+++ b/eclipse/plugins/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntLaunchDelegate.java
@@ -88,19 +88,27 @@ public class AntLaunchDelegate extends LaunchConfigurationDelegate {
private static final String BASE_DIR_PREFIX = "-Dbasedir="; //$NON-NLS-1$
private static final String INPUT_HANDLER_CLASS = "org.eclipse.ant.internal.ui.antsupport.inputhandler.AntInputHandler"; //$NON-NLS-1$
private static final String REMOTE_INPUT_HANDLER_CLASS = "org.eclipse.ant.internal.ui.antsupport.inputhandler.ProxyInputHandler"; //$NON-NLS-1$
-
- private static final IProject[] NO_PROJECTS = new IProject[0];
/**
* String attribute identifying the build scope for a launch configuration.
* <code>null</code> indicates the default workspace build.
+ *
+ * Note: this attribute was used with the old 'AntBuildTab' which has been replaced by
+ * the 'ExternalToolsBuildTab'. The 'ExternalToolsBuildTab' uses a different
+ * attribute key, so use the external tools attribute when present:
+ * IExternalToolConstants.ATTR_BUILD_SCOPE
*/
private static final String ATTR_BUILD_SCOPE = AntUIPlugin.getUniqueIdentifier() + ".ATTR_BUILD_SCOPE"; //$NON-NLS-1$
/**
- * Attribute identifier specifying whether referenced projects should be
+ * Attribute identifier specifying whether referenced projects should be
* considered when computing the projects to build. Default value is
* <code>true</code>.
+ *
+ * Note: this attribute was used with the old 'AntBuildTab' which has been replaced by
+ * the 'ExternalToolsBuildTab'. The 'ExternalToolsBuildTab' uses a different
+ * attribute key, so use the external tools attribute when present:
+ * IExternalToolConstants.ATTR_INCLUDE_REFERENCED_PROJECTS
*/
private static final String ATTR_INCLUDE_REFERENCED_PROJECTS = AntUIPlugin.getUniqueIdentifier() + ".ATTR_INCLUDE_REFERENCED_PROJECTS"; //$NON-NLS-1$
@@ -688,11 +696,19 @@ public class AntLaunchDelegate extends LaunchConfigurationDelegate {
* @see org.eclipse.debug.core.model.LaunchConfigurationDelegate#getBuildOrder(org.eclipse.debug.core.ILaunchConfiguration, java.lang.String)
*/
protected IProject[] getBuildOrder(ILaunchConfiguration configuration, String mode) throws CoreException {
- IProject[] projects = ExternalToolsBuildTab.getBuildProjects(configuration, ATTR_BUILD_SCOPE);
+ String scopeKey = ATTR_BUILD_SCOPE;
+ String refKey = ATTR_INCLUDE_REFERENCED_PROJECTS;
+ if (configuration.hasAttribute(IExternalToolConstants.ATTR_BUILD_SCOPE) ||
+ configuration.hasAttribute(IExternalToolConstants.ATTR_INCLUDE_REFERENCED_PROJECTS)) {
+ // use new attributes when present - see bug 282581
+ scopeKey = IExternalToolConstants.ATTR_BUILD_SCOPE;
+ refKey = IExternalToolConstants.ATTR_INCLUDE_REFERENCED_PROJECTS;
+ }
+ IProject[] projects = ExternalToolsBuildTab.getBuildProjects(configuration, scopeKey);
if (projects == null) {
- return NO_PROJECTS;
+ return null; // null scope indicates workspace build, vs. empty projects == empty scope
}
- boolean isRef = ExternalToolsBuildTab.isIncludeReferencedProjects(configuration, ATTR_INCLUDE_REFERENCED_PROJECTS);
+ boolean isRef = ExternalToolsBuildTab.isIncludeReferencedProjects(configuration, refKey);
if (isRef) {
return computeReferencedBuildOrder(projects);
}
diff --git a/eclipse/plugins/org.eclipse.ant.ui/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.ant.ui/META-INF/MANIFEST.MF
index 7eb5828..649a5b4 100644
--- a/eclipse/plugins/org.eclipse.ant.ui/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.ant.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.ant.ui; singleton:=true
-Bundle-Version: 3.4.1.qualifier
+Bundle-Version: 3.4.2.qualifier
Bundle-Activator: org.eclipse.ant.internal.ui.AntUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/eclipse/plugins/org.eclipse.compare/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.compare/META-INF/MANIFEST.MF
index de06a66..599217e 100644
--- a/eclipse/plugins/org.eclipse.compare/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.compare/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.compare; singleton:=true
-Bundle-Version: 3.5.0.qualifier
+Bundle-Version: 3.5.2.qualifier
Bundle-Activator: org.eclipse.compare.internal.CompareUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/eclipse/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java b/eclipse/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java
index ce6c876..82e3277 100644
--- a/eclipse/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java
+++ b/eclipse/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -18,7 +18,6 @@ import org.eclipse.compare.contentmergeviewer.IFlushable;
import org.eclipse.compare.internal.BinaryCompareViewer;
import org.eclipse.compare.internal.ChangePropertyAction;
import org.eclipse.compare.internal.CompareContentViewerSwitchingPane;
-import org.eclipse.compare.internal.CompareEditor;
import org.eclipse.compare.internal.CompareEditorInputNavigator;
import org.eclipse.compare.internal.CompareMessages;
import org.eclipse.compare.internal.ComparePreferencePage;
@@ -200,7 +199,6 @@ public abstract class CompareEditorInput implements IEditorInput, IPropertyChang
private ICompareContainer fContainer;
private boolean fContainerProvided;
-
private String fHelpContextId;
private InternalOutlineViewerCreator fOutlineView;
private ViewerDescriptor fContentViewerDescriptor;
@@ -543,11 +541,31 @@ public abstract class CompareEditorInput implements IEditorInput, IPropertyChang
fComposite.layout();
feedInput();
-
+
fComposite.addDisposeListener(new DisposeListener() {
public void widgetDisposed(DisposeEvent e) {
- if (!(getWorkbenchPart() instanceof CompareEditor))
- handleDispose();
+ /*
+ * When the UI associated with this compare editor input is
+ * disposed each composite being part of the UI releases its
+ * children first. A dispose listener is added to the last
+ * widget found in that structure. Therefore, compare editor
+ * input is disposed at the end making it possible to refer
+ * during widgets disposal.
+ */
+ Composite composite = fComposite;
+ Control control = composite;
+ while (composite.getChildren().length > 0) {
+ control = composite.getChildren()[composite.getChildren().length - 1];
+ if (control instanceof Composite)
+ composite = (Composite) control;
+ else
+ break;
+ }
+ control.addDisposeListener(new DisposeListener() {
+ public void widgetDisposed(DisposeEvent ev) {
+ handleDispose();
+ }
+ });
}
});
if (fHelpContextId != null)
@@ -557,19 +575,6 @@ public abstract class CompareEditorInput implements IEditorInput, IPropertyChang
}
/**
- * Disposes this editor input. Clients should not call this method. The
- * Compare Editor calls this method at appropriate times i.e. when disposing.
- *
- * @since 3.5
- * @nooverride This method is not intended to be re-implemented or extended
- * by clients.
- * @noreference This method is not intended to be referenced by clients.
- */
- public void dispose() {
- handleDispose();
- }
-
- /**
* Callback that occurs when the UI associated with this compare editor
* input is disposed. This method will only be invoked if the UI has been
* created (i.e. after the call to {@link #createContents(Composite)}.
diff --git a/eclipse/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java b/eclipse/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
index cb62c89..21bf0b5 100644
--- a/eclipse/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
+++ b/eclipse/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
@@ -3372,7 +3372,7 @@ public class TextMergeViewer extends ContentMergeViewer implements IAdaptable {
} else if (value.equals(ICompareUIConstants.PREF_VALUE_LOOP)) {
return isNavigationPossible();
} else if (value.equals(ICompareUIConstants.PREF_VALUE_NEXT)) {
- return hasNextElement(down);
+ return getNextVisibleDiff(down, deep) != null || hasNextElement(down);
} else if (value.equals(ICompareUIConstants.PREF_VALUE_PROMPT)) {
return isNavigationPossible() || hasNextElement(true);
}
diff --git a/eclipse/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditor.java b/eclipse/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditor.java
index ffc996b..f9c03ce 100644
--- a/eclipse/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditor.java
+++ b/eclipse/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditor.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -478,16 +478,10 @@ public class CompareEditor extends EditorPart implements IReusableEditor, ISavea
* @see org.eclipse.ui.part.WorkbenchPart#dispose()
*/
public void dispose() {
-
IEditorInput input= getEditorInput();
if (input instanceof IPropertyChangeNotifier)
((IPropertyChangeNotifier)input).removePropertyChangeListener(this);
-
- if (input instanceof CompareEditorInput)
- ((CompareEditorInput)input).dispose();
-
super.dispose();
-
}
/* (non-Javadoc)
diff --git a/eclipse/plugins/org.eclipse.core.expressions/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.core.expressions/META-INF/MANIFEST.MF
index ec590dd..db7f5e7 100644
--- a/eclipse/plugins/org.eclipse.core.expressions/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.core.expressions/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.core.expressions; singleton:=true
-Bundle-Version: 3.4.100.qualifier
+Bundle-Version: 3.4.101.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.core.internal.expressions.ExpressionPlugin
Bundle-Vendor: %providerName
diff --git a/eclipse/plugins/org.eclipse.core.filesystem.aix.ppc/.project b/eclipse/plugins/org.eclipse.core.filesystem.aix.ppc/.project
new file mode 100644
index 0000000..28c0e31
--- /dev/null
+++ b/eclipse/plugins/org.eclipse.core.filesystem.aix.ppc/.project
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.core.filesystem.aix.ppc</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ </natures>
+</projectDescription>
diff --git a/eclipse/plugins/org.eclipse.core.filesystem.aix.ppc/BUILD_INFO.txt b/eclipse/plugins/org.eclipse.core.filesystem.aix.ppc/BUILD_INFO.txt
new file mode 100644
index 0000000..4519f4b
--- /dev/null
+++ b/eclipse/plugins/org.eclipse.core.filesystem.aix.ppc/BUILD_INFO.txt
@@ -0,0 +1,10 @@
+Native Build Info:
+------------------
+
+platform: PPC
+built by: pawel.pogorzelski at pl.ibm.com
+build date: 03-Dec-2009
+OS Name: AIX
+OS Version: 5.3.9.0
+Compiler version: xlC_r version 10.1.0.0
+Java version: J2RE 1.4.2 IBM J9 2.3 AIX ppc64-64
diff --git a/eclipse/plugins/org.eclipse.core.filesystem.aix.ppc/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.core.filesystem.aix.ppc/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..f9b272f
--- /dev/null
+++ b/eclipse/plugins/org.eclipse.core.filesystem.aix.ppc/META-INF/MANIFEST.MF
@@ -0,0 +1,9 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %fragmentName
+Bundle-SymbolicName: org.eclipse.core.filesystem.aix.ppc;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Vendor: %providerName
+Fragment-Host: org.eclipse.core.filesystem;bundle-version="[1.1.0,2.0.0)"
+Bundle-Localization: fragment
+Eclipse-PlatformFilter: (& (osgi.os=aix) (osgi.arch=ppc))
diff --git a/eclipse/ecf-src/org.eclipse.equinox.concurrent/about.html b/eclipse/plugins/org.eclipse.core.filesystem.aix.ppc/about.html
similarity index 100%
copy from eclipse/ecf-src/org.eclipse.equinox.concurrent/about.html
copy to eclipse/plugins/org.eclipse.core.filesystem.aix.ppc/about.html
diff --git a/eclipse/plugins/org.eclipse.core.filesystem.aix.ppc/build.properties b/eclipse/plugins/org.eclipse.core.filesystem.aix.ppc/build.properties
new file mode 100644
index 0000000..864fbc4
--- /dev/null
+++ b/eclipse/plugins/org.eclipse.core.filesystem.aix.ppc/build.properties
@@ -0,0 +1,16 @@
+###############################################################################
+# Copyright (c) 2009 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+###############################################################################
+bin.includes = META-INF/,\
+ about.html,\
+ os/,\
+ fragment.properties
+src.includes = about.html
+generateSourceBundle=false
diff --git a/eclipse/plugins/org.eclipse.core.filesystem.aix.ppc/fragment.properties b/eclipse/plugins/org.eclipse.core.filesystem.aix.ppc/fragment.properties
new file mode 100644
index 0000000..97ba5fe
--- /dev/null
+++ b/eclipse/plugins/org.eclipse.core.filesystem.aix.ppc/fragment.properties
@@ -0,0 +1,12 @@
+###############################################################################
+# Copyright (c) 2009 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+###############################################################################
+fragmentName = Core File System for AIX PPC
+providerName = Eclipse.org
diff --git a/eclipse/plugins/org.eclipse.core.filesystem.linux.x86/BUILD_INFO.txt b/eclipse/plugins/org.eclipse.core.filesystem.linux.x86/BUILD_INFO.txt
index a032605..6f93b7d 100644
--- a/eclipse/plugins/org.eclipse.core.filesystem.linux.x86/BUILD_INFO.txt
+++ b/eclipse/plugins/org.eclipse.core.filesystem.linux.x86/BUILD_INFO.txt
@@ -2,9 +2,9 @@ Native Build Info:
------------------
platform: linux.x86
-built by: szymon.brandys at pl.ibm.com
-build date: 07-Dec-2007
-OS Name: Red Hat Enterprise Linux AS release 4 (Nahant Update 4)
-OS Version: Linux 2.6.9-42.0.10.ELsmp
-Compiler version: gcc version 3.4.6-3
-Java version: Standard Edition (build 1.4.2_16-b05)
+built by: pawel.pogorzelski at pl.ibm.com
+build date: 03-Dec-2009
+OS Name: Red Hat Enterprise Linux AS release 4 (Nahant Update 2)
+OS Version: Linux 2.6.9-22.0.10.ELsmp
+Compiler version: gcc version 3.4.4-2
+Java version: 1.5.0 IBM J9 2.3 Linux x86-32 j9vmxi3223-20080710
diff --git a/eclipse/plugins/org.eclipse.core.filesystem.linux.x86/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.core.filesystem.linux.x86/META-INF/MANIFEST.MF
index 820b48c..d83e25b 100644
--- a/eclipse/plugins/org.eclipse.core.filesystem.linux.x86/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.core.filesystem.linux.x86/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %fragmentName
Bundle-SymbolicName: org.eclipse.core.filesystem.linux.x86; singleton:=true
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.3.0.qualifier
Bundle-Vendor: %providerName
Fragment-Host: org.eclipse.core.filesystem;bundle-version="[1.1.0,2.0.0)"
Bundle-Localization: fragment
diff --git a/eclipse/plugins/org.eclipse.core.filesystem.linux.x86_64/BUILD_INFO.txt b/eclipse/plugins/org.eclipse.core.filesystem.linux.x86_64/BUILD_INFO.txt
index 299d8db..114ff49 100644
--- a/eclipse/plugins/org.eclipse.core.filesystem.linux.x86_64/BUILD_INFO.txt
+++ b/eclipse/plugins/org.eclipse.core.filesystem.linux.x86_64/BUILD_INFO.txt
@@ -2,18 +2,8 @@ Native Build Info:
------------------
platform: x86_64-redhat-linux
-built by: john_arthorne at ca.ibm.com
-build date: 10-May-2007
+built by: pawel.pogorzelski at pl.ibm.com
+build date: 03-Dec-2009
OS Name: Red Hat Enterprise Linux Client release 4
-OS Version: Linux 2.6.9-42.EL x86_64 (glibc-2.3.4-2.25)
-Compiler version: gcc version 3.4.6-3
-
-build script:
--------------
-#!/bin/sh
-rpm -q glibc
-#ensure system gcc
-export PATH=/usr/bin:$PATH
-cd org.eclipse.core.filesystem/natives/unix/linux
-make JAVA_HOME=$HOME/jdk1.5.0_11_x86-64
-cp liblocalfile_1_0_0.so ../../../../org.eclipse.core.filesystem.linux.x86_64/os/linux/x86_64/
+OS Version: Linux 2.6.9-67.EL x86_64 (glibc-2.3.4-2.39)
+Compiler version: gcc version 3.4.6-9
diff --git a/eclipse/plugins/org.eclipse.core.filesystem.linux.x86_64/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.core.filesystem.linux.x86_64/META-INF/MANIFEST.MF
index 8b905d2..4b84f3f 100644
--- a/eclipse/plugins/org.eclipse.core.filesystem.linux.x86_64/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.core.filesystem.linux.x86_64/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %fragmentName
Bundle-SymbolicName: org.eclipse.core.filesystem.linux.x86_64; singleton:=true
-Bundle-Version: 1.0.100.qualifier
+Bundle-Version: 1.1.0.qualifier
Bundle-Vendor: %providerName
Fragment-Host: org.eclipse.core.filesystem;bundle-version="[1.1.0,2.0.0)"
Bundle-Localization: fragment
diff --git a/eclipse/plugins/org.eclipse.core.filesystem.macosx/BUILD_INFO.txt b/eclipse/plugins/org.eclipse.core.filesystem.macosx/BUILD_INFO.txt
index 3c70b9a..5457bfe 100644
--- a/eclipse/plugins/org.eclipse.core.filesystem.macosx/BUILD_INFO.txt
+++ b/eclipse/plugins/org.eclipse.core.filesystem.macosx/BUILD_INFO.txt
@@ -2,9 +2,9 @@ Native Build Info:
------------------
platform: iMac
-built by: szymon.brandys at pl.ibm.com
-build date: 06-Jan-2009
+built by: pawel.pogorzelski at pl.ibm.com
+build date: 03-Dec-2009
OS Name: Mac OS X
-OS Version: 10.5.4
+OS Version: 10.5.7
Compiler version: gcc version 4.0.1
-Java version: Standard Edition (build 1.5.0_13-119)
+Java version: Standard Edition (build 1.5.0_19-137)
diff --git a/eclipse/plugins/org.eclipse.core.filesystem.macosx/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.core.filesystem.macosx/META-INF/MANIFEST.MF
index f92df13..6af72ff 100644
--- a/eclipse/plugins/org.eclipse.core.filesystem.macosx/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.core.filesystem.macosx/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %fragmentName
Bundle-SymbolicName: org.eclipse.core.filesystem.macosx; singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
Bundle-Vendor: %providerName
Fragment-Host: org.eclipse.core.filesystem;bundle-version="[1.0.0,2.0.0)"
Bundle-Localization: fragment
diff --git a/eclipse/plugins/org.eclipse.core.filesystem.macosx/os/macosx/liblocalfile_1_0_0.jnilib b/eclipse/plugins/org.eclipse.core.filesystem.macosx/os/macosx/liblocalfile_1_0_0.jnilib
index e0a3c7f..bbd4835 100644
Binary files a/eclipse/plugins/org.eclipse.core.filesystem.macosx/os/macosx/liblocalfile_1_0_0.jnilib and b/eclipse/plugins/org.eclipse.core.filesystem.macosx/os/macosx/liblocalfile_1_0_0.jnilib differ
diff --git a/eclipse/plugins/org.eclipse.core.filesystem.solaris.sparc/BUILD_INFO.txt b/eclipse/plugins/org.eclipse.core.filesystem.solaris.sparc/BUILD_INFO.txt
index 0171033..369ab11 100644
--- a/eclipse/plugins/org.eclipse.core.filesystem.solaris.sparc/BUILD_INFO.txt
+++ b/eclipse/plugins/org.eclipse.core.filesystem.solaris.sparc/BUILD_INFO.txt
@@ -1,17 +1,10 @@
Native Build Info:
------------------
-platform: sparc-sun-solaris2.5
-built by: martin.oberhuber at windriver.com
-build date: 19-Apr-2007
-OS Name: Solaris 5.5
-OS Version: SunOS mordor 5.5 Generic sun4u sparc SUNW,Ultra-1
-Compiler version: gcc-3.4.4
-Compiler config: configure --disable-shared
-
-build script:
--------------
-#!/bin/sh
-setenv PATH $TOOLSRV/gcc/3.4.4/SunOS/5.5/bin:$PATH
-cd org.eclipse.core.filesystem/natives/unix/solaris
-make install JAVA_HOME=$TOOLSRV/jdk/1.5.0_08/SunOS/5.9
+platform: 64-bit sparcv9
+built by: Pawel.Pogorzelski at pl.ibm.com
+build date: 03-Dec-2009
+OS Name: Solaris 5.8
+OS Version: SunOS nc142069 5.8 Generic_108528-29 sun4u sparc SUNW,Sun-Blade-1000
+Compiler version: Sun C 5.8 2005/10/13
+Compiler config: configure --disable-shared
\ No newline at end of file
diff --git a/eclipse/plugins/org.eclipse.core.filesystem.solaris.sparc/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.core.filesystem.solaris.sparc/META-INF/MANIFEST.MF
index e637cec..9bcec25 100644
--- a/eclipse/plugins/org.eclipse.core.filesystem.solaris.sparc/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.core.filesystem.solaris.sparc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %fragmentName
Bundle-SymbolicName: org.eclipse.core.filesystem.solaris.sparc;singleton:=true
-Bundle-Version: 1.0.100.qualifier
+Bundle-Version: 1.1.0.qualifier
Bundle-Vendor: %providerName
Fragment-Host: org.eclipse.core.filesystem;bundle-version="[1.1.0,2.0.0)"
Bundle-Localization: fragment
diff --git a/eclipse/plugins/org.eclipse.core.filesystem/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.core.filesystem/META-INF/MANIFEST.MF
index 5184c0f..e071b52 100644
--- a/eclipse/plugins/org.eclipse.core.filesystem/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.core.filesystem/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.core.filesystem; singleton:=true
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.2.1.qualifier
Bundle-Localization: plugin
Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.2.0,4.0.0)",
org.eclipse.equinox.registry;bundle-version="[3.2.0,4.0.0)",
diff --git a/eclipse/plugins/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.aix.ppc/.project b/eclipse/plugins/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.aix.ppc/.project
new file mode 100644
index 0000000..28c0e31
--- /dev/null
+++ b/eclipse/plugins/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.aix.ppc/.project
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.core.filesystem.aix.ppc</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ </natures>
+</projectDescription>
diff --git a/eclipse/plugins/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.aix.ppc/BUILD_INFO.txt b/eclipse/plugins/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.aix.ppc/BUILD_INFO.txt
new file mode 100644
index 0000000..4519f4b
--- /dev/null
+++ b/eclipse/plugins/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.aix.ppc/BUILD_INFO.txt
@@ -0,0 +1,10 @@
+Native Build Info:
+------------------
+
+platform: PPC
+built by: pawel.pogorzelski at pl.ibm.com
+build date: 03-Dec-2009
+OS Name: AIX
+OS Version: 5.3.9.0
+Compiler version: xlC_r version 10.1.0.0
+Java version: J2RE 1.4.2 IBM J9 2.3 AIX ppc64-64
diff --git a/eclipse/plugins/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.aix.ppc/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.aix.ppc/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..f9b272f
--- /dev/null
+++ b/eclipse/plugins/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.aix.ppc/META-INF/MANIFEST.MF
@@ -0,0 +1,9 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %fragmentName
+Bundle-SymbolicName: org.eclipse.core.filesystem.aix.ppc;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Vendor: %providerName
+Fragment-Host: org.eclipse.core.filesystem;bundle-version="[1.1.0,2.0.0)"
+Bundle-Localization: fragment
+Eclipse-PlatformFilter: (& (osgi.os=aix) (osgi.arch=ppc))
diff --git a/eclipse/ecf-src/org.eclipse.equinox.concurrent/about.html b/eclipse/plugins/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.aix.ppc/about.html
similarity index 100%
copy from eclipse/ecf-src/org.eclipse.equinox.concurrent/about.html
copy to eclipse/plugins/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.aix.ppc/about.html
diff --git a/eclipse/plugins/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.aix.ppc/build.properties b/eclipse/plugins/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.aix.ppc/build.properties
new file mode 100644
index 0000000..864fbc4
--- /dev/null
+++ b/eclipse/plugins/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.aix.ppc/build.properties
@@ -0,0 +1,16 @@
+###############################################################################
+# Copyright (c) 2009 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+###############################################################################
+bin.includes = META-INF/,\
+ about.html,\
+ os/,\
+ fragment.properties
+src.includes = about.html
+generateSourceBundle=false
diff --git a/eclipse/plugins/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.aix.ppc/fragment.properties b/eclipse/plugins/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.aix.ppc/fragment.properties
new file mode 100644
index 0000000..97ba5fe
--- /dev/null
+++ b/eclipse/plugins/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.aix.ppc/fragment.properties
@@ -0,0 +1,12 @@
+###############################################################################
+# Copyright (c) 2009 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+###############################################################################
+fragmentName = Core File System for AIX PPC
+providerName = Eclipse.org
diff --git a/eclipse/plugins/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.aix.ppc64/.project b/eclipse/plugins/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.aix.ppc64/.project
new file mode 100644
index 0000000..6116e74
--- /dev/null
+++ b/eclipse/plugins/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.aix.ppc64/.project
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.core.filesystem.aix.ppc64</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ </natures>
+</projectDescription>
diff --git a/eclipse/plugins/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.aix.ppc64/BUILD_INFO.txt b/eclipse/plugins/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.aix.ppc64/BUILD_INFO.txt
new file mode 100644
index 0000000..1c1f3e1
--- /dev/null
+++ b/eclipse/plugins/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.aix.ppc64/BUILD_INFO.txt
@@ -0,0 +1,10 @@
+Native Build Info:
+------------------
+
+platform: PPC64
+built by: pawel.pogorzelski at pl.ibm.com
+build date: 03-Dec-2009
+OS Name: AIX
+OS Version: 5.3.9.0
+Compiler version: xlC_r version 10.1.0.0
+Java version: J2RE 1.5.0 IBM J9 2.3 AIX ppc64-64
diff --git a/eclipse/plugins/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.aix.ppc64/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.aix.ppc64/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..f1e0733
--- /dev/null
+++ b/eclipse/plugins/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.aix.ppc64/META-INF/MANIFEST.MF
@@ -0,0 +1,9 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %fragmentName
+Bundle-SymbolicName: org.eclipse.core.filesystem.aix.ppc64;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Vendor: %providerName
+Fragment-Host: org.eclipse.core.filesystem;bundle-version="[1.1.0,2.0.0)"
+Bundle-Localization: fragment
+Eclipse-PlatformFilter: (& (osgi.os=aix) (osgi.arch=ppc64))
diff --git a/eclipse/ecf-src/org.eclipse.equinox.concurrent/about.html b/eclipse/plugins/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.aix.ppc64/about.html
similarity index 100%
copy from eclipse/ecf-src/org.eclipse.equinox.concurrent/about.html
copy to eclipse/plugins/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.aix.ppc64/about.html
diff --git a/eclipse/plugins/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.aix.ppc64/build.properties b/eclipse/plugins/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.aix.ppc64/build.properties
new file mode 100644
index 0000000..864fbc4
--- /dev/null
+++ b/eclipse/plugins/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.aix.ppc64/build.properties
@@ -0,0 +1,16 @@
+###############################################################################
+# Copyright (c) 2009 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+###############################################################################
+bin.includes = META-INF/,\
+ about.html,\
+ os/,\
+ fragment.properties
+src.includes = about.html
+generateSourceBundle=false
diff --git a/eclipse/plugins/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.aix.ppc64/fragment.properties b/eclipse/plugins/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.aix.ppc64/fragment.properties
new file mode 100644
index 0000000..84aabc3
--- /dev/null
+++ b/eclipse/plugins/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.aix.ppc64/fragment.properties
@@ -0,0 +1,12 @@
+###############################################################################
+# Copyright (c) 2009 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+###############################################################################
+fragmentName = Core File System for AIX PPC 64 bit
+providerName = Eclipse.org
diff --git a/eclipse/plugins/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.solaris.sparcv9/.project b/eclipse/plugins/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.solaris.sparcv9/.project
new file mode 100644
index 0000000..90cd371
--- /dev/null
+++ b/eclipse/plugins/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.solaris.sparcv9/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.core.filesystem.solaris.sparcv9</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
diff --git a/eclipse/plugins/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.solaris.sparcv9/BUILD_INFO.txt b/eclipse/plugins/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.solaris.sparcv9/BUILD_INFO.txt
new file mode 100644
index 0000000..56cbf26
--- /dev/null
+++ b/eclipse/plugins/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.solaris.sparcv9/BUILD_INFO.txt
@@ -0,0 +1,10 @@
+Native Build Info:
+------------------
+
+platform: 64-bit sparcv9
+built by: Pawel.Pogorzelski at pl.ibm.com
+build date: 03-Dec-2009
+OS Name: Solaris 5.8
+OS Version: SunOS nc142069 5.8 Generic_108528-29 sun4u sparc SUNW,Sun-Blade-1000
+Compiler version: Sun C 5.8 2005/10/13
+Compiler config: configure --disable-shared
diff --git a/eclipse/plugins/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.solaris.sparcv9/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.solaris.sparcv9/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..8517090
--- /dev/null
+++ b/eclipse/plugins/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.solaris.sparcv9/META-INF/MANIFEST.MF
@@ -0,0 +1,9 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %fragmentName
+Bundle-SymbolicName: org.eclipse.core.filesystem.solaris.sparcv9;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Vendor: %providerName
+Fragment-Host: org.eclipse.core.filesystem;bundle-version="[1.1.0,2.0.0)"
+Bundle-Localization: fragment
+Eclipse-PlatformFilter: (& (osgi.os=solaris) (osgi.arch=sparcv9))
diff --git a/eclipse/ecf-src/org.eclipse.equinox.concurrent/about.html b/eclipse/plugins/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.solaris.sparcv9/about.html
similarity index 100%
copy from eclipse/ecf-src/org.eclipse.equinox.concurrent/about.html
copy to eclipse/plugins/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.solaris.sparcv9/about.html
diff --git a/eclipse/plugins/org.eclipse.core.filesystem.solaris.sparc/build.properties b/eclipse/plugins/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.solaris.sparcv9/build.properties
similarity index 100%
copy from eclipse/plugins/org.eclipse.core.filesystem.solaris.sparc/build.properties
copy to eclipse/plugins/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.solaris.sparcv9/build.properties
diff --git a/eclipse/plugins/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.solaris.sparcv9/fragment.properties b/eclipse/plugins/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.solaris.sparcv9/fragment.properties
new file mode 100644
index 0000000..775cc72
--- /dev/null
+++ b/eclipse/plugins/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.solaris.sparcv9/fragment.properties
@@ -0,0 +1,12 @@
+###############################################################################
+# Copyright (c) 2006, 2009 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+###############################################################################
+fragmentName = Core File System for Solaris SPARC V9
+providerName = Eclipse.org
diff --git a/eclipse/plugins/org.eclipse.core.filesystem/natives/macosx/Makefile b/eclipse/plugins/org.eclipse.core.filesystem/natives/macosx/Makefile
index bb79cad..8359a7b 100755
--- a/eclipse/plugins/org.eclipse.core.filesystem/natives/macosx/Makefile
+++ b/eclipse/plugins/org.eclipse.core.filesystem/natives/macosx/Makefile
@@ -12,8 +12,7 @@
LIB_NAME = liblocalfile_1_0_0.jnilib
core:
- cc -I /System/Library/Frameworks/JavaVM.framework/Headers localfile.c -o $(LIB_NAME) -bundle -framework JavaVM -framework CoreServices -arch i386 -arch ppc -arch x86_64
+ cc -I /System/Library/Frameworks/JavaVM.framework/Headers localfile.c -o $(LIB_NAME) -bundle -framework JavaVM -framework CoreServices -arch i386 -arch ppc -arch x86_64 -mmacosx-version-min=10.4
clean:
- rm *.o
-
\ No newline at end of file
+ rm *.jnilib
diff --git a/eclipse/plugins/org.eclipse.core.filesystem/natives/macosx/localfile.c b/eclipse/plugins/org.eclipse.core.filesystem/natives/macosx/localfile.c
index 10cbad7..b6b701c 100644
--- a/eclipse/plugins/org.eclipse.core.filesystem/natives/macosx/localfile.c
+++ b/eclipse/plugins/org.eclipse.core.filesystem/natives/macosx/localfile.c
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -13,6 +13,7 @@
#include <jni.h>
#include <sys/types.h>
#include <sys/stat.h>
+#include <unistd.h>
#include <utime.h>
#include <stdlib.h>
#include <string.h>
@@ -23,6 +24,7 @@
#define USE_IMMUTABLE_FLAG 1
#define USE_ARCHIVE_FLAG 0
+#define EFS_SYMLINK_SUPPORT 1
/*
* Get a null-terminated byte array from a java char array.
@@ -48,6 +50,20 @@ static jbyte* getUTF8ByteArray(JNIEnv *env, jcharArray target) {
/*
* Class: org_eclipse_core_internal_filesystem_local_LocalFileNatives
+ * Method: nativeAttributes
+ * Signature: ()I
+ */
+JNIEXPORT jint JNICALL Java_org_eclipse_core_internal_filesystem_local_LocalFileNatives_nativeAttributes
+ (JNIEnv *env, jclass clazz) {
+#if defined(EFS_SYMLINK_SUPPORT)
+ return ATTRIBUTE_READ_ONLY | ATTRIBUTE_EXECUTABLE | ATTRIBUTE_SYMLINK | ATTRIBUTE_LINK_TARGET;
+#else
+ return ATTRIBUTE_READ_ONLY | ATTRIBUTE_EXECUTABLE;
+#endif
+}
+
+/*
+ * Class: org_eclipse_core_internal_filesystem_local_LocalFileNatives
* Method: internalIsUnicode
* Signature: ()Z
*/
@@ -120,6 +136,31 @@ jboolean convertStatToFileInfo (JNIEnv *env, struct stat info, jobject fileInfo)
return JNI_TRUE;
}
+#if defined(EFS_SYMLINK_SUPPORT)
+/*
+ * Set symbolic link information in IFileInfo
+ */
+jboolean setSymlinkInFileInfo (JNIEnv *env, jobject fileInfo, jstring linkTarget) {
+ jclass cls;
+ jmethodID mid;
+
+ cls = (*env)->GetObjectClass(env, fileInfo);
+ if (cls == 0) return JNI_FALSE;
+
+ // set symlink attribute
+ mid = (*env)->GetMethodID(env, cls, "setAttribute", "(IZ)V");
+ if (mid == 0) return JNI_FALSE;
+ (*env)->CallVoidMethod(env, fileInfo, mid, ATTRIBUTE_SYMLINK, JNI_TRUE);
+
+ // set link target
+ mid = (*env)->GetMethodID(env, cls, "setStringAttribute", "(ILjava/lang/String;)V");
+ if (mid == 0) return JNI_FALSE;
+ (*env)->CallVoidMethod(env, fileInfo, mid, ATTRIBUTE_LINK_TARGET, linkTarget);
+
+ return JNI_TRUE;
+}
+#endif
+
/*
* Class: org_eclipse_core_internal_filesystem_local_LocalFileNatives
* Method: internalGetFileInfo
@@ -141,15 +182,38 @@ JNIEXPORT jboolean JNICALL Java_org_eclipse_core_internal_filesystem_local_Local
struct stat info;
jint code;
+ jstring linkTarget = NULL;
/* get stat */
char *name= (char*) getUTF8ByteArray(env, target);
+#if defined(EFS_SYMLINK_SUPPORT)
+ //do an lstat first to see if it is a symbolic link
+ code = lstat(name, &info);
+ if (code == 0 && (info.st_mode & S_IFLNK) == S_IFLNK) {
+ //symbolic link: read link target
+ char buf[PATH_MAX+1];
+ int len;
+ len = readlink((const char*)name, buf, PATH_MAX);
+ if (len>0) {
+ buf[len]=0;
+ } else {
+ buf[0]=0;
+ }
+ // Mac OS encodes symlink target using UTF-8, ignoring platform default
+ linkTarget = (*env)->NewStringUTF(env, buf);
+ setSymlinkInFileInfo(env, fileInfo, linkTarget);
+
+ //stat link target (will fail for broken links)
+ code = stat((const char*)name, &info);
+ }
+#else
code = stat(name, &info);
+#endif
free(name);
/* test if an error occurred */
if (code == -1)
- return 0;
+ return JNI_FALSE;
return convertStatToFileInfo(env, info, fileInfo);
}
@@ -239,9 +303,9 @@ JNIEXPORT jboolean JNICALL Java_org_eclipse_core_internal_filesystem_local_Local
if (result != 0) goto fail;
/* create the mask for the relevant bits */
- int mask= info.st_mode & (S_IRWXU | S_IRWXG | S_IRWXO);
- int oldmask= mask;
- int flags= info.st_flags;
+ mode_t mask = info.st_mode & (S_IRWXU | S_IRWXG | S_IRWXO);
+ mode_t oldmask = mask;
+ int flags = info.st_flags;
#if USE_ARCHIVE_FLAG
if (archive)
@@ -251,7 +315,7 @@ JNIEXPORT jboolean JNICALL Java_org_eclipse_core_internal_filesystem_local_Local
#endif
if (executable)
- mask |= S_IXUSR; // set 'x' only for user
+ mask |= S_IXUSR;
else
mask &= ~(S_IXUSR | S_IXGRP | S_IXOTH); // clear all 'x'
@@ -261,7 +325,7 @@ JNIEXPORT jboolean JNICALL Java_org_eclipse_core_internal_filesystem_local_Local
flags |= UF_IMMUTABLE; // set immutable flag for usr
#endif
} else {
- mask |= (S_IRUSR | S_IWUSR); // set 'r' and 'w' for user
+ mask |= (S_IRUSR | S_IWUSR);
#if USE_IMMUTABLE_FLAG
flags &= ~UF_IMMUTABLE; // try to clear immutable flags for usr
#endif
diff --git a/eclipse/plugins/org.eclipse.core.filesystem/natives/unix/aix/Makefile b/eclipse/plugins/org.eclipse.core.filesystem/natives/unix/aix/Makefile
new file mode 100644
index 0000000..787b47f
--- /dev/null
+++ b/eclipse/plugins/org.eclipse.core.filesystem/natives/unix/aix/Makefile
@@ -0,0 +1,28 @@
+#**********************************************************************
+# Copyright (c) 2009 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#**********************************************************************
+#
+# makefile for liblocalfile.so
+
+CORE.C = ../localfile.c
+CORE.O = localfile.o
+LIB_NAME_FULL = liblocalfile_1_0_0.a
+
+OS_TYPE=aix
+CC=xlC_r
+LD=ld
+CFLAGS=-O -s -q32 -qwarn64
+LDFLAGS=-b32 -G -s -bnoentry -bexpall -lc
+JAVA_HOME=
+JDK_INCLUDE=-I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OS_TYPE}
+COMMON_INCLUDE=-Iinclude
+
+core :
+ $(CC) $(CFLAGS) $(JDK_INCLUDE) $(COMMON_INCLUDE) -c $(CORE.C) -o $(CORE.O)
+ $(LD) $(LDFLAGS) -o $(LIB_NAME_FULL) $(CORE.O)
+clean :
+ rm -f *.o *.a
diff --git a/eclipse/plugins/org.eclipse.core.filesystem/natives/unix/aix/include/os_custom.h b/eclipse/plugins/org.eclipse.core.filesystem/natives/unix/aix/include/os_custom.h
new file mode 100644
index 0000000..6d6df53
--- /dev/null
+++ b/eclipse/plugins/org.eclipse.core.filesystem/natives/unix/aix/include/os_custom.h
@@ -0,0 +1,22 @@
+/***********************************************************************
+* Copyright (c) 2009 IBM Corporation and others.
+* All rights reserved. This program and the accompanying materials
+* are made available under the terms of the Eclipse Public License v1.0
+* which accompanies this distribution, and is available at
+* http://www.eclipse.org/legal/epl-v10.html
+*
+* Contributors:
+* IBM Corporation - initial API and implementation
+***********************************************************************/
+
+/* Use this directive when introducing platform-specific code in localfile.c */
+#ifndef AIX
+#define AIX
+#endif
+
+/* Linux supports reading symbolic links */
+#ifndef EFS_SYMLINK_SUPPORT
+#define EFS_SYMLINK_SUPPORT
+#endif
+#include <limits.h>
+#include <unistd.h>
diff --git a/eclipse/plugins/org.eclipse.core.filesystem/natives/unix/linux/Makefile b/eclipse/plugins/org.eclipse.core.filesystem/natives/unix/linux/Makefile
index 34e7df7..2e4ad85 100644
--- a/eclipse/plugins/org.eclipse.core.filesystem/natives/unix/linux/Makefile
+++ b/eclipse/plugins/org.eclipse.core.filesystem/natives/unix/linux/Makefile
@@ -1,5 +1,5 @@
#**********************************************************************
-# Copyright (c) 2000, 2004 IBM Corporation and others.
+# Copyright (c) 2000, 2009 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -29,4 +29,4 @@ core :
gcc $(OPT_FLAGS) -shared -Wl,-soname,$(LIB_NAME) -o $(LIB_NAME_FULL) $(CORE.O) -lc
clean :
- rm *.o
+ rm -f $(CORE.O) $(LIB_NAME_FULL)
diff --git a/eclipse/plugins/org.eclipse.core.filesystem/natives/unix/localfile.c b/eclipse/plugins/org.eclipse.core.filesystem/natives/unix/localfile.c
index 5d11ccf..b87a1c1 100644
--- a/eclipse/plugins/org.eclipse.core.filesystem/natives/unix/localfile.c
+++ b/eclipse/plugins/org.eclipse.core.filesystem/natives/unix/localfile.c
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -16,9 +16,11 @@
#include <jni.h>
#include <sys/types.h>
#include <sys/stat.h>
+#include <sys/wait.h>
#include <utime.h>
#include <stdlib.h>
#include <string.h>
+#include <errno.h>
#include "../localfile.h"
#include <os_custom.h>
@@ -257,7 +259,7 @@ JNIEXPORT jboolean JNICALL Java_org_eclipse_core_internal_filesystem_local_Local
(JNIEnv *env, jclass clazz, jcharArray source, jcharArray destination, jboolean copyLastModified) {
// shouldn't ever be called - there is no Unicode-specific calls on *nix
return JNI_FALSE;
-}
+}
/*
* Class: org_eclipse_core_internal_filesystem_local_LocalFileNatives
@@ -267,7 +269,7 @@ JNIEXPORT jboolean JNICALL Java_org_eclipse_core_internal_filesystem_local_Local
JNIEXPORT jboolean JNICALL Java_org_eclipse_core_internal_filesystem_local_LocalFileNatives_internalSetFileInfo
(JNIEnv *env, jclass clazz, jcharArray target, jobject obj) {
- int mask;
+ mode_t mask;
struct stat info;
jbyte *name;
jint code = -1;
@@ -287,7 +289,7 @@ JNIEXPORT jboolean JNICALL Java_org_eclipse_core_internal_filesystem_local_Local
/* get the current permissions */
name = getByteArray(env, target);
code = stat((const char*)name, &info);
-
+
/* create the mask */
mask = S_IRUSR |
S_IWUSR |
@@ -307,7 +309,6 @@ JNIEXPORT jboolean JNICALL Java_org_eclipse_core_internal_filesystem_local_Local
mask &= ~(S_IWUSR | S_IWGRP | S_IWOTH);
else
mask |= (S_IRUSR | S_IWUSR);
-
/* write the permissions */
code = chmod((const char*)name, mask);
diff --git a/eclipse/plugins/org.eclipse.core.filesystem/natives/unix/solaris/Makefile b/eclipse/plugins/org.eclipse.core.filesystem/natives/unix/solaris/Makefile
index 2c0cb5e..9b4e1a4 100644
--- a/eclipse/plugins/org.eclipse.core.filesystem/natives/unix/solaris/Makefile
+++ b/eclipse/plugins/org.eclipse.core.filesystem/natives/unix/solaris/Makefile
@@ -1,13 +1,13 @@
#**********************************************************************
-# Copyright (c) 2000, 2007 IBM Corporation and others.
+# Copyright (c) 2000, 2009 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
#
# Contributors:
-# IBM Corporation - initial API and implementation
-# Martin Oberhuber (Wind River) - [183137] adapted from Linux for Solaris
+# IBM Corporation - initial API and implementation
+# Martin Oberhuber (Wind River) - [183137] adapted from Linux for Solaris
#**********************************************************************
#
# makefile for liblocalfile.so
@@ -21,27 +21,29 @@ LIB_NAME_FULL = liblocalfile_1_0_0.so
OS_TYPE = solaris
#Set this to be the location of your JRE
-JAVA_HOME = ~/vm/sun142
+JAVA_HOME =
JDK_INCLUDE = -I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS_TYPE}
COMMON_INCLUDE = -I include
#Solaris native cc uses -K PIC, gcc uses -fPIC
#To build native, use: make
#To build with debug, use: make OPT_FLAGS=-g
-#To build with gcc, use: make CC=gcc PICFLAG=-fPIC
-PICFLAG=-K PIC
-#PICFLAG=-fPIC
-OPT_FLAGS=-O -s -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-#OPT_FLAGS=-g -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+#To build for SPARC V9, use: make ARCH=v9
+
+PICFLAG=-KPIC
+ARCH=v8
+
+CFLAGS = -G -O -s $(PICFLAG) -xarch=$(ARCH) -mt -xregs=no%appl -xstrconst -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+LDFLAGS = -G -O -s $(PICFLAG) -lc -xarch=$(ARCH) -mt -z defs -z text -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
$(LIB_NAME_FULL) : $(CORE.C)
- $(CC) $(OPT_FLAGS) $(PICFLAG) -c $(JDK_INCLUDE) $(COMMON_INCLUDE) -o $(CORE.O) $(CORE.C)
- $(CC) $(OPT_FLAGS) -G -o $(LIB_NAME_FULL) $(CORE.O) -lc
+ $(CC) $(CFLAGS) -c $(JDK_INCLUDE) $(COMMON_INCLUDE) -o $(CORE.O) $(CORE.C)
+ $(CC) $(LDFLAGS) -o $(LIB_NAME_FULL) $(CORE.O) -lc
core : $(LIB_NAME_FULL)
clean :
- rm *.o
+ rm -f $(CORE.O) $(LIB_NAME_FULL)
install : $(LIB_NAME_FULL)
cp -f $(LIB_NAME_FULL) ../../../../org.eclipse.core.filesystem.solaris.sparc/os/solaris/sparc/
diff --git a/eclipse/plugins/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/LocalFile.java b/eclipse/plugins/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/LocalFile.java
index 2bb9d44..275d97a 100644
--- a/eclipse/plugins/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/LocalFile.java
+++ b/eclipse/plugins/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/LocalFile.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
+ * Copyright (c) 2005, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
+ * Martin Oberhuber (Wind River) - [294429] Avoid substring baggage in FileInfo
*******************************************************************************/
package org.eclipse.core.internal.filesystem.local;
@@ -142,8 +143,11 @@ public class LocalFile extends FileStore {
if (LocalFileNatives.usingNatives()) {
FileInfo info = LocalFileNatives.fetchFileInfo(filePath);
//natives don't set the file name on all platforms
- if (info.getName().length() == 0)
- info.setName(file.getName());
+ if (info.getName().length() == 0) {
+ String name = file.getName();
+ //Bug 294429: make sure that substring baggage is removed
+ info.setName(new String(name.toCharArray()));
+ }
return info;
}
//in-lined non-native implementation
@@ -328,7 +332,8 @@ public class LocalFile extends FileStore {
}
// source exists but destination doesn't so try to copy below
} else {
- if (!destination.exists()) {
+ // destination.exists() returns false for broken links, this has to be handled explicitly
+ if (!destination.exists() && !destFile.fetchInfo().getAttribute(EFS.ATTRIBUTE_SYMLINK)) {
// neither the source nor the destination exist. this is REALLY bad
String message = NLS.bind(Messages.failedMove, source.getAbsolutePath(), destination.getAbsolutePath());
Policy.error(EFS.ERROR_WRITE, message);
diff --git a/eclipse/plugins/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/LocalFileSystem.java b/eclipse/plugins/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/LocalFileSystem.java
index 62e5b0d..a73773b 100644
--- a/eclipse/plugins/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/LocalFileSystem.java
+++ b/eclipse/plugins/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/LocalFileSystem.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -93,7 +93,7 @@ public class LocalFileSystem extends FileSystem {
//all known platforms with native implementation support the read only flag
attributes |= EFS.ATTRIBUTE_READ_ONLY;
- //this must be kept in sync with the actual native implementations.
+ // this must be kept in sync with functionality of previous libs not implementing nativeAttributes method
String os = getOS();
String arch = System.getProperty("osgi.arch", ""); //$NON-NLS-1$ //$NON-NLS-2$
if (os.equals(Constants.OS_WIN32))
diff --git a/eclipse/plugins/org.eclipse.core.resources.compatibility/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.core.resources.compatibility/META-INF/MANIFEST.MF
index 7a2d601..654d2a5 100644
--- a/eclipse/plugins/org.eclipse.core.resources.compatibility/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.core.resources.compatibility/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %compatibilityFragmentName
Bundle-SymbolicName: org.eclipse.core.resources.compatibility
-Bundle-Version: 3.4.0.qualifier
+Bundle-Version: 3.4.1.qualifier
Bundle-Vendor: %providerName
Fragment-Host:
org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)"
diff --git a/eclipse/plugins/org.eclipse.core.resources/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.core.resources/META-INF/MANIFEST.MF
index b57a705..97b3e0b 100644
--- a/eclipse/plugins/org.eclipse.core.resources/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.core.resources/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.core.resources; singleton:=true
-Bundle-Version: 3.5.1.qualifier
+Bundle-Version: 3.5.2.qualifier
Bundle-Activator: org.eclipse.core.resources.ResourcesPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/eclipse/plugins/org.eclipse.core.resources/natives/ref.c b/eclipse/plugins/org.eclipse.core.resources/natives/ref.c
new file mode 100644
index 0000000..0c3a48b
--- /dev/null
+++ b/eclipse/plugins/org.eclipse.core.resources/natives/ref.c
@@ -0,0 +1,287 @@
+#include <windows.h>
+#include "ref.h"
+
+/*
+ * Class: org_eclipse_core_internal_resources_refresh_win32_Win32Natives
+ * Method: FindFirstChangeNotificationW
+ * Signature: (Ljava/lang/String;ZI)J
+ */
+JNIEXPORT jlong JNICALL Java_org_eclipse_core_internal_resources_refresh_win32_Win32Natives_FindFirstChangeNotificationW
+(JNIEnv * env, jclass this, jstring lpPathName, jboolean bWatchSubtree, jint dwNotifyFilter) {
+ jlong result;
+ jsize numberOfChars;
+ jchar *path;
+ const jchar *temp;
+
+ // create a new byte array to hold the prefixed and null terminated path
+ numberOfChars= (*env)->GetStringLength(env, lpPathName);
+ path= malloc((numberOfChars + 5) * sizeof(jchar));
+ //path= malloc((numberOfChars + 4) * sizeof(jchar));
+
+ // get the path characters from the vm, copy them, and release them
+ temp= (*env)->GetStringChars(env, lpPathName, JNI_FALSE);
+ memcpy(path + 4, temp, numberOfChars * sizeof(jchar));
+ (*env)->ReleaseStringChars(env, lpPathName, temp);
+
+ // prefix the path to enable long filenames, and null terminate it
+ path[0] = L'\\';
+ path[1] = L'\\';
+ path[2] = L'?';
+ path[3] = L'\\';
+ path[(numberOfChars + 4)] = L'\0';
+
+ // make the request and free the memory
+ //printf("%S\n", path);
+ result = (jlong) FindFirstChangeNotificationW(path, bWatchSubtree, dwNotifyFilter);
+ free(path);
+
+ return result;
+}
+
+/*
+ * Class: org_eclipse_core_internal_resources_refresh_win32_Win32Natives
+ * Method: FindFirstChangeNotificationA
+ * Signature: ([BZI)J
+ */
+JNIEXPORT jlong JNICALL Java_org_eclipse_core_internal_resources_refresh_win32_Win32Natives_FindFirstChangeNotificationA
+(JNIEnv * env, jclass this, jbyteArray lpPathName, jboolean bWatchSubtree, jint dwNotifyFilter) {
+ jlong result;
+ jsize numberOfChars;
+ jbyte *path, *temp;
+
+ // create a new byte array to hold the null terminated path
+ numberOfChars = (*env)->GetArrayLength(env, lpPathName);
+ path = malloc((numberOfChars + 1) * sizeof(jbyte));
+
+ // get the path bytes from the vm, copy them, and release them
+ temp = (*env)->GetByteArrayElements(env, lpPathName, 0);
+ memcpy(path, temp, numberOfChars * sizeof(jbyte));
+ (*env)->ReleaseByteArrayElements(env, lpPathName, temp, 0);
+
+ // null terminate the path, make the request, and release the path memory
+ path[numberOfChars] = '\0';
+ result = (jlong) FindFirstChangeNotificationA(path, bWatchSubtree, dwNotifyFilter);
+ free(path);
+
+ return result;
+}
+
+/*
+ * Class: org_eclipse_core_internal_resources_refresh_win32_Win32Natives
+ * Method: FindCloseChangeNotification
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_org_eclipse_core_internal_resources_refresh_win32_Win32Natives_FindCloseChangeNotification
+(JNIEnv *env, jclass this, jlong hChangeHandle){
+ return (jboolean) FindCloseChangeNotification((HANDLE) hChangeHandle);
+}
+
+/*
+ * Class: org_eclipse_core_internal_resources_refresh_win32_Win32Natives
+ * Method: FindNextChangeNotification
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_org_eclipse_core_internal_resources_refresh_win32_Win32Natives_FindNextChangeNotification
+(JNIEnv *env, jclass this, jlong hChangeHandle){
+ return (jboolean) FindNextChangeNotification((HANDLE) hChangeHandle);
+}
+
+/*
+ * Class: org_eclipse_core_internal_resources_refresh_win32_Win32Natives
+ * Method: WaitForMultipleObjects
+ * Signature: (I[JZI)I
+ */
+JNIEXPORT jint JNICALL Java_org_eclipse_core_internal_resources_refresh_win32_Win32Natives_WaitForMultipleObjects
+(JNIEnv *env, jclass this, jint nCount, jlongArray lpHandles, jboolean bWaitAll, jint dwMilliseconds) {
+ int i;
+ jint result;
+ HANDLE handles[MAXIMUM_WAIT_OBJECTS];
+ jlong *handlePointers = (*env)->GetLongArrayElements(env, lpHandles, 0);
+
+ for (i = 0; i < nCount; i++) {
+ handles[i] = (HANDLE) handlePointers[i];
+ }
+
+ result = WaitForMultipleObjects(nCount, handles, bWaitAll, dwMilliseconds);
+ (*env)->ReleaseLongArrayElements(env, lpHandles, handlePointers, 0);
+
+ return result;
+}
+
+/*
+ * Class: org_eclipse_core_internal_resources_refresh_win32_Win32Natives
+ * Method: IsUnicode
+ * Signature: ()Z
+ */
+JNIEXPORT jboolean JNICALL Java_org_eclipse_core_internal_resources_refresh_win32_Win32Natives_IsUnicode
+ (JNIEnv *env, jclass this) {
+ OSVERSIONINFO osvi;
+ memset(&osvi, 0, sizeof(OSVERSIONINFO));
+ osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+ if (! GetVersionEx (&osvi) )
+ return JNI_FALSE;
+ if (osvi.dwMajorVersion >= 5)
+ return JNI_TRUE;
+ return JNI_FALSE;
+}
+
+/*
+ * Class: org_eclipse_core_internal_resources_refresh_win32_Win32Natives
+ * Method: GetLastError
+ * Signature: ()I
+ */
+JNIEXPORT jint JNICALL Java_org_eclipse_core_internal_resources_refresh_win32_Win32Natives_GetLastError
+(JNIEnv *env, jclass this){
+ return GetLastError();
+}
+
+/*
+ * Class: org_eclipse_core_internal_resources_refresh_win32_Win32Natives
+ * Method: FILE_NOTIFY_CHANGE_LAST_WRITE
+ * Signature: ()I
+ */
+JNIEXPORT jint JNICALL Java_org_eclipse_core_internal_resources_refresh_win32_Win32Natives_FILE_1NOTIFY_1CHANGE_1LAST_1WRITE
+(JNIEnv *env, jclass this) {
+ return FILE_NOTIFY_CHANGE_LAST_WRITE;
+}
+
+/*
+ * Class: org_eclipse_core_internal_resources_refresh_win32_Win32Natives
+ * Method: FILE_NOTIFY_CHANGE_DIR_NAME
+ * Signature: ()I
+ */
+JNIEXPORT jint JNICALL Java_org_eclipse_core_internal_resources_refresh_win32_Win32Natives_FILE_1NOTIFY_1CHANGE_1DIR_1NAME
+(JNIEnv *env, jclass this) {
+ return FILE_NOTIFY_CHANGE_DIR_NAME;
+}
+
+/*
+ * Class: org_eclipse_core_internal_resources_refresh_win32_Win32Natives
+ * Method: FILE_NOTIFY_CHANGE_ATTRIBUTES
+ * Signature: ()I
+ */
+JNIEXPORT jint JNICALL Java_org_eclipse_core_internal_resources_refresh_win32_Win32Natives_FILE_1NOTIFY_1CHANGE_1ATTRIBUTES
+(JNIEnv *env, jclass this) {
+ return FILE_NOTIFY_CHANGE_ATTRIBUTES;
+}
+
+/*
+ * Class: org_eclipse_core_internal_resources_refresh_win32_Win32Natives
+ * Method: FILE_NOTIFY_CHANGE_SIZE
+ * Signature: ()I
+ */
+JNIEXPORT jint JNICALL Java_org_eclipse_core_internal_resources_refresh_win32_Win32Natives_FILE_1NOTIFY_1CHANGE_1SIZE
+(JNIEnv *env, jclass this) {
+ return FILE_NOTIFY_CHANGE_SIZE;
+}
+
+/*
+ * Class: org_eclipse_core_internal_resources_refresh_win32_Win32Natives
+ * Method: FILE_NOTIFY_CHANGE_FILE_NAME
+ * Signature: ()I
+ */
+JNIEXPORT jint JNICALL Java_org_eclipse_core_internal_resources_refresh_win32_Win32Natives_FILE_1NOTIFY_1CHANGE_1FILE_1NAME
+(JNIEnv *env, jclass this) {
+ return FILE_NOTIFY_CHANGE_FILE_NAME;
+}
+
+
+/*
+ * Class: org_eclipse_core_internal_resources_refresh_win32_Win32Natives
+ * Method: FILE_NOTIFY_CHANGE_SECURITY
+ * Signature: ()I
+ */
+JNIEXPORT jint JNICALL Java_org_eclipse_core_internal_resources_refresh_win32_Win32Natives_FILE_1NOTIFY_1CHANGE_1SECURITY
+(JNIEnv *env, jclass this) {
+ return FILE_NOTIFY_CHANGE_SECURITY;
+}
+
+/*
+ * Class: org_eclipse_core_internal_resources_refresh_win32_Win32Natives
+ * Method: MAXIMUM_WAIT_OBJECTS
+ * Signature: ()I
+ */
+JNIEXPORT jint JNICALL Java_org_eclipse_core_internal_resources_refresh_win32_Win32Natives_MAXIMUM_1WAIT_1OBJECTS
+(JNIEnv *env, jclass this) {
+ return MAXIMUM_WAIT_OBJECTS;
+}
+
+/*
+ * Class: org_eclipse_core_internal_resources_refresh_win32_Win32Natives
+ * Method: MAX_PATH
+ * Signature: ()I
+ */
+JNIEXPORT jint JNICALL Java_org_eclipse_core_internal_resources_refresh_win32_Win32Natives_MAX_1PATH
+(JNIEnv *env, jclass this) {
+ return MAX_PATH;
+}
+
+/*
+ * Class: org_eclipse_core_internal_resources_refresh_win32_Win32Natives
+ * Method: INFINITE
+ * Signature: ()I
+ */
+JNIEXPORT jint JNICALL Java_org_eclipse_core_internal_resources_refresh_win32_Win32Natives_INFINITE
+(JNIEnv *env, jclass this) {
+ return INFINITE;
+}
+
+/*
+ * Class: org_eclipse_core_internal_resources_refresh_win32_Win32Natives
+ * Method: WAIT_OBJECT_0
+ * Signature: ()I
+ */
+JNIEXPORT jint JNICALL Java_org_eclipse_core_internal_resources_refresh_win32_Win32Natives_WAIT_1OBJECT_10
+(JNIEnv *env, jclass this) {
+ return WAIT_OBJECT_0;
+}
+
+/*
+ * Class: org_eclipse_core_internal_resources_refresh_win32_Win32Natives
+ * Method: WAIT_FAILED
+ * Signature: ()I
+ */
+JNIEXPORT jint JNICALL Java_org_eclipse_core_internal_resources_refresh_win32_Win32Natives_WAIT_1FAILED
+(JNIEnv *env, jclass this) {
+ return WAIT_FAILED;
+}
+
+/*
+ * Class: org_eclipse_core_internal_resources_refresh_win32_Win32Natives
+ * Method: WAIT_TIMEOUT
+ * Signature: ()I
+ */
+JNIEXPORT jint JNICALL Java_org_eclipse_core_internal_resources_refresh_win32_Win32Natives_WAIT_1TIMEOUT
+(JNIEnv *env, jclass this) {
+ return WAIT_TIMEOUT;
+}
+
+/*
+ * Class: org_eclipse_core_internal_resources_refresh_win32_Win32Natives
+ * Method: ERROR_INVALID_HANDLE
+ * Signature: ()I
+ */
+JNIEXPORT jint JNICALL Java_org_eclipse_core_internal_resources_refresh_win32_Win32Natives_ERROR_1INVALID_1HANDLE
+(JNIEnv *env, jclass this) {
+ return ERROR_INVALID_HANDLE;
+}
+
+/*
+ * Class: org_eclipse_core_internal_resources_refresh_win32_Win32Natives
+ * Method: ERROR_SUCCESS
+ * Signature: ()I
+ */
+JNIEXPORT jint JNICALL Java_org_eclipse_core_internal_resources_refresh_win32_Win32Natives_ERROR_1SUCCESS
+(JNIEnv *env, jclass this) {
+ return ERROR_SUCCESS;
+}
+
+/*
+ * Class: org_eclipse_core_internal_resources_refresh_win32_Win32Natives
+ * Method: INVALID_HANDLE_VALUE
+ * Signature: ()J
+ */
+JNIEXPORT jlong JNICALL Java_org_eclipse_core_internal_resources_refresh_win32_Win32Natives_INVALID_1HANDLE_1VALUE
+(JNIEnv * env, jclass this) {
+ return (jlong)INVALID_HANDLE_VALUE;
+}
diff --git a/eclipse/plugins/org.eclipse.core.resources/src/org/eclipse/core/internal/localstore/UnifiedTree.java b/eclipse/plugins/org.eclipse.core.resources/src/org/eclipse/core/internal/localstore/UnifiedTree.java
index d2123fd..1c1f1fb 100644
--- a/eclipse/plugins/org.eclipse.core.resources/src/org/eclipse/core/internal/localstore/UnifiedTree.java
+++ b/eclipse/plugins/org.eclipse.core.resources/src/org/eclipse/core/internal/localstore/UnifiedTree.java
@@ -9,6 +9,7 @@
* IBM Corporation - initial API and implementation
* Martin Oberhuber (Wind River) - [105554] handle cyclic symbolic links
* Martin Oberhuber (Wind River) - [232426] shared prefix histories for symlinks
+ * Martin Oberhuber (Wind River) - [292267] OutOfMemoryError due to leak in UnifiedTree
*******************************************************************************/
package org.eclipse.core.internal.localstore;
@@ -107,8 +108,14 @@ public class UnifiedTree {
addNodeChildrenToQueue(node);
else
removeNodeChildrenFromQueue(node);
- //allow reuse of the node
- freeNodes.add(node);
+ //allow reuse of the node, but don't let the freeNodes list grow infinitely
+ if (freeNodes.size() < 32767) {
+ //free memory-consuming elements of the node for garbage collection
+ node.releaseForGc();
+ freeNodes.add(node);
+ }
+ //else, the whole node will be garbage collected since there is no
+ //reference to it any more.
}
}
@@ -171,7 +178,9 @@ public class UnifiedTree {
} else if (comp > 0) {
// resource exists only in file system
//don't create a node for symbolic links that create a cycle
- if (!localInfo.getAttribute(EFS.ATTRIBUTE_SYMLINK) || !localInfo.isDirectory() || !isRecursiveLink(node.getStore(), localInfo))
+ if (localInfo.getAttribute(EFS.ATTRIBUTE_SYMLINK) && localInfo.isDirectory() && isRecursiveLink(node.getStore(), localInfo))
+ child = null;
+ else
child = createChildNodeFromFileSystem(node, localInfo);
localIndex++;
} else {
diff --git a/eclipse/plugins/org.eclipse.core.resources/src/org/eclipse/core/internal/localstore/UnifiedTreeNode.java b/eclipse/plugins/org.eclipse.core.resources/src/org/eclipse/core/internal/localstore/UnifiedTreeNode.java
index fdf9f2a..e119907 100644
--- a/eclipse/plugins/org.eclipse.core.resources/src/org/eclipse/core/internal/localstore/UnifiedTreeNode.java
+++ b/eclipse/plugins/org.eclipse.core.resources/src/org/eclipse/core/internal/localstore/UnifiedTreeNode.java
@@ -7,6 +7,7 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
+ * Martin Oberhuber (Wind River) - [292267] OutOfMemoryError due to leak in UnifiedTree
*******************************************************************************/
package org.eclipse.core.internal.localstore;
@@ -108,6 +109,17 @@ public class UnifiedTreeNode implements ILocalStoreConstants {
this.fileInfo = info;
this.existsWorkspace = existsInWorkspace;
}
+
+ /**
+ * Releases elements that won't be needed any more for garbage collection.
+ * Should be called before adding a node to the free list.
+ */
+ public void releaseForGc() {
+ this.child = null;
+ this.resource = null;
+ this.store = null;
+ this.fileInfo = null;
+ }
public void setExistsWorkspace(boolean exists) {
this.existsWorkspace = exists;
diff --git a/eclipse/plugins/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/MarkerAttributeMap.java b/eclipse/plugins/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/MarkerAttributeMap.java
index d0e4c44..4bb856f 100644
--- a/eclipse/plugins/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/MarkerAttributeMap.java
+++ b/eclipse/plugins/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/MarkerAttributeMap.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -29,11 +29,13 @@ public class MarkerAttributeMap implements Map, IStringPoolParticipant {
protected static final int DEFAULT_SIZE = 16;
protected static final int GROW_SIZE = 10;
+ private static final Object[] EMPTY = new Object[0];
+
/**
* Creates a new marker attribute map of default size
*/
public MarkerAttributeMap() {
- super();
+ this(DEFAULT_SIZE);
}
/**
@@ -41,7 +43,7 @@ public class MarkerAttributeMap implements Map, IStringPoolParticipant {
* @param initialCapacity The initial number of elements that will fit in the map.
*/
public MarkerAttributeMap(int initialCapacity) {
- elements = new Object[Math.max(initialCapacity * 2, 0)];
+ elements = initialCapacity > 0 ? new Object[initialCapacity * 2] : EMPTY;
}
/**
@@ -57,17 +59,17 @@ public class MarkerAttributeMap implements Map, IStringPoolParticipant {
* @see Map#clear()
*/
public void clear() {
- elements = null;
count = 0;
+ elements = EMPTY;
}
/* (non-Javadoc)
* @see Map#containsKey(java.lang.Object)
*/
public boolean containsKey(Object key) {
- key = ((String) key).intern();
- if (elements == null || count == 0)
+ if (count == 0)
return false;
+ key = ((String) key).intern();
for (int i = 0; i < elements.length; i = i + 2)
if (elements[i] == key)
return true;
@@ -78,7 +80,7 @@ public class MarkerAttributeMap implements Map, IStringPoolParticipant {
* @see Map#containsValue(java.lang.Object)
*/
public boolean containsValue(Object value) {
- if (elements == null || count == 0)
+ if (count == 0)
return false;
for (int i = 1; i < elements.length; i = i + 2)
if (elements[i] != null && elements[i].equals(value))
@@ -107,6 +109,9 @@ public class MarkerAttributeMap implements Map, IStringPoolParticipant {
if (count != other.size())
return false;
+ if (count == 0)
+ return true;
+
//keysets must be equal
if (!keySet().equals(other.keySet()))
return false;
@@ -123,9 +128,9 @@ public class MarkerAttributeMap implements Map, IStringPoolParticipant {
* @see Map#get(java.lang.Object)
*/
public Object get(Object key) {
- key = ((String) key).intern();
- if (elements == null || count == 0)
+ if (count == 0)
return null;
+ key = ((String) key).intern();
for (int i = 0; i < elements.length; i = i + 2)
if (elements[i] == key)
return elements[i + 1];
@@ -147,6 +152,8 @@ public class MarkerAttributeMap implements Map, IStringPoolParticipant {
*/
public int hashCode() {
int hash = 0;
+ if (count == 0)
+ return hash;
for (int i = 0; i < elements.length; i = i + 2) {
if (elements[i] != null) {
hash += elements[i].hashCode();
@@ -170,6 +177,8 @@ public class MarkerAttributeMap implements Map, IStringPoolParticipant {
*/
public Set keySet() {
Set result = new HashSet(size());
+ if (count == 0)
+ return result;
for (int i = 0; i < elements.length; i = i + 2) {
if (elements[i] != null) {
result.add(elements[i]);
@@ -188,9 +197,10 @@ public class MarkerAttributeMap implements Map, IStringPoolParticipant {
return remove(key);
key = ((String) key).intern();
+ if (elements.length <= (count * 2))
+ grow();
+
// handle the case where we don't have any attributes yet
- if (elements == null)
- elements = new Object[DEFAULT_SIZE];
if (count == 0) {
elements[0] = key;
elements[1] = value;
@@ -208,9 +218,6 @@ public class MarkerAttributeMap implements Map, IStringPoolParticipant {
}
// otherwise add it to the list of elements.
- // grow if necessary
- if (elements.length <= (count * 2))
- grow();
for (int i = 0; i < elements.length; i = i + 2) {
if (elements[i] == null) {
elements[i] = key;
@@ -237,9 +244,9 @@ public class MarkerAttributeMap implements Map, IStringPoolParticipant {
* @see Map#remove(java.lang.Object)
*/
public Object remove(Object key) {
- key = ((String) key).intern();
- if (elements == null || count == 0)
+ if (count == 0)
return null;
+ key = ((String) key).intern();
for (int i = 0; i < elements.length; i = i + 2) {
if (elements[i] == key) {
elements[i] = null;
@@ -282,6 +289,8 @@ public class MarkerAttributeMap implements Map, IStringPoolParticipant {
*/
private HashMap toHashMap() {
HashMap result = new HashMap(size());
+ if (count == 0)
+ return result;
for (int i = 0; i < elements.length; i = i + 2) {
if (elements[i] != null) {
result.put(elements[i], elements[i + 1]);
@@ -298,6 +307,8 @@ public class MarkerAttributeMap implements Map, IStringPoolParticipant {
*/
public Collection values() {
Set result = new HashSet(size());
+ if (count == 0)
+ return result;
for (int i = 1; i < elements.length; i = i + 2) {
if (elements[i] != null) {
result.add(elements[i]);
diff --git a/eclipse/plugins/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/ProjectPreferences.java b/eclipse/plugins/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/ProjectPreferences.java
index 1d8e8b4..99058df 100644
--- a/eclipse/plugins/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/ProjectPreferences.java
+++ b/eclipse/plugins/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/ProjectPreferences.java
@@ -67,7 +67,7 @@ public class ProjectPreferences extends EclipsePreferences {
/**
* Cache which nodes have been loaded from disk
*/
- protected static Set loadedNodes = new HashSet();
+ protected static Set loadedNodes = Collections.synchronizedSet(new HashSet());
private IFile file;
private boolean initialized = false;
/**
@@ -246,9 +246,9 @@ public class ProjectPreferences extends EclipsePreferences {
}
removeLoadedNodes(node);
}
-
+
static void clearNode(Preferences node) throws CoreException {
- // if the underlying properties file was deleted, clear the values and remove
+ // if the underlying properties file was deleted, clear the values and remove
// it from the list of loaded nodes, keep the node as it might still be referenced
try {
clearAll(node);
@@ -259,7 +259,7 @@ public class ProjectPreferences extends EclipsePreferences {
}
removeLoadedNodes(node);
}
-
+
private static void clearAll(Preferences node) throws BackingStoreException {
node.clear();
String[] names = node.childrenNames();
@@ -267,13 +267,15 @@ public class ProjectPreferences extends EclipsePreferences {
clearAll(node.node(names[i]));
}
}
-
- private static synchronized void removeLoadedNodes(Preferences node){
+
+ private static void removeLoadedNodes(Preferences node) {
String path = node.absolutePath();
- for (Iterator i = loadedNodes.iterator(); i.hasNext();) {
- String key = (String) i.next();
- if (key.startsWith(path))
- i.remove();
+ synchronized (loadedNodes) {
+ for (Iterator i = loadedNodes.iterator(); i.hasNext();) {
+ String key = (String) i.next();
+ if (key.startsWith(path))
+ i.remove();
+ }
}
}
@@ -432,11 +434,11 @@ public class ProjectPreferences extends EclipsePreferences {
return new ProjectPreferences(nodeParent, nodeName);
}
- protected synchronized boolean isAlreadyLoaded(IEclipsePreferences node) {
+ protected boolean isAlreadyLoaded(IEclipsePreferences node) {
return loadedNodes.contains(node.absolutePath());
}
- protected synchronized boolean isAlreadyLoaded(String path) {
+ protected boolean isAlreadyLoaded(String path) {
return loadedNodes.contains(path);
}
@@ -468,14 +470,14 @@ public class ProjectPreferences extends EclipsePreferences {
convertFromProperties(this, fromDisk, true);
}
- protected synchronized void loaded() {
+ protected void loaded() {
loadedNodes.add(absolutePath());
}
/* (non-Javadoc)
* @see org.eclipse.core.internal.preferences.EclipsePreferences#nodeExists(java.lang.String)
*
- * If we are at the /project node and we are checking for the existance of a child, we
+ * If we are at the /project node and we are checking for the existence of a child, we
* want special behaviour. If the child is a single segment name, then we want to
* return true if the node exists OR if a project with that name exists in the workspace.
*/
diff --git a/eclipse/plugins/org.eclipse.cvs/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.cvs/META-INF/MANIFEST.MF
index dfb0ae9..2c1031d 100644
--- a/eclipse/plugins/org.eclipse.cvs/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.cvs/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.cvs; singleton:=true
-Bundle-Version: 1.0.300.qualifier
+Bundle-Version: 1.0.400.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Eclipse-AutoStart: true
diff --git a/eclipse/plugins/org.eclipse.cvs/about.properties b/eclipse/plugins/org.eclipse.cvs/about.properties
index 84a8dbd..d77ec24 100644
--- a/eclipse/plugins/org.eclipse.cvs/about.properties
+++ b/eclipse/plugins/org.eclipse.cvs/about.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2000, 2008 IBM Corporation and others.
+# Copyright (c) 2000, 2010 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -19,6 +19,6 @@ blurb=Eclipse CVS Client\n\
Version: {featureVersion}\n\
Build id: {0}\n\
\n\
-(c) Copyright Eclipse contributors and others 2000, 2009. All rights reserved.\n\
+(c) Copyright Eclipse contributors and others 2000, 2010. All rights reserved.\n\
Visit http://www.eclipse.org/eclipse/platform-cvs
diff --git a/eclipse/plugins/org.eclipse.debug.core/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.debug.core/META-INF/MANIFEST.MF
index ab80fd2..7b353c6 100644
--- a/eclipse/plugins/org.eclipse.debug.core/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.debug.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.debug.core; singleton:=true
-Bundle-Version: 3.5.0.qualifier
+Bundle-Version: 3.5.1.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.debug.core.DebugPlugin
Bundle-Vendor: %providerName
diff --git a/eclipse/plugins/org.eclipse.debug.core/core/org/eclipse/debug/core/DebugPlugin.java b/eclipse/plugins/org.eclipse.debug.core/core/org/eclipse/debug/core/DebugPlugin.java
index 9e37f3c..cd9e341 100644
--- a/eclipse/plugins/org.eclipse.debug.core/core/org/eclipse/debug/core/DebugPlugin.java
+++ b/eclipse/plugins/org.eclipse.debug.core/core/org/eclipse/debug/core/DebugPlugin.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -59,6 +59,7 @@ import org.eclipse.debug.internal.core.DebugCoreMessages;
import org.eclipse.debug.internal.core.DebugOptions;
import org.eclipse.debug.internal.core.ExpressionManager;
import org.eclipse.debug.internal.core.IConfigurationElementConstants;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
import org.eclipse.debug.internal.core.LaunchManager;
import org.eclipse.debug.internal.core.LogicalStructureManager;
import org.eclipse.debug.internal.core.MemoryBlockManager;
@@ -536,6 +537,10 @@ public class DebugPlugin extends Plugin {
* @since 2.0
*/
public IStatusHandler getStatusHandler(IStatus status) {
+ boolean enabled = getPluginPreferences().getBoolean(IInternalDebugCoreConstants.PREF_ENABLE_STATUS_HANDLERS);
+ if (!enabled) {
+ return null;
+ }
StatusHandlerKey key = new StatusHandlerKey(status.getPlugin(), status.getCode());
if (fStatusHandlers == null) {
initializeStatusHandlers();
diff --git a/eclipse/plugins/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/DebugPreferenceInitializer.java b/eclipse/plugins/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/DebugPreferenceInitializer.java
index 2ef4d7f..269c74c 100644
--- a/eclipse/plugins/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/DebugPreferenceInitializer.java
+++ b/eclipse/plugins/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/DebugPreferenceInitializer.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
+ * Copyright (c) 2006, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -29,6 +29,7 @@ public class DebugPreferenceInitializer extends AbstractPreferenceInitializer {
// Step filter preferences
prefs.setDefault(StepFilterManager.PREF_USE_STEP_FILTERS, false);
prefs.setDefault(LaunchManager.PREF_DELETE_CONFIGS_ON_PROJECT_DELETE, true);
+ prefs.setDefault(IInternalDebugCoreConstants.PREF_ENABLE_STATUS_HANDLERS, true);
}
}
diff --git a/eclipse/plugins/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/IInternalDebugCoreConstants.java b/eclipse/plugins/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/IInternalDebugCoreConstants.java
index ec6a7c2..cbcf068 100644
--- a/eclipse/plugins/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/IInternalDebugCoreConstants.java
+++ b/eclipse/plugins/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/IInternalDebugCoreConstants.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2007, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -10,6 +10,9 @@
*******************************************************************************/
package org.eclipse.debug.internal.core;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.debug.core.DebugPlugin;
+
/**
* Contains constants to be used internally in all debug components
*
@@ -21,5 +24,16 @@ public interface IInternalDebugCoreConstants {
* Represents the empty string
*/
public static final String EMPTY_STRING = ""; //$NON-NLS-1$
+
+ /**
+ * Boolean preference controlling whether status handler extensions
+ * are enabled. Default value is <code>true</code>. When disabled
+ * any call to {@link DebugPlugin#getStatusHandler(IStatus)} will return <code>null</code>.
+ *
+ * @since 3.4.2
+ */
+ public static final String PREF_ENABLE_STATUS_HANDLERS = DebugPlugin.getUniqueIdentifier() + ".PREF_ENABLE_STATUS_HANDLERS"; //$NON-NLS-1$
+
+
}
diff --git a/eclipse/plugins/org.eclipse.debug.ui/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.debug.ui/META-INF/MANIFEST.MF
index d817253..ccb28b2 100644
--- a/eclipse/plugins/org.eclipse.debug.ui/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.debug.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.debug.ui; singleton:=true
-Bundle-Version: 3.5.1.qualifier
+Bundle-Version: 3.5.2.qualifier
Bundle-Activator: org.eclipse.debug.internal.ui.DebugUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/eclipse/plugins/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupViewer.java b/eclipse/plugins/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupViewer.java
index 5a7a055..7ce280e 100644
--- a/eclipse/plugins/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupViewer.java
+++ b/eclipse/plugins/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupViewer.java
@@ -16,6 +16,8 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
@@ -499,10 +501,6 @@ public class LaunchConfigurationTabGroupViewer {
if (fInitializingTabs) {
return;
}
- if(fOriginal != null && fOriginal.isReadOnly()) {
- updateButtons();
- return;
- }
ILaunchConfigurationTab[] tabs = getTabs();
if (tabs != null) {
// update the working copy from the active tab
@@ -1046,9 +1044,6 @@ public class LaunchConfigurationTabGroupViewer {
return false;
}
}
- if(getWorkingCopy() != null) {
- return !getWorkingCopy().isReadOnly();
- }
return true;
}
@@ -1190,9 +1185,6 @@ public class LaunchConfigurationTabGroupViewer {
return temp.toString();
}
}
- if(getWorkingCopy().isReadOnly()) {
- return LaunchConfigurationsMessages.LaunchConfigurationTabGroupViewer_9;
- }
if(!canLaunchWithModes()) {
Set modes = getCurrentModeSet();
List names = LaunchConfigurationPresentationManager.getDefault().getLaunchModeNames(modes);
@@ -1337,7 +1329,13 @@ public class LaunchConfigurationTabGroupViewer {
/**
* Notification that the 'Apply' button has been pressed
*/
- protected void handleApplyPressed() {
+ protected boolean handleApplyPressed() {
+ if(fOriginal != null && fOriginal.isReadOnly()) {
+ IStatus status = ResourcesPlugin.getWorkspace().validateEdit(new IFile[] {fOriginal.getFile()}, fViewerControl.getShell());
+ if(!status.isOK()) {
+ return false;
+ }
+ }
Exception exception = null;
try {
// update launch config
@@ -1374,7 +1372,9 @@ public class LaunchConfigurationTabGroupViewer {
catch (InterruptedException e) {exception = e;}
if(exception != null) {
DebugUIPlugin.errorDialog(getShell(), LaunchConfigurationsMessages.LaunchConfigurationDialog_Launch_Configuration_Error_46, LaunchConfigurationsMessages.LaunchConfigurationDialog_Exception_occurred_while_saving_launch_configuration_47, exception); //
- return;
+ return false;
+ } else {
+ return true;
}
}
diff --git a/eclipse/plugins/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java b/eclipse/plugins/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java
index 7b513af..336ecdd 100644
--- a/eclipse/plugins/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java
+++ b/eclipse/plugins/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java
@@ -931,11 +931,12 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun
protected void handleLaunchPressed() {
ILaunchConfiguration config = fTabViewer.getOriginal();
if (fTabViewer.isDirty() && fTabViewer.canSave()) {
- fTabViewer.handleApplyPressed();
- config = fTabViewer.getOriginal();
+ if (fTabViewer.handleApplyPressed())
+ config = fTabViewer.getOriginal();
+ else config = null;
}
- close();
if(config != null) {
+ close();
DebugUITools.launch(config, getMode());
}
}
diff --git a/eclipse/plugins/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.java b/eclipse/plugins/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.java
index 0d085d4..14d1911 100644
--- a/eclipse/plugins/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.java
+++ b/eclipse/plugins/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.java
@@ -96,7 +96,6 @@ public class LaunchConfigurationsMessages extends NLS {
public static String LaunchConfigurationTabGroupViewer_17;
public static String LaunchConfigurationTabGroupViewer_18;
- public static String LaunchConfigurationTabGroupViewer_9;
public static String LaunchConfigurationTabGroupViewer_13;
public static String LaunchConfigurationTabGroupViewer_19;
diff --git a/eclipse/plugins/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.properties b/eclipse/plugins/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.properties
index 71b4dad..900779b 100644
--- a/eclipse/plugins/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.properties
+++ b/eclipse/plugins/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.properties
@@ -55,7 +55,6 @@ LaunchConfigurationTabGroupViewer_4=- Press the 'Delete' button to remove the se
LaunchConfigurationTabGroupViewer_6=- Press the 'Duplicate' button to copy the selected configuration.
LaunchConfigurationTabGroupViewer_5=Configure launch perspective settings from the <a>Perspectives</a> preference page.
LaunchConfigurationTabGroupViewer_8=- Press the 'Filter' button to configure filtering options.
-LaunchConfigurationTabGroupViewer_9=The file associated with this launch configuration is read-only and cannot be modified.\n
LaunchConfigurationTabGroupViewer_13=Select a supported <a>launch mode</a>.
LaunchConfigurationTabGroupViewer_14=Mixed launch mode not supported: {0}
LaunchConfigurationTabGroupViewer_15=More than one launcher available - <a>Select other...</a>
diff --git a/eclipse/plugins/org.eclipse.equinox.app/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.app/META-INF/MANIFEST.MF
index e865ce0..424ddbf 100755
--- a/eclipse/plugins/org.eclipse.equinox.app/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.app/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.equinox.app; singleton:=true
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.2.1.qualifier
Bundle-Vendor: %providerName
Bundle-Activator: org.eclipse.equinox.internal.app.Activator
Bundle-Localization: plugin
diff --git a/eclipse/plugins/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/CommandLineArgs.java b/eclipse/plugins/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/CommandLineArgs.java
index 16b3422..ddf3dba 100644
--- a/eclipse/plugins/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/CommandLineArgs.java
+++ b/eclipse/plugins/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/CommandLineArgs.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2007, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -24,6 +24,7 @@ public class CommandLineArgs {
private static final String UPDATE = "-update"; //$NON-NLS-1$
private static final String PASSWORD = "-password"; //$NON-NLS-1$
private static final String KEYRING = "-keyring"; //$NON-NLS-1$
+ private static final String PLUGIN_CUSTOMIZATION = "-pluginCustomization"; //$NON-NLS-1$
// supported command line args
private static final String PRODUCT = "-product"; //$NON-NLS-1$
@@ -73,6 +74,8 @@ public class CommandLineArgs {
found = true; // ignored
if (args[i].equalsIgnoreCase(PASSWORD))
found = true; // ignored
+ if (args[i].equalsIgnoreCase(PLUGIN_CUSTOMIZATION))
+ found = true; // ignored
// done checking obsolete for args. Remember where an arg was found
if (found) {
diff --git a/eclipse/plugins/org.eclipse.equinox.concurrent/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.concurrent/META-INF/MANIFEST.MF
index 8d1f21b..ab6f5e4 100644
--- a/eclipse/plugins/org.eclipse.equinox.concurrent/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.concurrent/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.equinox.concurrent
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.1.qualifier
Bundle-Vendor: %pluginProvider
Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,
J2SE-1.3
diff --git a/eclipse/plugins/org.eclipse.equinox.event/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.event/META-INF/MANIFEST.MF
index 9653fe8..821c8a0 100644
--- a/eclipse/plugins/org.eclipse.equinox.event/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.event/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
Bundle-ManifestVersion: 2
Bundle-Name: %bundleName
-Bundle-Version: 1.1.100.qualifier
+Bundle-Version: 1.1.101.qualifier
Bundle-SymbolicName: org.eclipse.equinox.event
Bundle-Activator: org.eclipse.equinox.internal.event.Activator
Bundle-Copyright: %bundleCopyright
diff --git a/eclipse/plugins/org.eclipse.equinox.frameworkadmin.equinox/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.frameworkadmin.equinox/META-INF/MANIFEST.MF
index 7f3334c..2f19abf 100644
--- a/eclipse/plugins/org.eclipse.equinox.frameworkadmin.equinox/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.frameworkadmin.equinox/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.equinox.frameworkadmin.equinox;singleton:=true
-Bundle-Version: 1.0.100.qualifier
+Bundle-Version: 1.0.101.qualifier
Bundle-Activator: org.eclipse.equinox.internal.frameworkadmin.equinox.Activator
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/eclipse/plugins/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/ParserUtils.java b/eclipse/plugins/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/ParserUtils.java
index b116497..2b45947 100644
--- a/eclipse/plugins/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/ParserUtils.java
+++ b/eclipse/plugins/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/ParserUtils.java
@@ -96,7 +96,7 @@ public class ParserUtils {
public static File fromOSGiJarToOSGiInstallArea(String path) {
IPath parentFolder = new Path(path).removeLastSegments(1);
- if (parentFolder.lastSegment().equalsIgnoreCase("plugins")) //$NON-NLS-1$
+ if ("plugins".equalsIgnoreCase(parentFolder.lastSegment())) //$NON-NLS-1$
return parentFolder.removeLastSegments(1).toFile();
return parentFolder.toFile();
}
diff --git a/eclipse/plugins/org.eclipse.equinox.jmx.common/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.jmx.common/META-INF/MANIFEST.MF
index 723b35c..3358bfa 100644
--- a/eclipse/plugins/org.eclipse.equinox.jmx.common/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.jmx.common/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Resource Monitoring Common Bundle (Incubation)
Bundle-SymbolicName: org.eclipse.equinox.jmx.common
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.1.qualifier
Bundle-Localization: plugin
Eclipse-LazyStart: true
Bundle-Activator: org.eclipse.equinox.jmx.internal.common.Activator
diff --git a/eclipse/plugins/org.eclipse.equinox.launcher.motif.aix.ppc/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.launcher.motif.aix.ppc/META-INF/MANIFEST.MF
index 8eca9b3..02caaa5 100644
--- a/eclipse/plugins/org.eclipse.equinox.launcher.motif.aix.ppc/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.launcher.motif.aix.ppc/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.equinox.launcher.motif.aix.ppc;singleton:=true
-Bundle-Version: 1.0.200.qualifier
+Bundle-Version: 1.0.201.qualifier
Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.1.0)"
Eclipse-PlatformFilter: (& (osgi.ws=motif) (osgi.os=aix) (osgi.arch=ppc))
Bundle-Localization: launcher.motif.aix.ppc
diff --git a/eclipse/plugins/org.eclipse.equinox.launcher.motif.aix.ppc/build.properties b/eclipse/plugins/org.eclipse.equinox.launcher.motif.aix.ppc/build.properties
index c64efe3..e890e22 100644
--- a/eclipse/plugins/org.eclipse.equinox.launcher.motif.aix.ppc/build.properties
+++ b/eclipse/plugins/org.eclipse.equinox.launcher.motif.aix.ppc/build.properties
@@ -1,5 +1,6 @@
bin.includes = META-INF/,\
eclipse_*.so,\
+ libeclipse-motif.so, \
launcher.motif.aix.ppc.properties,\
about.html
diff --git a/eclipse/plugins/org.eclipse.equinox.launcher.motif.linux.x86/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.launcher.motif.linux.x86/META-INF/MANIFEST.MF
index 9ab1d59..ec6ce7c 100755
--- a/eclipse/plugins/org.eclipse.equinox.launcher.motif.linux.x86/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.launcher.motif.linux.x86/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.equinox.launcher.motif.linux.x86;singleton:=true
-Bundle-Version: 1.0.200.qualifier
+Bundle-Version: 1.0.201.qualifier
Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.1.0)"
Eclipse-PlatformFilter: (& (osgi.ws=motif) (osgi.os=linux) (osgi.arch=x86))
Bundle-Localization: launcher.motif.linux.x86
diff --git a/eclipse/plugins/org.eclipse.equinox.launcher.motif.solaris.sparc/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.launcher.motif.solaris.sparc/META-INF/MANIFEST.MF
index 67e59ac..d460e39 100644
--- a/eclipse/plugins/org.eclipse.equinox.launcher.motif.solaris.sparc/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.launcher.motif.solaris.sparc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Sparc Fragment
Bundle-SymbolicName: org.eclipse.equinox.launcher.motif.solaris.sparc;singleton:=true
-Bundle-Version: 1.0.400.qualifier
+Bundle-Version: 1.0.300.qualifier
Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.1.0)"
Eclipse-PlatformFilter: (& (osgi.ws=motif) (osgi.os=solaris) (osgi.arch=sparc))
Bundle-Localization: launcher.motif.solaris.sparc
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.director.app/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.p2.director.app/META-INF/MANIFEST.MF
index f137e1c..fa286ac 100644
--- a/eclipse/plugins/org.eclipse.equinox.p2.director.app/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.p2.director.app/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-SymbolicName: org.eclipse.equinox.p2.director.app;singleton:=true
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-Version: 1.0.100.qualifier
+Bundle-Version: 1.0.101.qualifier
Import-Package: org.eclipse.equinox.app,
org.eclipse.equinox.internal.p2.console,
org.eclipse.equinox.internal.p2.core.helpers,
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.director/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.p2.director/META-INF/MANIFEST.MF
index 17b45a6..e5918c6 100644
--- a/eclipse/plugins/org.eclipse.equinox.p2.director/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.p2.director/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-SymbolicName: org.eclipse.equinox.p2.director;singleton:=true
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-Version: 1.0.100.qualifier
+Bundle-Version: 1.0.101.qualifier
Import-Package: org.eclipse.equinox.internal.p2.core.helpers,
org.eclipse.equinox.internal.provisional.configurator,
org.eclipse.equinox.internal.provisional.p2.core,
@@ -35,7 +35,7 @@ Bundle-Activator: org.eclipse.equinox.internal.p2.director.DirectorActivator
Eclipse-LazyStart: true
Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,
J2SE-1.4
-Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.5.0,4.0.0)",
+Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.3.0,4.0.0)",
org.sat4j.core;bundle-version="2.1.0",
org.sat4j.pb;bundle-version="2.1.0",
- org.eclipse.core.jobs;bundle-version="3.4.100"
+ org.eclipse.core.jobs;bundle-version="3.3.0"
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Projector.java b/eclipse/plugins/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Projector.java
index 57dcc4d..62c2305 100644
--- a/eclipse/plugins/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Projector.java
+++ b/eclipse/plugins/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Projector.java
@@ -389,9 +389,16 @@ public class Projector {
return aggregatedCapabilities;
}
+ static final class Pending {
+ List matches;
+ Explanation explanation;
+ Object left;
+ }
+
private void expandRequirementsWithPatches(IInstallableUnit iu, Collector applicablePatches, boolean isRootIu) throws ContradictionException {
//Unmodified dependencies
Map unchangedRequirements = new HashMap(getRequiredCapabilities(iu).length);
+ Map nonPatchedRequirements = new HashMap(getRequiredCapabilities(iu).length);
for (Iterator iterator = applicablePatches.iterator(); iterator.hasNext();) {
IInstallableUnitPatch patch = (IInstallableUnitPatch) iterator.next();
IRequiredCapability[][] reqs = mergeRequirements(iu, patch);
@@ -456,6 +463,15 @@ public class Projector {
//-P1 -> (A -> B) ( equiv. A -> (P1 or B) )
if (isApplicable(reqs[i][0])) {
IRequiredCapability req = reqs[i][0];
+
+ // Fix: if multiple patches apply to the same IU-req, we need to make sure we list each
+ // patch as an optional match
+ Pending pending = (Pending) nonPatchedRequirements.get(req);
+ if (pending != null) {
+ pending.matches.add(patch);
+ continue;
+ }
+
List matches = getApplicableMatches(req);
if (isHostRequirement(iu, req)) {
rememberHostMatches(iu, matches);
@@ -477,13 +493,26 @@ public class Projector {
} else {
explanation = new Explanation.HardRequirement(iu, req);
}
- createImplication(iu, matches, explanation);
+
+ // Fix: make sure we collect all patches that will impact this IU-req, not just one
+ pending = new Pending();
+ pending.left = iu;
+ pending.explanation = explanation;
+ pending.matches = matches;
+ nonPatchedRequirements.put(req, pending);
}
} else {
if (!matches.isEmpty()) {
AbstractVariable abs = getAbstractVariable();
matches.add(patch);
- createImplication(new Object[] {abs, iu}, matches, Explanation.OPTIONAL_REQUIREMENT);
+
+ // Fix: make sure we collect all patches that will impact this IU-req, not just one
+ pending = new Pending();
+ pending.left = new Object[] {abs, iu};
+ pending.explanation = Explanation.OPTIONAL_REQUIREMENT;
+ pending.matches = matches;
+ nonPatchedRequirements.put(req, pending);
+
optionalAbstractRequirements.add(abs);
}
}
@@ -491,6 +520,13 @@ public class Projector {
}
createOptionalityExpression(iu, optionalAbstractRequirements);
}
+
+ // Fix: now create the pending non-patch requirements based on the full set of patches
+ for (Iterator iterator = nonPatchedRequirements.values().iterator(); iterator.hasNext();) {
+ Pending pending = (Pending) iterator.next();
+ createImplication(pending.left, pending.matches, pending.explanation);
+ }
+
List optionalAbstractRequirements = new ArrayList();
for (Iterator iterator = unchangedRequirements.entrySet().iterator(); iterator.hasNext();) {
Entry entry = (Entry) iterator.next();
@@ -855,10 +891,10 @@ public class Projector {
IInstallableUnitFragment fragment = (IInstallableUnitFragment) iu;
IRequiredCapability[] reqs = fragment.getHost();
for (int i = 0; i < reqs.length; i++) {
- if (req == reqs[i])
+ if (req.equals(reqs[i]))
return true;
}
- return true;
+ return false;
}
}
\ No newline at end of file
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.engine/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.p2.engine/META-INF/MANIFEST.MF
index 28fe8ca..88c82d0 100644
--- a/eclipse/plugins/org.eclipse.equinox.p2.engine/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.p2.engine/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-SymbolicName: org.eclipse.equinox.p2.engine;singleton:=true
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-Version: 1.0.101.qualifier
+Bundle-Version: 1.0.102.qualifier
Export-Package: org.eclipse.equinox.internal.p2.engine;x-friends:="org.eclipse.equinox.p2.touchpoint.eclipse,org.eclipse.equinox.p2.touchpoint.natives",
org.eclipse.equinox.internal.provisional.p2.engine;
x-friends:="org.eclipse.equinox.p2.console,
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/ProfilePreferences.java b/eclipse/plugins/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/ProfilePreferences.java
index d2186e3..8c84e40 100644
--- a/eclipse/plugins/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/ProfilePreferences.java
+++ b/eclipse/plugins/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/ProfilePreferences.java
@@ -11,8 +11,7 @@
package org.eclipse.equinox.internal.p2.engine;
import java.io.File;
-import java.util.HashSet;
-import java.util.Set;
+import java.util.*;
import org.eclipse.core.internal.preferences.EclipsePreferences;
import org.eclipse.core.runtime.*;
import org.eclipse.core.runtime.jobs.Job;
@@ -51,7 +50,7 @@ public class ProfilePreferences extends EclipsePreferences {
}
// cache which nodes have been loaded from disk
- private static Set loadedNodes = new HashSet();
+ private static Set loadedNodes = Collections.synchronizedSet(new HashSet());
public static final Object PROFILE_SAVE_JOB_FAMILY = new Object();
@@ -160,11 +159,11 @@ public class ProfilePreferences extends EclipsePreferences {
return new ProfilePreferences(nodeParent, nodeName);
}
- protected synchronized boolean isAlreadyLoaded(IEclipsePreferences node) {
+ protected boolean isAlreadyLoaded(IEclipsePreferences node) {
return loadedNodes.contains(node.absolutePath());
}
- protected synchronized boolean isAlreadyLoaded(String path) {
+ protected boolean isAlreadyLoaded(String path) {
return loadedNodes.contains(path);
}
@@ -192,7 +191,7 @@ public class ProfilePreferences extends EclipsePreferences {
}
}
- protected synchronized void loaded() {
+ protected void loaded() {
loadedNodes.add(name());
}
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.metadata.generator/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.p2.metadata.generator/META-INF/MANIFEST.MF
index ba56346..992b215 100644
--- a/eclipse/plugins/org.eclipse.equinox.p2.metadata.generator/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.p2.metadata.generator/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-SymbolicName: org.eclipse.equinox.p2.metadata.generator;singleton:=true
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-Version: 1.0.100.qualifier
+Bundle-Version: 1.0.101.qualifier
Require-Bundle: org.eclipse.equinox.p2.core,
org.eclipse.osgi,
org.eclipse.equinox.common;bundle-version="[3.5.0,4.0.0)"
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/p2/metadata/generator/features/SiteFeature.java b/eclipse/plugins/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/p2/metadata/generator/features/SiteFeature.java
index ef3a743..4d2fb97 100644
--- a/eclipse/plugins/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/p2/metadata/generator/features/SiteFeature.java
+++ b/eclipse/plugins/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/p2/metadata/generator/features/SiteFeature.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -39,30 +39,42 @@ public class SiteFeature {
* Return false if one of them is null
*/
public static boolean sameURL(URL url1, URL url2) {
-
- if (url1 == null || url2 == null)
- return false;
if (url1 == url2)
return true;
- if (url1.equals(url2))
- return true;
+ if (url1 == null ^ url2 == null)
+ return false;
// 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())) //$NON-NLS-1$
- return false;
- if (!"file".equalsIgnoreCase(url2.getProtocol())) //$NON-NLS-1$
- return false;
-
- File file1 = new File(url1.getFile());
- File file2 = new File(url2.getFile());
-
- if (file1 == null)
+ final boolean isFile1 = "file".equalsIgnoreCase(url1.getProtocol());//$NON-NLS-1$
+ final boolean isFile2 = "file".equalsIgnoreCase(url2.getProtocol());//$NON-NLS-1$
+ if (isFile1 && isFile2) {
+ File file1 = new File(url1.getFile());
+ File file2 = new File(url2.getFile());
+ return file1.equals(file2);
+ }
+ // URL1 xor URL2 is a file, return false. (They either both need to be files, or neither)
+ if (isFile1 ^ isFile2)
return false;
+ return getExternalForm(url1).equals(getExternalForm(url2));
+ }
- return (file1.equals(file2));
+ /**
+ * Gets the external form of this URL. In particular, it trims any white space,
+ * removes a trailing slash and creates a lower case string.
+ */
+ private static String getExternalForm(URL url) {
+ String externalForm = url.toExternalForm();
+ if (externalForm == null)
+ return ""; //$NON-NLS-1$
+ externalForm = externalForm.trim();
+ if (externalForm.endsWith("/")) { //$NON-NLS-1$
+ // Remove the trailing slash
+ externalForm = externalForm.substring(0, externalForm.length() - 1);
+ }
+ return externalForm.toLowerCase();
}
/**
@@ -107,18 +119,44 @@ public class SiteFeature {
* <code>false</code> otherwise
*/
public boolean equals(Object object) {
-
if (object == null)
return false;
- if (getURL() == null)
- return false;
-
if (!(object instanceof SiteFeature))
return false;
+ SiteFeature that = (SiteFeature) object;
+ if (this.featureId == null) {
+ if (that.featureId != null)
+ return false;
+ } else if (!this.featureId.equals(that.featureId))
+ return false;
+ if (this.featureVersion == null) {
+ if (that.featureVersion != null)
+ return false;
+ } else if (!this.featureVersion.equals(that.featureVersion))
+ return false;
+ return sameURL(this.getURL(), that.getURL());
+ }
- SiteFeature f = (SiteFeature) object;
-
- return sameURL(getURL(), f.getURL());
+ /* (non-Javadoc)
+ * @see java.lang.Object#hashCode()
+ */
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + (featureId == null ? 0 : featureId.hashCode());
+ result = prime * result + (featureVersion == null ? 0 : featureVersion.hashCode());
+ if (this.getURL() == null)
+ return result;
+
+ if ("file".equalsIgnoreCase(getURL().getProtocol())) {//$NON-NLS-1$
+ // If the URL is a file, then create the HashCode from the file
+ File f = new File(getURL().getFile());
+ if (f != null)
+ result = prime * result + f.hashCode();
+ } else
+ // Otherwise create it from the External form of the URL (in lower case)
+ result = prime * result + getExternalForm(this.getURL()).hashCode();
+ return result;
}
/**
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.metadata/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.p2.metadata/META-INF/MANIFEST.MF
index 316bdc7..d2989ad 100644
--- a/eclipse/plugins/org.eclipse.equinox.p2.metadata/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.p2.metadata/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-SymbolicName: org.eclipse.equinox.p2.metadata;singleton:=true
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-Version: 1.0.100.qualifier
+Bundle-Version: 1.0.101.qualifier
Export-Package: org.eclipse.equinox.internal.p2.metadata;
x-friends:="org.eclipse.equinox.p2.metadata.generator,
org.eclipse.equinox.p2.metadata.repository,
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/ResolvedInstallableUnit.java b/eclipse/plugins/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/ResolvedInstallableUnit.java
index 1e7cd20..e7279ec 100644
--- a/eclipse/plugins/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/ResolvedInstallableUnit.java
+++ b/eclipse/plugins/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/ResolvedInstallableUnit.java
@@ -72,10 +72,22 @@ public class ResolvedInstallableUnit implements IInstallableUnit {
}
public IRequiredCapability[] getRequiredCapabilities() {
- ArrayList result = new ArrayList();
+ ArrayList result = new ArrayList(original.getRequiredCapabilities().length + 2);
result.addAll(Arrays.asList(original.getRequiredCapabilities()));
for (int i = 0; i < fragments.length; i++) {
- result.addAll(Arrays.asList(fragments[i].getRequiredCapabilities()));
+ IRequiredCapability hostReqs[] = ((IInstallableUnitFragment) fragments[i]).getHost();
+ IRequiredCapability normalReqs[] = fragments[i].getRequiredCapabilities();
+ for (int j = 0; j < normalReqs.length; j++) {
+ boolean hostMatch = false;
+ for (int k = 0; k < hostReqs.length; k++) {
+ if (normalReqs[j].equals(hostReqs[k])) {
+ hostMatch = true;
+ break;
+ }
+ }
+ if (!hostMatch)
+ result.add(normalReqs[j]);
+ }
}
return (IRequiredCapability[]) result.toArray(new IRequiredCapability[result.size()]);
}
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/query/UpdateQuery.java b/eclipse/plugins/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/query/UpdateQuery.java
index 5896d82..243e03a 100644
--- a/eclipse/plugins/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/query/UpdateQuery.java
+++ b/eclipse/plugins/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/query/UpdateQuery.java
@@ -20,20 +20,21 @@ public class UpdateQuery extends MatchQuery {
this.updateFrom = updateFrom;
}
- public boolean isMatch(Object obj) {
- if (!(obj instanceof IInstallableUnit))
- return false;
- if (obj instanceof IInstallableUnitPatch) {
- IInstallableUnitPatch potentialPatch = (IInstallableUnitPatch) obj;
+ public boolean isMatch(Object candidate) {
+ if (candidate instanceof IInstallableUnitPatch && !(updateFrom instanceof IInstallableUnitPatch)) {
+ IInstallableUnitPatch potentialPatch = (IInstallableUnitPatch) candidate;
IRequiredCapability lifeCycle = potentialPatch.getLifeCycle();
if (lifeCycle == null)
return false;
return updateFrom.satisfies(lifeCycle);
}
- IInstallableUnit candidate = (IInstallableUnit) obj;
- IUpdateDescriptor descriptor = candidate.getUpdateDescriptor();
- if (descriptor != null && descriptor.isUpdateOf(updateFrom) && updateFrom.getVersion().compareTo(candidate.getVersion()) < 0)
- return true;
+ IInstallableUnit candidateIU = (IInstallableUnit) candidate;
+ IUpdateDescriptor descriptor = candidateIU.getUpdateDescriptor();
+ if (descriptor != null && descriptor.isUpdateOf(updateFrom)) {
+ if (!updateFrom.getId().equals(candidateIU.getId()))
+ return true;
+ return updateFrom.getVersion().compareTo(candidateIU.getVersion()) < 0;
+ }
return false;
}
}
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.publisher/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.p2.publisher/META-INF/MANIFEST.MF
index 7b41d25..db348c3 100644
--- a/eclipse/plugins/org.eclipse.equinox.p2.publisher/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.p2.publisher/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.equinox.p2.publisher;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.1.qualifier
Bundle-Name: %bundleName
Bundle-Vendor: %providerName
Bundle-RequiredExecutionEnvironment: J2SE-1.4,
@@ -26,6 +26,7 @@ Import-Package: javax.xml.parsers,
org.eclipse.equinox.internal.provisional.p2.metadata.repository,
org.eclipse.equinox.internal.provisional.p2.query,
org.eclipse.equinox.internal.provisional.spi.p2.artifact.repository,
+ org.eclipse.osgi.service.datalocation;version="1.2.0",
org.eclipse.osgi.service.environment;version="1.1.0",
org.eclipse.osgi.service.pluginconversion;version="1.0.0",
org.eclipse.osgi.service.resolver;version="1.2.0",
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/eclipse/ProductFile.java b/eclipse/plugins/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/eclipse/ProductFile.java
index ab3984e..5089d0c 100644
--- a/eclipse/plugins/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/eclipse/ProductFile.java
+++ b/eclipse/plugins/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/eclipse/ProductFile.java
@@ -13,13 +13,16 @@
package org.eclipse.equinox.internal.p2.publisher.eclipse;
-import org.eclipse.equinox.internal.provisional.p2.core.VersionedName;
-
import java.io.*;
import java.util.*;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
+import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper;
+import org.eclipse.equinox.internal.p2.core.helpers.URLUtil;
+import org.eclipse.equinox.internal.p2.publisher.Activator;
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;
+import org.eclipse.equinox.internal.provisional.p2.core.VersionedName;
+import org.eclipse.osgi.service.datalocation.Location;
import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
import org.xml.sax.helpers.DefaultHandler;
@@ -703,14 +706,26 @@ public class ProductFile extends DefaultHandler implements IProductDescriptor {
private void addIcon(String os, String value) {
if (value == null)
return;
+
+ File iconFile = new File(value);
+ if (!iconFile.isFile()) {
+ //workspace
+ Location instanceLocation = (Location) ServiceHelper.getService(Activator.getContext(), Location.class.getName(), Location.INSTANCE_FILTER);
+ if (instanceLocation != null && instanceLocation.getURL() != null) {
+ File workspace = URLUtil.toFile(instanceLocation.getURL());
+ if (workspace != null)
+ iconFile = new File(workspace, value);
+ }
+ }
+ if (!iconFile.isFile())
+ iconFile = new File(location.getParentFile(), value);
+
Collection list = (Collection) icons.get(os);
if (list == null) {
list = new ArrayList(6);
icons.put(os, list);
}
- if (!new File(value).isAbsolute())
- value = new File(location.getParentFile(), value).getAbsolutePath();
- list.add(value);
+ list.add(iconFile.getAbsolutePath());
}
private void processSolaris(Attributes attributes) {
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/ProductFileAdvice.java b/eclipse/plugins/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/ProductFileAdvice.java
index 812f18a..8eced58 100644
--- a/eclipse/plugins/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/ProductFileAdvice.java
+++ b/eclipse/plugins/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/ProductFileAdvice.java
@@ -309,9 +309,12 @@ public class ProductFileAdvice extends AbstractAdvice implements ILicenseAdvice,
// Build may have copied the file to the correct place for us
if (!configFile.isAbsolute() || !configFile.exists())
configFile = new File(product.getLocation().getParentFile(), location);
- // TODO need to figure out what to do for the launcher location here...
- // for now just give any old path that has a parent
- return new DataLoader(configFile, new File(product.getLauncherName()).getAbsoluteFile());
+
+ //We don't really have an executable location, get something reasonable based on the config.ini location
+ File parent = configFile.getParentFile();
+ if (parent.getName().equals("configuration") && parent.getParentFile() != null) //$NON-NLS-1$
+ parent = parent.getParentFile();
+ return new DataLoader(configFile, parent);
}
}
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.repository.tools/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.p2.repository.tools/META-INF/MANIFEST.MF
index 68a0746..063c16c 100644
--- a/eclipse/plugins/org.eclipse.equinox.p2.repository.tools/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.p2.repository.tools/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %bundleName
Bundle-SymbolicName: org.eclipse.equinox.p2.repository.tools;singleton:=true
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.0.2.qualifier
Bundle-Activator: org.eclipse.equinox.p2.internal.repository.tools.Activator
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/AbstractApplication.java b/eclipse/plugins/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/AbstractApplication.java
index d02c1b4..c2ae771 100644
--- a/eclipse/plugins/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/AbstractApplication.java
+++ b/eclipse/plugins/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/AbstractApplication.java
@@ -53,6 +53,12 @@ public abstract class AbstractApplication {
for (Iterator iter = metadataReposToRemove.iterator(); iter.hasNext();)
metadataRepositoryManager.removeRepository((URI) iter.next());
}
+ metadataReposToRemove = null;
+ artifactReposToRemove = null;
+ compositeArtifactRepository = null;
+ compositeMetadataRepository = null;
+ destinationArtifactRepository = null;
+ destinationMetadataRepository = null;
}
public void initializeRepos(IProgressMonitor progress) throws ProvisionException {
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/persistence/XMLParser.java b/eclipse/plugins/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/persistence/XMLParser.java
index 1e874c1..11fc7fe 100644
--- a/eclipse/plugins/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/persistence/XMLParser.java
+++ b/eclipse/plugins/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/persistence/XMLParser.java
@@ -74,7 +74,7 @@ public abstract class XMLParser extends DefaultHandler implements XMLConstants {
return (status == null || !status.matches(IStatus.ERROR | IStatus.CANCEL));
}
- private static SAXParserFactory acquireXMLParsing(BundleContext context) {
+ private synchronized static SAXParserFactory acquireXMLParsing(BundleContext context) {
if (xmlTracker == null) {
xmlTracker = new ServiceTracker(context, SAXParserFactory.class.getName(), null);
xmlTracker.open();
@@ -82,9 +82,10 @@ public abstract class XMLParser extends DefaultHandler implements XMLConstants {
return (SAXParserFactory) xmlTracker.getService();
}
- protected static void releaseXMLParsing() {
+ protected synchronized static void releaseXMLParsing() {
if (xmlTracker != null) {
xmlTracker.close();
+ xmlTracker = null;
}
}
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.updatesite/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.p2.updatesite/META-INF/MANIFEST.MF
index 6767618..d99f154 100644
--- a/eclipse/plugins/org.eclipse.equinox.p2.updatesite/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.p2.updatesite/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.equinox.p2.updatesite;singleton:=true
Bundle-Localization: plugin
-Bundle-Version: 1.0.100.qualifier
+Bundle-Version: 1.0.101.qualifier
Bundle-Activator: org.eclipse.equinox.internal.p2.updatesite.Activator
Bundle-ActivationPolicy: lazy
Eclipse-LazyStart: true
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/SiteXMLAction.java b/eclipse/plugins/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/SiteXMLAction.java
index 27df916..d80f02b 100644
--- a/eclipse/plugins/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/SiteXMLAction.java
+++ b/eclipse/plugins/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/SiteXMLAction.java
@@ -289,7 +289,7 @@ public class SiteXMLAction extends AbstractPublisherAction {
// Create set of provided capabilities
ArrayList providedCapabilities = new ArrayList();
- providedCapabilities.add(PublisherHelper.createSelfCapability(categoryId, Version.emptyVersion));
+ providedCapabilities.add(PublisherHelper.createSelfCapability(categoryId, cat.getVersion()));
Map localizations = category.getLocalizations();
if (localizations != null) {
diff --git a/eclipse/plugins/org.eclipse.equinox.preferences/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.preferences/META-INF/MANIFEST.MF
index 3a13b89..cf9bdfa 100644
--- a/eclipse/plugins/org.eclipse.equinox.preferences/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.preferences/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.equinox.preferences; singleton:=true
-Bundle-Version: 3.2.300.qualifier
+Bundle-Version: 3.2.301.qualifier
Bundle-Activator: org.eclipse.core.internal.preferences.Activator
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/eclipse/plugins/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/ConfigurationPreferences.java b/eclipse/plugins/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/ConfigurationPreferences.java
index b2ae5ac..2941f23 100644
--- a/eclipse/plugins/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/ConfigurationPreferences.java
+++ b/eclipse/plugins/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/ConfigurationPreferences.java
@@ -11,11 +11,11 @@
package org.eclipse.core.internal.preferences;
import java.net.URL;
-import java.util.HashSet;
-import java.util.Set;
+import java.util.*;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.osgi.service.datalocation.Location;
/**
* @since 3.0
@@ -28,14 +28,17 @@ public class ConfigurationPreferences extends EclipsePreferences {
private IPath location;
private IEclipsePreferences loadLevel;
// cache which nodes have been loaded from disk
- private static Set loadedNodes = new HashSet();
+ private static Set loadedNodes = Collections.synchronizedSet(new HashSet());
private static boolean initialized = false;
private static IPath baseLocation;
static {
- URL url = PreferencesOSGiUtils.getDefault().getConfigurationLocation().getURL();
- if (url != null)
- baseLocation = new Path(url.getFile());
+ Location location = PreferencesOSGiUtils.getDefault().getConfigurationLocation();
+ if (location != null) {
+ URL url = location.getURL();
+ if (url != null)
+ baseLocation = new Path(url.getFile());
+ }
}
/**
@@ -70,11 +73,11 @@ public class ConfigurationPreferences extends EclipsePreferences {
return location;
}
- protected synchronized boolean isAlreadyLoaded(IEclipsePreferences node) {
+ protected boolean isAlreadyLoaded(IEclipsePreferences node) {
return loadedNodes.contains(node.name());
}
- protected synchronized void loaded() {
+ protected void loaded() {
loadedNodes.add(name());
}
diff --git a/eclipse/plugins/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/DefaultPreferences.java b/eclipse/plugins/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/DefaultPreferences.java
index 6dda6f4..c42f904 100644
--- a/eclipse/plugins/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/DefaultPreferences.java
+++ b/eclipse/plugins/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/DefaultPreferences.java
@@ -29,7 +29,7 @@ import org.osgi.util.tracker.ServiceTracker;
*/
public class DefaultPreferences extends EclipsePreferences {
// cache which nodes have been loaded from disk
- private static Set loadedNodes = new HashSet();
+ private static Set loadedNodes = Collections.synchronizedSet(new HashSet());
private static final String KEY_PREFIX = "%"; //$NON-NLS-1$
private static final String KEY_DOUBLE_PREFIX = "%%"; //$NON-NLS-1$
private static final IPath NL_DIR = new Path("$nl$"); //$NON-NLS-1$
@@ -221,7 +221,7 @@ public class DefaultPreferences extends EclipsePreferences {
return new DefaultPreferences(nodeParent, nodeName, context);
}
- protected synchronized boolean isAlreadyLoaded(IEclipsePreferences node) {
+ protected boolean isAlreadyLoaded(IEclipsePreferences node) {
return loadedNodes.contains(node.name());
}
@@ -287,7 +287,7 @@ public class DefaultPreferences extends EclipsePreferences {
return result;
}
- protected synchronized void loaded() {
+ protected void loaded() {
loadedNodes.add(name());
}
diff --git a/eclipse/plugins/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/InstancePreferences.java b/eclipse/plugins/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/InstancePreferences.java
index 15bdf4d..685bd89 100644
--- a/eclipse/plugins/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/InstancePreferences.java
+++ b/eclipse/plugins/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/InstancePreferences.java
@@ -29,7 +29,7 @@ public class InstancePreferences extends EclipsePreferences {
private IEclipsePreferences loadLevel;
private IPath location;
// cache which nodes have been loaded from disk
- private static Set loadedNodes = new HashSet();
+ private static Set loadedNodes = Collections.synchronizedSet(new HashSet());
private static boolean initialized = false;
private static IPath baseLocation;
@@ -71,11 +71,11 @@ public class InstancePreferences extends EclipsePreferences {
// accessed before the instance location is set.
}
- protected synchronized boolean isAlreadyLoaded(IEclipsePreferences node) {
+ protected boolean isAlreadyLoaded(IEclipsePreferences node) {
return loadedNodes.contains(node.name());
}
- protected synchronized void loaded() {
+ protected void loaded() {
loadedNodes.add(name());
}
diff --git a/eclipse/plugins/org.eclipse.equinox.simpleconfigurator.manipulator/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.simpleconfigurator.manipulator/META-INF/MANIFEST.MF
index 819de07..d11d039 100644
--- a/eclipse/plugins/org.eclipse.equinox.simpleconfigurator.manipulator/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.simpleconfigurator.manipulator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %bundleName
Bundle-SymbolicName: org.eclipse.equinox.simpleconfigurator.manipulator;singleton:=true
-Bundle-Version: 1.0.100.qualifier
+Bundle-Version: 1.0.101.qualifier
Bundle-Localization: plugin
Bundle-Activator: org.eclipse.equinox.internal.simpleconfigurator.manipulator.Activator
Eclipse-LazyStart: true
diff --git a/eclipse/plugins/org.eclipse.equinox.transforms.xslt/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.transforms.xslt/META-INF/MANIFEST.MF
index 427fcf1..fc3688f 100644
--- a/eclipse/plugins/org.eclipse.equinox.transforms.xslt/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.transforms.xslt/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %bundleName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.equinox.transforms.xslt
-Bundle-Version: 1.0.100.qualifier
+Bundle-Version: 1.0.101.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.4
Import-Package: org.eclipse.osgi.framework.log;version="1.0.0",
org.osgi.framework;version="1.3.0",
diff --git a/eclipse/plugins/org.eclipse.help.webapp/advanced/searchToolbar.jsp b/eclipse/plugins/org.eclipse.help.webapp/advanced/searchToolbar.jsp
index 75b0eef..c334d4d 100644
--- a/eclipse/plugins/org.eclipse.help.webapp/advanced/searchToolbar.jsp
+++ b/eclipse/plugins/org.eclipse.help.webapp/advanced/searchToolbar.jsp
@@ -1,5 +1,5 @@
<%--
- Copyright (c) 2000, 2007 IBM Corporation and others.
+ Copyright (c) 2000, 2009 IBM Corporation and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
@@ -9,6 +9,11 @@
IBM Corporation - initial API and implementation
--%>
<%@ include file="header.jsp"%>
+<%
+ // See Bug 290064 for an explanation of why these constants are used
+ final String ON = "on";
+ final String OFF = "off";
+%>
<jsp:include page="toolbar.jsp">
@@ -27,13 +32,13 @@
<jsp:param name="image" value="show_categories.gif"/>
<jsp:param name="action" value="toggleShowCategories"/>
<jsp:param name="param" value=""/>
- <jsp:param name="state" value="<%=((new SearchData(application, request, response)).isShowCategories() ? "on" : "off")%>"/>
+ <jsp:param name="state" value="<%=((new SearchData(application, request, response)).isShowCategories() ? ON : OFF)%>"/>
<jsp:param name="name" value="show_descriptions"/>
<jsp:param name="tooltip" value='show_descriptions'/>
<jsp:param name="image" value="show_descriptions.gif"/>
<jsp:param name="action" value="toggleShowDescriptions"/>
<jsp:param name="param" value=""/>
- <jsp:param name="state" value="<%=((new SearchData(application, request, response)).isShowDescriptions() ? "on" : "off")%>"/>
+ <jsp:param name="state" value="<%=((new SearchData(application, request, response)).isShowDescriptions() ? ON : OFF)%>"/>
</jsp:include>
\ No newline at end of file
diff --git a/eclipse/plugins/org.eclipse.help.webapp/advanced/tocToolbar.jsp b/eclipse/plugins/org.eclipse.help.webapp/advanced/tocToolbar.jsp
index f38e645..93803a8 100644
--- a/eclipse/plugins/org.eclipse.help.webapp/advanced/tocToolbar.jsp
+++ b/eclipse/plugins/org.eclipse.help.webapp/advanced/tocToolbar.jsp
@@ -16,6 +16,9 @@
String printError = UrlUtil.JavaScriptEncode(ServletResources.getString("PrintError", request));
String menuData = printTopicLabel + "=printTopic(\\'" + printError + "\\')," + printTocLabel + "=printToc(\\'" + printError + "\\')";
String quickSearchError = UrlUtil.JavaScriptEncode(ServletResources.getString("QuickSearchError", request));
+ // See Bug 290064 for an explanation of why these constants are used
+ final String ON = "on";
+ final String OFF = "off";
%>
<jsp:include page="toolbar.jsp">
@@ -62,6 +65,6 @@
<jsp:param name="image" value="auto_synch_toc.gif"/>
<jsp:param name="action" value="toggleAutosynch"/>
<jsp:param name="param" value=""/>
- <jsp:param name="state" value="<%=((new CookiesData(application, request, response)).isSynchToc() ? "on" : "off")%>"/>
+ <jsp:param name="state" value="<%=((new CookiesData(application, request, response)).isSynchToc() ? ON : OFF)%>"/>
</jsp:include>
\ No newline at end of file
diff --git a/eclipse/plugins/org.eclipse.jdt.apt.core/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.jdt.apt.core/META-INF/MANIFEST.MF
index 1cea906..3a9ce93 100644
--- a/eclipse/plugins/org.eclipse.jdt.apt.core/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.jdt.apt.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jdt.apt.core; singleton:=true
-Bundle-Version: 3.3.201.qualifier
+Bundle-Version: 3.3.202.qualifier
Bundle-Localization: plugin
Export-Package: com.sun.mirror.apt,
com.sun.mirror.declaration,
diff --git a/eclipse/plugins/org.eclipse.jdt.apt.core/build_notes.html b/eclipse/plugins/org.eclipse.jdt.apt.core/build_notes.html
index 02996fc..25eba41 100644
--- a/eclipse/plugins/org.eclipse.jdt.apt.core/build_notes.html
+++ b/eclipse/plugins/org.eclipse.jdt.apt.core/build_notes.html
@@ -4,14 +4,19 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<meta name="Build" content="Build">
- <title>Eclipse Platform Release Notes (3.4) - JDT Annotation Processing</title>
+ <title>Eclipse Platform Release Notes (3.5.1) - JDT Annotation Processing</title>
</head>
<body>
-
-<h1>Eclipse Platform Build Notes (3.4)<br>
+<h1>Eclipse Platform Build Notes (3.5.1)<br>
JDT Annotation Processing</h1>
+<p>Integration Build (August 21, 2009, 11:10 p.m.)</p>
+<p>Problem reports updated</p>
+<p>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=287323">Bug 287323</a>. [compiler][apt] Error type detection is too conservative (FIXED)<br>
+</p>
+
<p>Integration Build (August 17, 2009, 11:24 p.m.)</p>
<p>Problem reports updated</p>
<p>
diff --git a/eclipse/plugins/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/env/BaseProcessorEnv.java b/eclipse/plugins/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/env/BaseProcessorEnv.java
index 59bbb25..8e86472 100644
--- a/eclipse/plugins/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/env/BaseProcessorEnv.java
+++ b/eclipse/plugins/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/env/BaseProcessorEnv.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2008 BEA Systems Inc. and others
+ * Copyright (c) 2005, 2009 BEA Systems Inc. and others
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -498,6 +498,7 @@ public class BaseProcessorEnv implements AnnotationProcessorEnvironment
parser.setResolveBindings(true);
parser.setBindingsRecovery(true);
parser.setProject(_javaProject);
+ parser.setIgnoreMethodBodies(true);
ICompilationUnit[] units = unit == null ? NO_UNIT : new ICompilationUnit[]{unit};
parser.createASTs(units, new String[]{key}, requestor, null);
final IBinding result = requestor._result;
@@ -708,6 +709,7 @@ public class BaseProcessorEnv implements AnnotationProcessorEnvironment
parser.setBindingsRecovery(true);
parser.setSource(unit);
parser.setFocalPosition(0);
+ parser.setIgnoreMethodBodies(true);
CompilationUnit resultUnit = (CompilationUnit)parser.createAST(null);
_modelCompUnit2astCompUnit.put(unit, resultUnit);
return resultUnit;
@@ -853,6 +855,7 @@ public class BaseProcessorEnv implements AnnotationProcessorEnvironment
p.setBindingsRecovery(true);
p.setProject( javaProject );
p.setKind( ASTParser.K_COMPILATION_UNIT );
+ p.setIgnoreMethodBodies(true);
p.createASTs( parseUnits, keys, requestor, null);
}
@@ -881,6 +884,7 @@ public class BaseProcessorEnv implements AnnotationProcessorEnvironment
p.setBindingsRecovery(true);
p.setProject( javaProject );
p.setKind( ASTParser.K_COMPILATION_UNIT );
+ p.setIgnoreMethodBodies(true);
p.createASTs( new ICompilationUnit[]{compilationUnit}, NO_KEYS, requestor, null);
if( AptPlugin.DEBUG ){
AptPlugin.trace("created DOM AST for " + compilationUnit.getElementName() ); //$NON-NLS-1$
diff --git a/eclipse/plugins/org.eclipse.jdt.core/.settings/.api_filters b/eclipse/plugins/org.eclipse.jdt.core/.settings/.api_filters
index 3855e63..a9fe599 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/.settings/.api_filters
+++ b/eclipse/plugins/org.eclipse.jdt.core/.settings/.api_filters
@@ -1,17 +1,25 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.jdt.core" version="2">
- <resource path="model/org/eclipse/jdt/core/ITypeRoot.java" type="org.eclipse.jdt.core.ITypeRoot">
- <filter id="403853384">
+ <resource path="dom/org/eclipse/jdt/core/dom/ASTParser.java" type="org.eclipse.jdt.core.dom.ASTParser">
+ <filter id="1142947843">
<message_arguments>
- <message_argument value="org.eclipse.jdt.core.ITypeRoot"/>
+ <message_argument value="3.5.2"/>
+ <message_argument value="setIgnoreMethodBodies(boolean)"/>
</message_arguments>
</filter>
</resource>
- <resource path="search/org/eclipse/jdt/core/search/ReferenceMatch.java" type="org.eclipse.jdt.core.search.ReferenceMatch">
- <filter id="338792546">
+ <resource path="model/org/eclipse/jdt/core/ICompilationUnit.java" type="org.eclipse.jdt.core.ICompilationUnit">
+ <filter id="1210056707">
<message_arguments>
- <message_argument value="org.eclipse.jdt.core.search.ReferenceMatch"/>
- <message_argument value="localElement()"/>
+ <message_argument value="3.5.2"/>
+ <message_argument value="IGNORE_METHOD_BODIES"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="model/org/eclipse/jdt/core/ITypeRoot.java" type="org.eclipse.jdt.core.ITypeRoot">
+ <filter id="403853384">
+ <message_arguments>
+ <message_argument value="org.eclipse.jdt.core.ITypeRoot"/>
</message_arguments>
</filter>
</resource>
@@ -29,4 +37,12 @@
</message_arguments>
</filter>
</resource>
+ <resource path="search/org/eclipse/jdt/core/search/ReferenceMatch.java" type="org.eclipse.jdt.core.search.ReferenceMatch">
+ <filter id="338792546">
+ <message_arguments>
+ <message_argument value="org.eclipse.jdt.core.search.ReferenceMatch"/>
+ <message_argument value="localElement()"/>
+ </message_arguments>
+ </filter>
+ </resource>
</component>
diff --git a/eclipse/plugins/org.eclipse.jdt.core/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.jdt.core/META-INF/MANIFEST.MF
index 10a953e..d96d632 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.jdt.core/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Main-Class: org.eclipse.jdt.internal.compiler.batch.Main
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jdt.core; singleton:=true
-Bundle-Version: 3.5.1.qualifier
+Bundle-Version: 3.5.2.qualifier
Bundle-Activator: org.eclipse.jdt.core.JavaCore
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/eclipse/plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties b/eclipse/plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties
index 3ad2675..4d23f59 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties
+++ b/eclipse/plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties
@@ -13,9 +13,9 @@
### compiler
#Format: compiler.name = word1 word2 word3
-compiler.name = Eclipse Java Compiler
+compiler.name = Eclipse Compiler for Java (TM)
#Format: compiler.version = 0.XXX[, other words (don't forget the comma if adding other words)]
-compiler.version = 0.972_R35x, 3.5.1 release
+compiler.version = 0.980_R35x, 3.5.2 release
compiler.copyright = Copyright IBM Corp 2000, 2009. All rights reserved.
### progress
diff --git a/eclipse/plugins/org.eclipse.jdt.core/buildnotes_jdt-core.html b/eclipse/plugins/org.eclipse.jdt.core/buildnotes_jdt-core.html
index 71efd60..00aaea2 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/buildnotes_jdt-core.html
+++ b/eclipse/plugins/org.eclipse.jdt.core/buildnotes_jdt-core.html
@@ -39,6 +39,143 @@
</td>
</tr>
</table>
+<a name="v_980_R35x"></a>
+<hr><h1>
+Eclipse Platform Build Notes<br>
+Java development tools core</h1>
+Eclipse SDK 3.5.2 - January 12, 2010 - 3.5.2
+<br>Project org.eclipse.jdt.core v_980_R35x
+(<a href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.jdt.core/?only_with_tag=v_980_R35x">cvs</a>).
+<h2>What's new in this drop</h2>
+
+<h3>Problem Reports Fixed</h3>
+<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=291775">291775</a>
+[formatter] Backport fixes for known issues around 'Never Join Lines' preference to 3.5 maintenance stream
+<br><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=296343">296343</a>
+OOM error caused by java indexing referencing classloader from threadLocal
+
+<a name="v_979_R35x"></a>
+<hr><h1>
+Eclipse Platform Build Notes<br>
+Java development tools core</h1>
+Eclipse SDK 3.5.2 - November 30, 2009
+<br>Project org.eclipse.jdt.core v_979_R35x
+(<a href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.jdt.core/?only_with_tag=v_979_R35x">cvs</a>).
+<h2>What's new in this drop</h2>
+
+<h3>Problem Reports Fixed</h3>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=288211">288211</a>
+APT uses a lot of memory
+<br><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=277643">277643</a>
+Generics compile error
+
+<a name="v_978_R35x"></a>
+<hr><h1>
+Eclipse Platform Build Notes<br>
+Java development tools core</h1>
+Eclipse SDK 3.5.2 - November 25, 2009
+<br>Project org.eclipse.jdt.core v_978_R35x
+(<a href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.jdt.core/?only_with_tag=v_978_R35x">cvs</a>).
+<h2>What's new in this drop</h2>
+
+<h3>Problem Reports Fixed</h3>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=295698">295698</a>
+[1.5][compiler] ClassCastException in unchecked warning report
+
+<a name="v_977_R35x"></a>
+<hr><h1>
+Eclipse Platform Build Notes<br>
+Java development tools core</h1>
+Eclipse SDK 3.5.2 - November 19, 2009
+<br>Project org.eclipse.jdt.core v_977_R35x
+(<a href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.jdt.core/?only_with_tag=v_977_R35x">cvs</a>).
+<h2>What's new in this drop</h2>
+
+<h3>Problem Reports Fixed</h3>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=294662">294662</a>
+ClassCastException while invoking quick assist
+<br><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=293443">293443</a>
+AbortCompilation when invoking content assist
+<br><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=294404">294404</a>
+-target jsr14 flags error on foreach over Collection that does not implement Iterable
+<br><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=291985">291985</a>
+[compiler][jsr14] Translating Enum with jsr14 target: ECJ causes a runtime error while Sun compiler works fine
+
+<a name="v_976_R35x"></a>
+<hr><h1>
+Eclipse Platform Build Notes<br>
+Java development tools core</h1>
+Eclipse SDK 3.5.2 - October 21, 2009
+<br>Project org.eclipse.jdt.core v_976_R35x
+(<a href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.jdt.core/?only_with_tag=v_976_R35x">cvs</a>).
+<h2>What's new in this drop</h2>
+
+<h3>Problem Reports Fixed</h3>
+<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=292350">292350</a>
+[1.5][compiler] Compiler error: ambiguous method since 3.5.1 using generics and interface inheritance
+<br><a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=292240">292240</a>
+Compiler error on implementation of raw sub interface
+
+<a name="v_975_R35x"></a>
+<hr><h1>
+Eclipse Platform Build Notes<br>
+Java development tools core</h1>
+Eclipse SDK 3.5.2 - October 14, 2009
+<br>Project org.eclipse.jdt.core v_975_R35x
+(<a href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.jdt.core/?only_with_tag=v_975_R35x">cvs</a>).
+<h2>What's new in this drop</h2>
+
+<h3>Problem Reports Fixed</h3>
+<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=284280">284280</a>
+[1.5][compiler] Error on use generic interface in abstract super class
+<br><a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=290905">290905</a>
+[formatter] Certain formatter pref constellation cause endless loop ==> OOME
+<br><a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=291472">291472</a>
+[1.5][compiler] Access to a generic method is compiled incorrectly
+
+<a name="v_974_R35x"></a>
+<hr><h1>
+Eclipse Platform Build Notes<br>
+Java development tools core</h1>
+Eclipse SDK 3.5.2 - October 7, 2009
+<br>Project org.eclipse.jdt.core v_974_R35x
+(<a href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.jdt.core/?only_with_tag=v_974_R35x">cvs</a>).
+<h2>What's new in this drop</h2>
+
+<h3>Problem Reports Fixed</h3>
+<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=291322">291322</a>
+Test errors when running JDT Core tests on Windows 7
+<br><a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=285124">285124</a>
+serialVersionUID still causes error/warning
+<br><a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=290877">290877</a>
+[DOM] If using a tag named '@enum' the ASTParser ignores this
+<br><a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=281575">281575</a>
+Eclipse hangs in SourceMapper while doing java proposals
+
+<a name="v_973_R35x"></a>
+<hr><h1>
+Eclipse Platform Build Notes<br>
+Java development tools core</h1>
+Eclipse SDK 3.5.2 - September 30, 2009
+<br>Project org.eclipse.jdt.core v_973_R35x
+(<a href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.jdt.core/?only_with_tag=v_973_R35x">cvs</a>).
+<h2>What's new in this drop</h2>
+<ul>
+<li>Incremented org.eclipse.jdt.core plug-in ID to "3.5.2"</li>
+</ul>
+
+<h3>Problem Reports Fixed</h3>
+<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=290730">290730</a>
+Rewriting SwitchStatement throws NPE
+<br><a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=290376">290376</a>
+Errant "Comparing identical expressions" warning with assignment
+<br><a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=287592">287592</a>
+[1.5][compiler] Wrong ambiguous compilation error
+<br><a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=287833">287833</a>
+[formatter] Formatter removes the first character after the * in the <pre> tag
+<br><a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=289892">289892</a>
+[compiler] NPE during binaryTypeBinding field initialization
+
<a name="v_972_R35x"></a>
<hr><h1>
Eclipse Platform Build Notes<br>
diff --git a/eclipse/plugins/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/CompletionEngine.java b/eclipse/plugins/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/CompletionEngine.java
index 8bf39b7..5b2b230 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/CompletionEngine.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/CompletionEngine.java
@@ -11581,7 +11581,7 @@ public final class CompletionEngine
private INameEnvironment getNoCacheNameEnvironment() {
if (this.noCacheNameEnvironment == null) {
- JavaModelManager.getJavaModelManager().cacheZipFiles();
+ JavaModelManager.getJavaModelManager().cacheZipFiles(this);
this.noCacheNameEnvironment = new JavaSearchNameEnvironment(this.javaProject, this.owner == null ? null : JavaModelManager.getJavaModelManager().getWorkingCopies(this.owner, true/*add primary WCs*/));
}
return this.noCacheNameEnvironment;
@@ -12356,7 +12356,7 @@ public final class CompletionEngine
if (this.noCacheNameEnvironment != null) {
this.noCacheNameEnvironment.cleanup();
this.noCacheNameEnvironment = null;
- JavaModelManager.getJavaModelManager().flushZipFiles();
+ JavaModelManager.getJavaModelManager().flushZipFiles(this);
}
}
diff --git a/eclipse/plugins/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/InternalExtendedCompletionContext.java b/eclipse/plugins/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/InternalExtendedCompletionContext.java
index 6ffb7b1..0352ff5 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/InternalExtendedCompletionContext.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/InternalExtendedCompletionContext.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
+ * Copyright (c) 2008, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -348,24 +348,34 @@ public class InternalExtendedCompletionContext {
int size = this.visibleLocalVariables.size();
if (size > 0) {
next : for (int i = 0; i < size; i++) {
- LocalVariableBinding binding = (LocalVariableBinding) this.visibleLocalVariables.elementAt(i);
- if (assignableTypeBinding != null && !binding.type.isCompatibleWith(assignableTypeBinding)) continue next;
- JavaElement localVariable = getJavaElement(binding);
- if (localVariable != null) result[elementCount++] = localVariable;
+ try {
+ LocalVariableBinding binding = (LocalVariableBinding) this.visibleLocalVariables.elementAt(i);
+ if (assignableTypeBinding != null && !binding.type.isCompatibleWith(assignableTypeBinding)) continue next;
+ JavaElement localVariable = getJavaElement(binding);
+ if (localVariable != null) result[elementCount++] = localVariable;
+ } catch(AbortCompilation e) {
+ // log the exception and proceed
+ Util.logRepeatedMessage(e.getKey(), e);
+ }
}
}
size = this.visibleFields.size();
if (size > 0) {
next : for (int i = 0; i < size; i++) {
- FieldBinding binding = (FieldBinding) this.visibleFields.elementAt(i);
- if (assignableTypeBinding != null && !binding.type.isCompatibleWith(assignableTypeBinding)) continue next;
- if (this.assistScope.isDefinedInSameUnit(binding.declaringClass)) {
- JavaElement field = getJavaElementOfCompilationUnit(binding);
- if (field != null) result[elementCount++] = field;
- } else {
- JavaElement field = Util.getUnresolvedJavaElement(binding, this.owner, EmptyNodeMap);
- if (field != null) result[elementCount++] = field.resolved(binding);
+ try {
+ FieldBinding binding = (FieldBinding) this.visibleFields.elementAt(i);
+ if (assignableTypeBinding != null && !binding.type.isCompatibleWith(assignableTypeBinding)) continue next;
+ if (this.assistScope.isDefinedInSameUnit(binding.declaringClass)) {
+ JavaElement field = getJavaElementOfCompilationUnit(binding);
+ if (field != null) result[elementCount++] = field;
+ } else {
+ JavaElement field = Util.getUnresolvedJavaElement(binding, this.owner, EmptyNodeMap);
+ if (field != null) result[elementCount++] = field.resolved(binding);
+ }
+ } catch(AbortCompilation e) {
+ // log the exception and proceed
+ Util.logRepeatedMessage(e.getKey(), e);
}
}
@@ -373,16 +383,20 @@ public class InternalExtendedCompletionContext {
size = this.visibleMethods.size();
if (size > 0) {
next : for (int i = 0; i < size; i++) {
- MethodBinding binding = (MethodBinding) this.visibleMethods.elementAt(i);
- if (assignableTypeBinding != null && !binding.returnType.isCompatibleWith(assignableTypeBinding)) continue next;
- if (this.assistScope.isDefinedInSameUnit(binding.declaringClass)) {
- JavaElement method = getJavaElementOfCompilationUnit(binding);
- if (method != null) result[elementCount++] = method;
- } else {
- JavaElement method = Util.getUnresolvedJavaElement(binding, this.owner, EmptyNodeMap);
- if (method != null) result[elementCount++] = method.resolved(binding);
+ try {
+ MethodBinding binding = (MethodBinding) this.visibleMethods.elementAt(i);
+ if (assignableTypeBinding != null && !binding.returnType.isCompatibleWith(assignableTypeBinding)) continue next;
+ if (this.assistScope.isDefinedInSameUnit(binding.declaringClass)) {
+ JavaElement method = getJavaElementOfCompilationUnit(binding);
+ if (method != null) result[elementCount++] = method;
+ } else {
+ JavaElement method = Util.getUnresolvedJavaElement(binding, this.owner, EmptyNodeMap);
+ if (method != null) result[elementCount++] = method.resolved(binding);
+ }
+ } catch(AbortCompilation e) {
+ // log the exception and proceed
+ Util.logRepeatedMessage(e.getKey(), e);
}
-
}
}
diff --git a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/Compiler.java b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/Compiler.java
index 7cacbb8..c4341db 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/Compiler.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/Compiler.java
@@ -760,16 +760,15 @@ public class Compiler implements ITypeRequestor, ProblemSeverities {
long analyzeStart = System.currentTimeMillis();
this.stats.resolveTime += analyzeStart - resolveStart;
-
- // flow analysis
- unit.analyseCode();
+
+ // no need to analyse or generate code if statements are not required
+ if (!this.options.ignoreMethodBodies) unit.analyseCode(); // flow analysis
long generateStart = System.currentTimeMillis();
this.stats.analyzeTime += generateStart - analyzeStart;
-
- // code generation
- unit.generateCode();
-
+
+ if (!this.options.ignoreMethodBodies) unit.generateCode(); // code generation
+
// reference info
if (this.options.produceReferenceInfo && unit.scope != null)
unit.scope.storeDependencyInfo();
diff --git a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/AllocationExpression.java b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/AllocationExpression.java
index 9925379..f808070 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/AllocationExpression.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/AllocationExpression.java
@@ -44,7 +44,8 @@ public FlowInfo analyseCode(BlockScope currentScope, FlowContext flowContext, Fl
ReferenceBinding[] thrownExceptions;
if (((thrownExceptions = this.binding.thrownExceptions).length) != 0) {
if ((this.bits & ASTNode.Unchecked) != 0 && this.genericTypeArguments == null) {
- thrownExceptions = currentScope.environment().convertToRawTypes(this.binding.original().thrownExceptions, true, true);
+ // https://bugs.eclipse.org/bugs/show_bug.cgi?id=277643, align with javac on JLS 15.12.2.6
+ thrownExceptions = currentScope.environment().convertToRawTypes(this.binding.thrownExceptions, true, true);
}
// check exception handling
flowContext.checkExceptionHandlers(
diff --git a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/EqualExpression.java b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/EqualExpression.java
index 3ffcef1..e4d3c25 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/EqualExpression.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/EqualExpression.java
@@ -811,7 +811,8 @@ public class EqualExpression extends BinaryExpression {
// check whether comparing identical expressions
Binding leftDirect = Expression.getDirectBinding(this.left);
- if (leftDirect != null && leftDirect == Expression.getDirectBinding(this.right)) {
+ if (leftDirect != null && leftDirect == Expression.getDirectBinding(this.right)
+ && !(this.right instanceof Assignment)) {
scope.problemReporter().comparingIdenticalExpressions(this);
}
return this.resolvedType = TypeBinding.BOOLEAN;
@@ -848,7 +849,9 @@ public class EqualExpression extends BinaryExpression {
// check whether comparing identical expressions
Binding leftDirect = Expression.getDirectBinding(this.left);
if (leftDirect != null && leftDirect == Expression.getDirectBinding(this.right)) {
- scope.problemReporter().comparingIdenticalExpressions(this);
+ if (!(this.right instanceof Assignment)) {
+ scope.problemReporter().comparingIdenticalExpressions(this);
+ }
}
return this.resolvedType = TypeBinding.BOOLEAN;
}
diff --git a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ExplicitConstructorCall.java b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ExplicitConstructorCall.java
index 69c54d2..9a83c44 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ExplicitConstructorCall.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ExplicitConstructorCall.java
@@ -82,7 +82,8 @@ public class ExplicitConstructorCall extends Statement implements InvocationSite
ReferenceBinding[] thrownExceptions;
if ((thrownExceptions = this.binding.thrownExceptions) != Binding.NO_EXCEPTIONS) {
if ((this.bits & ASTNode.Unchecked) != 0 && this.genericTypeArguments == null) {
- thrownExceptions = currentScope.environment().convertToRawTypes(this.binding.original().thrownExceptions, true, true);
+ // https://bugs.eclipse.org/bugs/show_bug.cgi?id=277643, align with javac on JLS 15.12.2.6
+ thrownExceptions = currentScope.environment().convertToRawTypes(this.binding.thrownExceptions, true, true);
}
// check exceptions
flowContext.checkExceptionHandlers(
diff --git a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ForeachStatement.java b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ForeachStatement.java
index 616b188..fc068e0 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ForeachStatement.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ForeachStatement.java
@@ -383,8 +383,6 @@ public class ForeachStatement extends Statement {
if (elementType != null && collectionType != null) {
if (collectionType.isArrayType()) { // for(E e : E[])
this.kind = ARRAY;
- expectedCollectionType = upperScope.createArrayType(elementType, 1);
- this.collection.computeConversion(this.scope, expectedCollectionType, collectionType);
this.collectionElementType = ((ArrayBinding) collectionType).elementsType();
if (!this.collectionElementType.isCompatibleWith(elementType)
&& !this.scope.isBoxingCompatibleWith(this.collectionElementType, elementType)) {
@@ -393,7 +391,7 @@ public class ForeachStatement extends Statement {
// in case we need to do a conversion
int compileTimeTypeID = this.collectionElementType.id;
if (elementType.isBaseType()) {
- expectedCollectionType = null;
+ this.collection.computeConversion(this.scope, collectionType, collectionType);
if (!this.collectionElementType.isBaseType()) {
compileTimeTypeID = this.scope.environment().computeBoxingType(this.collectionElementType).id;
this.elementVariableImplicitWidening = UNBOXING;
@@ -405,19 +403,33 @@ public class ForeachStatement extends Statement {
this.elementVariableImplicitWidening = (elementType.id << 4) + compileTimeTypeID;
}
} else if (this.collectionElementType.isBaseType()) {
- expectedCollectionType = null;
+ this.collection.computeConversion(this.scope, collectionType, collectionType);
int boxedID = this.scope.environment().computeBoxingType(this.collectionElementType).id;
this.elementVariableImplicitWidening = BOXING | (compileTimeTypeID << 4) | compileTimeTypeID; // use primitive type in implicit conversion
compileTimeTypeID = boxedID;
this.scope.problemReporter().autoboxing(this.collection, this.collectionElementType, elementType);
+ } else {
+ expectedCollectionType = upperScope.createArrayType(elementType, 1);
+ this.collection.computeConversion(this.scope, expectedCollectionType, collectionType);
}
} else if (collectionType instanceof ReferenceBinding) {
ReferenceBinding iterableType = ((ReferenceBinding)collectionType).findSuperTypeOriginatingFrom(T_JavaLangIterable, false /*Iterable is not a class*/);
+ boolean isTargetJsr14 = upperScope.compilerOptions().targetJDK == ClassFileConstants.JDK1_4;
+ if (iterableType == null && isTargetJsr14) {
+ iterableType = ((ReferenceBinding)collectionType).findSuperTypeOriginatingFrom(T_JavaUtilCollection, false /*Iterable is not a class*/);
+ }
checkIterable: {
if (iterableType == null) break checkIterable;
this.iteratorReceiverType = collectionType.erasure();
- if (((ReferenceBinding)this.iteratorReceiverType).findSuperTypeOriginatingFrom(T_JavaLangIterable, false) == null) {
+ if (isTargetJsr14) {
+ if (((ReferenceBinding)this.iteratorReceiverType).findSuperTypeOriginatingFrom(T_JavaUtilCollection, false) == null) {
+ this.iteratorReceiverType = iterableType; // handle indirect inheritance thru variable secondary bound
+ this.collection.computeConversion(this.scope, iterableType, collectionType);
+ } else {
+ this.collection.computeConversion(this.scope, collectionType, collectionType);
+ }
+ } else if (((ReferenceBinding)this.iteratorReceiverType).findSuperTypeOriginatingFrom(T_JavaLangIterable, false) == null) {
this.iteratorReceiverType = iterableType; // handle indirect inheritance thru variable secondary bound
this.collection.computeConversion(this.scope, iterableType, collectionType);
} else {
diff --git a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/MessageSend.java b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/MessageSend.java
index 01828db..329bc27 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/MessageSend.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/MessageSend.java
@@ -70,7 +70,8 @@ public FlowInfo analyseCode(BlockScope currentScope, FlowContext flowContext, Fl
ReferenceBinding[] thrownExceptions;
if ((thrownExceptions = this.binding.thrownExceptions) != Binding.NO_EXCEPTIONS) {
if ((this.bits & ASTNode.Unchecked) != 0 && this.genericTypeArguments == null) {
- thrownExceptions = currentScope.environment().convertToRawTypes(this.binding.original().thrownExceptions, true, true);
+ // https://bugs.eclipse.org/bugs/show_bug.cgi?id=277643, align with javac on JLS 15.12.2.6
+ thrownExceptions = currentScope.environment().convertToRawTypes(this.binding.thrownExceptions, true, true);
}
// must verify that exceptions potentially thrown by this expression are caught in the method
flowContext.checkExceptionHandlers(thrownExceptions, this, flowInfo.copy(), currentScope);
@@ -487,7 +488,8 @@ public TypeBinding resolveType(BlockScope scope) {
} else {
TypeBinding returnType;
if ((this.bits & ASTNode.Unchecked) != 0 && this.genericTypeArguments == null) {
- returnType = this.binding.original().returnType;
+ // https://bugs.eclipse.org/bugs/show_bug.cgi?id=277643, align with javac on JLS 15.12.2.6
+ returnType = this.binding.returnType;
if (returnType != null) {
returnType = scope.environment().convertToRawType(returnType.erasure(), true);
}
diff --git a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/QualifiedAllocationExpression.java b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/QualifiedAllocationExpression.java
index cc4a47f..e9b9572 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/QualifiedAllocationExpression.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/QualifiedAllocationExpression.java
@@ -83,7 +83,8 @@ public class QualifiedAllocationExpression extends AllocationExpression {
ReferenceBinding[] thrownExceptions;
if (((thrownExceptions = this.binding.thrownExceptions).length) != 0) {
if ((this.bits & ASTNode.Unchecked) != 0 && this.genericTypeArguments == null) {
- thrownExceptions = currentScope.environment().convertToRawTypes(this.binding.original().thrownExceptions, true, true);
+ // https://bugs.eclipse.org/bugs/show_bug.cgi?id=277643, align with javac on JLS 15.12.2.6
+ thrownExceptions = currentScope.environment().convertToRawTypes(this.binding.thrownExceptions, true, true);
}
// check exception handling
flowContext.checkExceptionHandlers(
diff --git a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/TypeDeclaration.java b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/TypeDeclaration.java
index b165539..3a2fef8 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/TypeDeclaration.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/TypeDeclaration.java
@@ -393,8 +393,9 @@ public MethodBinding createDefaultConstructorWithBinding(MethodBinding inherited
}
//============BINDING UPDATE==========================
+ // https://bugs.eclipse.org/bugs/show_bug.cgi?id=277643, align with javac on JLS 15.12.2.6
ReferenceBinding[] thrownExceptions = eraseThrownExceptions
- ? this.scope.environment().convertToRawTypes(inheritedConstructorBinding.original().thrownExceptions, true, true)
+ ? this.scope.environment().convertToRawTypes(inheritedConstructorBinding.thrownExceptions, true, true)
: inheritedConstructorBinding.thrownExceptions;
SourceTypeBinding sourceType = this.binding;
@@ -1086,8 +1087,23 @@ public void resolve() {
this.maxFieldCount = localMaxFieldCount;
}
if (needSerialVersion) {
- this.scope.problemReporter().missingSerialVersion(this);
+ //check that the current type doesn't extend javax.rmi.CORBA.Stub
+ TypeBinding javaxRmiCorbaStub = this.scope.getType(TypeConstants.JAVAX_RMI_CORBA_STUB, 4);
+ if (javaxRmiCorbaStub.isValidBinding()) {
+ ReferenceBinding superclassBinding = this.binding.superclass;
+ loop: while (superclassBinding != null) {
+ if (superclassBinding == javaxRmiCorbaStub) {
+ needSerialVersion = false;
+ break loop;
+ }
+ superclassBinding = superclassBinding.superclass();
+ }
+ }
+ if (needSerialVersion) {
+ this.scope.problemReporter().missingSerialVersion(this);
+ }
}
+
// check extends/implements for annotation type
switch(kind(this.modifiers)) {
case TypeDeclaration.ANNOTATION_TYPE_DECL :
diff --git a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/CodeStream.java b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/CodeStream.java
index 5e71f0f..9aad201 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/CodeStream.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/CodeStream.java
@@ -2396,7 +2396,7 @@ public void generateSyntheticBodyForConstructorAccess(SyntheticMethodBinding acc
default :
resolvedPosition++;
break;
- }
+ }
}
}
invoke(Opcodes.OPC_invokespecial, constructorBinding, null /* default declaringClass */);
@@ -2409,7 +2409,7 @@ public void generateSyntheticBodyForConstructorAccess(SyntheticMethodBinding acc
public void generateSyntheticBodyForEnumValueOf(SyntheticMethodBinding methodBinding) {
initializeMaxLocals(methodBinding);
final ReferenceBinding declaringClass = methodBinding.declaringClass;
- this.ldc(declaringClass);
+ generateClassLiteralAccessForType(declaringClass, null);
aload_0();
invokeJavaLangEnumvalueOf(declaringClass);
this.checkcast(declaringClass);
diff --git a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java
index 652c0d9..a7cd80b 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java
@@ -331,6 +331,8 @@ public class CompilerOptions {
public boolean storeAnnotations;
/** Indicate if annotation processing generates classfiles */
public boolean generateClassFiles;
+ /** Indicate if method bodies should be ignored */
+ public boolean ignoreMethodBodies;
// keep in sync with warningTokenToIrritant and warningTokenFromIrritant
@@ -1040,6 +1042,8 @@ public class CompilerOptions {
// dead code detection
this.reportDeadCodeInTrivialIfStatement = false;
+ // ignore method bodies
+ this.ignoreMethodBodies = false;
}
public void set(Map optionsMap) {
diff --git a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/BinaryTypeBinding.java b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/BinaryTypeBinding.java
index b823ebb..e6bda1d 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/BinaryTypeBinding.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/BinaryTypeBinding.java
@@ -325,6 +325,21 @@ void cachePartsFrom(IBinaryType binaryType, boolean needFieldsAndMethods) {
if (needFieldsAndMethods) {
createFields(binaryType.getFields(), sourceLevel, missingTypeNames);
createMethods(binaryType.getMethods(), sourceLevel, missingTypeNames);
+ boolean isViewedAsDeprecated = isViewedAsDeprecated();
+ if (isViewedAsDeprecated) {
+ for (int i = 0, max = this.fields.length; i < max; i++) {
+ FieldBinding field = this.fields[i];
+ if (!field.isDeprecated()) {
+ field.modifiers |= ExtraCompilerModifiers.AccDeprecatedImplicitly;
+ }
+ }
+ for (int i = 0, max = this.methods.length; i < max; i++) {
+ MethodBinding method = this.methods[i];
+ if (!method.isDeprecated()) {
+ method.modifiers |= ExtraCompilerModifiers.AccDeprecatedImplicitly;
+ }
+ }
+ }
}
if (this.environment.globalOptions.storeAnnotations)
setAnnotations(createAnnotations(binaryType.getAnnotations(), this.environment, missingTypeNames));
@@ -344,7 +359,6 @@ private void createFields(IBinaryField[] iFields, long sourceLevel, char[][][] m
if (size > 0) {
this.fields = new FieldBinding[size];
boolean use15specifics = sourceLevel >= ClassFileConstants.JDK1_5;
- boolean isViewedAsDeprecated = isViewedAsDeprecated();
boolean hasRestrictedAccess = hasRestrictedAccess();
int firstAnnotatedFieldIndex = -1;
for (int i = 0; i < size; i++) {
@@ -368,8 +382,6 @@ private void createFields(IBinaryField[] iFields, long sourceLevel, char[][][] m
field.id = i; // ordinal
if (use15specifics)
field.tagBits |= binaryField.getTagBits();
- if (isViewedAsDeprecated && !field.isDeprecated())
- field.modifiers |= ExtraCompilerModifiers.AccDeprecatedImplicitly;
if (hasRestrictedAccess)
field.modifiers |= ExtraCompilerModifiers.AccRestrictedAccess;
if (fieldSignature != null)
@@ -569,14 +581,11 @@ private void createMethods(IBinaryMethod[] iMethods, long sourceLevel, char[][][
return;
}
- boolean isViewedAsDeprecated = isViewedAsDeprecated();
boolean hasRestrictedAccess = hasRestrictedAccess();
this.methods = new MethodBinding[total];
if (total == initialTotal) {
for (int i = 0; i < initialTotal; i++) {
MethodBinding method = createMethod(iMethods[i], sourceLevel, missingTypeNames);
- if (isViewedAsDeprecated && !method.isDeprecated())
- method.modifiers |= ExtraCompilerModifiers.AccDeprecatedImplicitly;
if (hasRestrictedAccess)
method.modifiers |= ExtraCompilerModifiers.AccRestrictedAccess;
this.methods[i] = method;
@@ -585,8 +594,6 @@ private void createMethods(IBinaryMethod[] iMethods, long sourceLevel, char[][][
for (int i = 0, index = 0; i < initialTotal; i++) {
if (iClinit != i && (toSkip == null || toSkip[i] != -1)) {
MethodBinding method = createMethod(iMethods[i], sourceLevel, missingTypeNames);
- if (isViewedAsDeprecated && !method.isDeprecated())
- method.modifiers |= ExtraCompilerModifiers.AccDeprecatedImplicitly;
if (hasRestrictedAccess)
method.modifiers |= ExtraCompilerModifiers.AccRestrictedAccess;
this.methods[index++] = method;
diff --git a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/MethodBinding.java b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/MethodBinding.java
index 3ebc57b..cb80c3a 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/MethodBinding.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/MethodBinding.java
@@ -426,6 +426,21 @@ public final char[] constantPoolName() {
return this.selector;
}
+public MethodBinding findOriginalInheritedMethod(MethodBinding inheritedMethod) {
+ MethodBinding inheritedOriginal = inheritedMethod.original();
+ TypeBinding superType = this.declaringClass.findSuperTypeOriginatingFrom(inheritedOriginal.declaringClass);
+ if (superType == null || !(superType instanceof ReferenceBinding)) return null;
+
+ if (inheritedOriginal.declaringClass != superType) {
+ // must find inherited method with the same substituted variables
+ MethodBinding[] superMethods = ((ReferenceBinding) superType).getMethods(inheritedOriginal.selector, inheritedOriginal.parameters.length);
+ for (int m = 0, l = superMethods.length; m < l; m++)
+ if (superMethods[m].original() == inheritedOriginal)
+ return superMethods[m];
+ }
+ return inheritedOriginal;
+}
+
/**
* <pre>
*<typeParam1 ... typeParamM>(param1 ... paramN)returnType thrownException1 ... thrownExceptionP
diff --git a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/MethodVerifier15.java b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/MethodVerifier15.java
index 6628605..e7def0d 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/MethodVerifier15.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/MethodVerifier15.java
@@ -23,19 +23,11 @@ MethodVerifier15(LookupEnvironment environment) {
boolean areMethodsCompatible(MethodBinding one, MethodBinding two) {
// use the original methods to test compatibility, but do not check visibility, etc
one = one.original();
- two = two.original();
+ two = one.findOriginalInheritedMethod(two);
- TypeBinding match = one.declaringClass.findSuperTypeOriginatingFrom(two.declaringClass);
- if (!(match instanceof ReferenceBinding))
+ if (two == null)
return false; // method's declaringClass does not inherit from inheritedMethod's
- if (match != two.declaringClass) {
- MethodBinding[] superMethods = ((ReferenceBinding) match).getMethods(two.selector);
- for (int i = 0, length = superMethods.length; i < length; i++)
- if (superMethods[i].original() == two)
- return isParameterSubsignature(one, superMethods[i]);
- }
-
return isParameterSubsignature(one, two);
}
boolean areParametersEqual(MethodBinding one, MethodBinding two) {
@@ -444,7 +436,7 @@ void checkMethods() {
if (index > 0)
checkInheritedMethods(matchingInherited, index + 1); // pass in the length of matching
- else if (mustImplementAbstractMethods && matchingInherited[0].isAbstract())
+ else if (mustImplementAbstractMethods && matchingInherited[0].isAbstract() && matchMethod == null)
checkAbstractMethod(matchingInherited[0]);
while (index >= 0) matchingInherited[index--] = null; // clear the previous contents of the matching methods
}
@@ -712,16 +704,8 @@ public boolean isMethodSubsignature(MethodBinding method, MethodBinding inherite
if (method.declaringClass.isParameterizedType())
method = method.original();
- inheritedMethod = inheritedMethod.original();
- TypeBinding match = method.declaringClass.findSuperTypeOriginatingFrom(inheritedMethod.declaringClass);
- if ((match instanceof ReferenceBinding) && match != inheritedMethod.declaringClass) {
- MethodBinding[] superMethods = ((ReferenceBinding) match).getMethods(inheritedMethod.selector);
- for (int i = 0, length = superMethods.length; i < length; i++)
- if (superMethods[i].original() == inheritedMethod.original())
- return isParameterSubsignature(method, superMethods[i]);
- }
-
- return isParameterSubsignature(method, inheritedMethod);
+ MethodBinding inheritedOriginal = method.findOriginalInheritedMethod(inheritedMethod);
+ return isParameterSubsignature(method, inheritedOriginal == null ? inheritedMethod : inheritedOriginal);
}
boolean isParameterSubsignature(MethodBinding method, MethodBinding inheritedMethod) {
MethodBinding substitute = computeSubstituteMethod(inheritedMethod, method);
diff --git a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/Scope.java b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/Scope.java
index dd4183b..cc9445d 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/Scope.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/Scope.java
@@ -835,9 +835,8 @@ public abstract class Scope {
MethodBinding compatibleMethod = computeCompatibleMethod(methodBinding, argumentTypes, invocationSite);
if (compatibleMethod != null) {
if (compatibleMethod.isValidBinding()) {
- if (concreteMatch != null && concreteMatch.declaringClass.findSuperTypeOriginatingFrom(compatibleMethod.declaringClass) != null)
- if (environment().methodVerifier().isParameterSubsignature(concreteMatch.original(), compatibleMethod.original()))
- continue; // can skip this method since concreteMatch overrides it
+ if (concreteMatch != null && environment().methodVerifier().areMethodsCompatible(concreteMatch, compatibleMethod))
+ continue; // can skip this method since concreteMatch overrides it
if (candidatesCount == 0) {
candidates = new MethodBinding[foundSize - startFoundSize + 1];
if (concreteMatch != null)
@@ -1227,7 +1226,9 @@ public abstract class Scope {
// BUT we can also ignore any overridden method since we already know the better match (fixes 80028)
for (int j = 0, max = found.size; j < max; j++) {
MethodBinding matchingMethod = (MethodBinding) found.elementAt(j);
- if (verifier.isParameterSubsignature(matchingMethod.original(), currentMethod.original())) {
+ MethodBinding matchingOriginal = matchingMethod.original();
+ MethodBinding currentOriginal = matchingOriginal.findOriginalInheritedMethod(currentMethod);
+ if (currentOriginal != null && verifier.isParameterSubsignature(matchingOriginal, currentOriginal)) {
if (isCompliant15) {
if (matchingMethod.isBridge() && !currentMethod.isBridge())
continue nextMethod; // keep inherited methods to find concrete method over a bridge method
@@ -3593,12 +3594,21 @@ public abstract class Scope {
}
// caveat: this is not a direct implementation of JLS
- protected final MethodBinding mostSpecificMethodBinding(MethodBinding[] visible, int visibleSize, TypeBinding[] argumentTypes, InvocationSite invocationSite, ReferenceBinding receiverType) {
+ protected final MethodBinding mostSpecificMethodBinding(MethodBinding[] visible, int visibleSize, TypeBinding[] argumentTypes, final InvocationSite invocationSite, ReferenceBinding receiverType) {
int[] compatibilityLevels = new int[visibleSize];
for (int i = 0; i < visibleSize; i++)
compatibilityLevels[i] = parameterCompatibilityLevel(visible[i], argumentTypes);
- boolean useTiebreakMethod = invocationSite.genericTypeArguments() == null;
+ InvocationSite tieBreakInvocationSite = new InvocationSite() {
+ public TypeBinding[] genericTypeArguments() { return null; } // ignore genericTypeArgs
+ public boolean isSuperAccess() { return invocationSite.isSuperAccess(); }
+ public boolean isTypeAccess() { return invocationSite.isTypeAccess(); }
+ public void setActualReceiverType(ReferenceBinding actualReceiverType) { /* ignore */}
+ public void setDepth(int depth) { /* ignore */}
+ public void setFieldIndex(int depth) { /* ignore */}
+ public int sourceStart() { return invocationSite.sourceStart(); }
+ public int sourceEnd() { return invocationSite.sourceStart(); }
+ };
MethodBinding[] moreSpecific = new MethodBinding[visibleSize];
int count = 0;
for (int level = 0, max = VARARGS_COMPATIBLE; level <= max; level++) {
@@ -3607,7 +3617,7 @@ public abstract class Scope {
max = level; // do not examine further categories, will either return mostSpecific or report ambiguous case
MethodBinding current = visible[i];
MethodBinding original = current.original();
- MethodBinding tiebreakMethod = useTiebreakMethod ? current.tiebreakMethod() : current;
+ MethodBinding tiebreakMethod = current.tiebreakMethod();
for (int j = 0; j < visibleSize; j++) {
if (i == j || compatibilityLevels[j] != level) continue;
MethodBinding next = visible[j];
@@ -3626,7 +3636,7 @@ public abstract class Scope {
methodToTest = pNext.originalMethod;
}
}
- MethodBinding acceptable = computeCompatibleMethod(methodToTest, tiebreakMethod.parameters, invocationSite);
+ MethodBinding acceptable = computeCompatibleMethod(methodToTest, tiebreakMethod.parameters, tieBreakInvocationSite);
/* There are 4 choices to consider with current & next :
foo(B) & foo(A) where B extends A
1. the 2 methods are equal (both accept each others parameters) -> want to continue
@@ -3679,20 +3689,11 @@ public abstract class Scope {
if (!original.isAbstract()) {
if (original2.isAbstract())
continue; // only compare current against other concrete methods
- TypeBinding superType = original.declaringClass.findSuperTypeOriginatingFrom(original2.declaringClass.erasure());
- if (superType == null)
+
+ original2 = original.findOriginalInheritedMethod(original2);
+ if (original2 == null)
continue nextSpecific; // current's declaringClass is not a subtype of next's declaringClass
if (current.hasSubstitutedParameters() || original.typeVariables != Binding.NO_TYPE_VARIABLES) {
- if (original2.declaringClass != superType) {
- // must find inherited method with the same substituted variables
- MethodBinding[] superMethods = ((ReferenceBinding) superType).getMethods(original2.selector, argumentTypes.length);
- for (int m = 0, l = superMethods.length; m < l; m++) {
- if (superMethods[m].original() == original2) {
- original2 = superMethods[m];
- break;
- }
- }
- }
if (!environment().methodVerifier().isParameterSubsignature(original, original2))
continue nextSpecific; // current does not override next
}
@@ -3728,7 +3729,7 @@ public abstract class Scope {
if (original2 == null || !original.areParameterErasuresEqual(original2))
continue nextSpecific; // current does not override next
if (original.returnType != original2.returnType) {
- if (current instanceof ParameterizedGenericMethodBinding) {
+ if (next.original().typeVariables != Binding.NO_TYPE_VARIABLES) {
if (original.returnType.erasure().findSuperTypeOriginatingFrom(original2.returnType.erasure()) == null)
continue nextSpecific;
} else if (!current.returnType.isCompatibleWith(next.returnType)) {
diff --git a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/TypeConstants.java b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/TypeConstants.java
index f80fbc7..f394bc1 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/TypeConstants.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/TypeConstants.java
@@ -127,6 +127,13 @@ public interface TypeConstants {
char[][] JAVA_IO_IOEXCEPTION = new char[][] { JAVA, IO, "IOException".toCharArray()};//$NON-NLS-1$
char[][] JAVA_IO_OBJECTOUTPUTSTREAM = new char[][] { JAVA, IO, "ObjectOutputStream".toCharArray()}; //$NON-NLS-1$
char[][] JAVA_IO_OBJECTINPUTSTREAM = new char[][] { JAVA, IO, "ObjectInputStream".toCharArray()}; //$NON-NLS-1$
+ // javax.rmi.CORBA.Stub
+ char[][] JAVAX_RMI_CORBA_STUB = new char[][] {
+ "javax".toCharArray(), //$NON-NLS-1$
+ "rmi".toCharArray(), //$NON-NLS-1$
+ "CORBA".toCharArray(), //$NON-NLS-1$
+ "Stub".toCharArray(), //$NON-NLS-1$
+ };
// Constraints for generic type argument inference
int CONSTRAINT_EQUAL = 0; // Actual = Formal
diff --git a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/Parser.java b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/Parser.java
index b56d01f..6316bf6 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/Parser.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/Parser.java
@@ -2545,23 +2545,25 @@ protected void consumeConstructorDeclaration() {
Statement[] statements = null;
if ((length = this.astLengthStack[this.astLengthPtr--]) != 0) {
this.astPtr -= length;
- if (this.astStack[this.astPtr + 1] instanceof ExplicitConstructorCall) {
- //avoid a isSomeThing that would only be used here BUT what is faster between two alternatives ?
- System.arraycopy(
- this.astStack,
- this.astPtr + 2,
- statements = new Statement[length - 1],
- 0,
- length - 1);
- constructorCall = (ExplicitConstructorCall) this.astStack[this.astPtr + 1];
- } else { //need to add explicitly the super();
- System.arraycopy(
- this.astStack,
- this.astPtr + 1,
- statements = new Statement[length],
- 0,
- length);
- constructorCall = SuperReference.implicitSuperConstructorCall();
+ if (!this.options.ignoreMethodBodies) {
+ if (this.astStack[this.astPtr + 1] instanceof ExplicitConstructorCall) {
+ //avoid a isSomeThing that would only be used here BUT what is faster between two alternatives ?
+ System.arraycopy(
+ this.astStack,
+ this.astPtr + 2,
+ statements = new Statement[length - 1],
+ 0,
+ length - 1);
+ constructorCall = (ExplicitConstructorCall) this.astStack[this.astPtr + 1];
+ } else { //need to add explicitly the super();
+ System.arraycopy(
+ this.astStack,
+ this.astPtr + 1,
+ statements = new Statement[length],
+ 0,
+ length);
+ constructorCall = SuperReference.implicitSuperConstructorCall();
+ }
}
} else {
boolean insideFieldInitializer = false;
@@ -4316,12 +4318,16 @@ protected void consumeMethodDeclaration(boolean isNotAbstract) {
//statements
explicitDeclarations = this.realBlockStack[this.realBlockPtr--];
if ((length = this.astLengthStack[this.astLengthPtr--]) != 0) {
- System.arraycopy(
- this.astStack,
- (this.astPtr -= length) + 1,
- statements = new Statement[length],
- 0,
- length);
+ if (this.options.ignoreMethodBodies) {
+ this.astPtr -= length;
+ } else {
+ System.arraycopy(
+ this.astStack,
+ (this.astPtr -= length) + 1,
+ statements = new Statement[length],
+ 0,
+ length);
+ }
}
}
@@ -9447,35 +9453,40 @@ public void parse(ConstructorDeclaration cd, CompilationUnitDeclaration unit, bo
int length;
if (this.astLengthPtr > -1 && (length = this.astLengthStack[this.astLengthPtr--]) != 0) {
this.astPtr -= length;
- if (this.astStack[this.astPtr + 1] instanceof ExplicitConstructorCall)
- //avoid a isSomeThing that would only be used here BUT what is faster between two alternatives ?
- {
- System.arraycopy(
- this.astStack,
- this.astPtr + 2,
- cd.statements = new Statement[length - 1],
- 0,
- length - 1);
- cd.constructorCall = (ExplicitConstructorCall) this.astStack[this.astPtr + 1];
- } else { //need to add explicitly the super();
- System.arraycopy(
- this.astStack,
- this.astPtr + 1,
- cd.statements = new Statement[length],
- 0,
- length);
- cd.constructorCall = SuperReference.implicitSuperConstructorCall();
+ if (!this.options.ignoreMethodBodies) {
+ if (this.astStack[this.astPtr + 1] instanceof ExplicitConstructorCall)
+ //avoid a isSomeThing that would only be used here BUT what is faster between two alternatives ?
+ {
+ System.arraycopy(
+ this.astStack,
+ this.astPtr + 2,
+ cd.statements = new Statement[length - 1],
+ 0,
+ length - 1);
+ cd.constructorCall = (ExplicitConstructorCall) this.astStack[this.astPtr + 1];
+ } else { //need to add explicitly the super();
+ System.arraycopy(
+ this.astStack,
+ this.astPtr + 1,
+ cd.statements = new Statement[length],
+ 0,
+ length);
+ cd.constructorCall = SuperReference.implicitSuperConstructorCall();
+ }
}
} else {
- cd.constructorCall = SuperReference.implicitSuperConstructorCall();
+ if (!this.options.ignoreMethodBodies) {
+ cd.constructorCall = SuperReference.implicitSuperConstructorCall();
+ }
if (!containsComment(cd.bodyStart, cd.bodyEnd)) {
cd.bits |= ASTNode.UndocumentedEmptyBlock;
}
}
- if (cd.constructorCall.sourceEnd == 0) {
- cd.constructorCall.sourceEnd = cd.sourceEnd;
- cd.constructorCall.sourceStart = cd.sourceStart;
+ ExplicitConstructorCall explicitConstructorCall = cd.constructorCall;
+ if (explicitConstructorCall != null && explicitConstructorCall.sourceEnd == 0) {
+ explicitConstructorCall.sourceEnd = cd.sourceEnd;
+ explicitConstructorCall.sourceStart = cd.sourceStart;
}
}
// A P I
@@ -9688,12 +9699,17 @@ public void parse(MethodDeclaration md, CompilationUnitDeclaration unit) {
md.explicitDeclarations = this.realBlockStack[this.realBlockPtr--];
int length;
if (this.astLengthPtr > -1 && (length = this.astLengthStack[this.astLengthPtr--]) != 0) {
- System.arraycopy(
- this.astStack,
- (this.astPtr -= length) + 1,
- md.statements = new Statement[length],
- 0,
- length);
+ if (this.options.ignoreMethodBodies) {
+ // ignore statements
+ this.astPtr -= length;
+ } else {
+ System.arraycopy(
+ this.astStack,
+ (this.astPtr -= length) + 1,
+ md.statements = new Statement[length],
+ 0,
+ length);
+ }
} else {
if (!containsComment(md.bodyStart, md.bodyEnd)) {
md.bits |= ASTNode.UndocumentedEmptyBlock;
diff --git a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/AbortCompilation.java b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/AbortCompilation.java
index d1cbba3..098456f 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/AbortCompilation.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/AbortCompilation.java
@@ -28,7 +28,7 @@ public class AbortCompilation extends RuntimeException {
public Throwable exception;
public CategorizedProblem problem;
- /* special fields used to abort silently (e.g. when cancelling build process) */
+ /* special fields used to abort silently (e.g. when canceling build process) */
public boolean isSilent;
public RuntimeException silentException;
@@ -55,7 +55,20 @@ public class AbortCompilation extends RuntimeException {
this.isSilent = isSilent;
this.silentException = silentException;
}
-
+ public String getMessage() {
+ String message = super.getMessage();
+ StringBuffer buffer = new StringBuffer(message == null ? Util.EMPTY_STRING : message);
+ if (this.problem != null) {
+ buffer.append(this.problem);
+ } else if (this.exception != null) {
+ message = this.exception.getMessage();
+ buffer.append(message == null ? Util.EMPTY_STRING : message);
+ } else if (this.silentException != null) {
+ message = this.silentException.getMessage();
+ buffer.append(message == null ? Util.EMPTY_STRING : message);
+ }
+ return String.valueOf(buffer);
+ }
public void updateContext(InvocationSite invocationSite, CompilationResult unitResult) {
if (this.problem == null) return;
if (this.problem.getSourceStart() != 0 || this.problem.getSourceEnd() != 0) return;
@@ -75,4 +88,12 @@ public class AbortCompilation extends RuntimeException {
this.problem.setSourceLineNumber(Util.getLineNumber(astNode.sourceStart(), lineEnds, 0, lineEnds.length-1));
this.compilationResult = unitResult;
}
+
+ public String getKey() {
+ StringBuffer buffer = new StringBuffer();
+ if (this.problem != null) {
+ buffer.append(this.problem);
+ }
+ return String.valueOf(buffer);
+ }
}
diff --git a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/ProblemReporter.java b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/ProblemReporter.java
index 99bc7e9..7dff062 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/ProblemReporter.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/ProblemReporter.java
@@ -6730,12 +6730,12 @@ public void unnecessaryTypeArgumentsForMethodInvocation(MethodBinding method, Ty
methodName,
typesAsString(method.isVarargs(), method.parameters, false),
new String(method.declaringClass.readableName()),
- typesAsString(method.isVarargs(), genericTypeArguments, false) },
+ typesAsString(false, genericTypeArguments, false) },
new String[] {
methodName,
typesAsString(method.isVarargs(), method.parameters, true),
new String(method.declaringClass.shortReadableName()),
- typesAsString(method.isVarargs(), genericTypeArguments, true) },
+ typesAsString(false, genericTypeArguments, true) },
typeArguments[0].sourceStart,
typeArguments[typeArguments.length-1].sourceEnd);
}
@@ -6872,7 +6872,7 @@ public void unsafeRawGenericMethodInvocation(ASTNode location, MethodBinding raw
new String(rawMethod.declaringClass.sourceName()),
typesAsString(rawMethod.original().isVarargs(), rawMethod.original().parameters, false),
new String(rawMethod.declaringClass.readableName()),
- typesAsString(rawMethod.original().isVarargs(), argumentTypes, false),
+ typesAsString(false, argumentTypes, false),
},
new String[] {
new String(rawMethod.declaringClass.sourceName()),
diff --git a/eclipse/plugins/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/ASTParser.java b/eclipse/plugins/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/ASTParser.java
index fc20b73..0929ed2 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/ASTParser.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/ASTParser.java
@@ -149,6 +149,10 @@ public class ASTParser {
private boolean statementsRecovery;
/**
+ * Request to ignore parsing the method bodies. Defaults to <code>false</code>.
+ */
+ private boolean ignoreMethodBodies;
+ /**
* Request for a bindings recovery. Defaults to <code>false</code>.
*/
private boolean bindingsRecovery;
@@ -226,6 +230,7 @@ public class ASTParser {
this.rawSource = null;
this.typeRoot = null;
this.resolveBindings = false;
+ this.ignoreMethodBodies = false;
this.sourceLength = -1;
this.sourceOffset = 0;
this.workingCopyOwner = DefaultWorkingCopyOwner.PRIMARY;
@@ -564,6 +569,21 @@ public class ASTParser {
public void setStatementsRecovery(boolean enabled) {
this.statementsRecovery = enabled;
}
+
+ /**
+ * Requests an abstract syntax tree without method bodies.
+ *
+ * <p>When ignore method bodies is enabled, all method bodies are discarded.
+ * This has no impact on the binding resolution.</p>
+ *
+ * <p>This setting is not used if the kind used in {@link #setKind(int)} is either
+ * {@link #K_EXPRESSION} or {@link #K_STATEMENTS}.</p>
+ *
+ * @since 3.5.2
+ */
+ public void setIgnoreMethodBodies(boolean enabled) {
+ this.ignoreMethodBodies = true;
+ }
/**
* Sets the working copy owner using when resolving bindings, where
@@ -730,6 +750,7 @@ public class ASTParser {
try {
int flags = 0;
if (this.statementsRecovery) flags |= ICompilationUnit.ENABLE_STATEMENTS_RECOVERY;
+ if (this.ignoreMethodBodies) flags |= ICompilationUnit.IGNORE_METHOD_BODIES;
if (this.resolveBindings) {
if (this.project == null)
throw new IllegalStateException("project not specified"); //$NON-NLS-1$
@@ -790,6 +811,7 @@ public class ASTParser {
int flags = 0;
if (this.statementsRecovery) flags |= ICompilationUnit.ENABLE_STATEMENTS_RECOVERY;
if (this.bindingsRecovery) flags |= ICompilationUnit.ENABLE_BINDINGS_RECOVERY;
+ if (this.ignoreMethodBodies) flags |= ICompilationUnit.IGNORE_METHOD_BODIES;
return CompilationUnitResolver.resolve(elements, this.apiLevel, this.compilerOptions, this.project, this.workingCopyOwner, flags, monitor);
} finally {
// re-init defaults to allow reuse (and avoid leaking)
@@ -900,6 +922,7 @@ public class ASTParser {
}
int flags = 0;
if (this.statementsRecovery) flags |= ICompilationUnit.ENABLE_STATEMENTS_RECOVERY;
+ if (searcher == null && this.ignoreMethodBodies) flags |= ICompilationUnit.IGNORE_METHOD_BODIES;
if (needToResolveBindings) {
if (this.bindingsRecovery) flags |= ICompilationUnit.ENABLE_BINDINGS_RECOVERY;
try {
@@ -1034,7 +1057,7 @@ public class ASTParser {
ast.setFlag(ICompilationUnit.ENABLE_STATEMENTS_RECOVERY);
}
converter.setAST(ast);
- CodeSnippetParsingUtil codeSnippetParsingUtil = new CodeSnippetParsingUtil();
+ CodeSnippetParsingUtil codeSnippetParsingUtil = new CodeSnippetParsingUtil(this.ignoreMethodBodies);
CompilationUnit compilationUnit = ast.newCompilationUnit();
if (this.sourceLength == -1) {
this.sourceLength = this.rawSource.length;
diff --git a/eclipse/plugins/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/CompilationUnitResolver.java b/eclipse/plugins/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/CompilationUnitResolver.java
index 1c2f114..8e00cef 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/CompilationUnitResolver.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/CompilationUnitResolver.java
@@ -336,6 +336,7 @@ class CompilationUnitResolver extends Compiler {
public static void parse(ICompilationUnit[] compilationUnits, ASTRequestor astRequestor, int apiLevel, Map options, int flags, IProgressMonitor monitor) {
try {
CompilerOptions compilerOptions = new CompilerOptions(options);
+ compilerOptions.ignoreMethodBodies = (flags & ICompilationUnit.IGNORE_METHOD_BODIES) != 0;
Parser parser = new CommentRecorderParser(
new ProblemReporter(
DefaultErrorHandlingPolicies.proceedWithAllProblems(),
@@ -389,6 +390,7 @@ class CompilationUnitResolver extends Compiler {
boolean statementsRecovery = (flags & ICompilationUnit.ENABLE_STATEMENTS_RECOVERY) != 0;
compilerOptions.performMethodsFullRecovery = statementsRecovery;
compilerOptions.performStatementsRecovery = statementsRecovery;
+ compilerOptions.ignoreMethodBodies = (flags & ICompilationUnit.IGNORE_METHOD_BODIES) != 0;
Parser parser = new CommentRecorderParser(
new ProblemReporter(
DefaultErrorHandlingPolicies.proceedWithAllProblems(),
@@ -462,15 +464,16 @@ class CompilationUnitResolver extends Compiler {
}
environment = new CancelableNameEnvironment(((JavaProject) javaProject), owner, monitor);
problemFactory = new CancelableProblemFactory(monitor);
+ CompilerOptions compilerOptions = getCompilerOptions(options, (flags & ICompilationUnit.ENABLE_STATEMENTS_RECOVERY) != 0);
+ compilerOptions.ignoreMethodBodies = (flags & ICompilationUnit.IGNORE_METHOD_BODIES) != 0;
CompilationUnitResolver resolver =
new CompilationUnitResolver(
environment,
getHandlingPolicy(),
- getCompilerOptions(options, (flags & ICompilationUnit.ENABLE_STATEMENTS_RECOVERY) != 0),
+ compilerOptions,
getRequestor(),
problemFactory,
monitor);
-
resolver.resolve(compilationUnits, bindingKeys, requestor, apiLevel, options, owner, flags);
if (NameLookup.VERBOSE) {
System.out.println(Thread.currentThread() + " TIME SPENT in NameLoopkup#seekTypesInSourcePackage: " + environment.nameLookup.timeSpentInSeekTypesInSourcePackage + "ms"); //$NON-NLS-1$ //$NON-NLS-2$
@@ -505,23 +508,26 @@ class CompilationUnitResolver extends Compiler {
try {
environment = new CancelableNameEnvironment(((JavaProject)javaProject), owner, monitor);
problemFactory = new CancelableProblemFactory(monitor);
+ CompilerOptions compilerOptions = getCompilerOptions(options, (flags & ICompilationUnit.ENABLE_STATEMENTS_RECOVERY) != 0);
+ boolean ignoreMethodBodies = (flags & ICompilationUnit.IGNORE_METHOD_BODIES) != 0;
+ compilerOptions.ignoreMethodBodies = ignoreMethodBodies;
resolver =
new CompilationUnitResolver(
environment,
getHandlingPolicy(),
- getCompilerOptions(options, (flags & ICompilationUnit.ENABLE_STATEMENTS_RECOVERY) != 0),
+ compilerOptions,
getRequestor(),
problemFactory,
monitor);
-
+ boolean analyzeAndGenerateCode = !ignoreMethodBodies;
unit =
resolver.resolve(
null, // no existing compilation unit declaration
sourceUnit,
nodeSearcher,
true, // method verification
- true, // analyze code
- true); // generate code
+ analyzeAndGenerateCode, // analyze code
+ analyzeAndGenerateCode); // generate code
if (resolver.hasCompilationAborted) {
// the bindings could not be resolved due to missing types in name environment
// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=86541
diff --git a/eclipse/plugins/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/DocCommentParser.java b/eclipse/plugins/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/DocCommentParser.java
index d98cd00..9d86170 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/DocCommentParser.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/DocCommentParser.java
@@ -555,6 +555,9 @@ class DocCommentParser extends AbstractCommentParser {
case TerminalTokens.TokenNamevoid:
case TerminalTokens.TokenNamevolatile:
case TerminalTokens.TokenNamewhile:
+ case TerminalTokens.TokenNameenum :
+ case TerminalTokens.TokenNameconst :
+ case TerminalTokens.TokenNamegoto :
this.tagValue = TAG_OTHERS_VALUE;
createTag();
break;
diff --git a/eclipse/plugins/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/InternalASTRewrite.java b/eclipse/plugins/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/InternalASTRewrite.java
index 2db70f4..09cf2ff 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/InternalASTRewrite.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/InternalASTRewrite.java
@@ -19,6 +19,7 @@ import org.eclipse.text.edits.TextEdit;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.TextUtilities;
+import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.core.dom.SimplePropertyDescriptor;
import org.eclipse.jdt.core.dom.StructuralPropertyDescriptor;
import org.eclipse.jdt.core.dom.rewrite.TargetSourceRangeComputer;
@@ -60,9 +61,12 @@ class InternalASTRewrite extends NodeEventHandler {
/**
* Performs the rewrite: The rewrite events are translated to the corresponding in text changes.
+ * The given options can be null in which case the global options {@link JavaCore#getOptions() JavaCore.getOptions()}
+ * will be used.
+ *
* @param document Document which describes the code of the AST that is passed in in the
* constructor. This document is accessed read-only.
- * @param options options
+ * @param options the given options
* @throws IllegalArgumentException if the rewrite fails
* @return Returns the edit describing the text changes.
*/
@@ -90,7 +94,8 @@ class InternalASTRewrite extends NodeEventHandler {
String lineDelim= TextUtilities.getDefaultLineDelimiter(document);
List comments= rootNode.getCommentList();
- ASTRewriteAnalyzer visitor = new ASTRewriteAnalyzer(content, lineInfo, lineDelim, result, this.eventStore, this.nodeStore, comments, options, xsrComputer, (RecoveryScannerData)rootNode.getStatementsRecoveryData());
+ Map currentOptions = options == null ? JavaCore.getOptions() : options;
+ ASTRewriteAnalyzer visitor = new ASTRewriteAnalyzer(content, lineInfo, lineDelim, result, this.eventStore, this.nodeStore, comments, currentOptions, xsrComputer, (RecoveryScannerData)rootNode.getStatementsRecoveryData());
rootNode.accept(visitor);
}
return result;
diff --git a/eclipse/plugins/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/rewrite/ASTRewrite.java b/eclipse/plugins/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/rewrite/ASTRewrite.java
index 5d5450c..c253c06 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/rewrite/ASTRewrite.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/rewrite/ASTRewrite.java
@@ -198,7 +198,8 @@ public class ASTRewrite {
ASTNode astRoot= rootNode.getRoot();
List commentNodes= astRoot instanceof CompilationUnit ? ((CompilationUnit) astRoot).getCommentList() : null;
- return internalRewriteAST(content, lineInfo, lineDelim, commentNodes, options, rootNode, (RecoveryScannerData)((CompilationUnit) astRoot).getStatementsRecoveryData());
+ Map currentOptions = options == null ? JavaCore.getOptions() : options;
+ return internalRewriteAST(content, lineInfo, lineDelim, commentNodes, currentOptions, rootNode, (RecoveryScannerData)((CompilationUnit) astRoot).getStatementsRecoveryData());
}
/**
diff --git a/eclipse/plugins/org.eclipse.jdt.core/dom/org/eclipse/jdt/internal/core/dom/rewrite/ASTRewriteAnalyzer.java b/eclipse/plugins/org.eclipse.jdt.core/dom/org/eclipse/jdt/internal/core/dom/rewrite/ASTRewriteAnalyzer.java
index 85d3fe3..ed72cc2 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/dom/org/eclipse/jdt/internal/core/dom/rewrite/ASTRewriteAnalyzer.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/dom/org/eclipse/jdt/internal/core/dom/rewrite/ASTRewriteAnalyzer.java
@@ -89,13 +89,15 @@ public final class ASTRewriteAnalyzer extends ASTVisitor {
/**
* Constructor for ASTRewriteAnalyzer.
+ * <p>The given options cannot be null.</p>
+ *
* @param content the content of the compilation unit to rewrite.
* @param lineInfo line information for the content of the compilation unit to rewrite.
* @param rootEdit the edit to add all generated edits to
* @param eventStore the event store containing the description of changes
* @param nodeInfos annotations to nodes, such as if a node is a string placeholder or a copy target
* @param comments list of comments of the compilation unit to rewrite (elements of type <code>Comment</code>) or <code>null</code>.
- * @param options the current jdt.core options (formatting/compliance) or <code>null</code>.
+ * @param options the current jdt.core options (formatting/compliance)
* @param extendedSourceRangeComputer the source range computer to use
* @param recoveryScannerData internal data used by {@link RecoveryScanner}
*/
diff --git a/eclipse/plugins/org.eclipse.jdt.core/dom/org/eclipse/jdt/internal/core/dom/rewrite/ASTRewriteFormatter.java b/eclipse/plugins/org.eclipse.jdt.core/dom/org/eclipse/jdt/internal/core/dom/rewrite/ASTRewriteFormatter.java
index 1cfea41..4a807ff 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/dom/org/eclipse/jdt/internal/core/dom/rewrite/ASTRewriteFormatter.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/dom/org/eclipse/jdt/internal/core/dom/rewrite/ASTRewriteFormatter.java
@@ -15,7 +15,6 @@ import java.util.Collection;
import java.util.Map;
import org.eclipse.core.runtime.Assert;
-import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.core.ToolFactory;
import org.eclipse.jdt.core.dom.ASTNode;
import org.eclipse.jdt.core.dom.Annotation;
@@ -128,11 +127,6 @@ import org.eclipse.text.edits.TextEdit;
this.placeholders= placeholders;
this.eventStore= eventStore;
- if (options == null) {
- options= JavaCore.getOptions();
- }
- //options.put(DefaultCodeFormatterConstants.FORMATTER_LINE_SPLIT, String.valueOf(9999));
-
this.options= options;
this.lineDelimiter= lineDelimiter;
diff --git a/eclipse/plugins/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/CodeFormatterVisitor.java b/eclipse/plugins/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/CodeFormatterVisitor.java
index f60820a..1a94679 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/CodeFormatterVisitor.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/CodeFormatterVisitor.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
+ * Copyright (c) 2002, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -1575,15 +1575,21 @@ public class CodeFormatterVisitor extends ASTVisitor {
}
private void formatLeftCurlyBrace(final int line, final String bracePosition) {
+ this.scribe.formatBrace = true;
/*
* deal with (quite unexpected) comments right before lcurly
*/
- this.scribe.printComment();
- if (DefaultCodeFormatterConstants.NEXT_LINE_ON_WRAP.equals(bracePosition)
- && (this.scribe.line > line || this.scribe.column >= this.preferences.page_width))
- {
- this.scribe.printNewLine();
- }
+ try {
+ this.scribe.printComment();
+ if (DefaultCodeFormatterConstants.NEXT_LINE_ON_WRAP.equals(bracePosition)
+ && (this.scribe.line > line || this.scribe.column >= this.preferences.page_width))
+ {
+ this.scribe.printNewLine();
+ }
+ }
+ finally {
+ this.scribe.formatBrace = false;
+ }
}
private void formatLocalDeclaration(LocalDeclaration localDeclaration, BlockScope scope, boolean insertSpaceBeforeComma, boolean insertSpaceAfterComma) {
diff --git a/eclipse/plugins/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/Location.java b/eclipse/plugins/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/Location.java
index d93e4d4..e80bdcb 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/Location.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/Location.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -18,6 +18,7 @@ package org.eclipse.jdt.internal.formatter;
public class Location {
public int inputOffset;
+ public int inputColumn;
public int outputLine;
public int outputColumn;
public int outputIndentationLevel;
@@ -42,6 +43,7 @@ public class Location {
this.outputColumn = scribe.column;
this.outputLine = scribe.line;
this.inputOffset = sourceRestart;
+ this.inputColumn = scribe.getCurrentIndentation(sourceRestart);
this.outputIndentationLevel = scribe.indentationLevel;
this.lastNumberOfNewLines = scribe.lastNumberOfNewLines;
this.needSpace = scribe.needSpace;
diff --git a/eclipse/plugins/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/Scribe.java b/eclipse/plugins/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/Scribe.java
index b90c0c5..e6d268d 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/Scribe.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/Scribe.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -72,6 +72,8 @@ public class Scribe implements IJavaDocTagConstants {
public CodeFormatterVisitor formatter;
public int indentationLevel;
public int lastNumberOfNewLines;
+ private boolean preserveLineBreakIndentation = false;
+ boolean formatBrace;
public int line;
private int[] lineEnds;
@@ -212,7 +214,7 @@ public class Scribe implements IJavaDocTagConstants {
/*
* Adapt edits to regions.
- *
+ *
* @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=234583"
* for more details
*/
@@ -257,7 +259,7 @@ public class Scribe implements IJavaDocTagConstants {
* Search whether a region overlap edit(s) at its start and/or at its end.
* If so, modify the concerned edits to keep only the modifications which are
* inside the given region.
- *
+ *
* The edit modification is done as follow:
* 1) start it from the region start if it overlaps the region's start
* 2) end it at the region end if it overlaps the region's end
@@ -274,8 +276,8 @@ public class Scribe implements IJavaDocTagConstants {
OptimizedReplaceEdit edit = null;
int overlapIndex = -1;
int linesOutside= -1;
-
- // Look for an edit overlapping the region start
+
+ // Look for an edit overlapping the region start
while (bottom <= top) {
i = bottom + (top - bottom) /2;
edit = sortedEdits[i];
@@ -300,7 +302,7 @@ public class Scribe implements IJavaDocTagConstants {
if (before) linesOutside++;
}
}
-
+
// Restart the edit at the beginning of the line where the region start
edit.offset = regionStart;
edit.length -= edit.offset - editStart;
@@ -352,8 +354,8 @@ public class Scribe implements IJavaDocTagConstants {
}
}
}
-
- // Look for an edit overlapping the region end
+
+ // Look for an edit overlapping the region end
if (overlapIndex != -1) bottom = overlapIndex;
while (bottom <= topEnd) {
i = bottom + (topEnd - bottom) /2;
@@ -817,6 +819,37 @@ public class Scribe implements IJavaDocTagConstants {
return offset;
}
+ int getCurrentIndentation(int start) {
+ int linePtr = Arrays.binarySearch(this.lineEnds, start);
+ if (linePtr < 0) {
+ linePtr = -linePtr - 1;
+ }
+ int offset = 0;
+ int beginningOfLine = getLineEnd(linePtr)+1;
+ if (beginningOfLine == -1) {
+ beginningOfLine = 0;
+ }
+ char[] source = this.scanner.source;
+
+ for (int i=beginningOfLine; i<start; i++) {
+ char currentCharacter = source[i];
+ switch (currentCharacter) {
+ case '\t' :
+ offset += this.tabLength;
+ break;
+ case '\r' :
+ case '\n' :
+ break;
+ case ' ':
+ offset++;
+ break;
+ default:
+ return offset;
+ }
+ }
+ return offset;
+ }
+
public String getEmptyLines(int linesNumber) {
if (this.nlsTagCounter > 0) {
return Util.EMPTY_STRING;
@@ -926,7 +959,7 @@ public class Scribe implements IJavaDocTagConstants {
if (indent == 0)
return this.indentationLevel;
if (this.tabChar == DefaultCodeFormatterOptions.TAB) {
- if (this.useTabsOnlyForLeadingIndents) {
+ if (this.indentationSize == 0 || this.useTabsOnlyForLeadingIndents) {
return indent;
}
int rem = indent % this.indentationSize;
@@ -944,14 +977,86 @@ public class Scribe implements IJavaDocTagConstants {
// preserve line breaks in wrapping if specified
// see bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=198074
if (this.currentAlignment != null && !this.formatter.preferences.join_wrapped_lines) {
- // insert a new line only if it has not been already done before
- // see bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=283476
- if (this.lastNumberOfNewLines == 0) {
+ // Insert a new line only if it has not been already done before
+ // (see bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=283476)
+ // or when there's no direct member alignment
+ // (additional fix for bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=286601)
+ if (this.lastNumberOfNewLines == 0 || this.memberAlignment == null || this.memberAlignment.location.inputOffset < this.currentAlignment.location.inputOffset) {
+
+ // Debug
+ if (DefaultCodeFormatter.DEBUG) {
+ System.out.println("Preserve empty lines:"); //$NON-NLS-1$
+ System.out.println(" - indentation level = "+this.indentationLevel); //$NON-NLS-1$
+ System.out.println(" - current alignment: "); //$NON-NLS-1$
+ System.out.print(this.currentAlignment.toString(new StringBuffer(), 1));
+ if (this.memberAlignment != null) {
+ System.out.println(" - member alignment: "); //$NON-NLS-1$
+ System.out.print(this.memberAlignment.toString(new StringBuffer(), 1));
+ }
+ }
+
+ // Reset indentation level to the location output
+ this.indentationLevel = this.currentAlignment.location.outputIndentationLevel;
+
+ // Create new line
StringBuffer buffer = new StringBuffer(getNewLine());
- int savedIndentation = this.indentationLevel;
- this.indentationLevel = this.currentAlignment.breakIndentationLevel;
+
+ // Look for current indentation
+ int currentColumn = getCurrentIndentation(this.scanner.currentPosition);
+
+ // Determine whether the alignment indentation can be used or not
+ // So far, the best algorithm is to use it when
+ // 1. this is not the opening brace of a local declaration assignment
+ // 2. this is not the first opening brace
+ // or this is an array initializer alignment
+ // or this is an binary expression alignment
+ // 3. the indentation level is below the alignment break indentation
+ int currentTokenStartPosition = this.scanner.currentPosition;
+ int nextToken = -1;
+ try {
+ nextToken = this.scanner.getNextToken();
+ } catch (InvalidInputException e) {
+ // skip
+ }
+ this.scanner.resetTo(currentTokenStartPosition, this.scannerEndPosition - 1);
+ boolean canUseAlignmentIndentation = (nextToken != TerminalTokens.TokenNameLBRACE || !this.currentAlignment.name.equals("localDeclarationAssignmentAlignment")); //$NON-NLS-1$
+ if (canUseAlignmentIndentation &&
+ (!this.formatBrace ||
+ this.currentAlignment.name.equals("array_initializer") || //$NON-NLS-1$
+ this.currentAlignment.name.equals("binaryExpressionAlignment")) && //$NON-NLS-1$
+ this.indentationLevel < this.currentAlignment.breakIndentationLevel) {
+ this.indentationLevel = this.currentAlignment.breakIndentationLevel;
+ }
+
+ // Use the current indentation if over the computed indentation
+ if (this.indentationLevel < currentColumn) {
+ this.indentationLevel = currentColumn;
+ }
+
+ // Debug
+ if (DefaultCodeFormatter.DEBUG) {
+ System.out.println(" - format brace = "+this.formatBrace); //$NON-NLS-1$
+ System.out.println(" - current column = "+currentColumn); //$NON-NLS-1$
+ System.out.println(" - current position = "+this.scanner.currentPosition); //$NON-NLS-1$
+ System.out.print(" - current line = "); //$NON-NLS-1$
+ int linePtr = Arrays.binarySearch(this.lineEnds, this.scanner.currentPosition);
+ if (linePtr < 0) {
+ linePtr = -linePtr - 1;
+ }
+ int i = getLineEnd(linePtr)+1;
+ while (this.scanner.source[i] != '\r') {
+ System.out.print(this.scanner.source[i++]);
+ }
+ System.out.println();
+ System.out.println(" - indentation level = "+this.indentationLevel); //$NON-NLS-1$
+ System.out.println();
+ }
+
+ // Set the flag to indicate that a specific indentation is currently in used
+ this.preserveLineBreakIndentation = true;
+
+ // Print the computed indentation in the buffer
printIndentationIfNecessary(buffer);
- this.indentationLevel = savedIndentation;
return buffer.toString();
}
}
@@ -1276,7 +1381,7 @@ public class Scribe implements IJavaDocTagConstants {
try {
while (nextCharacterStart <= currentTokenEndPosition && (currentCharacter = this.scanner.getNextChar()) != -1) {
nextCharacterStart = this.scanner.currentPosition;
-
+
switch(currentCharacter) {
case '\r' :
start = previousStart;
@@ -1296,7 +1401,7 @@ public class Scribe implements IJavaDocTagConstants {
this.column = 1;
this.line++;
isNewLine = false;
-
+
StringBuffer buffer = new StringBuffer();
if (onFirstColumn) {
// simply insert indentation if necessary
@@ -1848,9 +1953,27 @@ public class Scribe implements IJavaDocTagConstants {
CommentFormatterUtil.log(e);
return;
}
- int prefixOffset= inputBuffer.indexOf(contentPrefix, lineOffset);
- if (prefixOffset >= 0 && inputBuffer.substring(lineOffset, prefixOffset).trim().length() == 0)
- inputBuffer.delete(lineOffset, prefixOffset + 1 + 1);
+ int prefixOffset = inputBuffer.indexOf(contentPrefix, lineOffset);
+ if (prefixOffset >= 0 && inputBuffer.substring(lineOffset, prefixOffset).trim().length() == 0) {
+ int offsetEnd = prefixOffset + 1;
+ char ch = inputBuffer.charAt(offsetEnd);
+ switch (ch) {
+ case '\n':
+ case '\r':
+ break;
+ case ' ':
+ case '\t':
+ case '\u000c' : /* FORM FEED */
+ offsetEnd++;
+ break;
+ default:
+ if (ScannerHelper.isWhitespace(ch)) {
+ offsetEnd++;
+ }
+ break;
+ }
+ inputBuffer.delete(lineOffset, offsetEnd);
+ }
}
// 2 - convert HTML to Java (@see JavaDocRegion#convertHtml2Java)
@@ -2307,7 +2430,7 @@ public class Scribe implements IJavaDocTagConstants {
break;
}
}
-
+
// Delete leading whitespaces if any
if (previousToken != -1 && lastTokenEndPosition != commentStart && spaceEndPosition > lastTokenEndPosition) {
addDeleteEdit(lastTokenEndPosition, spaceEndPosition-1);
@@ -2341,7 +2464,7 @@ public class Scribe implements IJavaDocTagConstants {
int indentationsAsTab = 0;
if (useTabsForLeadingIndents) {
while (this.column <= this.indentationLevel) {
- if (indentationsAsTab < numberOfLeadingIndents) {
+ if (this.tabLength > 0 && indentationsAsTab < numberOfLeadingIndents) {
if (buffer != null) buffer.append('\t');
indentationsAsTab++;
int complement = this.tabLength - ((this.column - 1) % this.tabLength); // amount of space
@@ -2353,7 +2476,7 @@ public class Scribe implements IJavaDocTagConstants {
this.needSpace = false;
}
}
- } else {
+ } else if (this.tabLength > 0) {
while (this.column <= this.indentationLevel) {
if (buffer != null) buffer.append('\t');
int complement = this.tabLength - ((this.column - 1) % this.tabLength); // amount of space
@@ -2377,11 +2500,13 @@ public class Scribe implements IJavaDocTagConstants {
final int columnForLeadingIndents = numberOfLeadingIndents * this.indentationSize;
while (this.column <= this.indentationLevel) {
if (this.column <= columnForLeadingIndents) {
- if ((this.column - 1 + this.tabLength) <= this.indentationLevel) {
+ if (this.tabLength > 0 && (this.column - 1 + this.tabLength) <= this.indentationLevel) {
if (buffer != null) buffer.append('\t');
this.column += this.tabLength;
} else if ((this.column - 1 + this.indentationSize) <= this.indentationLevel) {
// print one indentation
+ // note that this.indentationSize > 0 when entering in the following loop
+ // hence this.column will be incremented and then avoid endless loop (see bug 290905)
for (int i = 0, max = this.indentationSize; i < max; i++) {
if (buffer != null) buffer.append(' ');
this.column++;
@@ -2400,10 +2525,10 @@ public class Scribe implements IJavaDocTagConstants {
}
} else {
while (this.column <= this.indentationLevel) {
- if ((this.column - 1 + this.tabLength) <= this.indentationLevel) {
+ if (this.tabLength > 0 && (this.column - 1 + this.tabLength) <= this.indentationLevel) {
if (buffer != null) buffer.append('\t');
this.column += this.tabLength;
- } else if ((this.column - 1 + this.indentationSize) <= this.indentationLevel) {
+ } else if (this.indentationSize > 0 && (this.column - 1 + this.indentationSize) <= this.indentationLevel) {
// print one indentation
for (int i = 0, max = this.indentationSize; i < max; i++) {
if (buffer != null) buffer.append(' ');
@@ -3267,34 +3392,47 @@ public class Scribe implements IJavaDocTagConstants {
if (codeEnd > end) {
if (this.formatter.preferences.comment_format_source) {
if (textStart < end) addReplaceEdit(textStart, end, buffer.toString());
- // Count the lines until the exact start position of the code
- this.scanner.resetTo(end+1, nextStart-1);
- int newLines = 0;
- try {
- int token = this.scanner.getNextToken();
- loop: while (true) {
- switch (token) {
- case TerminalTokens.TokenNameWHITESPACE:
- if (CharOperation.indexOf('\n', this.scanner.source, this.scanner.startPosition, this.scanner.currentPosition) < 0) {
- break loop;
- }
- newLines++;
- break;
- case TerminalTokens.TokenNameMULTIPLY:
- nextStart = this.scanner.currentPosition + 1;
- break;
- default:
- break loop;
+ // See whether there's a space before the code
+ boolean needLeadingSpace = false;
+ if (linesGap > 0) {
+ int lineStart = this.scanner.getLineStart(startLine);
+ if (nextStart > lineStart) { // if code starts at the line, then no leading space is needed
+ this.scanner.resetTo(lineStart, nextStart-1);
+ try {
+ int token = this.scanner.getNextToken();
+ if (token == TerminalTokens.TokenNameWHITESPACE) {
+ // skip indentation
+ token = this.scanner.getNextToken();
+ needLeadingSpace = false; // there may be no star after
+ } else {
+ needLeadingSpace = true;
+ }
+ if (token == TerminalTokens.TokenNameMULTIPLY) {
+ nextStart = this.scanner.currentPosition;
+ // skip javadoc comment star
+ token = this.scanner.getNextToken();
+ needLeadingSpace = true;
+ }
+ if (token == TerminalTokens.TokenNameWHITESPACE) {
+ needLeadingSpace = false;
+ nextStart++;
+ }
+ }
+ catch (InvalidInputException iie) {
+ // skip
}
- token = this.scanner.getNextToken();
}
}
- catch (InvalidInputException iie) {
- // skip
- }
+ // Format gap lines before code
+ int newLines = linesGap;
if (newLines == 0) newLines=1;
- printJavadocGapLines(end+1, nextStart-1, newLines, false/* clear first blank lines inside <pre> tag as done by old formatter */, false, null);
+ printJavadocGapLines(end+1, nextStart-1, newLines, false/* clear first blank lines inside <pre> tag as done by old formatter */, false, null);
+ if (needLeadingSpace) {
+ addInsertEdit(nextStart, " "); //$NON-NLS-1$
+ }
+ // Format the code
printCodeSnippet(nextStart, codeEnd);
+ // Format the gap lines after the code
nextStart = (int) text.separators[max];
printJavadocGapLines(codeEnd+1, nextStart-1, 1, false/* clear blank lines inside <pre> tag as done by old formatter */, false, null);
return 2;
@@ -3717,7 +3855,12 @@ public class Scribe implements IJavaDocTagConstants {
return;
}
if (this.lastNumberOfNewLines >= 1) {
- this.column = 1; // ensure that the scribe is at the beginning of a new line
+ // ensure that the scribe is at the beginning of a new line
+ // only if no specific indentation has been previously set
+ if (!this.preserveLineBreakIndentation) {
+ this.column = 1;
+ }
+ this.preserveLineBreakIndentation = false;
return;
}
addInsertEdit(insertPosition, this.lineSeparator);
@@ -3726,6 +3869,7 @@ public class Scribe implements IJavaDocTagConstants {
this.column = 1;
this.needSpace = false;
this.pendingSpace = false;
+ this.preserveLineBreakIndentation = false;
}
public void printNextToken(int expectedTokenType){
@@ -3733,15 +3877,31 @@ public class Scribe implements IJavaDocTagConstants {
}
public void printNextToken(int expectedTokenType, boolean considerSpaceIfAny){
- printComment(CodeFormatter.K_UNKNOWN);
+ // Set brace flag, it's useful for the scribe while preserving line breaks
+ switch (expectedTokenType) {
+ case TerminalTokens.TokenNameRBRACE:
+ case TerminalTokens.TokenNameLBRACE:
+ this.formatBrace = true;
+ }
try {
- this.currentToken = this.scanner.getNextToken();
- if (expectedTokenType != this.currentToken) {
- throw new AbortFormatting("unexpected token type, expecting:"+expectedTokenType+", actual:"+this.currentToken);//$NON-NLS-1$//$NON-NLS-2$
+ printComment(CodeFormatter.K_UNKNOWN);
+ try {
+ this.currentToken = this.scanner.getNextToken();
+ if (expectedTokenType != this.currentToken) {
+ throw new AbortFormatting("unexpected token type, expecting:"+expectedTokenType+", actual:"+this.currentToken);//$NON-NLS-1$//$NON-NLS-2$
+ }
+ print(this.scanner.currentPosition - this.scanner.startPosition, considerSpaceIfAny);
+ } catch (InvalidInputException e) {
+ throw new AbortFormatting(e);
+ }
+ }
+ finally {
+ // Flush brace flag
+ switch (expectedTokenType) {
+ case TerminalTokens.TokenNameRBRACE:
+ case TerminalTokens.TokenNameLBRACE:
+ this.formatBrace = false;
}
- print(this.scanner.currentPosition - this.scanner.startPosition, considerSpaceIfAny);
- } catch (InvalidInputException e) {
- throw new AbortFormatting(e);
}
}
@@ -4110,7 +4270,9 @@ public class Scribe implements IJavaDocTagConstants {
.append(this.lineSeparator)
.append("==================================================================================") //$NON-NLS-1$
.append(this.lineSeparator);
- printRule(stringBuffer);
+ if (this.tabLength >= 0) {
+ printRule(stringBuffer);
+ }
return stringBuffer.toString();
}
diff --git a/eclipse/plugins/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/align/Alignment.java b/eclipse/plugins/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/align/Alignment.java
index e0bac18..7893530 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/align/Alignment.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/align/Alignment.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -379,18 +379,26 @@ public class Alignment {
public String toString() {
StringBuffer buffer = new StringBuffer(10);
- String className = getClass().getName();
- className = className.substring(className.lastIndexOf('.')+1);
+ return toString(buffer, -1);
+ }
+
+ public String toString(StringBuffer buffer, int level) {
+
+ // Compute the indentation at the given level
+ StringBuffer indentation = new StringBuffer();
+ for (int i=0; i<level; i++) {
+ indentation.append('\t');
+ }
+
+ // First line is for class and name
+ buffer.append(indentation);
buffer
- .append(className)
- .append(":<name: ") //$NON-NLS-1$
+ .append("<name: ") //$NON-NLS-1$
.append(this.name)
- .append(">"); //$NON-NLS-1$
- int indentLength = className.length()+1;
- buffer.append('\n');
- for (int i=0; i<indentLength; i++) {
- buffer.append(' ');
- }
+ .append(">\n"); //$NON-NLS-1$
+
+ // Line for depth and break indentation
+ buffer.append(indentation);
buffer
.append("<depth=") //$NON-NLS-1$
.append(depth())
@@ -398,18 +406,23 @@ public class Alignment {
.append(this.breakIndentationLevel)
.append("><shiftBreakIndent=") //$NON-NLS-1$
.append(this.shiftBreakIndentationLevel)
- .append('>');
- if (this.enclosing != null) {
- buffer
- .append("<enclosingName: ") //$NON-NLS-1$
- .append(this.enclosing.name)
- .append('>');
- }
- buffer.append('\n');
+ .append(">\n"); //$NON-NLS-1$
+ // Line to display the location
+ buffer.append(indentation);
+ buffer
+ .append("<location=") //$NON-NLS-1$
+ .append(this.location.toString())
+ .append(">\n"); //$NON-NLS-1$
+
+ // Lines for fragments
+ buffer
+ .append(indentation)
+ .append("<fragments:\n"); //$NON-NLS-1$
for (int i = 0; i < this.fragmentCount; i++){
buffer
- .append(" - fragment ") //$NON-NLS-1$
+ .append(indentation)
+ .append(" - ") //$NON-NLS-1$
.append(i)
.append(": ") //$NON-NLS-1$
.append("<break: ") //$NON-NLS-1$
@@ -419,7 +432,22 @@ public class Alignment {
.append(this.fragmentIndentations[i])
.append(">\n"); //$NON-NLS-1$
}
- buffer.append('\n');
+ buffer
+ .append(indentation)
+ .append(">\n"); //$NON-NLS-1$
+
+ // Display enclosing
+ if (this.enclosing != null && level >= 0) {
+ buffer
+ .append(indentation)
+ .append("<enclosing assignement:\n"); //$NON-NLS-1$
+ this.enclosing.toString(buffer, level+1);
+ buffer
+ .append(indentation)
+ .append(">\n"); //$NON-NLS-1$
+ }
+
+ // Return the result
return buffer.toString();
}
diff --git a/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/core/ICompilationUnit.java b/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/core/ICompilationUnit.java
index 7bfe7d6..ef78b3c 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/core/ICompilationUnit.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/core/ICompilationUnit.java
@@ -63,6 +63,14 @@ public static final int ENABLE_STATEMENTS_RECOVERY = 0x02;
public static final int ENABLE_BINDINGS_RECOVERY = 0x04;
/**
+ * Constant indicating that a reconcile operation could ignore to parse the method bodies.
+ * @see ASTParser#setIgnoreMethodBodies(boolean)
+ * @since 3.5.2
+ */
+public static final int IGNORE_METHOD_BODIES = 0x08;
+
+
+/**
* Applies a text edit to the compilation unit's buffer.
* <p>
* Note that the edit is simply applied to the compilation unit's buffer.
diff --git a/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/core/compiler/ReconcileContext.java b/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/core/compiler/ReconcileContext.java
index 1b32a03..6fa7747 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/core/compiler/ReconcileContext.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/core/compiler/ReconcileContext.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
+ * Copyright (c) 2005, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -94,6 +94,7 @@ public org.eclipse.jdt.core.dom.CompilationUnit getAST3() throws JavaModelExcept
parser.setStatementsRecovery((this.operation.reconcileFlags & ICompilationUnit.ENABLE_STATEMENTS_RECOVERY) != 0);
parser.setBindingsRecovery((this.operation.reconcileFlags & ICompilationUnit.ENABLE_BINDINGS_RECOVERY) != 0);
parser.setSource(this.workingCopy);
+ parser.setIgnoreMethodBodies((this.operation.reconcileFlags & ICompilationUnit.IGNORE_METHOD_BODIES) != 0);
return (org.eclipse.jdt.core.dom.CompilationUnit) parser.createAST(this.operation.progressMonitor);
}
return this.operation.makeConsistent(this.workingCopy);
diff --git a/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CompilationUnit.java b/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CompilationUnit.java
index fd63038..f517b45 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CompilationUnit.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CompilationUnit.java
@@ -145,10 +145,12 @@ protected boolean buildStructure(OpenableElementInfo info, final IProgressMonito
// disable task tags checking to speed up parsing
options.put(JavaCore.COMPILER_TASK_TAGS, ""); //$NON-NLS-1$
}
+ CompilerOptions compilerOptions = new CompilerOptions(options);
+ compilerOptions.ignoreMethodBodies = (reconcileFlags & ICompilationUnit.IGNORE_METHOD_BODIES) != 0;
SourceElementParser parser = new SourceElementParser(
requestor,
problemFactory,
- new CompilerOptions(options),
+ compilerOptions,
true/*report local declarations*/,
!createAST /*optimize string literals only if not creating a DOM AST*/);
parser.reportOnlyOneSyntaxError = !computeProblems;
@@ -1238,10 +1240,10 @@ public org.eclipse.jdt.core.dom.CompilationUnit reconcile(
ReconcileWorkingCopyOperation op = new ReconcileWorkingCopyOperation(this, astLevel, reconcileFlags, workingCopyOwner);
JavaModelManager manager = JavaModelManager.getJavaModelManager();
try {
- manager.cacheZipFiles(); // cache zip files for performance (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=134172)
+ manager.cacheZipFiles(this); // cache zip files for performance (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=134172)
op.runOperation(monitor);
} finally {
- manager.flushZipFiles();
+ manager.flushZipFiles(this);
}
if(ReconcileWorkingCopyOperation.PERF) {
stats.endRun();
diff --git a/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CompilationUnitProblemFinder.java b/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CompilationUnitProblemFinder.java
index a754396..7e62a1b 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CompilationUnitProblemFinder.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CompilationUnitProblemFinder.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -157,12 +157,16 @@ public class CompilationUnitProblemFinder extends Compiler {
try {
environment = new CancelableNameEnvironment(project, workingCopyOwner, monitor);
problemFactory = new CancelableProblemFactory(monitor);
+ CompilerOptions compilerOptions = getCompilerOptions(project.getOptions(true), creatingAST, ((reconcileFlags & ICompilationUnit.ENABLE_STATEMENTS_RECOVERY) != 0));
+ boolean ignoreMethodBodies = (reconcileFlags & ICompilationUnit.IGNORE_METHOD_BODIES) != 0;
+ compilerOptions.ignoreMethodBodies = ignoreMethodBodies;
problemFinder = new CompilationUnitProblemFinder(
environment,
getHandlingPolicy(),
- getCompilerOptions(project.getOptions(true), creatingAST, ((reconcileFlags & ICompilationUnit.ENABLE_STATEMENTS_RECOVERY) != 0)),
+ compilerOptions,
getRequestor(),
problemFactory);
+ boolean analyzeAndGenerateCode = !ignoreMethodBodies;
CompilationUnitDeclaration unit = null;
if (parser != null) {
problemFinder.parser = parser;
@@ -172,8 +176,8 @@ public class CompilationUnitProblemFinder extends Compiler {
unit,
unitElement,
true, // verify methods
- true, // analyze code
- true); // generate code
+ analyzeAndGenerateCode, // analyze code
+ analyzeAndGenerateCode); // generate code
} catch (AbortCompilation e) {
problemFinder.handleInternalException(e, unit);
}
@@ -182,8 +186,8 @@ public class CompilationUnitProblemFinder extends Compiler {
problemFinder.resolve(
unitElement,
true, // verify methods
- true, // analyze code
- true); // generate code
+ analyzeAndGenerateCode, // analyze code
+ analyzeAndGenerateCode); // generate code
}
CompilationResult unitResult = unit.compilationResult;
CategorizedProblem[] unitProblems = unitResult.getProblems();
diff --git a/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModelManager.java b/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModelManager.java
index 317c552..e7f57cc 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModelManager.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModelManager.java
@@ -83,6 +83,42 @@ import org.xml.sax.SAXException;
public class JavaModelManager implements ISaveParticipant, IContentTypeChangeListener {
/**
+ * Define a zip cache object.
+ */
+ static class ZipCache {
+ private Map map;
+ Object owner;
+
+ ZipCache(Object owner) {
+ this.map = new HashMap();
+ this.owner = owner;
+ }
+
+ public void flush() {
+ Thread currentThread = Thread.currentThread();
+ Iterator iterator = this.map.values().iterator();
+ while (iterator.hasNext()) {
+ try {
+ ZipFile zipFile = (ZipFile)iterator.next();
+ if (JavaModelManager.ZIP_ACCESS_VERBOSE) {
+ System.out.println("(" + currentThread + ") [JavaModelManager.flushZipFiles()] Closing ZipFile on " +zipFile.getName()); //$NON-NLS-1$//$NON-NLS-2$
+ }
+ zipFile.close();
+ } catch (IOException e) {
+ // problem occured closing zip file: cannot do much more
+ }
+ }
+ }
+
+ public ZipFile getCache(IPath path) {
+ return (ZipFile) this.map.get(path);
+ }
+
+ public void setCache(IPath path, ZipFile zipFile) {
+ this.map.put(path, zipFile);
+ }
+ }
+ /**
* Unique handle onto the JavaModel
*/
final JavaModel javaModel = new JavaModel();
@@ -1496,10 +1532,15 @@ public class JavaModelManager implements ISaveParticipant, IContentTypeChangeLis
* Starts caching ZipFiles.
* Ignores if there are already clients.
*/
- public void cacheZipFiles() {
- if (this.zipFiles.get() != null) return;
- this.zipFiles.set(new HashMap());
+ public void cacheZipFiles(Object owner) {
+ ZipCache zipCache = (ZipCache) this.zipFiles.get();
+ if (zipCache != null) {
+ return;
+ }
+ // the owner will be responsible for flushing the cache
+ this.zipFiles.set(new ZipCache(owner));
}
+
public void closeZipFile(ZipFile zipFile) {
if (zipFile == null) return;
if (this.zipFiles.get() != null) {
@@ -1709,22 +1750,16 @@ public class JavaModelManager implements ISaveParticipant, IContentTypeChangeLis
/**
* Flushes ZipFiles cache if there are no more clients.
*/
- public void flushZipFiles() {
- Thread currentThread = Thread.currentThread();
- HashMap map = (HashMap)this.zipFiles.get();
- if (map == null) return;
- this.zipFiles.set(null);
- Iterator iterator = map.values().iterator();
- while (iterator.hasNext()) {
- try {
- ZipFile zipFile = (ZipFile)iterator.next();
- if (JavaModelManager.ZIP_ACCESS_VERBOSE) {
- System.out.println("(" + currentThread + ") [JavaModelManager.flushZipFiles()] Closing ZipFile on " +zipFile.getName()); //$NON-NLS-1$//$NON-NLS-2$
- }
- zipFile.close();
- } catch (IOException e) {
- // problem occured closing zip file: cannot do much more
- }
+ public void flushZipFiles(Object owner) {
+ ZipCache zipCache = (ZipCache)this.zipFiles.get();
+ if (zipCache == null) {
+ return;
+ }
+ // the owner will be responsible for flushing the cache
+ // we want to check object identity to make sure this is the owner that created the cache
+ if (zipCache.owner == owner) {
+ this.zipFiles.set(null);
+ zipCache.flush();
}
}
@@ -2388,11 +2423,10 @@ public class JavaModelManager implements ISaveParticipant, IContentTypeChangeLis
*/
public ZipFile getZipFile(IPath path) throws CoreException {
- HashMap map;
+ ZipCache zipCache;
ZipFile zipFile;
- if ((map = (HashMap)this.zipFiles.get()) != null
- && (zipFile = (ZipFile)map.get(path)) != null) {
-
+ if ((zipCache = (ZipCache)this.zipFiles.get()) != null
+ && (zipFile = zipCache.getCache(path)) != null) {
return zipFile;
}
File localFile = null;
@@ -2417,8 +2451,8 @@ public class JavaModelManager implements ISaveParticipant, IContentTypeChangeLis
System.out.println("(" + Thread.currentThread() + ") [JavaModelManager.getZipFile(IPath)] Creating ZipFile on " + localFile ); //$NON-NLS-1$ //$NON-NLS-2$
}
zipFile = new ZipFile(localFile);
- if (map != null) {
- map.put(path, zipFile);
+ if (zipCache != null) {
+ zipCache.setCache(path, zipFile);
}
return zipFile;
} catch (IOException e) {
diff --git a/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SourceMapper.java b/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SourceMapper.java
index 9c51c3e..0b0796f 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SourceMapper.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SourceMapper.java
@@ -7,6 +7,7 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
+ * Kelly Campbell <kellyc at google.com> - Hangs in SourceMapper during java proposals - https://bugs.eclipse.org/bugs/show_bug.cgi?id=281575
*******************************************************************************/
package org.eclipse.jdt.internal.core;
@@ -860,25 +861,32 @@ public class SourceMapper
char[] source = null;
- if (this.rootPath != null) {
- source = getSourceForRootPath(this.rootPath, name);
- }
+ JavaModelManager javaModelManager = JavaModelManager.getJavaModelManager();
+ try {
+ javaModelManager.cacheZipFiles(this); // Cache any zip files we open during this operation
- if (source == null) {
- computeAllRootPaths(type);
- if (this.rootPaths != null) {
- loop: for (Iterator iterator = this.rootPaths.iterator(); iterator.hasNext(); ) {
- String currentRootPath = (String) iterator.next();
- if (!currentRootPath.equals(this.rootPath)) {
- source = getSourceForRootPath(currentRootPath, name);
- if (source != null) {
- // remember right root path
- this.rootPath = currentRootPath;
- break loop;
+ if (this.rootPath != null) {
+ source = getSourceForRootPath(this.rootPath, name);
+ }
+
+ if (source == null) {
+ computeAllRootPaths(type);
+ if (this.rootPaths != null) {
+ loop: for (Iterator iterator = this.rootPaths.iterator(); iterator.hasNext(); ) {
+ String currentRootPath = (String) iterator.next();
+ if (!currentRootPath.equals(this.rootPath)) {
+ source = getSourceForRootPath(currentRootPath, name);
+ if (source != null) {
+ // remember right root path
+ this.rootPath = currentRootPath;
+ break loop;
+ }
}
}
}
}
+ } finally {
+ javaModelManager.flushZipFiles(this); // clean up cached zip files.
}
if (VERBOSE) {
System.out.println("spent " + (System.currentTimeMillis() - time) + "ms for " + type.getElementName()); //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/State.java b/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/State.java
index 8b3f9f7..2769749 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/State.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/State.java
@@ -44,7 +44,7 @@ private long previousStructuralBuildTime;
private StringSet structurallyChangedTypes;
public static int MaxStructurallyChangedTypes = 100; // keep track of ? structurally changed types, otherwise consider all to be changed
-public static final byte VERSION = 0x0017; // added root name references
+public static final byte VERSION = 0x0018; // to fix 291472
static final byte SOURCE_FOLDER = 1;
static final byte BINARY_FOLDER = 2;
diff --git a/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/hierarchy/IndexBasedHierarchyBuilder.java b/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/hierarchy/IndexBasedHierarchyBuilder.java
index 356e2bd..0b49220 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/hierarchy/IndexBasedHierarchyBuilder.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/hierarchy/IndexBasedHierarchyBuilder.java
@@ -102,7 +102,7 @@ public void build(boolean computeSubtypes) {
JavaModelManager manager = JavaModelManager.getJavaModelManager();
try {
// optimize access to zip files while building hierarchy
- manager.cacheZipFiles();
+ manager.cacheZipFiles(this);
if (computeSubtypes) {
// Note by construction there always is a focus type here
@@ -135,7 +135,7 @@ public void build(boolean computeSubtypes) {
buildSupertypes();
}
} finally {
- manager.flushZipFiles();
+ manager.flushZipFiles(this);
}
}
private void buildForProject(JavaProject project, ArrayList potentialSubtypes, org.eclipse.jdt.core.ICompilationUnit[] workingCopies, HashSet localTypes, IProgressMonitor monitor) throws JavaModelException {
diff --git a/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/hierarchy/RegionBasedHierarchyBuilder.java b/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/hierarchy/RegionBasedHierarchyBuilder.java
index e3e5671..a4aa822 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/hierarchy/RegionBasedHierarchyBuilder.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/hierarchy/RegionBasedHierarchyBuilder.java
@@ -43,7 +43,7 @@ public void build(boolean computeSubtypes) {
JavaModelManager manager = JavaModelManager.getJavaModelManager();
try {
// optimize access to zip files while building hierarchy
- manager.cacheZipFiles();
+ manager.cacheZipFiles(this);
if (this.hierarchy.focusType == null || computeSubtypes) {
IProgressMonitor typeInRegionMonitor =
@@ -63,7 +63,7 @@ public void build(boolean computeSubtypes) {
buildSupertypes();
}
} finally {
- manager.flushZipFiles();
+ manager.flushZipFiles(this);
}
}
/**
diff --git a/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/CodeSnippetParsingUtil.java b/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/CodeSnippetParsingUtil.java
index a90f370..6115e3d 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/CodeSnippetParsingUtil.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/CodeSnippetParsingUtil.java
@@ -32,6 +32,15 @@ import org.eclipse.jdt.internal.compiler.problem.ProblemReporter;
public class CodeSnippetParsingUtil {
public RecordedParsingInformation recordedParsingInformation;
+ public boolean ignoreMethodBodies;
+
+ public CodeSnippetParsingUtil(boolean ignoreMethodBodies) {
+ this.ignoreMethodBodies = ignoreMethodBodies;
+ }
+
+ public CodeSnippetParsingUtil() {
+ this(false);
+ }
private RecordedParsingInformation getRecordedParsingInformation(CompilationResult compilationResult, int[][] commentPositions) {
int problemsCount = compilationResult.problemCount;
@@ -62,6 +71,7 @@ public class CodeSnippetParsingUtil {
throw new IllegalArgumentException();
}
CompilerOptions compilerOptions = new CompilerOptions(settings);
+ compilerOptions.ignoreMethodBodies = this.ignoreMethodBodies;
final ProblemReporter problemReporter = new ProblemReporter(
DefaultErrorHandlingPolicies.proceedWithAllProblems(),
compilerOptions,
@@ -92,6 +102,7 @@ public class CodeSnippetParsingUtil {
throw new IllegalArgumentException();
}
CompilerOptions compilerOptions = new CompilerOptions(settings);
+ compilerOptions.ignoreMethodBodies = this.ignoreMethodBodies;
CommentRecorderParser parser =
new CommentRecorderParser(
new ProblemReporter(
@@ -144,6 +155,7 @@ public class CodeSnippetParsingUtil {
throw new IllegalArgumentException();
}
CompilerOptions compilerOptions = new CompilerOptions(settings);
+ // in this case we don't want to ignore method bodies since we are parsing only an expression
final ProblemReporter problemReporter = new ProblemReporter(
DefaultErrorHandlingPolicies.proceedWithAllProblems(),
compilerOptions,
@@ -182,6 +194,7 @@ public class CodeSnippetParsingUtil {
throw new IllegalArgumentException();
}
CompilerOptions compilerOptions = new CompilerOptions(settings);
+ // in this case we don't want to ignore method bodies since we are parsing only statements
final ProblemReporter problemReporter = new ProblemReporter(
DefaultErrorHandlingPolicies.proceedWithAllProblems(),
compilerOptions,
diff --git a/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/Messages.java b/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/Messages.java
index e0dafd4..81a725a 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/Messages.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/Messages.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -343,6 +343,7 @@ public final class Messages extends NLS {
public static String disassembler_frame_full_frame;
public static String disassembler_frame_same_frame;
public static String disassembler_frame_same_locals_1_stack_item;
+ public static String code_assist_internal_error;
static {
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
diff --git a/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/Util.java b/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/Util.java
index 205f265..6f052c4 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/Util.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/Util.java
@@ -112,6 +112,8 @@ public class Util {
private static final char[] VOID = "void".toCharArray(); //$NON-NLS-1$
private static final char[] INIT = "<init>".toCharArray(); //$NON-NLS-1$
+ private static List fgRepeatedMessages= new ArrayList(5);
+
private Util() {
// cannot be instantiated
}
@@ -1307,10 +1309,12 @@ public class Util {
* Return the java element corresponding to the given compiler binding.
*/
public static JavaElement getUnresolvedJavaElement(FieldBinding binding, WorkingCopyOwner workingCopyOwner, BindingsToNodesMap bindingsToNodes) {
- if (binding.declaringClass == null) return null; // arraylength
- IType declaringType = (IType) getUnresolvedJavaElement(binding.declaringClass, workingCopyOwner, bindingsToNodes);
- if (declaringType == null) return null;
- return (JavaElement) declaringType.getField(String.valueOf(binding.name));
+ if (binding.declaringClass == null) return null; // array length
+ JavaElement unresolvedJavaElement = getUnresolvedJavaElement(binding.declaringClass, workingCopyOwner, bindingsToNodes);
+ if (unresolvedJavaElement == null || unresolvedJavaElement.getElementType() != IJavaElement.TYPE) {
+ return null;
+ }
+ return (JavaElement) ((IType) unresolvedJavaElement).getField(String.valueOf(binding.name));
}
/**
@@ -1342,9 +1346,11 @@ public class Util {
* Return the java element corresponding to the given compiler binding.
*/
public static JavaElement getUnresolvedJavaElement(MethodBinding methodBinding, WorkingCopyOwner workingCopyOwner, BindingsToNodesMap bindingsToNodes) {
- IType declaringType = (IType) getUnresolvedJavaElement(methodBinding.declaringClass, workingCopyOwner, bindingsToNodes);
-
- if (declaringType == null) return null;
+ JavaElement unresolvedJavaElement = getUnresolvedJavaElement(methodBinding.declaringClass, workingCopyOwner, bindingsToNodes);
+ if (unresolvedJavaElement == null || unresolvedJavaElement.getElementType() != IJavaElement.TYPE) {
+ return null;
+ }
+ IType declaringType = (IType) unresolvedJavaElement;
org.eclipse.jdt.internal.compiler.ast.ASTNode node = bindingsToNodes == null ? null : bindingsToNodes.get(methodBinding);
if (node != null && !declaringType.isBinary()) {
@@ -1770,26 +1776,56 @@ public class Util {
&& (nestedException = ((JavaModelException)e).getException()) != null) {
e = nestedException;
}
- IStatus status= new Status(
- IStatus.ERROR,
- JavaCore.PLUGIN_ID,
- IStatus.ERROR,
- message,
- e);
- JavaCore.getPlugin().getLog().log(status);
+ log(new Status(
+ IStatus.ERROR,
+ JavaCore.PLUGIN_ID,
+ IStatus.ERROR,
+ message,
+ e));
+ }
+
+ /**
+ * Log a message that is potentially repeated in the same session.
+ * The first time this method is called with a given exception, the
+ * exception stack trace is written to the log.
+ * <p>Only intended for use in debug statements.</p>
+ *
+ * @param key the given key
+ * @param e the given exception
+ * @throws IllegalArgumentException if the given key is null
+ */
+ public static void logRepeatedMessage(String key, Exception e) {
+ if (key == null) {
+ throw new IllegalArgumentException("key cannot be null"); //$NON-NLS-1$
+ }
+ if (fgRepeatedMessages.contains(key)) {
+ return;
+ }
+ fgRepeatedMessages.add(key);
+ log(e);
}
/*
* Add a log entry
*/
public static void log(int statusErrorID, String message) {
- IStatus status= new Status(
- statusErrorID,
- JavaCore.PLUGIN_ID,
- message);
+ log(new Status(
+ statusErrorID,
+ JavaCore.PLUGIN_ID,
+ message));
+ }
+
+ /*
+ * Add a log entry
+ */
+ public static void log(IStatus status) {
JavaCore.getPlugin().getLog().log(status);
}
+ public static void log(Throwable e) {
+ log(new Status(IStatus.ERROR, JavaCore.PLUGIN_ID, Messages.code_assist_internal_error, e));
+ }
+
public static ClassFileReader newClassFileReader(IResource resource) throws CoreException, ClassFormatException, IOException {
InputStream in = null;
try {
diff --git a/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/messages.properties b/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/messages.properties
index b2f171f..2b7f435 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/messages.properties
+++ b/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/messages.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2000, 2008 IBM Corporation and others.
+# Copyright (c) 2000, 2009 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -378,3 +378,4 @@ classfileformat_localvariabletableentry = [pc: {0}, pc: {1}] local: {2} index: {
### Eclipse Java Core completion messages.
engine_completing = Computing proposals...
+code_assist_internal_error=Code assist internal error
diff --git a/eclipse/plugins/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/MatchLocator.java b/eclipse/plugins/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/MatchLocator.java
index e07d05d..54731f8 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/MatchLocator.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/MatchLocator.java
@@ -1120,7 +1120,7 @@ public void locateMatches(SearchDocument[] searchDocuments) throws CoreException
this.bindings = new SimpleLookupTable();
try {
// optimize access to zip files during search operation
- manager.cacheZipFiles();
+ manager.cacheZipFiles(this);
// initialize handle factory (used as a cache of handles so as to optimize space)
if (this.handleFactory == null)
@@ -1222,7 +1222,7 @@ public void locateMatches(SearchDocument[] searchDocuments) throws CoreException
this.progressMonitor.done();
if (this.nameEnvironment != null)
this.nameEnvironment.cleanup();
- manager.flushZipFiles();
+ manager.flushZipFiles(this);
this.bindings = null;
}
}
diff --git a/eclipse/plugins/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/processing/JobManager.java b/eclipse/plugins/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/processing/JobManager.java
index bcafc96..028d214 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/processing/JobManager.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/processing/JobManager.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -324,6 +324,9 @@ public abstract class JobManager implements Runnable {
this.processingThread.setDaemon(true);
// less prioritary by default, priority is raised if clients are actively waiting on it
this.processingThread.setPriority(Thread.NORM_PRIORITY-1);
+ // https://bugs.eclipse.org/bugs/show_bug.cgi?id=296343
+ // set the context loader to avoid leaking the current context loader
+ this.processingThread.setContextClassLoader(this.getClass().getClassLoader());
this.processingThread.start();
}
}
diff --git a/eclipse/plugins/org.eclipse.jdt.doc.user/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.jdt.doc.user/META-INF/MANIFEST.MF
index feabd20..a707bd3 100644
--- a/eclipse/plugins/org.eclipse.jdt.doc.user/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.jdt.doc.user/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jdt.doc.user; singleton:=true
-Bundle-Version: 3.5.1.qualifier
+Bundle-Version: 3.5.2.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/eclipse/plugins/org.eclipse.jdt.doc.user/gettingStarted/intro/overview.htm b/eclipse/plugins/org.eclipse.jdt.doc.user/gettingStarted/intro/overview.htm
index db2d5b2..86ecf5f 100644
--- a/eclipse/plugins/org.eclipse.jdt.doc.user/gettingStarted/intro/overview.htm
+++ b/eclipse/plugins/org.eclipse.jdt.doc.user/gettingStarted/intro/overview.htm
@@ -1,24 +1,12 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html lang="en">
<head>
- <meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+ <meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
<link rel="stylesheet" href="../../book.css" charset="ISO-8859-1" type="text/css">
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<meta http-equiv="Content-Style-Type" content="text/css">
<title>Java development overview</title>
- <script language="JavaScript" type="text/javascript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"> </script>
- <script type="text/javaScript">
- function openRelatedLink(rel) {
- var href = '/org.eclipse.jdt.doc.user/'+rel;
- if (self.name=="ContentViewFrame") {
- showTopicInContents(href);
- window.location = '../../'+rel;
- }
- else {
- window.location = 'http://org.eclipse.ui.intro/showHelpTopic?id='+href;
- }
- }
- </script>
+ <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"> </script>
</head>
<body>
@@ -27,9 +15,9 @@
<p>
The JDT project provides the tool plug-ins that implement a Java IDE supporting the development of any Java application, including Eclipse plug-ins. It adds a Java project nature and Java perspective to the Eclipse Workbench as well as a number of views, editors, wizards, builders, and code merging and refactoring tools. The JDT project allows Eclipse to be a development environment for itself.</p>
<p>
- Try the <a href="javaScript:openRelatedLink('gettingStarted/qs-BasicTutorial.htm')">
- Basic tutorial</a> to get a first impression. Discover more in the <a href="javaScript:openRelatedLink('tips/jdt_tips.html')">
- Tips and Tricks</a> section and learn about the latest features in <a href="javaScript:openRelatedLink('whatsNew/jdt_whatsnew.html')">
+ Try the <a href="../../gettingStarted/qs-BasicTutorial.htm">
+ Basic tutorial</a> to get a first impression. Discover more in the <a href="../../tips/jdt_tips.html">
+ Tips and Tricks</a> section and learn about the latest features in <a href="../../whatsNew/jdt_whatsnew.html">
What's new in 3.4</a>
</p>
diff --git a/eclipse/plugins/org.eclipse.jdt.junit/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.jdt.junit/META-INF/MANIFEST.MF
index 362993b..d74ae5f 100644
--- a/eclipse/plugins/org.eclipse.jdt.junit/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.jdt.junit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jdt.junit;singleton:=true
-Bundle-Version: 3.5.1.qualifier
+Bundle-Version: 3.5.2.qualifier
Bundle-Activator: org.eclipse.jdt.internal.junit.ui.JUnitPlugin
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %providerName
diff --git a/eclipse/plugins/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/buildpath/P2Utils.java b/eclipse/plugins/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/buildpath/P2Utils.java
index 38d3a33..78bfcbb 100644
--- a/eclipse/plugins/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/buildpath/P2Utils.java
+++ b/eclipse/plugins/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/buildpath/P2Utils.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
+ * Copyright (c) 2009, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
+ * Patrick Higgins <patrick133t at yahoo.com> - [JUnit] JUnit not found when JDT installed as dropin - https://bugs.eclipse.org/bugs/show_bug.cgi?id=297663
*******************************************************************************/
package org.eclipse.jdt.internal.junit.buildpath;
@@ -16,6 +17,9 @@ import java.net.MalformedURLException;
import java.net.URI;
import java.net.URL;
import java.net.URLDecoder;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
import org.osgi.framework.Version;
@@ -45,8 +49,6 @@ import org.eclipse.jdt.internal.junit.ui.JUnitPlugin;
*/
class P2Utils {
- private static final String CONFIG_FOLDER = "configuration"; //$NON-NLS-1$
-
private static final String SRC_INFO_FOLDER = "org.eclipse.equinox.source"; //$NON-NLS-1$
private static final String SRC_INFO_PATH= SRC_INFO_FOLDER + File.separator + "source.info"; //$NON-NLS-1$
@@ -55,73 +57,6 @@ class P2Utils {
/**
- * Returns bundles defined by the 'bundles.info'.
- *
- * @param isSourceBundle <code>true</code> if source bundles should be read <code>false</code>
- * otherwise
- * @param useConfigArea <code>true</code> if the bundles are read from the config area, or
- * <code>false</code> if the install location should be used
- * @return all bundles in the installation or <code>null</code> if not able to locate a
- * bundles.info
- */
- private static BundleInfo[] readBundles(boolean isSourceBundle, boolean useConfigArea) {
- final Location bundlesLocation;
- final String bundleInfoPath;
- if (useConfigArea) {
- bundlesLocation= Platform.getConfigurationLocation();
- if (isSourceBundle)
- bundleInfoPath= SRC_INFO_PATH;
- else
- bundleInfoPath= BUNDLE_INFO_PATH;
- } else {
- bundlesLocation= Platform.getInstallLocation();
- if (isSourceBundle)
- bundleInfoPath= CONFIG_FOLDER + File.separator + SRC_INFO_PATH;
- else
- bundleInfoPath= CONFIG_FOLDER + File.separator + BUNDLE_INFO_PATH;
- }
- if (bundlesLocation == null)
- return null;
-
- URL bundlesLocationURL= bundlesLocation.getURL();
- if (bundleInfoPath == null)
- return null;
-
- try {
- URL bundlesTxt= new URL(bundlesLocationURL.getProtocol(), bundlesLocationURL.getHost(), new File(bundlesLocationURL.getFile(), bundleInfoPath).getAbsolutePath());
- BundleInfo bundles[]= getBundlesFromFile(bundlesLocationURL, bundlesTxt);
- if (bundles == null || bundles.length == 0) {
- return null;
- }
- return bundles;
- } catch (MalformedURLException e) {
- JUnitPlugin.log(e);
- return null;
- } catch (IOException e) {
- JUnitPlugin.log(e);
- return null;
- }
- }
-
- /**
- * Returns an array of {@link BundleInfo} for each bundle entry or <code>null</code> if there is a
- * problem reading the file.
- *
- * @param bundlesLocation the URL of the bundle location
- * @param fileURL the URL of the info file
- * @return array of bundle infos or <code>null</code>
- * @throws IOException if loading the configuration fails
- */
- private static BundleInfo[] getBundlesFromFile(URL bundlesLocation, URL fileURL) throws IOException {
- SimpleConfiguratorManipulator manipulator= (SimpleConfiguratorManipulator)JUnitPlugin.getDefault().getService(SimpleConfiguratorManipulator.class.getName());
- if (manipulator == null)
- return null;
-
- File home= new File(bundlesLocation.getFile());
- return manipulator.loadConfiguration(fileURL, home);
- }
-
- /**
* Finds the bundle info for the given arguments.
* <p>
* The first match will be returned if more than one bundle matches the arguments.
@@ -140,6 +75,31 @@ class P2Utils {
}
/**
+ * Adds the directories (as <code>java.io.File</code>) for the given location and all of its parents to the given list.
+ *
+ * @param locations the list to add the URLs to
+ * @param location the location
+ * @param useParent <code>true</code> if location's parent directory should be used <code>false</code> otherwise
+ */
+ private static void addLocationDirs(List locations, Location location, boolean useParent) {
+ while (location != null) {
+ URL url= location.getURL();
+ if (url != null) {
+ try {
+ File dir = new File(FileLocator.toFileURL(url).getPath());
+ if (useParent)
+ dir = dir.getParentFile();
+ if (!locations.contains(dir))
+ locations.add(dir);
+ } catch (IOException e) {
+ JUnitPlugin.log(e);
+ }
+ }
+ location= location.getParentLocation();
+ }
+ }
+
+ /**
* Finds the bundle info for the given arguments.
* <p>
* The first match will be returned if more than one bundle matches the arguments.
@@ -154,37 +114,46 @@ class P2Utils {
Assert.isLegal(symbolicName != null);
Assert.isLegal(versionRange != null);
- // First try to find the bundle in the config area
- BundleInfo bundleInfo= findBundle(symbolicName, versionRange, isSourceBundle, true);
- if (bundleInfo != null)
- return bundleInfo;
-
- // Use install location if not found in config area
- return findBundle(symbolicName, versionRange, isSourceBundle, false);
- }
-
- /**
- * Finds the bundle info for the given arguments.
- *
- * @param symbolicName the symbolic name
- * @param versionRange the version range for the bundle version
- * @param isSourceBundle <code>true</code> if source bundles should be read <code>false</code>
- * otherwise
- * @param useConfigArea <code>true</code> if the bundles are read from the config area, or
- * <code>false</code> if the install location should be used
- * @return the bundle info or <code>null</code> if not found
- * @since 3.5
- */
- private static BundleInfo findBundle(String symbolicName, VersionRange versionRange, boolean isSourceBundle, boolean useConfigArea) {
- BundleInfo[] bundles= readBundles(isSourceBundle, useConfigArea);
- if (bundles == null)
+ SimpleConfiguratorManipulator manipulator= (SimpleConfiguratorManipulator)JUnitPlugin.getDefault().getService(SimpleConfiguratorManipulator.class.getName());
+ if (manipulator == null)
return null;
-
- for (int i= 0; i < bundles.length; i++) {
- if (symbolicName.equals(bundles[i].getSymbolicName()) && versionRange.isIncluded(new Version(bundles[i].getVersion()))) {
- IPath path= getBundleLocationPath(bundles[i]);
- if (path.toFile().exists())
- return bundles[i];
+
+ List bundleLocations = new ArrayList();
+ addLocationDirs(bundleLocations, Platform.getConfigurationLocation(), true);
+ addLocationDirs(bundleLocations, Platform.getInstallLocation(), false);
+
+ for (Location configLocation= Platform.getConfigurationLocation(); configLocation != null; configLocation= configLocation.getParentLocation()) {
+ URL configUrl= configLocation.getURL();
+ if (configUrl == null)
+ continue;
+
+ try {
+ String bundleInfoPath= null;
+ if (isSourceBundle)
+ bundleInfoPath= SRC_INFO_PATH;
+ else
+ bundleInfoPath= BUNDLE_INFO_PATH;
+
+ URL bundlesTxt = new URL(configUrl.getProtocol(), configUrl.getHost(), new File(configUrl.getPath(), bundleInfoPath).getAbsolutePath());
+
+ for (Iterator i= bundleLocations.iterator(); i.hasNext(); ) {
+ File home= (File) i.next();
+ BundleInfo bundles[]= manipulator.loadConfiguration(bundlesTxt, home);
+ if (bundles != null) {
+ for (int j= 0; j < bundles.length; j++) {
+ BundleInfo bundle= bundles[j];
+ if (symbolicName.equals(bundle.getSymbolicName()) && versionRange.isIncluded(new Version(bundle.getVersion()))) {
+ IPath path= getBundleLocationPath(bundle);
+ if (path.toFile().exists())
+ return bundle;
+ }
+ }
+ }
+ }
+ } catch (MalformedURLException e) {
+ JUnitPlugin.log(e);
+ } catch (IOException e) {
+ JUnitPlugin.log(e);
}
}
@@ -206,7 +175,7 @@ class P2Utils {
return null;
try {
- String fileStr= FileLocator.toFileURL(URIUtil.toURL(bundleLocation)).getFile();
+ String fileStr= FileLocator.toFileURL(URIUtil.toURL(bundleLocation)).getPath();
fileStr= URLDecoder.decode(fileStr, "UTF-8"); //$NON-NLS-1$
return new Path(fileStr);
} catch (IOException e) {
diff --git a/eclipse/plugins/org.eclipse.jdt.launching/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.jdt.launching/META-INF/MANIFEST.MF
index 4643381..8ea8f12 100644
--- a/eclipse/plugins/org.eclipse.jdt.launching/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.jdt.launching/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jdt.launching; singleton:=true
-Bundle-Version: 3.5.0.qualifier
+Bundle-Version: 3.5.1.qualifier
Bundle-Activator: org.eclipse.jdt.internal.launching.LaunchingPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/eclipse/plugins/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaSourceLookupUtil.java b/eclipse/plugins/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaSourceLookupUtil.java
index 66609a6..76468c0 100644
--- a/eclipse/plugins/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaSourceLookupUtil.java
+++ b/eclipse/plugins/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaSourceLookupUtil.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
+ * Kelly Campbell - Bug 285607
*******************************************************************************/
package org.eclipse.jdt.internal.launching;
@@ -149,75 +150,51 @@ public class JavaSourceLookupUtil {
*/
private static IPackageFragmentRoot getPackageFragmentRoot(IRuntimeClasspathEntry entry) {
IResource resource = entry.getResource();
- if (resource == null) {
- // Check all package fragment roots for case of external archive.
- // External jars are shared, so it does not matter which project it
- // originates from
- IJavaModel model = JavaCore.create(ResourcesPlugin.getWorkspace().getRoot());
+ if (resource != null) {
+ // find package fragment associated with the resource
+ IProject project = resource.getProject();
+ IJavaProject jp = JavaCore.create(project);
try {
- IJavaProject[] jps = model.getJavaProjects();
- for (int i = 0; i < jps.length; i++) {
- IJavaProject jp = jps[i];
- IProject p = jp.getProject();
- if (p.isOpen()) {
- IPackageFragmentRoot[] allRoots = jp.getPackageFragmentRoots();
- for (int j = 0; j < allRoots.length; j++) {
- IPackageFragmentRoot root = allRoots[j];
- if (root.isExternal() && root.getPath().equals(new Path(entry.getLocation()))) {
- if (isSourceAttachmentEqual(root, entry)) {
- // use package fragment root
- return root;
- }
- }
+ if (project.isOpen() && jp.exists()) {
+ IPackageFragmentRoot root = jp.findPackageFragmentRoot(resource.getFullPath());
+ if (root != null) {
+ // ensure source attachment paths match
+ if (isSourceAttachmentEqual(root, entry)) {
+ // use package fragment root
+ return root;
}
}
}
} catch (JavaModelException e) {
LaunchingPlugin.log(e);
}
- } else {
- // check if the archive is a package fragment root
- IProject project = resource.getProject();
- IJavaProject jp = JavaCore.create(project);
- try {
- if (project.isOpen() && jp.exists()) {
- IPackageFragmentRoot root = jp.getPackageFragmentRoot(resource);
+ }
+ // Check all package fragment roots for case of external archive.
+ // External jars are shared, so it does not matter which project it
+ // originates from
+ IJavaModel model = JavaCore.create(ResourcesPlugin.getWorkspace().getRoot());
+ Path entryPath = new Path(entry.getLocation());
+ try {
+ IJavaProject[] jps = model.getJavaProjects();
+ for (int i = 0; i < jps.length; i++) {
+ IJavaProject jp = jps[i];
+ IProject p = jp.getProject();
+ if (p.isOpen()) {
IPackageFragmentRoot[] allRoots = jp.getPackageFragmentRoots();
for (int j = 0; j < allRoots.length; j++) {
- if (allRoots[j].equals(root)) {
- // ensure source attachment paths match
+ IPackageFragmentRoot root = allRoots[j];
+ if (root.isExternal() && root.getPath().equals(entryPath)) {
if (isSourceAttachmentEqual(root, entry)) {
// use package fragment root
return root;
- }
- }
- }
-
- }
- // check all other java projects to see if another project references
- // the archive
- IJavaModel model = JavaCore.create(ResourcesPlugin.getWorkspace().getRoot());
- IJavaProject[] jps = model.getJavaProjects();
- for (int i = 0; i < jps.length; i++) {
- IJavaProject jp1 = jps[i];
- IProject p = jp1.getProject();
- if (p.isOpen()) {
- IPackageFragmentRoot[] allRoots = jp1.getPackageFragmentRoots();
- for (int j = 0; j < allRoots.length; j++) {
- IPackageFragmentRoot root = allRoots[j];
- if (!root.isExternal() && root.getPath().equals(entry.getPath())) {
- if (isSourceAttachmentEqual(root, entry)) {
- // use package fragment root
- return root;
- }
- }
+ }
}
}
}
- } catch (JavaModelException e) {
- LaunchingPlugin.log(e);
- }
- }
+ }
+ } catch (JavaModelException e) {
+ LaunchingPlugin.log(e);
+ }
return null;
}
}
diff --git a/eclipse/plugins/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathEntry.java b/eclipse/plugins/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathEntry.java
index ae83131..260cc33 100644
--- a/eclipse/plugins/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathEntry.java
+++ b/eclipse/plugins/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathEntry.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -324,10 +324,6 @@ public class RuntimeClasspathEntry implements IRuntimeClasspathEntry {
protected IResource getResource(IPath path) {
if (path != null) {
IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- if (path.getDevice() == null) {
- // search relative to the workspace if no device present
- return root.findMember(path);
- }
// look for files or folders with the given path
IFile[] files = root.findFilesForLocation(path);
if (files.length > 0) {
@@ -337,6 +333,10 @@ public class RuntimeClasspathEntry implements IRuntimeClasspathEntry {
if (containers.length > 0) {
return containers[0];
}
+ if (path.getDevice() == null) {
+ // search relative to the workspace if no device present
+ return root.findMember(path);
+ }
}
return null;
}
diff --git a/eclipse/plugins/org.eclipse.jdt.ui/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.jdt.ui/META-INF/MANIFEST.MF
index a760d7b..361575c 100644
--- a/eclipse/plugins/org.eclipse.jdt.ui/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.jdt.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jdt.ui; singleton:=true
-Bundle-Version: 3.5.1.qualifier
+Bundle-Version: 3.5.2.qualifier
Bundle-Activator: org.eclipse.jdt.internal.ui.JavaPlugin
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %providerName
diff --git a/eclipse/plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/proposals/ChangeCorrectionProposal.java b/eclipse/plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/proposals/ChangeCorrectionProposal.java
index c9c6ece..5549f6c 100644
--- a/eclipse/plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/proposals/ChangeCorrectionProposal.java
+++ b/eclipse/plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/proposals/ChangeCorrectionProposal.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -259,7 +259,7 @@ public class ChangeCorrectionProposal implements IJavaCompletionProposal, IComma
* @return returns the change for this proposal.
* @throws CoreException thrown when the change could not be created
*/
- public final Change getChange() throws CoreException {
+ public synchronized final Change getChange() throws CoreException {
if (fChange == null) {
fChange= createChange();
}
diff --git a/eclipse/plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/JavaWorkingSetPageContentProvider.java b/eclipse/plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/JavaWorkingSetPageContentProvider.java
index dae4fc0..6bc98f3 100644
--- a/eclipse/plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/JavaWorkingSetPageContentProvider.java
+++ b/eclipse/plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/JavaWorkingSetPageContentProvider.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -31,8 +31,10 @@ class JavaWorkingSetPageContentProvider extends StandardJavaElementContentProvid
if (element instanceof IPackageFragment) {
IPackageFragment pkg= (IPackageFragment)element;
try {
- if (pkg.getKind() == IPackageFragmentRoot.K_BINARY)
+ if (pkg.getKind() == IPackageFragmentRoot.K_BINARY) {
+ // Don't show IJarEntryResource
return pkg.getChildren().length > 0;
+ }
} catch (JavaModelException ex) {
// use super behavior
}
@@ -58,6 +60,15 @@ class JavaWorkingSetPageContentProvider extends StandardJavaElementContentProvid
}
}
+ protected Object[] getPackageFragmentRootContent(IPackageFragmentRoot root) throws JavaModelException {
+ if (root.getKind() == IPackageFragmentRoot.K_BINARY) {
+ // Don't show IJarEntryResource
+ return root.getChildren();
+ }
+
+ return super.getPackageFragmentRootContent(root);
+ }
+
private Object[] getNonJavaProjects(IJavaModel model) throws JavaModelException {
return model.getNonJavaResources();
}
diff --git a/eclipse/plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/WorkingSetFilter.java b/eclipse/plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/WorkingSetFilter.java
index 2055991..a6778a4 100644
--- a/eclipse/plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/WorkingSetFilter.java
+++ b/eclipse/plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/WorkingSetFilter.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -19,6 +19,7 @@ import org.eclipse.jface.viewers.Viewer;
import org.eclipse.ui.IWorkingSet;
+import org.eclipse.jdt.core.IJarEntryResource;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.IMember;
@@ -34,10 +35,17 @@ import org.eclipse.jdt.internal.ui.viewsupport.JavaViewerFilter;
*/
public class WorkingSetFilter extends JavaViewerFilter {
+
private static class WorkingSetCompareEntry {
+
+ /**
+ * Denotes an {@link IJarEntryResource} if it is
+ * <code>null && fJavaElement != null.</code>
+ */
private IPath fResourcePath;
private IJavaElement fJavaElement;
+
public WorkingSetCompareEntry(IAdaptable a) {
if (a instanceof IJavaElement) {
init((IJavaElement) a);
@@ -50,6 +58,8 @@ public class WorkingSetFilter extends JavaViewerFilter {
// that means it will only appear if the parent container project is in the working set
IResource fakeInternal= proj.getProject().getFile(wrapper.getProject().getElementName() + "-fake-jar.jar"); //$NON-NLS-1$
init(proj.getPackageFragmentRoot(fakeInternal));
+ } else if (a instanceof IJarEntryResource) {
+ init((IJarEntryResource)a);
} else {
IJavaElement je= (IJavaElement) a.getAdapter(IJavaElement.class);
if (je != null) {
@@ -76,6 +86,14 @@ public class WorkingSetFilter extends JavaViewerFilter {
fResourcePath= curr.getPath();
}
+ private void init(IJarEntryResource jarEntryResource) {
+ Object parent= jarEntryResource.getParent();
+ while (parent instanceof IJarEntryResource)
+ parent= ((IJarEntryResource)parent).getParent();
+ fJavaElement= (IJavaElement)parent;
+ fResourcePath= null;
+ }
+
public boolean contains(WorkingSetCompareEntry element) {
if (fJavaElement != null && element.fJavaElement != null) {
IJavaElement other= element.fJavaElement;
@@ -88,7 +106,8 @@ public class WorkingSetFilter extends JavaViewerFilter {
}
}
- if (isAncestor(other, fJavaElement) || isAncestor(fJavaElement, other)) {
+ // Check relationship in both directions except for IJarFileEntryResource which cannot be part of a working set
+ if (isAncestor(other, fJavaElement) || isAncestor(fJavaElement, other) && element.fResourcePath != null) {
return true;
}
return false;
@@ -101,6 +120,14 @@ public class WorkingSetFilter extends JavaViewerFilter {
return false;
}
+ /**
+ * Check whether the given parent is an ancestor of the given element
+ * or the same as the element.
+ *
+ * @param elem the element
+ * @param parent the anchestor
+ * @return <code>true</code> if it is an ancestor
+ */
private boolean isAncestor(IJavaElement elem, IJavaElement parent) {
IJavaElement anc= elem.getAncestor(parent.getElementType());
if (parent.equals(anc)) {
diff --git a/eclipse/plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/jarpackager/JarPackageData.java b/eclipse/plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/jarpackager/JarPackageData.java
index fb12464..68e2576 100644
--- a/eclipse/plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/jarpackager/JarPackageData.java
+++ b/eclipse/plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/jarpackager/JarPackageData.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -23,6 +23,7 @@ import org.eclipse.core.runtime.Path;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.jface.operation.IRunnableContext;
@@ -310,17 +311,19 @@ public class JarPackageData {
* @since 3.0
*/
public IPath getAbsoluteJarLocation() {
- if (!fJarLocation.isAbsolute() && fJarLocation.segmentCount() >= 2) {
- // reverse of AbstractJarDestinationWizardPage#handleDestinationBrowseButtonPressed()
- IFile file= ResourcesPlugin.getWorkspace().getRoot().getFile(fJarLocation);
- IPath absolutePath= file.getLocation();
- if (absolutePath != null) {
- return absolutePath;
- } else {
- // The path does not exist in the workspace (e.g. because there's no such project).
- // Fallback is to just append the path to the workspace root.
- return ResourcesPlugin.getWorkspace().getRoot().getLocation().append(fJarLocation);
+ if (!fJarLocation.isAbsolute()) {
+ IWorkspaceRoot root= ResourcesPlugin.getWorkspace().getRoot();
+ if (fJarLocation.segmentCount() >= 2 && !"..".equals(fJarLocation.segment(0))) { //$NON-NLS-1$
+ // reverse of AbstractJarDestinationWizardPage#handleDestinationBrowseButtonPressed()
+ IFile file= root.getFile(fJarLocation);
+ IPath absolutePath= file.getLocation();
+ if (absolutePath != null) {
+ return absolutePath;
+ }
}
+ // The path does not exist in the workspace (e.g. because there's no such project).
+ // Fallback is to just append the path to the workspace root.
+ return root.getLocation().append(fJarLocation);
}
return fJarLocation;
}
diff --git a/eclipse/plugins/org.eclipse.jdt/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.jdt/META-INF/MANIFEST.MF
index 926cdef..6ffeebc 100644
--- a/eclipse/plugins/org.eclipse.jdt/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.jdt/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jdt; singleton:=true
-Bundle-Version: 3.5.1.qualifier
+Bundle-Version: 3.5.2.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui.intro;bundle-version="[3.2.0,4.0.0)",
diff --git a/eclipse/plugins/org.eclipse.jface.text/.settings/.api_filters b/eclipse/plugins/org.eclipse.jface.text/.settings/.api_filters
index 7d35f4a..257c0d3 100644
--- a/eclipse/plugins/org.eclipse.jface.text/.settings/.api_filters
+++ b/eclipse/plugins/org.eclipse.jface.text/.settings/.api_filters
@@ -1,5 +1,13 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.jface.text" version="2">
+ <resource path="src/org/eclipse/jface/text/AbstractInformationControlManager.java" type="org.eclipse.jface.text.AbstractInformationControlManager">
+ <filter id="1142947843">
+ <message_arguments>
+ <message_argument value="3.5.2"/>
+ <message_argument value="canClearDataOnHide()"/>
+ </message_arguments>
+ </filter>
+ </resource>
<resource path="src/org/eclipse/jface/text/TextViewer.java" type="org.eclipse.jface.text.TextViewer">
<filter id="572522506">
<message_arguments>
diff --git a/eclipse/plugins/org.eclipse.jface.text/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.jface.text/META-INF/MANIFEST.MF
index 55038fd..28ed3a3 100644
--- a/eclipse/plugins/org.eclipse.jface.text/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.jface.text/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jface.text
-Bundle-Version: 3.5.1.qualifier
+Bundle-Version: 3.5.2.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Export-Package:
diff --git a/eclipse/plugins/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractInformationControlManager.java b/eclipse/plugins/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractInformationControlManager.java
index ab4ecdd..b670658 100644
--- a/eclipse/plugins/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractInformationControlManager.java
+++ b/eclipse/plugins/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractInformationControlManager.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -1232,8 +1232,21 @@ abstract public class AbstractInformationControlManager {
if (fInformationControlCloser != null)
fInformationControlCloser.stop();
}
- fSubjectArea= null;
- fInformation= null; // allow garbage collection of potentially large object
+ if (canClearDataOnHide()) {
+ fSubjectArea= null;
+ fInformation= null; // allow garbage collection of potentially large object
+ }
+ }
+
+ /**
+ * Tells whether internal data can be cleared on hide.
+ *
+ * @return <code>true</code> if data can be cleared on hide
+ * @see #hideInformationControl()
+ * @since 3.5.2
+ */
+ protected boolean canClearDataOnHide() {
+ return true;
}
/**
@@ -1246,7 +1259,7 @@ abstract public class AbstractInformationControlManager {
fInformationControl.setVisible(true);
if (fInformationControl == null)
- return; // could already be disposed if setVisible(..) runs the display loop
+ return; // could already be disposed if setVisible(..) runs the display loop
if (fTakesFocusWhenVisible)
fInformationControl.setFocus();
diff --git a/eclipse/plugins/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/AdditionalInfoController.java b/eclipse/plugins/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/AdditionalInfoController.java
index 6e4f7f2..0fde9f0 100644
--- a/eclipse/plugins/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/AdditionalInfoController.java
+++ b/eclipse/plugins/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/AdditionalInfoController.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -582,6 +582,14 @@ class AdditionalInfoController extends AbstractInformationControlManager {
super.hideInformationControl();
}
+ /*
+ * @see org.eclipse.jface.text.AbstractInformationControlManager#canClearDataOnHide()
+ * @since 3.6
+ */
+ protected boolean canClearDataOnHide() {
+ return false; // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=293176
+ }
+
/**
* @return the current information control, or <code>null</code> if none available
*/
diff --git a/eclipse/plugins/org.eclipse.jface/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.jface/META-INF/MANIFEST.MF
index 368a91e..747cbba 100644
--- a/eclipse/plugins/org.eclipse.jface/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.jface/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jface
-Bundle-Version: 3.5.1.qualifier
+Bundle-Version: 3.5.2.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/eclipse/plugins/org.eclipse.jface/src/org/eclipse/jface/fieldassist/ControlDecoration.java b/eclipse/plugins/org.eclipse.jface/src/org/eclipse/jface/fieldassist/ControlDecoration.java
index fb8790f..dd3e1c5 100644
--- a/eclipse/plugins/org.eclipse.jface/src/org/eclipse/jface/fieldassist/ControlDecoration.java
+++ b/eclipse/plugins/org.eclipse.jface/src/org/eclipse/jface/fieldassist/ControlDecoration.java
@@ -1079,7 +1079,9 @@ public class ControlDecoration {
}
hover.setText(text, getDecorationRectangle(control.getParent()),
control);
- hover.setVisible(true);
+ if (control.isVisible()) {
+ hover.setVisible(true);
+ }
}
/*
diff --git a/eclipse/plugins/org.eclipse.jface/src/org/eclipse/jface/viewers/StructuredViewer.java b/eclipse/plugins/org.eclipse.jface/src/org/eclipse/jface/viewers/StructuredViewer.java
index 58a77e5..967ddbe 100644
--- a/eclipse/plugins/org.eclipse.jface/src/org/eclipse/jface/viewers/StructuredViewer.java
+++ b/eclipse/plugins/org.eclipse.jface/src/org/eclipse/jface/viewers/StructuredViewer.java
@@ -614,14 +614,14 @@ public abstract class StructuredViewer extends ContentViewer implements IPostSel
}
item.setData(element);
mapElement(element, item);
- if (associateListener != null)
- associateListener.associate(element, item);
} else {
// Always map the element, even if data == element,
// since unmapAllElements() can leave the map inconsistent
// See bug 2741 for details.
mapElement(element, item);
}
+ if (associateListener != null)
+ associateListener.associate(element, item);
}
diff --git a/eclipse/plugins/org.eclipse.jface/src/org/eclipse/jface/viewers/TableViewerFocusCellManager.java b/eclipse/plugins/org.eclipse.jface/src/org/eclipse/jface/viewers/TableViewerFocusCellManager.java
index 8e2513f..ec688c9 100644
--- a/eclipse/plugins/org.eclipse.jface/src/org/eclipse/jface/viewers/TableViewerFocusCellManager.java
+++ b/eclipse/plugins/org.eclipse.jface/src/org/eclipse/jface/viewers/TableViewerFocusCellManager.java
@@ -13,6 +13,7 @@
package org.eclipse.jface.viewers;
+import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.widgets.Table;
/**
@@ -68,17 +69,27 @@ public class TableViewerFocusCellManager extends SWTFocusCellManager {
Table table = (Table) getViewer().getControl();
if (!table.isDisposed() && table.getItemCount() > 0
- && !table.getItem(0).isDisposed()) {
+ && !table.getItem(table.getTopIndex()).isDisposed()) {
final ViewerRow aViewerRow = getViewer().getViewerRowFromItem(
- table.getItem(0));
+ table.getItem(table.getTopIndex()));
+ if (table.getColumnCount() == 0) {
+ return aViewerRow.getCell(0);
+ }
+
+ Rectangle clientArea = table.getClientArea();
for (int i = 0; i < table.getColumnCount(); i++) {
- if (aViewerRow.getWidth(i) > 0)
+ if (aViewerRow.getWidth(i) > 0 && columnInVisibleArea(clientArea,aViewerRow,i))
return aViewerRow.getCell(i);
- }}
+ }
+ }
return null;
}
+ private boolean columnInVisibleArea(Rectangle clientArea, ViewerRow row, int colIndex) {
+ return row.getBounds(colIndex).x >= clientArea.x;
+ }
+
public ViewerCell getFocusCell() {
ViewerCell cell = super.getFocusCell();
Table t = (Table) getViewer().getControl();
diff --git a/eclipse/plugins/org.eclipse.jface/src/org/eclipse/jface/viewers/TreeViewerFocusCellManager.java b/eclipse/plugins/org.eclipse.jface/src/org/eclipse/jface/viewers/TreeViewerFocusCellManager.java
index 6944a0f..4497a89 100644
--- a/eclipse/plugins/org.eclipse.jface/src/org/eclipse/jface/viewers/TreeViewerFocusCellManager.java
+++ b/eclipse/plugins/org.eclipse.jface/src/org/eclipse/jface/viewers/TreeViewerFocusCellManager.java
@@ -14,6 +14,7 @@
package org.eclipse.jface.viewers;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Item;
import org.eclipse.swt.widgets.Tree;
@@ -118,13 +119,26 @@ public class TreeViewerFocusCellManager extends SWTFocusCellManager {
ViewerCell getInitialFocusCell() {
Tree tree = (Tree) getViewer().getControl();
- if (! tree.isDisposed() && tree.getItemCount() > 0 && ! tree.getItem(0).isDisposed()) {
- return getViewer().getViewerRowFromItem(tree.getItem(0)).getCell(0);
+ if (! tree.isDisposed() && tree.getItemCount() > 0 && ! tree.getTopItem().isDisposed()) {
+ ViewerRow aViewerRow = getViewer().getViewerRowFromItem(tree.getTopItem());
+ if (tree.getColumnCount() == 0) {
+ return aViewerRow.getCell(0);
+ }
+
+ Rectangle clientArea = tree.getClientArea();
+ for (int i = 0; i < tree.getColumnCount(); i++) {
+ if (aViewerRow.getWidth(i) > 0 && columnInVisibleArea(clientArea,aViewerRow,i))
+ return aViewerRow.getCell(i);
+ }
}
return null;
}
+ private boolean columnInVisibleArea(Rectangle clientArea, ViewerRow row, int colIndex) {
+ return row.getBounds(colIndex).x >= clientArea.x;
+ }
+
public ViewerCell getFocusCell() {
ViewerCell cell = super.getFocusCell();
Tree t = (Tree) getViewer().getControl();
diff --git a/eclipse/plugins/org.eclipse.ltk.ui.refactoring/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.ltk.ui.refactoring/META-INF/MANIFEST.MF
index f074048..b95cf4a 100644
--- a/eclipse/plugins/org.eclipse.ltk.ui.refactoring/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.ltk.ui.refactoring/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.ltk.ui.refactoring; singleton:=true
-Bundle-Version: 3.4.100.qualifier
+Bundle-Version: 3.4.101.qualifier
Bundle-Activator: org.eclipse.ltk.internal.ui.refactoring.RefactoringUIPlugin
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %providerName
diff --git a/eclipse/plugins/org.eclipse.osgi/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.osgi/META-INF/MANIFEST.MF
index 939b8e4..7696d37 100644
--- a/eclipse/plugins/org.eclipse.osgi/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.osgi/META-INF/MANIFEST.MF
@@ -68,7 +68,7 @@ Bundle-Activator: org.eclipse.osgi.framework.internal.core.SystemBundleActivator
Bundle-Description: %systemBundle
Bundle-Copyright: %copyright
Bundle-Vendor: %eclipse.org
-Bundle-Version: 3.5.1.qualifier
+Bundle-Version: 3.5.2.qualifier
Bundle-Localization: systembundle
Bundle-DocUrl: http://www.eclipse.org
Eclipse-ExtensibleAPI: true
diff --git a/eclipse/plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/eventmgr/EventManager.java b/eclipse/plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/eventmgr/EventManager.java
index d42cdde..2dc7188 100644
--- a/eclipse/plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/eventmgr/EventManager.java
+++ b/eclipse/plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/eventmgr/EventManager.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2009 IBM Corporation and others.
+ * Copyright (c) 2003, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -335,6 +335,10 @@ public class EventManager {
return;
}
EventManager.dispatchEvent(item.listeners, item.dispatcher, item.action, item.object);
+ // Bug 299589: since the call to getNextEvent() will eventually block for a long time, we need to make sure that the 'item'
+ // variable is cleared of the previous value before the call to getNextEvent(). See VM SPec 2.5.7 for why the compiler
+ // will not automatically clear this variable for each loop iteration.
+ item = null;
}
} catch (RuntimeException e) {
if (EventManager.DEBUG) {
diff --git a/eclipse/plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/FilterImpl.java b/eclipse/plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/FilterImpl.java
index 6581e20..66b0c24 100644
--- a/eclipse/plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/FilterImpl.java
+++ b/eclipse/plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/FilterImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2009 IBM Corporation and others.
+ * Copyright (c) 2003, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -756,7 +756,12 @@ public class FilterImpl implements Filter /* since Framework 1.1 */{
return false;
}
- int intval2 = Integer.parseInt(((String) value2).trim());
+ int intval2;
+ try {
+ intval2 = Integer.parseInt(((String) value2).trim());
+ } catch (IllegalArgumentException e) {
+ return false;
+ }
switch (operation) {
case EQUAL : {
if (Debug.DEBUG && Debug.DEBUG_FILTER) {
@@ -795,7 +800,12 @@ public class FilterImpl implements Filter /* since Framework 1.1 */{
return false;
}
- long longval2 = Long.parseLong(((String) value2).trim());
+ long longval2;
+ try {
+ longval2 = Long.parseLong(((String) value2).trim());
+ } catch (IllegalArgumentException e) {
+ return false;
+ }
switch (operation) {
case EQUAL : {
if (Debug.DEBUG && Debug.DEBUG_FILTER) {
@@ -834,7 +844,12 @@ public class FilterImpl implements Filter /* since Framework 1.1 */{
return false;
}
- byte byteval2 = Byte.parseByte(((String) value2).trim());
+ byte byteval2;
+ try {
+ byteval2 = Byte.parseByte(((String) value2).trim());
+ } catch (IllegalArgumentException e) {
+ return false;
+ }
switch (operation) {
case EQUAL : {
if (Debug.DEBUG && Debug.DEBUG_FILTER) {
@@ -873,7 +888,12 @@ public class FilterImpl implements Filter /* since Framework 1.1 */{
return false;
}
- short shortval2 = Short.parseShort(((String) value2).trim());
+ short shortval2;
+ try {
+ shortval2 = Short.parseShort(((String) value2).trim());
+ } catch (IllegalArgumentException e) {
+ return false;
+ }
switch (operation) {
case EQUAL : {
if (Debug.DEBUG && Debug.DEBUG_FILTER) {
@@ -912,7 +932,12 @@ public class FilterImpl implements Filter /* since Framework 1.1 */{
return false;
}
- char charval2 = (((String) value2).trim()).charAt(0);
+ char charval2;
+ try {
+ charval2 = ((String) value2).charAt(0);
+ } catch (IndexOutOfBoundsException e) {
+ return false;
+ }
switch (operation) {
case EQUAL : {
if (Debug.DEBUG && Debug.DEBUG_FILTER) {
@@ -990,7 +1015,12 @@ public class FilterImpl implements Filter /* since Framework 1.1 */{
return false;
}
- float floatval2 = Float.parseFloat(((String) value2).trim());
+ float floatval2;
+ try {
+ floatval2 = Float.parseFloat(((String) value2).trim());
+ } catch (IllegalArgumentException e) {
+ return false;
+ }
switch (operation) {
case EQUAL : {
if (Debug.DEBUG && Debug.DEBUG_FILTER) {
@@ -1029,7 +1059,12 @@ public class FilterImpl implements Filter /* since Framework 1.1 */{
return false;
}
- double doubleval2 = Double.parseDouble(((String) value2).trim());
+ double doubleval2;
+ try {
+ doubleval2 = Double.parseDouble(((String) value2).trim());
+ } catch (IllegalArgumentException e) {
+ return false;
+ }
switch (operation) {
case EQUAL : {
if (Debug.DEBUG && Debug.DEBUG_FILTER) {
@@ -1339,10 +1374,12 @@ public class FilterImpl implements Filter /* since Framework 1.1 */{
}
private FilterImpl parse_and() throws InvalidSyntaxException {
+ int lookahead = pos;
skipWhiteSpace();
if (filterChars[pos] != '(') {
- throw new InvalidSyntaxException(NLS.bind(Msg.FILTER_MISSING_LEFTPAREN, filterstring.substring(pos)), filterstring);
+ pos = lookahead - 1;
+ return parse_item();
}
List operands = new ArrayList(10);
@@ -1356,10 +1393,12 @@ public class FilterImpl implements Filter /* since Framework 1.1 */{
}
private FilterImpl parse_or() throws InvalidSyntaxException {
+ int lookahead = pos;
skipWhiteSpace();
if (filterChars[pos] != '(') {
- throw new InvalidSyntaxException(NLS.bind(Msg.FILTER_MISSING_LEFTPAREN, filterstring.substring(pos)), filterstring);
+ pos = lookahead - 1;
+ return parse_item();
}
List operands = new ArrayList(10);
@@ -1373,10 +1412,12 @@ public class FilterImpl implements Filter /* since Framework 1.1 */{
}
private FilterImpl parse_not() throws InvalidSyntaxException {
+ int lookahead = pos;
skipWhiteSpace();
if (filterChars[pos] != '(') {
- throw new InvalidSyntaxException(NLS.bind(Msg.FILTER_MISSING_LEFTPAREN, filterstring.substring(pos)), filterstring);
+ pos = lookahead - 1;
+ return parse_item();
}
FilterImpl child = parse_filter();
@@ -1549,7 +1590,7 @@ public class FilterImpl implements Filter /* since Framework 1.1 */{
int size = operands.size();
if (size == 0) {
- throw new InvalidSyntaxException(NLS.bind(Msg.FILTER_MISSING_VALUE, filterstring.substring(pos)), filterstring);
+ return "";
}
if (size == 1) {
diff --git a/eclipse/plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/internal/serviceregistry/ServiceRegistrationImpl.java b/eclipse/plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/internal/serviceregistry/ServiceRegistrationImpl.java
index 3030c08..5cfa1ca 100755
--- a/eclipse/plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/internal/serviceregistry/ServiceRegistrationImpl.java
+++ b/eclipse/plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/internal/serviceregistry/ServiceRegistrationImpl.java
@@ -154,16 +154,18 @@ public class ServiceRegistrationImpl implements ServiceRegistration, Comparable
public void setProperties(Dictionary props) {
final ServiceReferenceImpl ref;
final ServiceProperties previousProperties;
- synchronized (registrationLock) {
- if (state != REGISTERED) { /* in the process of unregistering */
- throw new IllegalStateException(Msg.SERVICE_ALREADY_UNREGISTERED_EXCEPTION);
- }
+ synchronized (registry) {
+ synchronized (registrationLock) {
+ if (state != REGISTERED) { /* in the process of unregistering */
+ throw new IllegalStateException(Msg.SERVICE_ALREADY_UNREGISTERED_EXCEPTION);
+ }
- ref = reference; /* used to publish event outside sync */
- previousProperties = this.properties;
- this.properties = createProperties(props);
+ ref = reference; /* used to publish event outside sync */
+ previousProperties = this.properties;
+ this.properties = createProperties(props);
+ }
+ registry.modifyServiceRegistration(context, this);
}
-
/* must not hold the registrationLock when this event is published */
registry.publishServiceEvent(new ModifiedServiceEvent(ref, previousProperties));
}
diff --git a/eclipse/plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/internal/serviceregistry/ServiceRegistry.java b/eclipse/plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/internal/serviceregistry/ServiceRegistry.java
index 33a1e5f..812647f 100755
--- a/eclipse/plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/internal/serviceregistry/ServiceRegistry.java
+++ b/eclipse/plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/internal/serviceregistry/ServiceRegistry.java
@@ -586,6 +586,7 @@ public class ServiceRegistry {
/* already unregistered */
}
}
+ removeServiceRegistrations(context); // remove empty list
}
/**
@@ -808,29 +809,64 @@ public class ServiceRegistry {
}
/**
+ * Modify the ServiceRegistrationImpl in the data structure.
+ *
+ * @param context The BundleContext of the bundle registering the service.
+ * @param registration The modified ServiceRegistration.
+ */
+ /* @GuardedBy("this") */
+ void modifyServiceRegistration(BundleContextImpl context, ServiceRegistrationImpl registration) {
+ // The list of Services published by BundleContextImpl is not sorted, so
+ // we do not need to modify it.
+
+ // Remove the ServiceRegistrationImpl from the list of Services published by Class Name
+ // and then add at the correct index.
+ String[] clazzes = registration.getClasses();
+ int insertIndex;
+ for (int i = 0, size = clazzes.length; i < size; i++) {
+ String clazz = clazzes[i];
+ List services = (List) publishedServicesByClass.get(clazz);
+ services.remove(registration);
+ // The list is sorted, so we must find the proper location to insert
+ insertIndex = -Collections.binarySearch(services, registration) - 1;
+ services.add(insertIndex, registration);
+ }
+
+ // Remove the ServiceRegistrationImpl from the list of all published Services
+ // and then add at the correct index.
+ allPublishedServices.remove(registration);
+ // The list is sorted, so we must find the proper location to insert
+ insertIndex = -Collections.binarySearch(allPublishedServices, registration) - 1;
+ allPublishedServices.add(insertIndex, registration);
+ }
+
+ /**
* Remove the ServiceRegistrationImpl from the data structure.
*
* @param context The BundleContext of the bundle registering the service.
* @param registration The ServiceRegistration to remove.
*/
/* @GuardedBy("this") */
- void removeServiceRegistration(BundleContextImpl context, ServiceRegistrationImpl serviceReg) {
+ void removeServiceRegistration(BundleContextImpl context, ServiceRegistrationImpl registration) {
// Remove the ServiceRegistrationImpl from the list of Services published by BundleContextImpl.
List contextServices = (List) publishedServicesByContext.get(context);
if (contextServices != null) {
- contextServices.remove(serviceReg);
+ contextServices.remove(registration);
}
// Remove the ServiceRegistrationImpl from the list of Services published by Class Name.
- String[] clazzes = serviceReg.getClasses();
+ String[] clazzes = registration.getClasses();
for (int i = 0, size = clazzes.length; i < size; i++) {
String clazz = clazzes[i];
List services = (List) publishedServicesByClass.get(clazz);
- services.remove(serviceReg);
+ services.remove(registration);
+ if (services.isEmpty()) { // remove empty list
+ publishedServicesByClass.remove(clazz);
+ }
}
// Remove the ServiceRegistrationImpl from the list of all published Services.
- allPublishedServices.remove(serviceReg);
+ allPublishedServices.remove(registration);
}
/**
@@ -888,6 +924,15 @@ public class ServiceRegistry {
}
/**
+ * Remove Service Registrations in the data structure by BundleContext.
+ *
+ * @param context The BundleContext for which to remove Service Registrations.
+ */
+ private synchronized void removeServiceRegistrations(BundleContextImpl context) {
+ publishedServicesByContext.remove(context);
+ }
+
+ /**
* Modify a List<ServiceRegistrationImpl> in place to a List<ServiceReferenceImpl>.
*
* @param result The input List<ServiceRegistrationImpl>.
diff --git a/eclipse/plugins/org.eclipse.osgi/osgi/src/org/osgi/framework/FrameworkUtil.java b/eclipse/plugins/org.eclipse.osgi/osgi/src/org/osgi/framework/FrameworkUtil.java
index b565b86..0b31ec8 100644
--- a/eclipse/plugins/org.eclipse.osgi/osgi/src/org/osgi/framework/FrameworkUtil.java
+++ b/eclipse/plugins/org.eclipse.osgi/osgi/src/org/osgi/framework/FrameworkUtil.java
@@ -39,7 +39,7 @@ import javax.security.auth.x500.X500Principal;
*
* @since 1.3
* @ThreadSafe
- * @version $Revision: 7761 $
+ * @version $Revision: 8080 $
*/
public class FrameworkUtil {
/**
@@ -919,7 +919,13 @@ public class FrameworkUtil {
if (operation == SUBSTRING) {
return false;
}
- int intval2 = Integer.parseInt(((String) value2).trim());
+ int intval2;
+ try {
+ intval2 = Integer.parseInt(((String) value2).trim());
+ }
+ catch (IllegalArgumentException e) {
+ return false;
+ }
switch (operation) {
case APPROX :
case EQUAL : {
@@ -939,7 +945,14 @@ public class FrameworkUtil {
if (operation == SUBSTRING) {
return false;
}
- long longval2 = Long.parseLong(((String) value2).trim());
+ long longval2;
+ try {
+ longval2 = Long.parseLong(((String) value2).trim());
+ }
+ catch (IllegalArgumentException e) {
+ return false;
+ }
+
switch (operation) {
case APPROX :
case EQUAL : {
@@ -959,7 +972,14 @@ public class FrameworkUtil {
if (operation == SUBSTRING) {
return false;
}
- byte byteval2 = Byte.parseByte(((String) value2).trim());
+ byte byteval2;
+ try {
+ byteval2 = Byte.parseByte(((String) value2).trim());
+ }
+ catch (IllegalArgumentException e) {
+ return false;
+ }
+
switch (operation) {
case APPROX :
case EQUAL : {
@@ -980,7 +1000,14 @@ public class FrameworkUtil {
if (operation == SUBSTRING) {
return false;
}
- short shortval2 = Short.parseShort(((String) value2).trim());
+ short shortval2;
+ try {
+ shortval2 = Short.parseShort(((String) value2).trim());
+ }
+ catch (IllegalArgumentException e) {
+ return false;
+ }
+
switch (operation) {
case APPROX :
case EQUAL : {
@@ -1001,7 +1028,14 @@ public class FrameworkUtil {
if (operation == SUBSTRING) {
return false;
}
- char charval2 = (((String) value2).trim()).charAt(0);
+ char charval2;
+ try {
+ charval2 = ((String) value2).charAt(0);
+ }
+ catch (IndexOutOfBoundsException e) {
+ return false;
+ }
+
switch (operation) {
case EQUAL : {
return charval == charval2;
@@ -1046,7 +1080,14 @@ public class FrameworkUtil {
if (operation == SUBSTRING) {
return false;
}
- float floatval2 = Float.parseFloat(((String) value2).trim());
+ float floatval2;
+ try {
+ floatval2 = Float.parseFloat(((String) value2).trim());
+ }
+ catch (IllegalArgumentException e) {
+ return false;
+ }
+
switch (operation) {
case APPROX :
case EQUAL : {
@@ -1067,7 +1108,14 @@ public class FrameworkUtil {
if (operation == SUBSTRING) {
return false;
}
- double doubleval2 = Double.parseDouble(((String) value2).trim());
+ double doubleval2;
+ try {
+ doubleval2 = Double.parseDouble(((String) value2).trim());
+ }
+ catch (IllegalArgumentException e) {
+ return false;
+ }
+
switch (operation) {
case APPROX :
case EQUAL : {
@@ -1281,11 +1329,12 @@ public class FrameworkUtil {
}
private FilterImpl parse_and() throws InvalidSyntaxException {
+ int lookahead = pos;
skipWhiteSpace();
if (filterChars[pos] != '(') {
- throw new InvalidSyntaxException("Missing '(': "
- + filterstring.substring(pos), filterstring);
+ pos = lookahead - 1;
+ return parse_item();
}
List operands = new ArrayList(10);
@@ -1300,11 +1349,12 @@ public class FrameworkUtil {
}
private FilterImpl parse_or() throws InvalidSyntaxException {
+ int lookahead = pos;
skipWhiteSpace();
if (filterChars[pos] != '(') {
- throw new InvalidSyntaxException("Missing '(': "
- + filterstring.substring(pos), filterstring);
+ pos = lookahead - 1;
+ return parse_item();
}
List operands = new ArrayList(10);
@@ -1319,11 +1369,12 @@ public class FrameworkUtil {
}
private FilterImpl parse_not() throws InvalidSyntaxException {
+ int lookahead = pos;
skipWhiteSpace();
if (filterChars[pos] != '(') {
- throw new InvalidSyntaxException("Missing '(': "
- + filterstring.substring(pos), filterstring);
+ pos = lookahead - 1;
+ return parse_item();
}
FilterImpl child = parse_filter();
@@ -1508,8 +1559,7 @@ public class FrameworkUtil {
int size = operands.size();
if (size == 0) {
- throw new InvalidSyntaxException("Missing value: "
- + filterstring.substring(pos), filterstring);
+ return "";
}
if (size == 1) {
diff --git a/eclipse/plugins/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/module/PermissionChecker.java b/eclipse/plugins/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/module/PermissionChecker.java
index 0c9033f..4ef1b41 100644
--- a/eclipse/plugins/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/module/PermissionChecker.java
+++ b/eclipse/plugins/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/module/PermissionChecker.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
+ * Copyright (c) 2004, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -41,7 +41,7 @@ public class PermissionChecker {
errorType = ResolverError.IMPORT_PACKAGE_PERMISSION;
producer = context.getBundle(((ExportPackageDescription) bd).getExporter().getBundleId());
producerPermission = new PackagePermission(bd.getName(), PackagePermission.EXPORTONLY);
- consumerPermission = new PackagePermission(vc.getName(), producer, PackagePermission.IMPORT);
+ consumerPermission = producer != null ? new PackagePermission(vc.getName(), producer, PackagePermission.IMPORT) : new PackagePermission(vc.getName(), PackagePermission.IMPORT);
} else {
boolean requireBundle = vc instanceof BundleSpecification;
errorType = requireBundle ? ResolverError.REQUIRE_BUNDLE_PERMISSION : ResolverError.FRAGMENT_BUNDLE_PERMISSION;
diff --git a/eclipse/plugins/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/module/ResolverConstraint.java b/eclipse/plugins/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/module/ResolverConstraint.java
index 49713ee..b692b11 100644
--- a/eclipse/plugins/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/module/ResolverConstraint.java
+++ b/eclipse/plugins/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/module/ResolverConstraint.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others. All rights reserved. This
+ * Copyright (c) 2005, 2010 IBM Corporation and others. All rights reserved. This
* program and the accompanying materials are made available under the terms of
* the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html
@@ -42,9 +42,9 @@ public abstract class ResolverConstraint {
// Same as VersionConstraint but does additinal permission checks
boolean isSatisfiedBy(VersionSupplier vs) {
- if (!bundle.getResolver().getPermissionChecker().checkPermission(constraint, vs.getBaseDescription()))
+ if (vs.getResolverBundle().isUninstalled() || !bundle.getResolver().getPermissionChecker().checkPermission(constraint, vs.getBaseDescription()))
return false;
- return vs.getSubstitute() == null && !vs.getResolverBundle().isUninstalled() && constraint.isSatisfiedBy(vs.getBaseDescription());
+ return vs.getSubstitute() == null && constraint.isSatisfiedBy(vs.getBaseDescription());
}
// returns the companion VersionConstraint object from the State
diff --git a/eclipse/plugins/org.eclipse.pde.build/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.pde.build/META-INF/MANIFEST.MF
index 9a3af24..cb88ce0 100644
--- a/eclipse/plugins/org.eclipse.pde.build/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.pde.build/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
-Bundle-Version: 3.5.1.qualifier
+Bundle-Version: 3.5.2.qualifier
Bundle-SymbolicName: org.eclipse.pde.build; singleton:=true
Bundle-Vendor: %providerName
Bundle-ClassPath: pdebuild.jar
diff --git a/eclipse/plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/BrandingIron.java b/eclipse/plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/BrandingIron.java
index b831fe2..ee9bc8e 100644
--- a/eclipse/plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/BrandingIron.java
+++ b/eclipse/plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/BrandingIron.java
@@ -103,7 +103,8 @@ public class BrandingIron implements IXMLConstants {
}
else
icon = new File(icons[0]);
- Utils.copy(icon, new File(root, "icon.xpm")); //$NON-NLS-1$
+ if (icon != null)
+ Utils.copy(icon, new File(root, "icon.xpm")); //$NON-NLS-1$
}
}
diff --git a/eclipse/plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java b/eclipse/plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java
index f218882..bf53ed6 100644
--- a/eclipse/plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java
+++ b/eclipse/plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java
@@ -630,17 +630,17 @@ public class ModelBuildScriptGenerator extends AbstractBuildScriptGenerator {
script.println(" artifactRepository=\"" + Utils.getPropertyFormat(PROPERTY_P2_BUILD_REPO) + "\""); //$NON-NLS-1$ //$NON-NLS-2$
script.println(" buildResultFolder=\"" + Utils.getPropertyFormat(PROPERTY_BUILD_RESULT_FOLDER) + "\""); //$NON-NLS-1$ //$NON-NLS-2$
+ //if the feature specifies the bundle shape, or the bundle itself doesn't have a preferred shape, then use the feature shape value (true by default)
+ if (associatedEntry != null && (associatedEntry.unpackSet() || !Utils.hasBundleShapeHeader(model)))
+ script.println(" unpack=\"" + String.valueOf(associatedEntry.isUnpack()) + "\""); //$NON-NLS-1$ //$NON-NLS-2$
+
if (customBuildCallbacks != null) {
script.println(" targetFolder=\"" + root + "\""); //$NON-NLS-1$ //$NON-NLS-2$
script.println("/>"); //$NON-NLS-1$
} else {
script.println(" baseDirectory=\"${basedir}\""); //$NON-NLS-1$
- //if the feature specifies the bundle shape, or the bundle itself doesn't have a preferred shape, then use the feature shape value (true by default)
- if (associatedEntry != null && (associatedEntry.unpackSet() || !Utils.hasBundleShapeHeader(model)))
- script.println(" unpack=\"" + String.valueOf(associatedEntry.isUnpack()) + "\""); //$NON-NLS-1$ //$NON-NLS-2$
- if (Utils.isSourceBundle(model)) {
+ if (Utils.isSourceBundle(model))
script.println(" gatheredSource=\"" + Utils.getPropertyFormat(PROPERTY_BUILD_RESULT_FOLDER) + "/sources\""); //$NON-NLS-1$//$NON-NLS-2$
- }
if (workspaceOutputFolders == null || workspaceOutputFolders.size() == 0 || customBuildCallbacks != null) {
script.println("/>"); //$NON-NLS-1$
diff --git a/eclipse/plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/BuildTimeSite.java b/eclipse/plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/BuildTimeSite.java
index 3541c70..53d357c 100644
--- a/eclipse/plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/BuildTimeSite.java
+++ b/eclipse/plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/BuildTimeSite.java
@@ -104,8 +104,8 @@ public class BuildTimeSite /*extends Site*/implements IPDEBuildConstants, IXMLCo
if (provider.getInitialState() != null) {
state = new PDEState(provider.getInitialState());
state.setEESources(eeSources);
- state.resolveState();
state.setPlatformProperties(getUIPlatformProperties());
+ state.resolveState();
return state;
}
diff --git a/eclipse/plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/PDEState.java b/eclipse/plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/PDEState.java
index 9e6f07f..57ce240 100644
--- a/eclipse/plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/PDEState.java
+++ b/eclipse/plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/PDEState.java
@@ -479,15 +479,11 @@ public class PDEState implements IPDEBuildConstants, IBuildPropertiesConstants {
if (description != null && (!resolved || description.isResolved()))
return description;
- int qualifierIdx = -1;
- if ((qualifierIdx = parsedVersion.getQualifier().indexOf(IBuildPropertiesConstants.PROPERTY_QUALIFIER)) != -1) {
+ if (parsedVersion.getQualifier().indexOf(IBuildPropertiesConstants.PROPERTY_QUALIFIER) > -1) {
BundleDescription[] bundles = getState().getBundles(bundleId);
-
- String qualifierPrefix = qualifierIdx > 0 ? parsedVersion.getQualifier().substring(0, qualifierIdx - 1) : ""; //$NON-NLS-1$
-
+ VersionRange qualifierRange = Utils.createVersionRange(version);
for (int i = 0; i < bundles.length; i++) {
- Version bundleVersion = bundles[i].getVersion();
- if (bundleVersion.getMajor() == parsedVersion.getMajor() && bundleVersion.getMinor() == parsedVersion.getMinor() && bundleVersion.getMicro() == parsedVersion.getMicro() && bundleVersion.getQualifier().compareTo(qualifierPrefix) >= 0)
+ if (qualifierRange.isIncluded(bundles[i].getVersion()) && (!resolved || bundles[i].isResolved()))
return bundles[i];
}
}
diff --git a/eclipse/plugins/org.eclipse.pde.core/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.pde.core/META-INF/MANIFEST.MF
index 162dc02..24f85c3 100644
--- a/eclipse/plugins/org.eclipse.pde.core/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.pde.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %name
Bundle-SymbolicName: org.eclipse.pde.core; singleton:=true
-Bundle-Version: 3.5.100.qualifier
+Bundle-Version: 3.5.101.qualifier
Bundle-Activator: org.eclipse.pde.internal.core.PDECore
Bundle-Vendor: %provider-name
Bundle-Localization: plugin
diff --git a/eclipse/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/exports/FeatureExportOperation.java b/eclipse/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/exports/FeatureExportOperation.java
index 200df26..4a341e9 100644
--- a/eclipse/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/exports/FeatureExportOperation.java
+++ b/eclipse/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/exports/FeatureExportOperation.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others.
+ * Copyright (c) 2006, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -925,6 +925,23 @@ public class FeatureExportOperation extends Job {
}
}
+ private BundleDescription getMatchingLauncher(String[] configuration, BundleDescription[] fragments) {
+ //return the launcher fragment that matches the given configuration
+ Dictionary environment = getEnvironment(configuration);
+ for (int i = 0; i < fragments.length; i++) {
+ if (!isNLFragment(fragments[i]) && shouldAddPlugin(fragments[i], environment))
+ return fragments[i];
+ }
+ return null;
+ }
+
+ private boolean isNLFragment(BundleDescription fragment) {
+ //this assumes a name like org.eclipse.equinox.launcher.<ws>.<os>.<arch>.nl_de
+ String symbolicName = fragment.getSymbolicName();
+ int idx = symbolicName.lastIndexOf('.');
+ return (idx > -1 && symbolicName.regionMatches(true, idx + 1, "nl", 0, 2)); //$NON-NLS-1$
+ }
+
protected void createFeature(String featureID, String featureLocation, String[][] configurations, boolean includeLauncher) throws IOException {
File file = new File(featureLocation);
if (!file.exists() || !file.isDirectory())
@@ -946,6 +963,29 @@ public class FeatureExportOperation extends Job {
includes.setAttribute("id", feature.getId()); //$NON-NLS-1$
includes.setAttribute("version", feature.getVersion()); //$NON-NLS-1$
root.appendChild(includes);
+ } else {
+ IPluginModelBase launcherPlugin = PluginRegistry.findModel(IPDEBuildConstants.BUNDLE_EQUINOX_LAUNCHER);
+ if (launcherPlugin != null) {
+ BundleDescription bundle = launcherPlugin.getBundleDescription();
+ if (bundle != null) {
+ Element plugin = doc.createElement("plugin"); //$NON-NLS-1$
+ plugin.setAttribute("id", bundle.getSymbolicName()); //$NON-NLS-1$
+ plugin.setAttribute("version", bundle.getVersion().toString()); //$NON-NLS-1$
+ root.appendChild(plugin);
+ BundleDescription[] fragments = bundle.getFragments();
+ for (int i = 0; i < configurations.length; i++) {
+ BundleDescription launcherFragment = getMatchingLauncher(configurations[i], fragments);
+ if (launcherFragment != null) {
+ Element fragment = doc.createElement("plugin"); //$NON-NLS-1$
+ fragment.setAttribute("id", launcherFragment.getSymbolicName()); //$NON-NLS-1$
+ fragment.setAttribute("version", launcherFragment.getVersion().toString()); //$NON-NLS-1$
+ fragment.setAttribute("fragment", "true"); //$NON-NLS-1$ //$NON-NLS-2$
+ setFilterAttributes(fragment, configurations[i]);
+ root.appendChild(fragment);
+ }
+ }
+ }
+ }
}
}
diff --git a/eclipse/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/NameVersionDescriptor.java b/eclipse/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/NameVersionDescriptor.java
index 20ccc0f..c4e6aa9 100644
--- a/eclipse/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/NameVersionDescriptor.java
+++ b/eclipse/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/NameVersionDescriptor.java
@@ -46,7 +46,7 @@ public class NameVersionDescriptor {
* @see java.lang.Object#hashCode()
*/
public int hashCode() {
- return fId.hashCode() + fVersion != null ? fVersion.hashCode() : 0;
+ return fId.hashCode() + (fVersion != null ? fVersion.hashCode() : 0);
}
public String getId() {
diff --git a/eclipse/plugins/org.eclipse.pde.ds.core/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.pde.ds.core/META-INF/MANIFEST.MF
index fb0f64f..0c258e6 100644
--- a/eclipse/plugins/org.eclipse.pde.ds.core/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.pde.ds.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.pde.ds.core;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.1.qualifier
Bundle-Activator: org.eclipse.pde.internal.ds.core.Activator
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)",
org.eclipse.core.filebuffers;bundle-version="[3.3.0,4.0.0)",
diff --git a/eclipse/plugins/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/builders/DSErrorReporter.java b/eclipse/plugins/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/builders/DSErrorReporter.java
index b6beeba..b47ad7d 100644
--- a/eclipse/plugins/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/builders/DSErrorReporter.java
+++ b/eclipse/plugins/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/builders/DSErrorReporter.java
@@ -182,7 +182,7 @@ public class DSErrorReporter extends XMLErrorReporter {
IDSConstants.VALUE_REFERENCE_POLICY_DYNAMIC,
IDSConstants.VALUE_REFERENCE_POLICY_STATIC };
- if (attribute != null) {
+ if (attribute != null && attribute.length() > 0) {
for (int i = 0; i < allowedValues.length; i++) {
if (allowedValues[i].equalsIgnoreCase(attribute)) {
return;
diff --git a/eclipse/plugins/org.eclipse.pde.ui/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.pde.ui/META-INF/MANIFEST.MF
index 6822930..ebd4a4f 100644
--- a/eclipse/plugins/org.eclipse.pde.ui/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.pde.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %name
Bundle-SymbolicName: org.eclipse.pde.ui; singleton:=true
-Bundle-Version: 3.5.0.qualifier
+Bundle-Version: 3.5.1.qualifier
Bundle-Activator: org.eclipse.pde.internal.ui.PDEPlugin
Bundle-Vendor: %provider-name
Bundle-Localization: plugin
diff --git a/eclipse/plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/EnvironmentSection.java b/eclipse/plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/EnvironmentSection.java
index 4a8a047..53d014f 100755
--- a/eclipse/plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/EnvironmentSection.java
+++ b/eclipse/plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/EnvironmentSection.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
+ * Copyright (c) 2005, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -144,20 +144,45 @@ public class EnvironmentSection extends SectionPart {
getTarget().setOS(getText(fOSCombo));
}
});
+ // see bug 292068
+ fOSCombo.addSelectionListener(new SelectionAdapter() {
+ public void widgetSelected(SelectionEvent e) {
+ markDirty();
+ getTarget().setOS(getText(fOSCombo));
+ }
+ });
+
fWSCombo.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
markDirty();
getTarget().setWS(getText(fWSCombo));
}
});
+ // see bug 292068
+ fWSCombo.addSelectionListener(new SelectionAdapter() {
+ public void widgetSelected(SelectionEvent e) {
+ markDirty();
+ getTarget().setWS(getText(fWSCombo));
+ }
+ });
+
fArchCombo.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
markDirty();
getTarget().setArch(getText(fArchCombo));
}
});
+ // see bug 292068
+ fArchCombo.addSelectionListener(new SelectionAdapter() {
+ public void widgetSelected(SelectionEvent e) {
+ markDirty();
+ getTarget().setArch(getText(fArchCombo));
+ }
+ });
+
fNLCombo.getControl().addFocusListener(new FocusAdapter() {
public void focusGained(FocusEvent event) {
+
// if we haven't gotten all the values for the NL's, display a busy cursor to the user while we find them.
if (!LOCALES_INITIALIZED) {
try {
@@ -198,6 +223,22 @@ public class EnvironmentSection extends SectionPart {
markDirty();
}
});
+
+ // see bug 292068
+ fNLCombo.addSelectionListener(new SelectionAdapter() {
+ public void widgetSelected(SelectionEvent e) {
+ String value = getText(fNLCombo);
+ if (value == null) {
+ getTarget().setNL(null);
+ } else {
+ int index = value.indexOf("-"); //$NON-NLS-1$
+ if (index > 0)
+ value = value.substring(0, index);
+ getTarget().setNL(value.trim());
+ }
+ markDirty();
+ }
+ });
}
}
diff --git a/eclipse/plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/ProductExportWizard.java b/eclipse/plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/ProductExportWizard.java
index 6213a5b..682edf7 100644
--- a/eclipse/plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/ProductExportWizard.java
+++ b/eclipse/plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/ProductExportWizard.java
@@ -1,185 +1,167 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.exports;
-
-import java.io.File;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.osgi.service.resolver.BundleDescription;
-import org.eclipse.osgi.service.resolver.State;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.core.plugin.PluginRegistry;
-import org.eclipse.pde.internal.build.IPDEBuildConstants;
-import org.eclipse.pde.internal.core.*;
-import org.eclipse.pde.internal.core.exports.FeatureExportInfo;
-import org.eclipse.pde.internal.core.exports.ProductExportOperation;
-import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
-import org.eclipse.pde.internal.core.iproduct.IProductFeature;
-import org.eclipse.pde.internal.core.iproduct.IProductPlugin;
-import org.eclipse.pde.internal.core.product.WorkspaceProductModel;
-import org.eclipse.pde.internal.ui.PDEPluginImages;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.wizards.product.SynchronizationOperation;
-import org.eclipse.ui.progress.IProgressConstants;
-import org.osgi.framework.Version;
-
-public class ProductExportWizard extends BaseExportWizard {
-
- private static final String STORE_SECTION = "ProductExportWizard"; //$NON-NLS-1$
- private WorkspaceProductModel fProductModel;
- private CrossPlatformExportPage fPage2;
- private ProductExportWizardPage fPage;
- private IProject fProject;
-
- public ProductExportWizard() {
- this(null);
- }
-
- public ProductExportWizard(IProject project) {
- setDefaultPageImageDescriptor(PDEPluginImages.DESC_PRODUCT_EXPORT_WIZ);
- fProject = project;
- }
-
- public void addPages() {
- fPage = new ProductExportWizardPage(getSelection());
- addPage(fPage);
-
- IFeatureModel model = PDECore.getDefault().getFeatureModelManager().getDeltaPackFeature();
- if (model != null) {
- fPage2 = new CrossPlatformExportPage("environment", model); //$NON-NLS-1$
- addPage(fPage2);
- }
- }
-
- protected String getSettingsSectionName() {
- return STORE_SECTION;
- }
-
- protected void scheduleExportJob() {
- FeatureExportInfo info = new FeatureExportInfo();
- info.toDirectory = fPage.doExportToDirectory();
- info.exportSource = fPage.doExportSource();
- info.exportSourceBundle = fPage.doExportSourceBundles();
- info.allowBinaryCycles = fPage.doBinaryCycles();
- info.exportMetadata = fPage.doExportMetadata();
- info.destinationDirectory = fPage.getDestination();
- info.zipFileName = fPage.getFileName();
- if (fPage2 != null && fPage.doMultiPlatform())
- info.targets = fPage2.getTargets();
- if (fProductModel.getProduct().useFeatures())
- info.items = getFeatureModels();
- else
- info.items = getPluginModels();
-
- String rootDirectory = fPage.getRootDirectory();
- if ("".equals(rootDirectory.trim())) //$NON-NLS-1$
- rootDirectory = "."; //$NON-NLS-1$
- ProductExportOperation job = new ProductExportOperation(info, PDEUIMessages.ProductExportJob_name, fProductModel.getProduct(), rootDirectory);
- job.setUser(true);
- job.setRule(ResourcesPlugin.getWorkspace().getRoot());
- job.schedule();
- job.setProperty(IProgressConstants.ICON_PROPERTY, PDEPluginImages.DESC_FEATURE_OBJ);
- }
-
- private IFeatureModel[] getFeatureModels() {
- ArrayList list = new ArrayList();
- FeatureModelManager manager = PDECore.getDefault().getFeatureModelManager();
- IProductFeature[] features = fProductModel.getProduct().getFeatures();
- for (int i = 0; i < features.length; i++) {
- IFeatureModel model = manager.findFeatureModel(features[i].getId(), features[i].getVersion());
- if (model != null)
- list.add(model);
- }
- return (IFeatureModel[]) list.toArray(new IFeatureModel[list.size()]);
- }
-
- private BundleDescription[] getPluginModels() {
- ArrayList list = new ArrayList();
- State state = TargetPlatformHelper.getState();
- IProductPlugin[] plugins = fProductModel.getProduct().getPlugins();
- for (int i = 0; i < plugins.length; i++) {
- BundleDescription bundle = null;
- String v = plugins[i].getVersion();
- if (v != null && v.length() > 0) {
- bundle = state.getBundle(plugins[i].getId(), Version.parseVersion(v));
- }
- // if there's no version, just grab a bundle like before
- if (bundle == null)
- bundle = state.getBundle(plugins[i].getId(), null);
- if (bundle != null)
- list.add(bundle);
- }
- // implicitly add the new launcher plug-in/fragment if we are to use the
- // new launching story and the launcher plug-in/fragment are not already included in the .product file
- IPluginModelBase launcherPlugin = PluginRegistry.findModel(IPDEBuildConstants.BUNDLE_EQUINOX_LAUNCHER);
- if (launcherPlugin != null) {
- BundleDescription bundle = launcherPlugin.getBundleDescription();
- if (bundle != null && !list.contains(bundle)) {
- list.add(bundle);
- BundleDescription[] fragments = bundle.getFragments();
- for (int i = 0; i < fragments.length; i++) {
- if (!list.contains(fragments[i])) {
- list.add(fragments[i]);
- }
- }
- }
- }
- return (BundleDescription[]) list.toArray(new BundleDescription[list.size()]);
- }
-
- protected boolean performPreliminaryChecks() {
- fProductModel = new WorkspaceProductModel(fPage.getProductFile(), false);
- try {
- fProductModel.load();
- if (!fProductModel.isLoaded()) {
- MessageDialog.openError(getContainer().getShell(), PDEUIMessages.ProductExportWizard_error, PDEUIMessages.ProductExportWizard_corrupt); //
- return false;
- }
- } catch (CoreException e) {
- MessageDialog.openError(getContainer().getShell(), PDEUIMessages.ProductExportWizard_error, PDEUIMessages.ProductExportWizard_corrupt); //
- return false;
- }
-
- if (fPage.doSync()) {
- try {
- getContainer().run(false, false, new SynchronizationOperation(fProductModel.getProduct(), getContainer().getShell(), fProject));
- } catch (InvocationTargetException e) {
- MessageDialog.openError(getContainer().getShell(), PDEUIMessages.ProductExportWizard_syncTitle, e.getTargetException().getMessage());
- return false;
- } catch (InterruptedException e) {
- return false;
- }
- }
- return true;
- }
-
- protected boolean confirmDelete() {
- if (!fPage.doExportToDirectory()) {
- File zipFile = new File(fPage.getDestination(), fPage.getFileName());
- if (zipFile.exists()) {
- if (!MessageDialog.openQuestion(getContainer().getShell(), PDEUIMessages.BaseExportWizard_confirmReplace_title, NLS.bind(PDEUIMessages.BaseExportWizard_confirmReplace_desc, zipFile.getAbsolutePath())))
- return false;
- zipFile.delete();
- }
- }
- return true;
- }
-
- public boolean canFinish() {
- return (fPage.getNextPage() != null) ? super.canFinish() : fPage.isPageComplete();
- }
-
-}
+/*******************************************************************************
+ * Copyright (c) 2005, 2010 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.pde.internal.ui.wizards.exports;
+
+import java.io.File;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.osgi.service.resolver.BundleDescription;
+import org.eclipse.osgi.service.resolver.State;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.pde.internal.core.*;
+import org.eclipse.pde.internal.core.exports.FeatureExportInfo;
+import org.eclipse.pde.internal.core.exports.ProductExportOperation;
+import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
+import org.eclipse.pde.internal.core.iproduct.IProductFeature;
+import org.eclipse.pde.internal.core.iproduct.IProductPlugin;
+import org.eclipse.pde.internal.core.product.WorkspaceProductModel;
+import org.eclipse.pde.internal.ui.PDEPluginImages;
+import org.eclipse.pde.internal.ui.PDEUIMessages;
+import org.eclipse.pde.internal.ui.wizards.product.SynchronizationOperation;
+import org.eclipse.ui.progress.IProgressConstants;
+import org.osgi.framework.Version;
+
+public class ProductExportWizard extends BaseExportWizard {
+
+ private static final String STORE_SECTION = "ProductExportWizard"; //$NON-NLS-1$
+ private WorkspaceProductModel fProductModel;
+ private CrossPlatformExportPage fPage2;
+ private ProductExportWizardPage fPage;
+ private IProject fProject;
+
+ public ProductExportWizard() {
+ this(null);
+ }
+
+ public ProductExportWizard(IProject project) {
+ setDefaultPageImageDescriptor(PDEPluginImages.DESC_PRODUCT_EXPORT_WIZ);
+ fProject = project;
+ }
+
+ public void addPages() {
+ fPage = new ProductExportWizardPage(getSelection());
+ addPage(fPage);
+
+ IFeatureModel model = PDECore.getDefault().getFeatureModelManager().getDeltaPackFeature();
+ if (model != null) {
+ fPage2 = new CrossPlatformExportPage("environment", model); //$NON-NLS-1$
+ addPage(fPage2);
+ }
+ }
+
+ protected String getSettingsSectionName() {
+ return STORE_SECTION;
+ }
+
+ protected void scheduleExportJob() {
+ FeatureExportInfo info = new FeatureExportInfo();
+ info.toDirectory = fPage.doExportToDirectory();
+ info.exportSource = fPage.doExportSource();
+ info.exportSourceBundle = fPage.doExportSourceBundles();
+ info.allowBinaryCycles = fPage.doBinaryCycles();
+ info.exportMetadata = fPage.doExportMetadata();
+ info.destinationDirectory = fPage.getDestination();
+ info.zipFileName = fPage.getFileName();
+ if (fPage2 != null && fPage.doMultiPlatform())
+ info.targets = fPage2.getTargets();
+ if (fProductModel.getProduct().useFeatures())
+ info.items = getFeatureModels();
+ else
+ info.items = getPluginModels();
+
+ String rootDirectory = fPage.getRootDirectory();
+ if ("".equals(rootDirectory.trim())) //$NON-NLS-1$
+ rootDirectory = "."; //$NON-NLS-1$
+ ProductExportOperation job = new ProductExportOperation(info, PDEUIMessages.ProductExportJob_name, fProductModel.getProduct(), rootDirectory);
+ job.setUser(true);
+ job.setRule(ResourcesPlugin.getWorkspace().getRoot());
+ job.schedule();
+ job.setProperty(IProgressConstants.ICON_PROPERTY, PDEPluginImages.DESC_FEATURE_OBJ);
+ }
+
+ private IFeatureModel[] getFeatureModels() {
+ ArrayList list = new ArrayList();
+ FeatureModelManager manager = PDECore.getDefault().getFeatureModelManager();
+ IProductFeature[] features = fProductModel.getProduct().getFeatures();
+ for (int i = 0; i < features.length; i++) {
+ IFeatureModel model = manager.findFeatureModel(features[i].getId(), features[i].getVersion());
+ if (model != null)
+ list.add(model);
+ }
+ return (IFeatureModel[]) list.toArray(new IFeatureModel[list.size()]);
+ }
+
+ private BundleDescription[] getPluginModels() {
+ ArrayList list = new ArrayList();
+ State state = TargetPlatformHelper.getState();
+ IProductPlugin[] plugins = fProductModel.getProduct().getPlugins();
+ for (int i = 0; i < plugins.length; i++) {
+ BundleDescription bundle = null;
+ String v = plugins[i].getVersion();
+ if (v != null && v.length() > 0) {
+ bundle = state.getBundle(plugins[i].getId(), Version.parseVersion(v));
+ }
+ // if there's no version, just grab a bundle like before
+ if (bundle == null)
+ bundle = state.getBundle(plugins[i].getId(), null);
+ if (bundle != null)
+ list.add(bundle);
+ }
+ return (BundleDescription[]) list.toArray(new BundleDescription[list.size()]);
+ }
+
+ protected boolean performPreliminaryChecks() {
+ fProductModel = new WorkspaceProductModel(fPage.getProductFile(), false);
+ try {
+ fProductModel.load();
+ if (!fProductModel.isLoaded()) {
+ MessageDialog.openError(getContainer().getShell(), PDEUIMessages.ProductExportWizard_error, PDEUIMessages.ProductExportWizard_corrupt); //
+ return false;
+ }
+ } catch (CoreException e) {
+ MessageDialog.openError(getContainer().getShell(), PDEUIMessages.ProductExportWizard_error, PDEUIMessages.ProductExportWizard_corrupt); //
+ return false;
+ }
+
+ if (fPage.doSync()) {
+ try {
+ getContainer().run(false, false, new SynchronizationOperation(fProductModel.getProduct(), getContainer().getShell(), fProject));
+ } catch (InvocationTargetException e) {
+ MessageDialog.openError(getContainer().getShell(), PDEUIMessages.ProductExportWizard_syncTitle, e.getTargetException().getMessage());
+ return false;
+ } catch (InterruptedException e) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ protected boolean confirmDelete() {
+ if (!fPage.doExportToDirectory()) {
+ File zipFile = new File(fPage.getDestination(), fPage.getFileName());
+ if (zipFile.exists()) {
+ if (!MessageDialog.openQuestion(getContainer().getShell(), PDEUIMessages.BaseExportWizard_confirmReplace_title, NLS.bind(PDEUIMessages.BaseExportWizard_confirmReplace_desc, zipFile.getAbsolutePath())))
+ return false;
+ zipFile.delete();
+ }
+ }
+ return true;
+ }
+
+ public boolean canFinish() {
+ return (fPage.getNextPage() != null) ? super.canFinish() : fPage.isPageComplete();
+ }
+
+}
diff --git a/eclipse/plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportOperation.java b/eclipse/plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportOperation.java
index fe1c874..70bcd61 100644
--- a/eclipse/plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportOperation.java
+++ b/eclipse/plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportOperation.java
@@ -335,14 +335,22 @@ public class PluginImportOperation extends WorkspaceJob {
// Extract the binary plug-in (for non-class files)
// Use the package locations map to put files that belong in the package directory structure into the proper source directory
if (isJARd(model)) {
- Map collected = new HashMap();
- ZipFileStructureProvider provider = new ZipFileStructureProvider(new ZipFile(new File(model.getInstallLocation())));
- PluginImportHelper.collectBinaryFiles(provider, provider.getRoot(), packageLocations, collected);
- for (Iterator iterator = collected.keySet().iterator(); iterator.hasNext();) {
- IPath currentDestination = (IPath) iterator.next();
- IPath destination = project.getFullPath();
- destination = destination.append(currentDestination);
- PluginImportHelper.importContent(provider.getRoot(), destination, provider, (List) collected.get(currentDestination), new NullProgressMonitor());
+ ZipFile zip = null;
+ try {
+ zip = new ZipFile(new File(model.getInstallLocation()));
+ ZipFileStructureProvider provider = new ZipFileStructureProvider(zip);
+ Map collected = new HashMap();
+ PluginImportHelper.collectBinaryFiles(provider, provider.getRoot(), packageLocations, collected);
+ for (Iterator iterator = collected.keySet().iterator(); iterator.hasNext();) {
+ IPath currentDestination = (IPath) iterator.next();
+ IPath destination = project.getFullPath();
+ destination = destination.append(currentDestination);
+ PluginImportHelper.importContent(provider.getRoot(), destination, provider, (List) collected.get(currentDestination), new NullProgressMonitor());
+ }
+ } finally {
+ if (zip != null) {
+ zip.close();
+ }
}
monitor.worked(1);
} else {
@@ -482,11 +490,13 @@ public class PluginImportOperation extends WorkspaceJob {
}
// Check for source inside the binary plug-in
+ ZipFile zip = null;
try {
IImportStructureProvider provider;
Object root;
if (isJARd(model)) {
- provider = new ZipFileStructureProvider(new ZipFile(new File(model.getInstallLocation())));
+ zip = new ZipFile(new File(model.getInstallLocation()));
+ provider = new ZipFileStructureProvider(zip);
root = ((ZipFileStructureProvider) provider).getRoot();
} else {
provider = FileSystemStructureProvider.INSTANCE;
@@ -501,6 +511,13 @@ public class PluginImportOperation extends WorkspaceJob {
}
} catch (IOException e) {
// Do nothing, any other problems will be caught during binary import
+ } finally {
+ if (zip != null) {
+ try {
+ zip.close();
+ } catch (IOException e) {
+ }
+ }
}
return false;
@@ -720,22 +737,31 @@ public class PluginImportOperation extends WorkspaceJob {
private boolean handleInternalSource(IPluginModelBase model, WorkspaceBuildModel buildModel, Map packageLocations) throws CoreException, ZipException, IOException {
IImportStructureProvider provider;
Object root;
- if (isJARd(model)) {
- provider = new ZipFileStructureProvider(new ZipFile(new File(model.getInstallLocation())));
- root = ((ZipFileStructureProvider) provider).getRoot();
- } else {
- provider = FileSystemStructureProvider.INSTANCE;
- root = new File(model.getInstallLocation());
- }
- IPath defaultSourcePath = new Path(DEFAULT_SOURCE_DIR);
- ArrayList collected = new ArrayList();
- PluginImportHelper.collectResourcesFromFolder(provider, root, defaultSourcePath, collected);
- if (collected.size() > 0) {
- Set packages = new HashSet();
- PluginImportHelper.collectJavaPackages(provider, collected, defaultSourcePath, packages);
- addPackageEntries(packages, defaultSourcePath, packageLocations);
- addBuildEntry(buildModel, "source." + DEFAULT_LIBRARY_NAME, DEFAULT_SOURCE_DIR + "/"); //$NON-NLS-1$ //$NON-NLS-2$
- return true;
+
+ ZipFile zip = null;
+ try {
+ if (isJARd(model)) {
+ zip = new ZipFile(new File(model.getInstallLocation()));
+ provider = new ZipFileStructureProvider(zip);
+ root = ((ZipFileStructureProvider) provider).getRoot();
+ } else {
+ provider = FileSystemStructureProvider.INSTANCE;
+ root = new File(model.getInstallLocation());
+ }
+ IPath defaultSourcePath = new Path(DEFAULT_SOURCE_DIR);
+ ArrayList collected = new ArrayList();
+ PluginImportHelper.collectResourcesFromFolder(provider, root, defaultSourcePath, collected);
+ if (collected.size() > 0) {
+ Set packages = new HashSet();
+ PluginImportHelper.collectJavaPackages(provider, collected, defaultSourcePath, packages);
+ addPackageEntries(packages, defaultSourcePath, packageLocations);
+ addBuildEntry(buildModel, "source." + DEFAULT_LIBRARY_NAME, DEFAULT_SOURCE_DIR + "/"); //$NON-NLS-1$ //$NON-NLS-2$
+ return true;
+ }
+ } finally {
+ if (zip != null) {
+ zip.close();
+ }
}
return false;
}
@@ -777,16 +803,24 @@ public class PluginImportOperation extends WorkspaceJob {
File sourceLocation = PDECore.getDefault().getSourceLocationManager().findSourcePlugin(model.getPluginBase());
if (sourceLocation != null) {
if (sourceLocation.isFile()) {
- ArrayList collected = new ArrayList();
- ZipFileStructureProvider provider = null;
+ ZipFile zip = null;
try {
- provider = new ZipFileStructureProvider(new ZipFile(sourceLocation));
+ zip = new ZipFile(sourceLocation);
+ ZipFileStructureProvider provider = new ZipFileStructureProvider(zip);
+ ArrayList collected = new ArrayList();
+ PluginImportHelper.collectNonJavaNonBuildFiles(provider, provider.getRoot(), collected);
+ PluginImportHelper.importContent(provider.getRoot(), project.getFullPath(), provider, collected, monitor);
} catch (IOException e) {
IStatus status = new Status(IStatus.ERROR, PDEPlugin.getPluginId(), IStatus.ERROR, e.getMessage(), e);
throw new CoreException(status);
+ } finally {
+ if (zip != null) {
+ try {
+ zip.close();
+ } catch (IOException e) {
+ }
+ }
}
- PluginImportHelper.collectNonJavaNonBuildFiles(provider, provider.getRoot(), collected);
- PluginImportHelper.importContent(provider.getRoot(), project.getFullPath(), provider, collected, monitor);
} else {
ArrayList collected = new ArrayList();
PluginImportHelper.collectNonJavaNonBuildFiles(FileSystemStructureProvider.INSTANCE, sourceLocation, collected);
@@ -805,16 +839,24 @@ public class PluginImportOperation extends WorkspaceJob {
*/
private void importRequiredPluginFiles(IProject project, IPluginModelBase model, IProgressMonitor monitor) throws CoreException {
if (isJARd(model)) {
- ArrayList collected = new ArrayList();
- ZipFileStructureProvider provider = null;
+ ZipFile zip = null;
try {
- provider = new ZipFileStructureProvider(new ZipFile(new File(model.getInstallLocation())));
+ zip = new ZipFile(new File(model.getInstallLocation()));
+ ZipFileStructureProvider provider = new ZipFileStructureProvider(zip);
+ ArrayList collected = new ArrayList();
+ PluginImportHelper.collectRequiredBundleFiles(provider, provider.getRoot(), collected);
+ PluginImportHelper.importContent(provider.getRoot(), project.getFullPath(), provider, collected, monitor);
} catch (IOException e) {
IStatus status = new Status(IStatus.ERROR, PDEPlugin.getPluginId(), IStatus.ERROR, e.getMessage(), e);
throw new CoreException(status);
+ } finally {
+ if (zip != null) {
+ try {
+ zip.close();
+ } catch (IOException e) {
+ }
+ }
}
- PluginImportHelper.collectRequiredBundleFiles(provider, provider.getRoot(), collected);
- PluginImportHelper.importContent(provider.getRoot(), project.getFullPath(), provider, collected, monitor);
} else {
ArrayList collected = new ArrayList();
File file = new File(model.getInstallLocation());
diff --git a/eclipse/plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/target/TargetDefinitionContentPage.java b/eclipse/plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/target/TargetDefinitionContentPage.java
index 0cfd073..f19113e 100644
--- a/eclipse/plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/target/TargetDefinitionContentPage.java
+++ b/eclipse/plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/target/TargetDefinitionContentPage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
+ * Copyright (c) 2009, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -336,6 +336,12 @@ public class TargetDefinitionContentPage extends TargetDefinitionPage {
getTargetDefinition().setOS(getModelValue(fOSCombo.getText()));
}
});
+ // see bug 292068
+ fOSCombo.addSelectionListener(new SelectionAdapter() {
+ public void widgetSelected(SelectionEvent e) {
+ getTargetDefinition().setOS(getModelValue(fOSCombo.getText()));
+ }
+ });
SWTFactory.createLabel(group, PDEUIMessages.Preferences_TargetEnvironmentPage_ws, 1);
@@ -345,6 +351,12 @@ public class TargetDefinitionContentPage extends TargetDefinitionPage {
getTargetDefinition().setWS(getModelValue(fWSCombo.getText()));
}
});
+ // see bug 292068
+ fWSCombo.addSelectionListener(new SelectionAdapter() {
+ public void widgetSelected(SelectionEvent e) {
+ getTargetDefinition().setWS(getModelValue(fWSCombo.getText()));
+ }
+ });
SWTFactory.createLabel(group, PDEUIMessages.Preferences_TargetEnvironmentPage_arch, 1);
@@ -354,6 +366,12 @@ public class TargetDefinitionContentPage extends TargetDefinitionPage {
getTargetDefinition().setArch(getModelValue(fArchCombo.getText()));
}
});
+ // see bug 292068
+ fArchCombo.addSelectionListener(new SelectionAdapter() {
+ public void widgetSelected(SelectionEvent e) {
+ getTargetDefinition().setArch(getModelValue(fArchCombo.getText()));
+ }
+ });
SWTFactory.createLabel(group, PDEUIMessages.Preferences_TargetEnvironmentPage_nl, 1);
@@ -367,6 +385,16 @@ public class TargetDefinitionContentPage extends TargetDefinitionPage {
getTargetDefinition().setNL(getModelValue(value));
}
});
+ // see bug 292068
+ fNLCombo.addSelectionListener(new SelectionAdapter() {
+ public void widgetSelected(SelectionEvent e) {
+ String value = fNLCombo.getText();
+ int index = value.indexOf("-"); //$NON-NLS-1$
+ if (index > 0)
+ value = value.substring(0, index);
+ getTargetDefinition().setNL(getModelValue(value));
+ }
+ });
}
/**
@@ -387,10 +415,10 @@ public class TargetDefinitionContentPage extends TargetDefinitionPage {
}
/**
- * Delimits a comma separated preference and add the items to the given set
- * @param set
- * @param preference
- */
+ * Delimits a comma separated preference and add the items to the given set
+ * @param set
+ * @param preference
+ */
private void addExtraChoices(Set set, String preference) {
StringTokenizer tokenizer = new StringTokenizer(preference, ","); //$NON-NLS-1$
while (tokenizer.hasMoreTokens()) {
diff --git a/eclipse/plugins/org.eclipse.platform.doc.isv/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.platform.doc.isv/META-INF/MANIFEST.MF
index 3d29b85..7f21aa4 100644
--- a/eclipse/plugins/org.eclipse.platform.doc.isv/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.platform.doc.isv/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.platform.doc.isv; singleton:=true
-Bundle-Version: 3.5.1.qualifier
+Bundle-Version: 3.5.2.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Require-Bundle: org.eclipse.help;bundle-version="[3.2.0,4.0.0)"
diff --git a/eclipse/plugins/org.eclipse.platform.doc.isv/reference/misc/runtime-options.html b/eclipse/plugins/org.eclipse.platform.doc.isv/reference/misc/runtime-options.html
index 6049242..34e15b9 100644
--- a/eclipse/plugins/org.eclipse.platform.doc.isv/reference/misc/runtime-options.html
+++ b/eclipse/plugins/org.eclipse.platform.doc.isv/reference/misc/runtime-options.html
@@ -14,7 +14,7 @@
<body>
<h1>The Eclipse runtime options</h1>
-<p>Version 3.5.1 - Last revised August 5, 2009</p>
+<p>Version 3.5.2 - Last revised January 18, 2010</p>
<p>The Eclipse platform is highly configurable. Configuration input takes the
form of command line arguments and System property settings. In many cases
the command line arguments are simply short cuts for setting the related System
@@ -362,7 +362,9 @@ in <a href="#eclipsevm">eclipse.vm</a>.</dd>
<a href="#osgiconfigurationarea">osgi.configuration.area</a> is not specified.</dd>
<dt><a name="osgibundlefilelimit"></a>osgi.bundlefile.limit</dt>
<dd>specifies a limit on the number of jar files the framework will keep open.
- The minimum value allowed is 10. By default the value is unlimited.</dd>
+ The minimum value allowed is 10. Any value less than 10 will disable the
+ bundle file limit, making the the number of jar files the framework
+ keeps open unlimited. By default the value is 100.</dd>
<dt><a name="osgibundles"></a>osgi.bundles</dt>
<dd>The comma-separated list of bundles which are automatically installed
and optionally started
diff --git a/eclipse/plugins/org.eclipse.platform.doc.user/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.platform.doc.user/META-INF/MANIFEST.MF
index 2fc9b50..9d85d03 100644
--- a/eclipse/plugins/org.eclipse.platform.doc.user/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.platform.doc.user/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.platform.doc.user; singleton:=true
-Bundle-Version: 3.5.1.qualifier
+Bundle-Version: 3.5.2.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Require-Bundle: org.eclipse.help;bundle-version="[3.2.0,4.0.0)"
diff --git a/eclipse/plugins/org.eclipse.platform.doc.user/contexts_Workbench.xml b/eclipse/plugins/org.eclipse.platform.doc.user/contexts_Workbench.xml
index ee0c469..1cf279f 100644
--- a/eclipse/plugins/org.eclipse.platform.doc.user/contexts_Workbench.xml
+++ b/eclipse/plugins/org.eclipse.platform.doc.user/contexts_Workbench.xml
@@ -685,7 +685,7 @@
<context id="export_wizard_selection_wizard_page_context">
<description>Choose the type of export you would like to do.</description>
<topic label="Using the Export Wizard" href="reference/ref-71.htm"/>
- <topic label="Exporting resources" href="tasks/tasks-57.htm"/>
+ <topic label="Exporting resources" href="tasks/tasks-57.xhtml"/>
<topic label="Exporting to the File System" href="tasks/tasks-59.htm"/>
<topic label="Exporting to a Zip File" href="tasks/tasks-59ag.htm"/>
</context>
@@ -746,7 +746,7 @@
</context>
<context id="export_wizard_context">
<description>Wizard to assist in exporting resources.</description>
- <topic label="Exporting files" href="tasks/tasks-57.htm"/>
+ <topic label="Exporting files" href="tasks/tasks-57.xhtml"/>
<topic label="Exporting to the File System" href="tasks/tasks-59.htm"/>
<topic label="Exporting to a Zip File" href="tasks/tasks-59ag.htm"/>
<topic label="Export Wizard" href="reference/ref-71.htm"/>
diff --git a/eclipse/plugins/org.eclipse.platform.doc.user/gettingStarted/intro/overview.htm b/eclipse/plugins/org.eclipse.platform.doc.user/gettingStarted/intro/overview.htm
index e066a4a..aad9075 100644
--- a/eclipse/plugins/org.eclipse.platform.doc.user/gettingStarted/intro/overview.htm
+++ b/eclipse/plugins/org.eclipse.platform.doc.user/gettingStarted/intro/overview.htm
@@ -10,18 +10,6 @@
<title>Eclipse platform overview</title>
<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"> </script>
-<script type="text/javaScript">
- function openRelatedLink(rel) {
- var href = '/org.eclipse.platform.doc.user/'+rel;
- if (self.name=="ContentViewFrame") {
- showTopicInContents(href);
- window.location = '../../'+rel;
- }
- else {
- window.location = 'http://org.eclipse.ui.intro/showHelpTopic?id='+href;
- }
- }
-</script>
</head>
<BODY BGCOLOR="#ffffff">
@@ -45,22 +33,22 @@ what appears in certain menus and tool bars. More than one Workbench windo
on the desktop at any given time.</P>
<P>
<img border="0" src="../../images/ngrelc.png" alt="Related concepts"><br>
-<a href="javaScript:openRelatedLink('concepts/concepts-25.htm')">Features</a><br>
-<a href="javaScript:openRelatedLink('concepts/concepts-12.htm')">Resources</a><br>
-<a href="javaScript:openRelatedLink('concepts/concepts-4.htm')">Perspectives</a><br>
-<a href="javaScript:openRelatedLink('concepts/concepts-5.htm')">Views</a><br>
-<a href="javaScript:openRelatedLink('concepts/concepts-6.htm')">Editors</a><br>
-<a href="javaScript:openRelatedLink('concepts/concepts-27c.htm')">CVS Repositories</a>
+<a href="../../concepts/concepts-25.htm">Features</a><br>
+<a href="../../concepts/concepts-12.htm">Resources</a><br>
+<a href="../../concepts/concepts-4.htm">Perspectives</a><br>
+<a href="../../concepts/concepts-5.htm">Views</a><br>
+<a href="../../concepts/concepts-6.htm">Editors</a><br>
+<a href="../../concepts/concepts-27c.htm">CVS Repositories</a>
</P>
<P>
<img border="0" src="../../images/ngrelt.png" alt="Related tasks"><br>
-<a href="javaScript:openRelatedLink('tasks/tasks-124.htm')">Installing new software</a><br>
-<a href="javaScript:openRelatedLink('tasks/tasks-9f.htm')">Opening perspectives</a><br>
-<a href="javaScript:openRelatedLink('tasks/tasks-3.htm')">Opening views</a><br>
-<a href="javaScript:openRelatedLink('tasks/tasks-28.htm')">Switching between perspectives</a><br>
-<a href="javaScript:openRelatedLink('tasks/tasks-9n.htm')">Showing and hiding menu items and toolbar buttons</a><br>
-<a href="javaScript:openRelatedLink('tasks/tasks-9m.htm')">Configuring perspective command groups</a><br>
-<a href="javaScript:openRelatedLink('tasks/tasks-9k.htm')">Configuring perspective shortcuts</a><br>
+<a href="../../tasks/tasks-124.htm">Installing new software</a><br>
+<a href="../../tasks/tasks-9f.htm">Opening perspectives</a><br>
+<a href="../../tasks/tasks-3.htm">Opening views</a><br>
+<a href="../../tasks/tasks-28.htm">Switching between perspectives</a><br>
+<a href="../../tasks/tasks-9n.htm">Showing and hiding menu items and toolbar buttons</a><br>
+<a href="../../tasks/tasks-9m.htm">Configuring perspective command groups</a><br>
+<a href="../../tasks/tasks-9k.htm">Configuring perspective shortcuts</a><br>
</P>
diff --git a/eclipse/plugins/org.eclipse.platform/3_6SplashHeliosPsd.zip b/eclipse/plugins/org.eclipse.platform/3_6SplashHeliosPsd.zip
new file mode 100644
index 0000000..889f8a0
Binary files /dev/null and b/eclipse/plugins/org.eclipse.platform/3_6SplashHeliosPsd.zip differ
diff --git a/eclipse/plugins/org.eclipse.platform/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.platform/META-INF/MANIFEST.MF
index b26ee74..917625b 100644
--- a/eclipse/plugins/org.eclipse.platform/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.platform/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.platform; singleton:=true
-Bundle-Version: 3.3.201.qualifier
+Bundle-Version: 3.3.202.qualifier
Bundle-ClassPath: platform.jar
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/eclipse/plugins/org.eclipse.platform/about.properties b/eclipse/plugins/org.eclipse.platform/about.properties
index 4c8ecfc..8bf09c1 100644
--- a/eclipse/plugins/org.eclipse.platform/about.properties
+++ b/eclipse/plugins/org.eclipse.platform/about.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2000, 2009 IBM Corporation and others.
+# Copyright (c) 2000, 2010 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -21,7 +21,7 @@ blurb=Eclipse Platform\n\
Version: {featureVersion}\n\
Build id: {0}\n\
\n\
-(c) Copyright Eclipse contributors and others 2000, 2009. All rights reserved.\n\
+(c) Copyright Eclipse contributors and others 2000, 2010. All rights reserved.\n\
Visit http://www.eclipse.org/platform\n\
\n\
This product includes software developed by the\n\
diff --git a/eclipse/plugins/org.eclipse.platform/launchersrc.zip b/eclipse/plugins/org.eclipse.platform/launchersrc.zip
index cb6f488..37df238 100644
Binary files a/eclipse/plugins/org.eclipse.platform/launchersrc.zip and b/eclipse/plugins/org.eclipse.platform/launchersrc.zip differ
diff --git a/eclipse/plugins/org.eclipse.platform/plugin.properties b/eclipse/plugins/org.eclipse.platform/plugin.properties
index a1140e9..16681ba 100644
--- a/eclipse/plugins/org.eclipse.platform/plugin.properties
+++ b/eclipse/plugins/org.eclipse.platform/plugin.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2000, 2008 IBM Corporation and others.
+# Copyright (c) 2000, 2010 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -14,10 +14,10 @@ providerName=Eclipse.org
productName=Eclipse Platform
productBlurb=Eclipse Platform\n\
\n\
-Version: 3.5.1\n\
+Version: 3.5.2\n\
Build id: {0}\n\
\n\
-(c) Copyright Eclipse contributors and others 2000, 2009. All rights reserved.\n\
+(c) Copyright Eclipse contributors and others 2000, 2010. All rights reserved.\n\
Visit http://www.eclipse.org/platform\n\
\n\
This product includes software developed by the\n\
diff --git a/eclipse/plugins/org.eclipse.platform/splash.bmp b/eclipse/plugins/org.eclipse.platform/splash.bmp
index 0c4f760..4546d9e 100644
Binary files a/eclipse/plugins/org.eclipse.platform/splash.bmp and b/eclipse/plugins/org.eclipse.platform/splash.bmp differ
diff --git a/eclipse/plugins/org.eclipse.rcp/about.properties b/eclipse/plugins/org.eclipse.rcp/about.properties
index e855b9f..f6d85d0 100644
--- a/eclipse/plugins/org.eclipse.rcp/about.properties
+++ b/eclipse/plugins/org.eclipse.rcp/about.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2000, 2009 IBM Corporation and others.
+# Copyright (c) 2000, 2010 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -19,6 +19,6 @@ blurb=Eclipse RCP\n\
Version: {featureVersion}\n\
Build id: {0}\n\
\n\
-(c) Copyright Eclipse contributors and others 2000, 2009. All rights reserved.\n\
+(c) Copyright Eclipse contributors and others 2000, 2010. All rights reserved.\n\
Visit http://www.eclipse.org/rcp
diff --git a/eclipse/plugins/org.eclipse.sdk/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.sdk/META-INF/MANIFEST.MF
index 51dab00..7db6fc9 100644
--- a/eclipse/plugins/org.eclipse.sdk/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.sdk/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.sdk; singleton:=true
-Bundle-Version: 3.5.1.qualifier
+Bundle-Version: 3.5.2.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
diff --git a/eclipse/plugins/org.eclipse.sdk/about.properties b/eclipse/plugins/org.eclipse.sdk/about.properties
index f2c4383..f7a8801 100644
--- a/eclipse/plugins/org.eclipse.sdk/about.properties
+++ b/eclipse/plugins/org.eclipse.sdk/about.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2000, 2009 IBM Corporation and others.
+# Copyright (c) 2000, 2010 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -19,6 +19,6 @@ blurb=Eclipse Project SDK\n\
Version: {featureVersion}\n\
Build id: {0}\n\
\n\
-(c) Copyright Eclipse contributors and others 2000, 2009. All rights reserved.\n\
+(c) Copyright Eclipse contributors and others 2000, 2010. All rights reserved.\n\
Visit http://www.eclipse.org/eclipse
diff --git a/eclipse/plugins/org.eclipse.sdk/plugin.properties b/eclipse/plugins/org.eclipse.sdk/plugin.properties
index 53b4590..438fd19 100644
--- a/eclipse/plugins/org.eclipse.sdk/plugin.properties
+++ b/eclipse/plugins/org.eclipse.sdk/plugin.properties
@@ -14,10 +14,10 @@ providerName=Eclipse.org
productName=Eclipse SDK
productBlurb=Eclipse SDK\n\
\n\
-Version: 3.5.1\n\
+Version: 3.5.2\n\
Build id: {0}\n\
\n\
-(c) Copyright Eclipse contributors and others 2000, 2009. All rights reserved.\n\
+(c) Copyright Eclipse contributors and others 2000, 2010. All rights reserved.\n\
Visit http://www.eclipse.org/platform\n\
\n\
This product includes software developed by the\n\
diff --git a/eclipse/plugins/org.eclipse.sdk/plugin.xml b/eclipse/plugins/org.eclipse.sdk/plugin.xml
index 329acf3..df5ca36 100644
--- a/eclipse/plugins/org.eclipse.sdk/plugin.xml
+++ b/eclipse/plugins/org.eclipse.sdk/plugin.xml
@@ -302,19 +302,6 @@
<engine
enabled="true"
engineTypeId="org.eclipse.help.ui.web"
- id="org.eclipse.sdk.Google"
- label="%search.Google.label">
- <description>
- %search.Google.desc
- </description>
- <param
- name="url"
- value="http://www.google.com/search?hl=en&q={expression}&btnG=Google+Search&meta=">
- </param>
- </engine>
- <engine
- enabled="true"
- engineTypeId="org.eclipse.help.ui.web"
id="org.eclipse.sdk.Eclipse"
label="%search.Eclipse.label">
<description>
diff --git a/eclipse/plugins/org.eclipse.swt.carbon.macosx/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.swt.carbon.macosx/META-INF/MANIFEST.MF
index 34eb144..563f960 100755
--- a/eclipse/plugins/org.eclipse.swt.carbon.macosx/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.swt.carbon.macosx/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)"
Bundle-Name: %fragmentName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.swt.carbon.macosx; singleton:=true
-Bundle-Version: 3.5.1.qualifier
+Bundle-Version: 3.5.2.qualifier
Bundle-ManifestVersion: 2
Bundle-Localization: fragment
Export-Package:
diff --git a/eclipse/plugins/org.eclipse.swt.carbon.macosx/about.html b/eclipse/plugins/org.eclipse.swt.carbon.macosx/about.html
index 7d21fed..9b526f1 100755
--- a/eclipse/plugins/org.eclipse.swt.carbon.macosx/about.html
+++ b/eclipse/plugins/org.eclipse.swt.carbon.macosx/about.html
@@ -86,7 +86,7 @@ conditions of the Mozilla Public License Version 1.1 ("MPL"). A copy
<h4>XULRunner 1.9 (subset, derivative work)</h4>
-The library swt-xulrunner-carbon-xxxx.dll (where "xxxx" is the version number) contains a small portion of XULRunner 1.9 content (header files) that have
+The library libswt-xulrunner-carbon-xxxx.jnilib (where "xxxx" is the version number) contains a small portion of XULRunner 1.9 content (header files) that have
been modified from the Original Code provided by mozilla.org, and whose Initial Developer is Netscape Communications Corporation. Use of this code is governed by
the terms and conditions of the Mozilla Public License Version 1.1 ("MPL"). A copy of the MPL is provided with the Content (<a href="./about_files/mpl-v11.txt">mpl-v11.txt</a>)
and is also available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>.
diff --git a/eclipse/plugins/org.eclipse.swt.carbon.macosx/libswt-agl-carbon-3555.jnilib b/eclipse/plugins/org.eclipse.swt.carbon.macosx/libswt-agl-carbon-3557.jnilib
similarity index 100%
rename from eclipse/plugins/org.eclipse.swt.carbon.macosx/libswt-agl-carbon-3555.jnilib
rename to eclipse/plugins/org.eclipse.swt.carbon.macosx/libswt-agl-carbon-3557.jnilib
diff --git a/eclipse/plugins/org.eclipse.swt.carbon.macosx/libswt-carbon-3555.jnilib b/eclipse/plugins/org.eclipse.swt.carbon.macosx/libswt-carbon-3557.jnilib
similarity index 100%
rename from eclipse/plugins/org.eclipse.swt.carbon.macosx/libswt-carbon-3555.jnilib
rename to eclipse/plugins/org.eclipse.swt.carbon.macosx/libswt-carbon-3557.jnilib
diff --git a/eclipse/plugins/org.eclipse.swt.carbon.macosx/libswt-cocoa-carbon-3555.jnilib b/eclipse/plugins/org.eclipse.swt.carbon.macosx/libswt-cocoa-carbon-3555.jnilib
deleted file mode 100755
index f53170a..0000000
Binary files a/eclipse/plugins/org.eclipse.swt.carbon.macosx/libswt-cocoa-carbon-3555.jnilib and /dev/null differ
diff --git a/eclipse/plugins/org.eclipse.swt.carbon.macosx/libswt-cocoa-carbon-3557.jnilib b/eclipse/plugins/org.eclipse.swt.carbon.macosx/libswt-cocoa-carbon-3557.jnilib
new file mode 100755
index 0000000..a2ac9ab
Binary files /dev/null and b/eclipse/plugins/org.eclipse.swt.carbon.macosx/libswt-cocoa-carbon-3557.jnilib differ
diff --git a/eclipse/plugins/org.eclipse.swt.carbon.macosx/libswt-pi-carbon-3555.jnilib b/eclipse/plugins/org.eclipse.swt.carbon.macosx/libswt-pi-carbon-3557.jnilib
similarity index 100%
rename from eclipse/plugins/org.eclipse.swt.carbon.macosx/libswt-pi-carbon-3555.jnilib
rename to eclipse/plugins/org.eclipse.swt.carbon.macosx/libswt-pi-carbon-3557.jnilib
diff --git a/eclipse/plugins/org.eclipse.swt.carbon.macosx/libswt-xulrunner-carbon-3555.jnilib b/eclipse/plugins/org.eclipse.swt.carbon.macosx/libswt-xulrunner-carbon-3557.jnilib
similarity index 100%
rename from eclipse/plugins/org.eclipse.swt.carbon.macosx/libswt-xulrunner-carbon-3555.jnilib
rename to eclipse/plugins/org.eclipse.swt.carbon.macosx/libswt-xulrunner-carbon-3557.jnilib
diff --git a/eclipse/plugins/org.eclipse.swt.cocoa.macosx.x86_64/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.swt.cocoa.macosx.x86_64/META-INF/MANIFEST.MF
index c464530..3ec6489 100755
--- a/eclipse/plugins/org.eclipse.swt.cocoa.macosx.x86_64/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.swt.cocoa.macosx.x86_64/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)"
Bundle-Name: %fragmentName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.swt.cocoa.macosx.x86_64; singleton:=true
-Bundle-Version: 3.5.1.qualifier
+Bundle-Version: 3.5.2.qualifier
Bundle-ManifestVersion: 2
Bundle-Localization: fragment
Export-Package:
diff --git a/eclipse/plugins/org.eclipse.swt.cocoa.macosx.x86_64/libswt-awt-cocoa-3555.jnilib b/eclipse/plugins/org.eclipse.swt.cocoa.macosx.x86_64/libswt-awt-cocoa-3555.jnilib
deleted file mode 100755
index 76f6469..0000000
Binary files a/eclipse/plugins/org.eclipse.swt.cocoa.macosx.x86_64/libswt-awt-cocoa-3555.jnilib and /dev/null differ
diff --git a/eclipse/plugins/org.eclipse.swt.cocoa.macosx.x86_64/libswt-awt-cocoa-3557.jnilib b/eclipse/plugins/org.eclipse.swt.cocoa.macosx.x86_64/libswt-awt-cocoa-3557.jnilib
new file mode 100755
index 0000000..9a42002
Binary files /dev/null and b/eclipse/plugins/org.eclipse.swt.cocoa.macosx.x86_64/libswt-awt-cocoa-3557.jnilib differ
diff --git a/eclipse/plugins/org.eclipse.swt.cocoa.macosx.x86_64/libswt-cocoa-3555.jnilib b/eclipse/plugins/org.eclipse.swt.cocoa.macosx.x86_64/libswt-cocoa-3555.jnilib
deleted file mode 100755
index 87061e8..0000000
Binary files a/eclipse/plugins/org.eclipse.swt.cocoa.macosx.x86_64/libswt-cocoa-3555.jnilib and /dev/null differ
diff --git a/eclipse/plugins/org.eclipse.swt.cocoa.macosx.x86_64/libswt-cocoa-3557.jnilib b/eclipse/plugins/org.eclipse.swt.cocoa.macosx.x86_64/libswt-cocoa-3557.jnilib
new file mode 100755
index 0000000..9d54498
Binary files /dev/null and b/eclipse/plugins/org.eclipse.swt.cocoa.macosx.x86_64/libswt-cocoa-3557.jnilib differ
diff --git a/eclipse/plugins/org.eclipse.swt.cocoa.macosx.x86_64/libswt-pi-cocoa-3555.jnilib b/eclipse/plugins/org.eclipse.swt.cocoa.macosx.x86_64/libswt-pi-cocoa-3555.jnilib
deleted file mode 100755
index 2d4a2d9..0000000
Binary files a/eclipse/plugins/org.eclipse.swt.cocoa.macosx.x86_64/libswt-pi-cocoa-3555.jnilib and /dev/null differ
diff --git a/eclipse/plugins/org.eclipse.swt.cocoa.macosx.x86_64/libswt-pi-cocoa-3557.jnilib b/eclipse/plugins/org.eclipse.swt.cocoa.macosx.x86_64/libswt-pi-cocoa-3557.jnilib
new file mode 100755
index 0000000..63244e2
Binary files /dev/null and b/eclipse/plugins/org.eclipse.swt.cocoa.macosx.x86_64/libswt-pi-cocoa-3557.jnilib differ
diff --git a/eclipse/plugins/org.eclipse.swt.cocoa.macosx/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.swt.cocoa.macosx/META-INF/MANIFEST.MF
index b881414..2ea0d6c 100755
--- a/eclipse/plugins/org.eclipse.swt.cocoa.macosx/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.swt.cocoa.macosx/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)"
Bundle-Name: %fragmentName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.swt.cocoa.macosx; singleton:=true
-Bundle-Version: 3.5.1.qualifier
+Bundle-Version: 3.5.2.qualifier
Bundle-ManifestVersion: 2
Bundle-Localization: fragment
Export-Package:
diff --git a/eclipse/plugins/org.eclipse.swt.cocoa.macosx/about.html b/eclipse/plugins/org.eclipse.swt.cocoa.macosx/about.html
index ac9725f..d4f53de 100755
--- a/eclipse/plugins/org.eclipse.swt.cocoa.macosx/about.html
+++ b/eclipse/plugins/org.eclipse.swt.cocoa.macosx/about.html
@@ -86,7 +86,7 @@ conditions of the Mozilla Public License Version 1.1 ("MPL"). A copy
<h4>XULRunner 1.9 (subset, derivative work)</h4>
-The library swt-xulrunner-cocoa-xxxx.dll (where "xxxx" is the version number) contains a small portion of XULRunner 1.9 content (header files) that have
+The library libswt-xulrunner-cocoa-xxxx.jnilib (where "xxxx" is the version number) contains a small portion of XULRunner 1.9 content (header files) that have
been modified from the Original Code provided by mozilla.org, and whose Initial Developer is Netscape Communications Corporation. Use of this code is governed by
the terms and conditions of the Mozilla Public License Version 1.1 ("MPL"). A copy of the MPL is provided with the Content (<a href="./about_files/mpl-v11.txt">mpl-v11.txt</a>)
and is also available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>.
diff --git a/eclipse/plugins/org.eclipse.swt.cocoa.macosx/libswt-awt-cocoa-3555.jnilib b/eclipse/plugins/org.eclipse.swt.cocoa.macosx/libswt-awt-cocoa-3555.jnilib
deleted file mode 100755
index b43e568..0000000
Binary files a/eclipse/plugins/org.eclipse.swt.cocoa.macosx/libswt-awt-cocoa-3555.jnilib and /dev/null differ
diff --git a/eclipse/plugins/org.eclipse.swt.cocoa.macosx/libswt-awt-cocoa-3557.jnilib b/eclipse/plugins/org.eclipse.swt.cocoa.macosx/libswt-awt-cocoa-3557.jnilib
new file mode 100755
index 0000000..700316c
Binary files /dev/null and b/eclipse/plugins/org.eclipse.swt.cocoa.macosx/libswt-awt-cocoa-3557.jnilib differ
diff --git a/eclipse/plugins/org.eclipse.swt.cocoa.macosx/libswt-cocoa-3555.jnilib b/eclipse/plugins/org.eclipse.swt.cocoa.macosx/libswt-cocoa-3555.jnilib
deleted file mode 100755
index 11078eb..0000000
Binary files a/eclipse/plugins/org.eclipse.swt.cocoa.macosx/libswt-cocoa-3555.jnilib and /dev/null differ
diff --git a/eclipse/plugins/org.eclipse.swt.cocoa.macosx/libswt-cocoa-3557.jnilib b/eclipse/plugins/org.eclipse.swt.cocoa.macosx/libswt-cocoa-3557.jnilib
new file mode 100755
index 0000000..d9f9330
Binary files /dev/null and b/eclipse/plugins/org.eclipse.swt.cocoa.macosx/libswt-cocoa-3557.jnilib differ
diff --git a/eclipse/plugins/org.eclipse.swt.cocoa.macosx/libswt-pi-cocoa-3555.jnilib b/eclipse/plugins/org.eclipse.swt.cocoa.macosx/libswt-pi-cocoa-3555.jnilib
deleted file mode 100755
index 13ca9c7..0000000
Binary files a/eclipse/plugins/org.eclipse.swt.cocoa.macosx/libswt-pi-cocoa-3555.jnilib and /dev/null differ
diff --git a/eclipse/plugins/org.eclipse.swt.cocoa.macosx/libswt-pi-cocoa-3557.jnilib b/eclipse/plugins/org.eclipse.swt.cocoa.macosx/libswt-pi-cocoa-3557.jnilib
new file mode 100755
index 0000000..adcfc48
Binary files /dev/null and b/eclipse/plugins/org.eclipse.swt.cocoa.macosx/libswt-pi-cocoa-3557.jnilib differ
diff --git a/eclipse/plugins/org.eclipse.swt.cocoa.macosx/libswt-xulrunner-cocoa-3555.jnilib b/eclipse/plugins/org.eclipse.swt.cocoa.macosx/libswt-xulrunner-cocoa-3555.jnilib
deleted file mode 100755
index 82c14f1..0000000
Binary files a/eclipse/plugins/org.eclipse.swt.cocoa.macosx/libswt-xulrunner-cocoa-3555.jnilib and /dev/null differ
diff --git a/eclipse/plugins/org.eclipse.swt.cocoa.macosx/libswt-xulrunner-cocoa-3557.jnilib b/eclipse/plugins/org.eclipse.swt.cocoa.macosx/libswt-xulrunner-cocoa-3557.jnilib
new file mode 100755
index 0000000..5d54230
Binary files /dev/null and b/eclipse/plugins/org.eclipse.swt.cocoa.macosx/libswt-xulrunner-cocoa-3557.jnilib differ
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.linux.ppc/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.swt.gtk.linux.ppc/META-INF/MANIFEST.MF
index 619e5cc..0ef624d 100644
--- a/eclipse/plugins/org.eclipse.swt.gtk.linux.ppc/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.swt.gtk.linux.ppc/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)"
Bundle-Name: %fragmentName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.swt.gtk.linux.ppc; singleton:=true
-Bundle-Version: 3.5.1.qualifier
+Bundle-Version: 3.5.2.qualifier
Bundle-ManifestVersion: 2
Bundle-Localization: fragment
Export-Package:
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.linux.ppc/about.html b/eclipse/plugins/org.eclipse.swt.gtk.linux.ppc/about.html
index e102e6c..57d0b3c 100644
--- a/eclipse/plugins/org.eclipse.swt.gtk.linux.ppc/about.html
+++ b/eclipse/plugins/org.eclipse.swt.gtk.linux.ppc/about.html
@@ -107,7 +107,7 @@ conditions of the Mozilla Public License Version 1.1 ("MPL"). A copy
<h4>XULRunner 1.9 (subset, derivative work)</h4>
-The library swt-xulrunner-gtk-xxxx.dll (where "xxxx" is the version number) contains a small portion of XULRunner 1.9 content (header files) that have
+The library libswt-xulrunner-gtk-xxxx.so (where "xxxx" is the version number) contains a small portion of XULRunner 1.9 content (header files) that have
been modified from the Original Code provided by mozilla.org, and whose Initial Developer is Netscape Communications Corporation. Use of this code is governed by
the terms and conditions of the Mozilla Public License Version 1.1 ("MPL"). A copy of the MPL is provided with the Content (<a href="./about_files/mpl-v11.txt">mpl-v11.txt</a>)
and is also available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>.
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.linux.x86/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.swt.gtk.linux.x86/META-INF/MANIFEST.MF
index c62864b..fd3e4ad 100644
--- a/eclipse/plugins/org.eclipse.swt.gtk.linux.x86/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.swt.gtk.linux.x86/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)"
Bundle-Name: %fragmentName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.swt.gtk.linux.x86; singleton:=true
-Bundle-Version: 3.5.1.qualifier
+Bundle-Version: 3.5.2.qualifier
Bundle-ManifestVersion: 2
Bundle-Localization: fragment
Export-Package:
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.linux.x86/about.html b/eclipse/plugins/org.eclipse.swt.gtk.linux.x86/about.html
index ea2d22d..eab9b35 100644
--- a/eclipse/plugins/org.eclipse.swt.gtk.linux.x86/about.html
+++ b/eclipse/plugins/org.eclipse.swt.gtk.linux.x86/about.html
@@ -108,7 +108,7 @@ conditions of the Mozilla Public License Version 1.1 ("MPL"). A copy
<h4>XULRunner 1.9 (subset, derivative work)</h4>
-The libraries swt-xulrunner-gtk-xxxx.dll, swt-mozilla-gtk-xxxx.dll, and swt-mozilla-gcc3-gtk-xxxx.dll (where "xxxx" is the version number) contain a small portion of XULRunner 1.9 content (header files)
+The libraries libswt-xulrunner-gtk-xxxx.so, libswt-mozilla-gtk-xxxx.so, and libswt-mozilla-gcc3-gtk-xxxx.so (where "xxxx" is the version number) contain a small portion of XULRunner 1.9 content (header files)
that have been modified from the Original Code provided by mozilla.org, and whose Initial Developer is Netscape Communications Corporation. Use of this code is governed by
the terms and conditions of the Mozilla Public License Version 1.1 ("MPL"). A copy of the MPL is provided with the Content (<a href="./about_files/mpl-v11.txt">mpl-v11.txt</a>)
and is also available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>.
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.linux.x86_64/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.swt.gtk.linux.x86_64/META-INF/MANIFEST.MF
index 82a81f7..54a2cd1 100644
--- a/eclipse/plugins/org.eclipse.swt.gtk.linux.x86_64/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.swt.gtk.linux.x86_64/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)"
Bundle-Name: %fragmentName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.swt.gtk.linux.x86_64; singleton:=true
-Bundle-Version: 3.5.1.qualifier
+Bundle-Version: 3.5.2.qualifier
Bundle-ManifestVersion: 2
Bundle-Localization: fragment
Export-Package:
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.linux.x86_64/about.html b/eclipse/plugins/org.eclipse.swt.gtk.linux.x86_64/about.html
index ea2d22d..eab9b35 100644
--- a/eclipse/plugins/org.eclipse.swt.gtk.linux.x86_64/about.html
+++ b/eclipse/plugins/org.eclipse.swt.gtk.linux.x86_64/about.html
@@ -108,7 +108,7 @@ conditions of the Mozilla Public License Version 1.1 ("MPL"). A copy
<h4>XULRunner 1.9 (subset, derivative work)</h4>
-The libraries swt-xulrunner-gtk-xxxx.dll, swt-mozilla-gtk-xxxx.dll, and swt-mozilla-gcc3-gtk-xxxx.dll (where "xxxx" is the version number) contain a small portion of XULRunner 1.9 content (header files)
+The libraries libswt-xulrunner-gtk-xxxx.so, libswt-mozilla-gtk-xxxx.so, and libswt-mozilla-gcc3-gtk-xxxx.so (where "xxxx" is the version number) contain a small portion of XULRunner 1.9 content (header files)
that have been modified from the Original Code provided by mozilla.org, and whose Initial Developer is Netscape Communications Corporation. Use of this code is governed by
the terms and conditions of the Mozilla Public License Version 1.1 ("MPL"). A copy of the MPL is provided with the Content (<a href="./about_files/mpl-v11.txt">mpl-v11.txt</a>)
and is also available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>.
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.solaris.sparc/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.swt.gtk.solaris.sparc/META-INF/MANIFEST.MF
index 0ce89bb..016a294 100644
--- a/eclipse/plugins/org.eclipse.swt.gtk.solaris.sparc/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.swt.gtk.solaris.sparc/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)"
Bundle-Name: %fragmentName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.swt.gtk.solaris.sparc; singleton:=true
-Bundle-Version: 3.5.1.qualifier
+Bundle-Version: 3.5.2.qualifier
Bundle-ManifestVersion: 2
Bundle-Localization: fragment
Export-Package:
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.solaris.sparc/about.html b/eclipse/plugins/org.eclipse.swt.gtk.solaris.sparc/about.html
index 3f91266..5ad75a9 100644
--- a/eclipse/plugins/org.eclipse.swt.gtk.solaris.sparc/about.html
+++ b/eclipse/plugins/org.eclipse.swt.gtk.solaris.sparc/about.html
@@ -60,6 +60,37 @@ other terms and conditions of Section 6 as well as other Sections of the LGPL.
governed by the terms and conditions of the LGPL. Also note, the terms of the EPL permit you to modify the combined work and the source code of the combined
work is provided for debugging purposes so there is no need to reverse engineer the combined work.</p>
+<h4>Mozilla Binding</h4>
+
+<p>The "Mozilla Binding" is a binding to the Mozilla API. The Content may include any or all of the following files:</p>
+
+<p>The following files in the plug-in JAR shall be defined as the native code portion of the Mozilla Binding:</p>
+<ul>
+ <li>libswt-mozilla-gtk-xxxx.so (where "xxxx" is the version number)</li>
+</ul>
+
+<p>The following files in both the plug-in JAR and the src.zip shall be defined respectively as the bytecode and source code portions of the Mozilla Binding:</p>
+<ul>
+ <li>The contents of the directory org/eclipse/swt/internal/mozilla (but not including any sub-directories)</li>
+</ul>
+
+<p>The Mozilla Binding contains portions of Mozilla ("Mozilla"). Mozilla is made available by Mozilla.org. Use of Mozilla is governed by the terms and
+conditions of the Mozilla Public License Version 1.1 ("MPL"). A copy of the MPL is provided with the Content (<a href="about_files/mpl-v11.txt" target="_blank">mpl-v11.txt</a>) and is also available at
+<a href="http://www.mozilla.org/MPL/MPL-1.1.html" target="_blank">http://www.mozilla.org/MPL/MPL-1.1.html</a>.</p>
+
+<h4>XULRunner 1.9 (subset, derivative work)</h4>
+
+The library libswt-mozilla-gtk-xxxx.so (where "xxxx" is the version number) contains a small portion of XULRunner 1.9 content (header files)
+that have been modified from the Original Code provided by mozilla.org, and whose Initial Developer is Netscape Communications Corporation. Use of this code is governed by
+the terms and conditions of the Mozilla Public License Version 1.1 ("MPL"). A copy of the MPL is provided with the Content (<a href="./about_files/mpl-v11.txt">mpl-v11.txt</a>)
+and is also available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>.
+<p>The changed files are:
+<ul>
+ <li>org.eclipse.swt/Eclipse SWT Mozilla/common/library/nsIScriptContext.h</code>
+ <li>org.eclipse.swt/Eclipse SWT Mozilla/common/library/nsIScriptGlobalObject.h</code>
+</ul>
+Changes to the original files were made by SWT on April 7, 2009 and are marked with trailing comment <em>"//SWT-20090407"</em>.
+
<h4>Independent JPEG Group's JPEG software release 6b</h4>
<p>This software is based in part on the work of the Independent JPEG Group's JPEG software release 6b ("LIBJPEG").
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.solaris.x86/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.swt.gtk.solaris.x86/META-INF/MANIFEST.MF
index 89f783c..a745aca 100644
--- a/eclipse/plugins/org.eclipse.swt.gtk.solaris.x86/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.swt.gtk.solaris.x86/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)"
Bundle-Name: %fragmentName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.swt.gtk.solaris.x86; singleton:=true
-Bundle-Version: 3.5.1.qualifier
+Bundle-Version: 3.5.2.qualifier
Bundle-ManifestVersion: 2
Bundle-Localization: fragment
Export-Package:
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.solaris.x86/about.html b/eclipse/plugins/org.eclipse.swt.gtk.solaris.x86/about.html
index efdf0da..5a06c72 100644
--- a/eclipse/plugins/org.eclipse.swt.gtk.solaris.x86/about.html
+++ b/eclipse/plugins/org.eclipse.swt.gtk.solaris.x86/about.html
@@ -80,7 +80,7 @@ conditions of the Mozilla Public License Version 1.1 ("MPL"). A copy
<h4>XULRunner 1.9 (subset, derivative work)</h4>
-The library swt-mozilla-gtk-xxxx.dll (where "xxxx" is the version number) contains a small portion of XULRunner 1.9 content (header files) that have
+The library libswt-mozilla-gtk-xxxx.so (where "xxxx" is the version number) contains a small portion of XULRunner 1.9 content (header files) that have
been modified from the Original Code provided by mozilla.org, and whose Initial Developer is Netscape Communications Corporation. Use of this code is governed by
the terms and conditions of the Mozilla Public License Version 1.1 ("MPL"). A copy of the MPL is provided with the Content (<a href="./about_files/mpl-v11.txt">mpl-v11.txt</a>)
and is also available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>.
diff --git a/eclipse/plugins/org.eclipse.swt.motif.aix.ppc/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.swt.motif.aix.ppc/META-INF/MANIFEST.MF
index 3f52825..a849434 100644
--- a/eclipse/plugins/org.eclipse.swt.motif.aix.ppc/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.swt.motif.aix.ppc/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)"
Bundle-Name: %fragmentName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.swt.motif.aix.ppc; singleton:=true
-Bundle-Version: 3.5.1.qualifier
+Bundle-Version: 3.5.2.qualifier
Bundle-ManifestVersion: 2
Bundle-Localization: fragment
Export-Package:
diff --git a/eclipse/plugins/org.eclipse.swt.motif.aix.ppc/libswt-awt-motif-3555.a b/eclipse/plugins/org.eclipse.swt.motif.aix.ppc/libswt-awt-motif-3555.a
deleted file mode 100755
index b27caa2..0000000
Binary files a/eclipse/plugins/org.eclipse.swt.motif.aix.ppc/libswt-awt-motif-3555.a and /dev/null differ
diff --git a/eclipse/plugins/org.eclipse.swt.motif.aix.ppc/libswt-cairo-motif-3555.a b/eclipse/plugins/org.eclipse.swt.motif.aix.ppc/libswt-cairo-motif-3555.a
deleted file mode 100755
index f867301..0000000
Binary files a/eclipse/plugins/org.eclipse.swt.motif.aix.ppc/libswt-cairo-motif-3555.a and /dev/null differ
diff --git a/eclipse/plugins/org.eclipse.swt.motif.aix.ppc/libswt-cde-motif-3555.a b/eclipse/plugins/org.eclipse.swt.motif.aix.ppc/libswt-cde-motif-3555.a
deleted file mode 100755
index 4761c91..0000000
Binary files a/eclipse/plugins/org.eclipse.swt.motif.aix.ppc/libswt-cde-motif-3555.a and /dev/null differ
diff --git a/eclipse/plugins/org.eclipse.swt.motif.aix.ppc/libswt-motif-3555.a b/eclipse/plugins/org.eclipse.swt.motif.aix.ppc/libswt-motif-3555.a
deleted file mode 100755
index 6dc8a3d..0000000
Binary files a/eclipse/plugins/org.eclipse.swt.motif.aix.ppc/libswt-motif-3555.a and /dev/null differ
diff --git a/eclipse/plugins/org.eclipse.swt.motif.hpux.ia64_32/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.swt.motif.hpux.ia64_32/META-INF/MANIFEST.MF
index 443dff0..3f34e2c 100644
--- a/eclipse/plugins/org.eclipse.swt.motif.hpux.ia64_32/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.swt.motif.hpux.ia64_32/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)"
Bundle-Name: %fragmentName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.swt.motif.hpux.ia64_32; singleton:=true
-Bundle-Version: 3.5.1.qualifier
+Bundle-Version: 3.5.2.qualifier
Bundle-ManifestVersion: 2
Bundle-Localization: fragment
Export-Package:
diff --git a/eclipse/plugins/org.eclipse.swt.motif.linux.x86/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.swt.motif.linux.x86/META-INF/MANIFEST.MF
index a37b099..d35449d 100644
--- a/eclipse/plugins/org.eclipse.swt.motif.linux.x86/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.swt.motif.linux.x86/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)"
Bundle-Name: %fragmentName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.swt.motif.linux.x86; singleton:=true
-Bundle-Version: 3.5.1.qualifier
+Bundle-Version: 3.5.2.qualifier
Bundle-ManifestVersion: 2
Bundle-Localization: fragment
Export-Package:
diff --git a/eclipse/plugins/org.eclipse.swt.motif.linux.x86/about.html b/eclipse/plugins/org.eclipse.swt.motif.linux.x86/about.html
index c8a0c68..c06208a 100644
--- a/eclipse/plugins/org.eclipse.swt.motif.linux.x86/about.html
+++ b/eclipse/plugins/org.eclipse.swt.motif.linux.x86/about.html
@@ -106,7 +106,7 @@ conditions of the Mozilla Public License Version 1.1 ("MPL"). A copy
<h4>XULRunner 1.9 (subset, derivative work)</h4>
-The libraries swt-xulrunner-motif-xxxx.dll, swt-mozilla-motif-xxxx.dll, and swt-mozilla-gcc3-motif-xxxx.dll (where "xxxx" is the version number) contain a small portion of XULRunner 1.9 content (header files)
+The libraries libswt-xulrunner-motif-xxxx.so, libswt-mozilla-motif-xxxx.so, and libswt-mozilla-gcc3-motif-xxxx.so (where "xxxx" is the version number) contain a small portion of XULRunner 1.9 content (header files)
that have been modified from the Original Code provided by mozilla.org, and whose Initial Developer is Netscape Communications Corporation. Use of this code is governed by
the terms and conditions of the Mozilla Public License Version 1.1 ("MPL"). A copy of the MPL is provided with the Content (<a href="./about_files/mpl-v11.txt">mpl-v11.txt</a>)
and is also available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>.
diff --git a/eclipse/plugins/org.eclipse.swt.motif.solaris.sparc/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.swt.motif.solaris.sparc/META-INF/MANIFEST.MF
index 2c9470d..663048c 100644
--- a/eclipse/plugins/org.eclipse.swt.motif.solaris.sparc/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.swt.motif.solaris.sparc/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)"
Bundle-Name: %fragmentName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.swt.motif.solaris.sparc; singleton:=true
-Bundle-Version: 3.5.1.qualifier
+Bundle-Version: 3.5.2.qualifier
Bundle-ManifestVersion: 2
Bundle-Localization: fragment
Export-Package:
diff --git a/eclipse/plugins/org.eclipse.swt.photon.qnx.x86/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.swt.photon.qnx.x86/META-INF/MANIFEST.MF
index 2252198..578749a 100644
--- a/eclipse/plugins/org.eclipse.swt.photon.qnx.x86/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.swt.photon.qnx.x86/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)"
Bundle-Name: %fragmentName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.swt.photon.qnx.x86; singleton:=true
-Bundle-Version: 3.5.1.qualifier
+Bundle-Version: 3.5.2.qualifier
Bundle-ManifestVersion: 2
Bundle-Localization: fragment
Export-Package:
diff --git a/eclipse/plugins/org.eclipse.swt.win32.wce_ppc.arm/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.swt.win32.wce_ppc.arm/META-INF/MANIFEST.MF
index ad8126b..c8b539c 100644
--- a/eclipse/plugins/org.eclipse.swt.win32.wce_ppc.arm/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.swt.win32.wce_ppc.arm/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)"
Bundle-Name: %fragmentName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.swt.win32.wce_ppc.arm; singleton:=true
-Bundle-Version: 3.5.1.qualifier
+Bundle-Version: 3.5.2.qualifier
Bundle-ManifestVersion: 2
Bundle-Localization: fragment
Export-Package:
diff --git a/eclipse/plugins/org.eclipse.swt.win32.win32.x86/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.swt.win32.win32.x86/META-INF/MANIFEST.MF
index a8c29cf..81abcc2 100644
--- a/eclipse/plugins/org.eclipse.swt.win32.win32.x86/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.swt.win32.win32.x86/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)"
Bundle-Name: %fragmentName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.swt.win32.win32.x86; singleton:=true
-Bundle-Version: 3.5.1.qualifier
+Bundle-Version: 3.5.2.qualifier
Bundle-ManifestVersion: 2
Bundle-Localization: fragment
Export-Package:
diff --git a/eclipse/plugins/org.eclipse.swt.win32.win32.x86_64/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.swt.win32.win32.x86_64/META-INF/MANIFEST.MF
index a0504ec..fa33597 100644
--- a/eclipse/plugins/org.eclipse.swt.win32.win32.x86_64/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.swt.win32.win32.x86_64/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)"
Bundle-Name: %fragmentName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.swt.win32.win32.x86_64; singleton:=true
-Bundle-Version: 3.5.1.qualifier
+Bundle-Version: 3.5.2.qualifier
Bundle-ManifestVersion: 2
Bundle-Localization: fragment
Export-Package:
diff --git a/eclipse/plugins/org.eclipse.swt.wpf.win32.x86/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.swt.wpf.win32.x86/META-INF/MANIFEST.MF
index c858bbb..c642ceb 100644
--- a/eclipse/plugins/org.eclipse.swt.wpf.win32.x86/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.swt.wpf.win32.x86/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)"
Bundle-Name: %fragmentName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.swt.wpf.win32.x86;singleton:=true
-Bundle-Version: 3.5.1.qualifier
+Bundle-Version: 3.5.2.qualifier
Bundle-ManifestVersion: 2
Bundle-Localization: fragment
Export-Package:
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java
index 00b05d5..1293d93 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java
@@ -1176,7 +1176,12 @@ class AccessibleObject {
}
static AccessibleObject getAccessibleObject (int /*long*/ atkObject) {
- return (AccessibleObject)AccessibleObjects.get (new LONG (atkObject));
+ AccessibleObject object = (AccessibleObject)AccessibleObjects.get (new LONG (atkObject));
+ if (object == null) return null;
+ if (object.accessible == null) return null;
+ Control control = object.accessible.control;
+ if (control == null || control.isDisposed()) return null;
+ return object;
}
AccessibleObject getChildByHandle (int /*long*/ handle) {
@@ -1252,7 +1257,7 @@ class AccessibleObject {
GObjectClass objectClassStruct = new GObjectClass ();
ATK.memmove (objectClassStruct, gObjectClass);
ATK.call (objectClassStruct.finalize, atkObject);
- AccessibleObject object = getAccessibleObject (atkObject);
+ AccessibleObject object = (AccessibleObject)AccessibleObjects.get (new LONG (atkObject));
if (object != null) {
AccessibleObjects.remove (new LONG (atkObject));
object.release ();
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/IE.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/IE.java
index 16c010d..199d44d 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/IE.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/IE.java
@@ -36,8 +36,9 @@ class IE extends WebBrowser {
int style, lastKeyCode, lastCharCode;
int lastMouseMoveX, lastMouseMoveY;
- static boolean IsIE7;
+ static int IEVersion;
static String ProgId = "Shell.Explorer"; //$NON-NLS-1$
+ static int PDFCount;
static final int BeforeNavigate2 = 0xfa;
static final int CommandStateChange = 0x69;
@@ -97,6 +98,9 @@ class IE extends WebBrowser {
static final String ABOUT_BLANK = "about:blank"; //$NON-NLS-1$
static final String CLSID_SHELLEXPLORER1 = "{EAB22AC3-30C1-11CF-A7EB-0000C05BAE0B}"; //$NON-NLS-1$
+ static final String EXTENSION_PDF = ".pdf"; //$NON-NLS-1$
+ static final int MAX_PDF = 20;
+
static final String EVENT_DOUBLECLICK = "dblclick"; //$NON-NLS-1$
static final String EVENT_DRAGEND = "dragend"; //$NON-NLS-1$
static final String EVENT_DRAGSTART = "dragstart"; //$NON-NLS-1$
@@ -188,13 +192,11 @@ class IE extends WebBrowser {
int index = versionString.indexOf ("."); //$NON-NLS-1$
if (index != -1) {
String majorString = versionString.substring (0, index);
- int major = 0;
try {
- major = Integer.valueOf (majorString).intValue ();
+ IEVersion = Integer.valueOf (majorString).intValue ();
} catch (NumberFormatException e) {
/* just continue, version-specific features will not be enabled */
}
- IsIE7 = major >= 7;
}
}
}
@@ -524,7 +526,27 @@ public void create(Composite parent, int style) {
Variant varResult = event.arguments[0];
IDispatch dispatch = varResult.getDispatch();
if (globalDispatch == 0) globalDispatch = dispatch.getAddress();
-
+
+ /*
+ * Bug in Acrobat Reader. Opening > MAX_PDF PDF files causes Acrobat to not
+ * clean up its shells properly when the container Browser is disposed.
+ * This results in Eclipse crashing at shutdown time because the leftover
+ * shells have invalid references to unloaded Acrobat libraries. The
+ * workaround is to not unload the Acrobat libraries if > MAX_PDF PDF
+ * files have been opened.
+ */
+ String url = event.arguments[1].getString();
+ int extensionIndex = url.lastIndexOf('.');
+ if (extensionIndex != -1) {
+ String extension = url.substring(extensionIndex);
+ if (extension.equalsIgnoreCase(EXTENSION_PDF)) {
+ PDFCount++;
+ if (PDFCount > MAX_PDF) {
+ COM.FreeUnusedLibraries = false;
+ }
+ }
+ }
+
OleAutomation webBrowser = varResult.getAutomation();
varResult = event.arguments[1];
Variant variant = new Variant(auto);
@@ -893,6 +915,26 @@ public boolean isFocusControl () {
}
public void refresh() {
+ /*
+ * Bug in Acrobat Reader. Opening > MAX_PDF PDF files causes Acrobat to not
+ * clean up its shells properly when the container Browser is disposed.
+ * This results in Eclipse crashing at shutdown time because the leftover
+ * shells have invalid references to unloaded Acrobat libraries. The
+ * workaround is to not unload the Acrobat libraries if > MAX_PDF PDF
+ * files have been opened.
+ */
+ String url = getUrl();
+ int extensionIndex = url.lastIndexOf('.');
+ if (extensionIndex != -1) {
+ String extension = url.substring(extensionIndex);
+ if (extension.equalsIgnoreCase (EXTENSION_PDF)) {
+ PDFCount++;
+ if (PDFCount > MAX_PDF) {
+ COM.FreeUnusedLibraries = false;
+ }
+ }
+ }
+
int[] rgdispid = auto.getIDsOfNames(new String[] { "Refresh" }); //$NON-NLS-1$
auto.invoke(rgdispid[0]);
}
@@ -948,13 +990,13 @@ public boolean setText(String html) {
int[] rgdispidNamedArgs = new int[1];
rgdispidNamedArgs[0] = rgdispid[1];
boolean oldValue = false;
- if (!OS.IsWinCE && IsIE7) {
+ if (!OS.IsWinCE && IEVersion >= 7) {
int hResult = OS.CoInternetIsFeatureEnabled(OS.FEATURE_DISABLE_NAVIGATION_SOUNDS, OS.GET_FEATURE_FROM_PROCESS);
oldValue = hResult == COM.S_OK;
OS.CoInternetSetFeatureEnabled(OS.FEATURE_DISABLE_NAVIGATION_SOUNDS, OS.SET_FEATURE_ON_PROCESS, true);
}
Variant pVarResult = auto.invoke(rgdispid[0], rgvarg, rgdispidNamedArgs);
- if (!OS.IsWinCE && IsIE7) {
+ if (!OS.IsWinCE && IEVersion >= 7) {
OS.CoInternetSetFeatureEnabled(OS.FEATURE_DISABLE_NAVIGATION_SOUNDS, OS.SET_FEATURE_ON_PROCESS, oldValue);
}
rgvarg[0].dispose();
@@ -988,13 +1030,13 @@ public boolean setUrl(String url) {
int[] rgdispidNamedArgs = new int[1];
rgdispidNamedArgs[0] = rgdispid[1];
boolean oldValue = false;
- if (!OS.IsWinCE && IsIE7) {
+ if (!OS.IsWinCE && IEVersion >= 7) {
int hResult = OS.CoInternetIsFeatureEnabled(OS.FEATURE_DISABLE_NAVIGATION_SOUNDS, OS.GET_FEATURE_FROM_PROCESS);
oldValue = hResult == COM.S_OK;
OS.CoInternetSetFeatureEnabled(OS.FEATURE_DISABLE_NAVIGATION_SOUNDS, OS.SET_FEATURE_ON_PROCESS, true);
}
auto.invoke(rgdispid[0], rgvarg, rgdispidNamedArgs);
- if (!OS.IsWinCE && IsIE7) {
+ if (!OS.IsWinCE && IEVersion >= 7) {
OS.CoInternetSetFeatureEnabled(OS.FEATURE_DISABLE_NAVIGATION_SOUNDS, OS.SET_FEATURE_ON_PROCESS, oldValue);
}
rgvarg[0].dispose();
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/WebSite.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/WebSite.java
index 0c2bc05..38571fa 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/WebSite.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/WebSite.java
@@ -311,10 +311,14 @@ int TranslateAccelerator(int /*long*/ lpMsg, int /*long*/ pguidCmdGroup, int nCm
}
}
/*
- * By default the IE shortcuts are run. However, F5 causes a refresh, which is not
- * appropriate when rendering HTML from memory, and CTRL-N opens a standalone IE,
- * which is undesirable and can cause a crash in some contexts. The workaround is
- * to block IE from handling these shortcuts by answering COM.S_OK.
+ * By default the IE shortcuts are run. However, the shortcuts below should not run
+ * in this context. The workaround is to block IE from handling these shortcuts by
+ * answering COM.S_OK.
+ *
+ * - F5 causes a refresh, which is not appropriate when rendering HTML from memory
+ * - CTRL+L opens an Open Location dialog in IE8, which is undesirable and can
+ * crash in some contexts
+ * - CTRL+N opens a standalone IE, which is undesirable and can crash in some contexts
*/
int result = COM.S_FALSE;
MSG msg = new MSG();
@@ -348,11 +352,14 @@ int TranslateAccelerator(int /*long*/ lpMsg, int /*long*/ pguidCmdGroup, int nCm
* handler.
*/
break;
+ case OS.VK_L:
case OS.VK_N:
if (OS.GetKeyState (OS.VK_CONTROL) < 0 && OS.GetKeyState (OS.VK_MENU) >= 0 && OS.GetKeyState (OS.VK_SHIFT) >= 0) {
- frame.setData(CONSUME_KEY, "false"); //$NON-NLS-1$
- result = COM.S_OK;
- break;
+ if (msg.wParam == OS.VK_N || IE.IEVersion >= 8) {
+ frame.setData(CONSUME_KEY, "false"); //$NON-NLS-1$
+ result = COM.S_OK;
+ break;
+ }
}
// FALL THROUGH
default:
@@ -568,7 +575,7 @@ boolean canExecuteApplets () {
* executing applets with IE6 embedded can crash, so do not
* attempt this if the version is less than IE7
*/
- if (!IE.IsIE7) return false;
+ if (IE.IEVersion < 7) return false;
if (canExecuteApplets == null) {
WebBrowser webBrowser = ((Browser)getParent ().getParent ()).webBrowser;
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java
index 50e1587..914a473 100755
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java
@@ -1648,6 +1648,7 @@ static int checkStyle(int style) {
* deleted lines.
*/
void claimBottomFreeSpace() {
+ if (ime.getCompositionOffset() != -1) return;
if (isFixedLineHeight()) {
int newVerticalOffset = Math.max(0, renderer.getHeight() - clientAreaHeight);
if (newVerticalOffset < getVerticalScrollOffset()) {
@@ -3616,7 +3617,7 @@ Rectangle getBoundsAtOffset(int offset) {
} else {
bounds = new Rectangle (0, 0, 0, renderer.getLineHeight());
}
- if (offset == caretOffset) {
+ if (offset == caretOffset && !wordWrap) {
int lineEnd = lineOffset + line.length();
if (offset == lineEnd) {
bounds.width += getCaretWidth();
@@ -5241,7 +5242,7 @@ int getCaretLine() {
}
int getWrapWidth () {
if (wordWrap && !isSingleLine()) {
- int width = clientAreaWidth - leftMargin - rightMargin - getCaretWidth();
+ int width = clientAreaWidth - leftMargin - rightMargin;
return width > 0 ? width : 1;
}
return -1;
@@ -5692,7 +5693,7 @@ void handleCompositionChanged(Event event) {
caretDirection = SWT.NULL;
} else {
content.replaceTextRange(start, end - start, text);
- setCaretOffset(ime.getCaretOffset(), SWT.DEFAULT);
+ int alignment = SWT.DEFAULT;
if (ime.getWideCaret()) {
start = ime.getCompositionOffset();
int lineIndex = getCaretLine();
@@ -5700,7 +5701,9 @@ void handleCompositionChanged(Event event) {
TextLayout layout = renderer.getTextLayout(lineIndex);
caretWidth = layout.getBounds(start - lineOffset, start + length - 1 - lineOffset).width;
renderer.disposeTextLayout(layout);
+ alignment = OFFSET_LEADING;
}
+ setCaretOffset(ime.getCaretOffset(), alignment);
}
showCaret();
}
@@ -7291,6 +7294,7 @@ boolean scrollHorizontal(int pixels, boolean adjustScrollBar) {
if (pixels == 0) {
return false;
}
+ if (wordWrap) return false;
ScrollBar horizontalBar = getHorizontalBar();
if (horizontalBar != null && adjustScrollBar) {
horizontalBar.setSelection(horizontalScrollOffset + pixels);
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/Clipboard.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/Clipboard.java
index 10a3126..913d7d8 100755
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/Clipboard.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/Clipboard.java
@@ -649,7 +649,9 @@ private int Release() {
this.data = new Object[0];
this.transferAgents = new Transfer[0];
disposeCOMInterfaces();
- COM.CoFreeUnusedLibraries();
+ if (COM.FreeUnusedLibraries) {
+ COM.CoFreeUnusedLibraries();
+ }
}
return refCount;
}
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DragSource.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DragSource.java
index a7f220d..4e83e95 100755
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DragSource.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DragSource.java
@@ -655,7 +655,9 @@ private int Release() {
refCount--;
if (refCount == 0) {
disposeCOMInterfaces();
- COM.CoFreeUnusedLibraries();
+ if (COM.FreeUnusedLibraries) {
+ COM.CoFreeUnusedLibraries();
+ }
}
return refCount;
}
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DropTarget.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DropTarget.java
index f8720f8..fe7785e 100755
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DropTarget.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DropTarget.java
@@ -566,8 +566,14 @@ void onDispose () {
COM.CoLockObjectExternal(iDropTarget.getAddress(), false, true);
this.Release();
+ if (iDataObject != null) {
+ iDataObject.Release();
+ }
+ iDataObject = null;
- COM.CoFreeUnusedLibraries();
+ if (COM.FreeUnusedLibraries) {
+ COM.CoFreeUnusedLibraries();
+ }
}
int opToOs(int operation) {
@@ -623,7 +629,9 @@ int Release() {
if (refCount == 0) {
disposeCOMInterfaces();
- COM.CoFreeUnusedLibraries();
+ if (COM.FreeUnusedLibraries) {
+ COM.CoFreeUnusedLibraries();
+ }
}
return refCount;
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/OleEnumFORMATETC.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/OleEnumFORMATETC.java
index c1c8c1f..bfe4acb 100755
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/OleEnumFORMATETC.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/OleEnumFORMATETC.java
@@ -133,7 +133,9 @@ int Release() {
if (refCount == 0) {
disposeCOMInterfaces();
- COM.CoFreeUnusedLibraries();
+ if (COM.FreeUnusedLibraries) {
+ COM.CoFreeUnusedLibraries();
+ }
}
return refCount;
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_custom.cpp b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_custom.cpp
index d84a81d..c27048e 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_custom.cpp
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_custom.cpp
@@ -57,7 +57,7 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(_1JS_1EvaluateUCScriptForPrincipals)
#ifdef _WIN32
LOAD_FUNCTION(fp, JS_EvaluateUCScriptForPrincipals)
if (fp) {
- rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jintLong, jchar *, jint, jbyte *, jint, jintLong *))fp)(arg0, arg1, arg2, lparg3, arg4, lparg5, arg6, lparg7);
+ rc = (jint)((jint (*)(jintLong, jintLong, jintLong, jchar *, jint, jbyte *, jint, jintLong *))fp)(arg0, arg1, arg2, lparg3, arg4, lparg5, arg6, lparg7);
}
#else
#define CALLING_CONVENTION
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java
index 9cbf020..7f20d97 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java
@@ -47,6 +47,7 @@ class Mozilla extends WebBrowser {
int /*long*/ request;
Point location, size;
boolean visible, isChild, ignoreDispose, isRetrievingBadCert, isViewingErrorPage;
+ boolean updateLastNavigateUrl;
Shell tip = null;
Listener listener;
Vector unhookedDOMWindows = new Vector ();
@@ -1234,7 +1235,7 @@ public void create (Composite parent, int style) {
nsIPrefService prefService = new nsIPrefService (result[0]);
result[0] = 0;
- rc = prefService.SavePrefFile(prefFile.getAddress ());
+ rc = prefService.SavePrefFile (prefFile.getAddress ());
prefService.Release ();
prefFile.Release ();
}
@@ -1242,19 +1243,11 @@ public void create (Composite parent, int style) {
if (XPCOMWasGlued) {
/*
- * XULRunner 1.9 can crash on Windows if XPCOMGlueShutdown is invoked here,
- * presumably because one or more of its unloaded symbols are referenced when
- * this callback returns. The workaround is to delay invoking XPCOMGlueShutdown
- * so that its symbols are still available once this callback returns.
+ * The following is intentionally commented because it causes subsequent
+ * browser instantiations within the process to fail. Mozilla does not
+ * support being unloaded and then re-initialized in a process, see
+ * http://www.mail-archive.com/dev-embedding@lists.mozilla.org/msg01732.html .
*/
- display.asyncExec (new Runnable () {
- public void run () {
- XPCOM.XPCOMGlueShutdown ();
- }
- });
-
- // the following is intentionally commented, because calling XRE_TermEmbedding
- // causes subsequent browser instantiations within the process to fail
// int size = XPCOM.nsDynamicFunctionLoad_sizeof ();
// /* alloc memory for two structs, the second is empty to signify the end of the list */
@@ -1276,6 +1269,7 @@ public void create (Composite parent, int style) {
// C.free (ptr);
// XPCOM.Call (functionPtr);
+// XPCOM.XPCOMGlueShutdown ();
XPCOMWasGlued = false;
}
if (XPCOMInitWasGlued) {
@@ -1771,7 +1765,6 @@ public boolean execute (String script) {
securityManager.Release ();
}
}
- serviceManager.Release ();
if (principal != null) {
rc = webBrowser.QueryInterface (nsIInterfaceRequestor.NS_IINTERFACEREQUESTOR_IID, result);
@@ -1780,8 +1773,13 @@ public boolean execute (String script) {
nsIInterfaceRequestor interfaceRequestor = new nsIInterfaceRequestor (result[0]);
result[0] = 0;
- nsID scriptGlobalObjectNSID = new nsID ("6afecd40-0b9a-4cfd-8c42-0f645cd91829"); /* nsIScriptGlobalObject */ //$NON-NLS-1$
- rc = interfaceRequestor.GetInterface (scriptGlobalObjectNSID, result);
+ nsID scriptGlobalObjectNSID_1_9 = new nsID ("6afecd40-0b9a-4cfd-8c42-0f645cd91829"); /* nsIScriptGlobalObject */ //$NON-NLS-1$
+ rc = interfaceRequestor.GetInterface (scriptGlobalObjectNSID_1_9, result);
+ if (!(rc == XPCOM.NS_OK && result[0] != 0)) {
+ result[0] = 0;
+ nsID scriptGlobalObjectNSID_1_9_2 = new nsID ("e9f3f2c1-2d94-4722-bbd4-2bf6fdf42f48"); /* nsIScriptGlobalObject */ //$NON-NLS-1$
+ rc = interfaceRequestor.GetInterface (scriptGlobalObjectNSID_1_9_2, result);
+ }
interfaceRequestor.Release ();
if (rc == XPCOM.NS_OK && result[0] != 0) {
@@ -1795,8 +1793,14 @@ public boolean execute (String script) {
if (scriptContext != 0 && globalJSObject != 0) {
/* ensure that the received nsIScriptContext implements the expected interface */
- nsID scriptContextNSID = new nsID ("e7b9871d-3adc-4bf7-850d-7fb9554886bf"); /* nsIScriptContext */ //$NON-NLS-1$
- rc = new nsISupports (scriptContext).QueryInterface (scriptContextNSID, result);
+ nsID scriptContextNSID_1_9 = new nsID ("e7b9871d-3adc-4bf7-850d-7fb9554886bf"); /* nsIScriptContext */ //$NON-NLS-1$
+ rc = new nsISupports (scriptContext).QueryInterface (scriptContextNSID_1_9, result);
+ if (!(rc == XPCOM.NS_OK && result[0] != 0)) {
+ result[0] = 0;
+ nsID scriptContextNSID_1_9_2 = new nsID ("87482b5e-e019-4df5-9bc2-b2a51b1f2d28"); /* nsIScriptContext */ //$NON-NLS-1$
+ rc = new nsISupports (scriptContext).QueryInterface (scriptContextNSID_1_9_2, result);
+ }
+
if (rc == XPCOM.NS_OK && result[0] != 0) {
new nsISupports (result[0]).Release ();
result[0] = 0;
@@ -1819,8 +1823,24 @@ public boolean execute (String script) {
} catch (UnsupportedEncodingException e) {
pathBytes = mozillaPath.getBytes ();
}
- rc = XPCOM.JS_EvaluateUCScriptForPrincipals (pathBytes, nativeContext, globalJSObject, principals, scriptChars, length, urlbytes, 0, result);
- return rc != 0;
+
+ aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_CONTEXTSTACK_CONTRACTID, true);
+ rc = serviceManager.GetServiceByContractID (aContractID, nsIJSContextStack.NS_IJSCONTEXTSTACK_IID, result);
+ if (rc != XPCOM.NS_OK) error (rc);
+ if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
+ serviceManager.Release ();
+
+ nsIJSContextStack stack = new nsIJSContextStack (result[0]);
+ result[0] = 0;
+ rc = stack.Push (nativeContext);
+ if (rc != XPCOM.NS_OK) error (rc);
+ boolean success = XPCOM.JS_EvaluateUCScriptForPrincipals (pathBytes, nativeContext, globalJSObject, principals, scriptChars, length, urlbytes, 0, result) != 0;
+ result[0] = 0;
+ rc = stack.Pop (result);
+ if (rc != XPCOM.NS_OK) error (rc);
+ stack.Release ();
+
+ return success;
}
}
}
@@ -1828,6 +1848,7 @@ public boolean execute (String script) {
}
principal.Release ();
}
+ serviceManager.Release ();
}
/* fall back to the pre-1.9 approach */
@@ -2631,6 +2652,38 @@ int GetWeakReference (int /*long*/ ppvObject) {
/* nsIWebProgressListener */
int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateFlags, int aStatus) {
+ /*
+ * Feature of Mozilla. When a redirect occurs to a site with an invalid
+ * certificate, no STATE_IS_DOCUMENT state transitions are received for the
+ * new location, and an immediate attempt is made to show the invalid
+ * certificate error. However our invalid certificate handler must know
+ * the site with the invalid certificate, not the site that redirected to
+ * it. The only opportunity to get this site before our invalid certificate
+ * handler is invoked is in the subsequent STATE_START | STATE_IS_REQUEST
+ * transition. When this comes, if the request's name appears to be a
+ * url then take this to be the new site, in case our invalid certificate
+ * handler is about to be invoked.
+ *
+ * Note that updateLastNavigateUrl is not reset to false here so that in
+ * typical contexts where a redirect occurs without an accompanying invalid
+ * certificate, the updated site will be retrieved from the channel (this
+ * is more proper) on the next STATE_TRANSFERRING | STATE_IS_DOCUMENT transition.
+ */
+ if (updateLastNavigateUrl && aStateFlags == (nsIWebProgressListener.STATE_IS_REQUEST | nsIWebProgressListener.STATE_START)) {
+ nsIRequest request = new nsIRequest (aRequest);
+ int /*long*/ name = XPCOM.nsEmbedCString_new ();
+ int rc = request.GetName (name);
+ if (rc == XPCOM.NS_OK) {
+ int length = XPCOM.nsEmbedCString_Length (name);
+ int /*long*/ buffer = XPCOM.nsEmbedCString_get (name);
+ byte[] bytes = new byte[length];
+ XPCOM.memmove (bytes, buffer, length);
+ String value = new String (bytes);
+ if (value.indexOf (":/") != -1) lastNavigateURL = value; //$NON-NLS-1$
+ }
+ XPCOM.nsEmbedCString_delete (name);
+ }
+
if ((aStateFlags & nsIWebProgressListener.STATE_IS_DOCUMENT) == 0) return XPCOM.NS_OK;
if ((aStateFlags & nsIWebProgressListener.STATE_START) != 0) {
int /*long*/[] result = new int /*long*/[1];
@@ -2668,6 +2721,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
unhookedDOMWindows.addElement (new LONG (result[0]));
} else if ((aStateFlags & nsIWebProgressListener.STATE_REDIRECTING) != 0) {
if (request == aRequest) request = 0;
+ updateLastNavigateUrl = true;
} else if ((aStateFlags & nsIWebProgressListener.STATE_STOP) != 0) {
/*
* If this page's nsIDOMWindow handle is still in unhookedDOMWindows then
@@ -2868,6 +2922,35 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
}
}
} else if ((aStateFlags & nsIWebProgressListener.STATE_TRANSFERRING) != 0) {
+ if (updateLastNavigateUrl) {
+ updateLastNavigateUrl = false;
+ int /*long*/[] result = new int /*long*/[1];
+ nsIRequest request = new nsIRequest (aRequest);
+
+ int rc = request.QueryInterface (nsIChannel.NS_ICHANNEL_IID, result);
+ if (rc != XPCOM.NS_OK) error (rc);
+ if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
+ nsIChannel channel = new nsIChannel (result[0]);
+ result[0] = 0;
+ rc = channel.GetURI (result);
+ if (rc != XPCOM.NS_OK) error (rc);
+ if (result[0] == 0) error (XPCOM.NS_ERROR_NULL_POINTER);
+ channel.Release ();
+
+ nsIURI uri = new nsIURI (result[0]);
+ result[0] = 0;
+ int /*long*/ aSpec = XPCOM.nsEmbedCString_new ();
+ rc = uri.GetSpec (aSpec);
+ if (rc != XPCOM.NS_OK) error (rc);
+ int length = XPCOM.nsEmbedCString_Length (aSpec);
+ int /*long*/ buffer = XPCOM.nsEmbedCString_get (aSpec);
+ byte[] bytes = new byte[length];
+ XPCOM.memmove (bytes, buffer, length);
+ lastNavigateURL = new String (bytes);
+ XPCOM.nsEmbedCString_delete (aSpec);
+ uri.Release ();
+ }
+
/*
* Hook DOM listeners to the page's nsIDOMWindow here because this is
* the earliest opportunity to do so.
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptService2.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptService2.java
index e41b97a..b1c74b2 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptService2.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptService2.java
@@ -21,6 +21,17 @@ class PromptService2 {
XPCOMObject promptService2;
int refCount = 0;
+ static final String[] certErrorCodes = new String[] {
+ "ssl_error_bad_cert_domain",
+ "sec_error_ca_cert_invalid",
+ "sec_error_expired_certificate",
+ "sec_error_expired_issuer_certificate",
+ "sec_error_inadequate_key_usage",
+ "sec_error_unknown_issuer",
+ "sec_error_untrusted_cert",
+ "sec_error_untrusted_issuer",
+ }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
+
PromptService2 () {
createCOMInterfaces ();
}
@@ -169,15 +180,15 @@ int Alert (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText)
* detected then instead of showing it, re-navigate to the page with the invalid
* certificate so that the browser's nsIBadCertListener2 will be invoked.
*/
- if (textLabel.indexOf ("ssl_error_bad_cert_domain") != -1 ||
- textLabel.indexOf ("sec_error_unknown_issuer") != -1 ||
- textLabel.indexOf ("sec_error_expired_certificate") != -1) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- if (browser != null) {
+ if (browser != null) {
+ for (int i = 0; i < certErrorCodes.length; i++) {
+ if (textLabel.indexOf (certErrorCodes[i]) != -1) {
Mozilla mozilla = (Mozilla)browser.webBrowser;
mozilla.isRetrievingBadCert = true;
browser.setUrl (mozilla.lastNavigateURL);
return XPCOM.NS_OK;
}
+ }
}
Shell shell = browser == null ? new Shell () : browser.getShell ();
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java
index f191c60..7907060 100755
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java
@@ -78,6 +78,7 @@ public class OleClientSite extends Composite {
private int aspect; // the display aspect of the embedded object, e.g., DvaspectContent or DvaspectIcon
private int type; // Indicates the type of client that can be supported inside this container
private boolean isStatic; // Indicates item's display is static, i.e., a bitmap, metafile, etc.
+ boolean isActivated;
private RECT borderWidths = new RECT();
private RECT indent = new RECT();
@@ -131,6 +132,8 @@ protected OleClientSite(Composite parent, int style) {
case SWT.Paint: onPaint(e); break;
case SWT.Traverse: onTraverse(e); break;
case SWT.KeyDown: /* required for traversal */ break;
+ case SWT.Activate: isActivated = true; break;
+ case SWT.Deactivate: isActivated = false; break;
default :
OLE.error(SWT.ERROR_NOT_IMPLEMENTED);
}
@@ -145,6 +148,8 @@ protected OleClientSite(Composite parent, int style) {
addListener(SWT.Paint, listener);
addListener(SWT.Traverse, listener);
addListener(SWT.KeyDown, listener);
+ addListener(SWT.Activate, listener);
+ addListener(SWT.Deactivate, listener);
}
/**
* Create an OleClientSite child widget using the OLE Document type associated with the
@@ -178,28 +183,12 @@ public OleClientSite(Composite parent, int style, File file) {
GUID fileClsid = new GUID();
char[] fileName = (file.getAbsolutePath()+"\0").toCharArray();
int result = COM.GetClassFile(fileName, fileClsid);
- if (result != COM.S_OK)
- OLE.error(OLE.ERROR_INVALID_CLASSID, result);
+ if (result != COM.S_OK) OLE.error(OLE.ERROR_INVALID_CLASSID, result);
// associated CLSID may not be installed on this machine
- appClsid = fileClsid;
- String progID = getProgramID();
- if (progID == null)
- OLE.error(OLE.ERROR_INVALID_CLASSID, result);
+ String progID = getProgID(fileClsid);
+ if (progID == null) OLE.error(OLE.ERROR_INVALID_CLASSID, result);
- /* Bug in Windows. In some machines running Windows Vista and
- * Office 2007, OleCreateFromFile() fails to open files from
- * Office Word 97 - 2003. The fix is to detect this case and create
- * the activeX using CoCreateInstance() and then load the file
- * using IPersistStorage.Load().
- */
- if (progID.equals("Word.Document.8")) { //$NON-NLS-1$
- GUID clsid = getClassID(WORDPROGID);
- String latestProgID = getProgID(clsid);
- if (latestProgID.equals("Word.Document.12")) { //$NON-NLS-1$
- appClsid = clsid;
- }
- }
-
+ appClsid = fileClsid;
OleCreate(appClsid, fileClsid, fileName, file);
} catch (SWTException e) {
dispose();
@@ -307,7 +296,15 @@ public OleClientSite(Composite parent, int style, String progId, File file) {
}
void OleCreate(GUID appClsid, GUID fileClsid, char[] fileName, File file) {
- if (COM.IsEqualGUID(appClsid, fileClsid)){
+
+ /* Bug in Windows. In some machines running Windows Vista and
+ * Office 2007, OleCreateFromFile() fails to open files from
+ * Office Word 97 - 2003 and in some other cases it fails to
+ * save files due to a lock. The fix is to detect this case and
+ * create the activeX using CoCreateInstance().
+ */
+ boolean isOffice2007 = isOffice2007(true);
+ if (!isOffice2007 && COM.IsEqualGUID(appClsid, fileClsid)){
// Using the same application that created file, therefore, use default mechanism.
tempStorage = createTempStorage();
// Create ole object with storage object
@@ -337,6 +334,7 @@ void OleCreate(GUID appClsid, GUID fileClsid, char[] fileName, File file) {
String streamName = "CONTENTS"; //$NON-NLS-1$
GUID wordGUID = getClassID(WORDPROGID);
if (wordGUID != null && COM.IsEqualGUID(appClsid, wordGUID)) streamName = "WordDocument"; //$NON-NLS-1$
+ if (isOffice2007) streamName = "Package"; //$NON-NLS-1$
address = new int /*long*/[1];
result = storage.CreateStream(streamName, mode, 0, 0, address); // Increments ref count if successful
if (result != COM.S_OK) {
@@ -859,9 +857,18 @@ public boolean isFocusControl () {
}
return false;
}
-private boolean isOffice2007() {
+private boolean isOffice2007(boolean program) {
String programID = getProgramID();
if (programID == null) return false;
+ if (program) {
+ int lastDot = programID.lastIndexOf('.');
+ if (lastDot != -1) {
+ programID = programID.substring(0, lastDot);
+ GUID guid = getClassID(programID);
+ programID = getProgID(guid);
+ if (programID == null) return false;
+ }
+ }
if (programID.equals("Word.Document.12")) return true; //$NON-NLS-1$
if (programID.equals("Excel.Sheet.12")) return true; //$NON-NLS-1$
if (programID.equals("PowerPoint.Show.12")) return true; //$NON-NLS-1$
@@ -1119,8 +1126,10 @@ protected void releaseObjectInterfaces() {
objIUnknown.Release();
}
objIUnknown = null;
-
- COM.CoFreeUnusedLibraries();
+
+ if (COM.FreeUnusedLibraries) {
+ COM.CoFreeUnusedLibraries();
+ }
}
/**
* Saves the document to the specified file and includes OLE specific information if specified.
@@ -1134,6 +1143,14 @@ protected void releaseObjectInterfaces() {
* @return true if the save was successful
*/
public boolean save(File file, boolean includeOleInfo) {
+ /*
+ * Bug in Office 2007. Saving Office 2007 documents to compound file storage object
+ * causes the output file to be corrupted. The fix is to detect Office 2007 documents
+ * using the program ID and save only the content of the 'Package' stream.
+ */
+ if (isOffice2007(false)) {
+ return saveOffice2007(file);
+ }
if (includeOleInfo)
return saveToStorageFile(file);
return saveToTraditionalFile(file);
@@ -1212,6 +1229,31 @@ private int SaveObject() {
return COM.S_OK;
}
+private boolean saveOffice2007(File file) {
+ if (file == null || file.isDirectory()) return false;
+ if (!updateStorage()) return false;
+ boolean result = false;
+
+ /* Excel fails to open the package stream when the PersistStorage is not in hands off mode */
+ int /*long*/[] ppv = new int /*long*/[1];
+ IPersistStorage iPersistStorage = null;
+ if (objIUnknown.QueryInterface(COM.IIDIPersistStorage, ppv) == COM.S_OK) {
+ iPersistStorage = new IPersistStorage(ppv[0]);
+ tempStorage.AddRef();
+ iPersistStorage.HandsOffStorage();
+ }
+ int /*long*/[] address = new int /*long*/[1];
+ int grfMode = COM.STGM_DIRECT | COM.STGM_READ | COM.STGM_SHARE_EXCLUSIVE;
+ if (tempStorage.OpenStream("Package", 0, grfMode, 0, address) == COM.S_OK) { //$NON-NLS-1$
+ result = saveFromContents(address[0], file);
+ }
+ if (iPersistStorage != null) {
+ iPersistStorage.SaveCompleted(tempStorage.getAddress());
+ tempStorage.Release();
+ iPersistStorage.Release();
+ }
+ return result;
+}
/**
* Saves the document to the specified file and includes OLE specific information. This method
* must <b>only</b> be used for files that have an OLE Storage format. For example, a word file
@@ -1233,38 +1275,8 @@ private boolean saveToStorageFile(File file) {
if (file == null || file.isDirectory()) return false;
if (!updateStorage()) return false;
- int /*long*/[] address = new int /*long*/[1];
- if (objIOleObject.QueryInterface(COM.IIDIPersistFile, address) == COM.S_OK) {
- String fileName = null;
- IPersistFile persistFile = new IPersistFile(address[0]);
- int /*long*/[] ppszFileName = new int /*long*/[1];
- if (persistFile.GetCurFile(ppszFileName) == COM.S_OK) {
- int /*long*/ pszFileName = ppszFileName [0];
- int length = OS.wcslen(pszFileName);
- char[] buffer = new char[length];
- OS.MoveMemory(buffer, pszFileName, length * 2);
- fileName = new String(buffer, 0, length);
- // Doc says to use IMalloc::Free, but CoTaskMemFree() does the same
- COM.CoTaskMemFree(pszFileName);
- }
- int result;
- String newFile = file.getAbsolutePath();
- if (fileName != null && fileName.equalsIgnoreCase(newFile)) {
- result = persistFile.Save(0, false);
- } else {
- int length = newFile.length();
- char[] buffer = new char[length + 1];
- newFile.getChars(0, length, buffer, 0);
- int /*long*/ lpszNewFile = COM.CoTaskMemAlloc(buffer.length * 2);
- COM.MoveMemory(lpszNewFile, buffer, buffer.length * 2);
- result = persistFile.Save(lpszNewFile, false);
- COM.CoTaskMemFree(lpszNewFile);
- }
- persistFile.Release();
- if (result == COM.S_OK) return true;
- }
-
// get access to the persistent storage mechanism
+ int /*long*/[] address = new int /*long*/[1];
if (objIOleObject.QueryInterface(COM.IIDIPersistStorage, address) != COM.S_OK) return false;
IPersistStorage permStorage = new IPersistStorage(address[0]);
try {
@@ -1307,34 +1319,6 @@ private boolean saveToTraditionalFile(File file) {
if (!updateStorage())
return false;
- /*
- * Bug in Office 2007. Saving Office 2007 documents to compound file storage object
- * causes the output file to be corrupted. The fix is to detect Office 2007 documents
- * using the program ID and save only the content of the 'Package' stream.
- */
- if (isOffice2007()) {
- /* Excel fails to open the package stream when the PersistStorage is not in hands off mode */
- int /*long*/[] ppv = new int /*long*/[1];
- IPersistStorage iPersistStorage = null;
- if (objIUnknown.QueryInterface(COM.IIDIPersistStorage, ppv) == COM.S_OK) {
- iPersistStorage = new IPersistStorage(ppv[0]);
- tempStorage.AddRef();
- iPersistStorage.HandsOffStorage();
- }
- boolean result = false;
- int /*long*/[] address = new int /*long*/[1];
- int grfMode = COM.STGM_DIRECT | COM.STGM_READ | COM.STGM_SHARE_EXCLUSIVE;
- if (tempStorage.OpenStream("Package", 0, grfMode, 0, address) == COM.S_OK) { //$NON-NLS-1$
- result = saveFromContents(address[0], file);
- }
- if (iPersistStorage != null) {
- iPersistStorage.SaveCompleted(tempStorage.getAddress());
- tempStorage.Release();
- iPersistStorage.Release();
- }
- return result;
- }
-
int /*long*/[] address = new int /*long*/[1];
// Look for a CONTENTS stream
if (tempStorage.OpenStream("CONTENTS", 0, COM.STGM_DIRECT | COM.STGM_READ | COM.STGM_SHARE_EXCLUSIVE, 0, address) == COM.S_OK) //$NON-NLS-1$
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleControlSite.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleControlSite.java
index 3290cdb..5bb981e 100755
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleControlSite.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleControlSite.java
@@ -64,6 +64,10 @@ public class OleControlSite extends OleClientSite
private Font font;
+ // work around for IE destroying the caret
+ static int SWT_RESTORECARET;
+
+ static final String SHELL_PROG_ID = "Shell.Explorer"; //$NON-NLS-1$
/**
* Create an OleControlSite child widget using the OLE Document type associated with the
@@ -652,71 +656,65 @@ private int OnControlInfoChanged() {
}
return COM.S_OK;
}
-
-// The following is intentionally commented, it's not believed that
-// OLEIVERB_UIACTIVATE and UIDeactivate should be invoked for every
-// received focusIn and focusOut, respectively.
-//
-//void onFocusIn(Event e) {
-// String progID = getProgramID();
-// if (progID == null) return;
-// if (!progID.startsWith("Shell.Explorer")) {
-// super.onFocusIn(e);
-// return;
-// }
-// if (objIOleInPlaceObject == null) return;
-// doVerb(OLE.OLEIVERB_UIACTIVATE);
-// if (isFocusControl()) return;
-// int /*long*/[] phwnd = new int /*long*/[1];
-// objIOleInPlaceObject.GetWindow(phwnd);
-// if (phwnd[0] == 0) return;
-// OS.SetFocus(phwnd[0]);
-//}
-//void onFocusOut(Event e) {
-// if (objIOleInPlaceObject == null) return;
-// String progID = getProgramID();
-// if (progID == null) return;
-// if (!progID.startsWith("Shell.Explorer")) {
-// super.onFocusOut(e);
-// return;
-// }
-// /*
-// * Bug in Windows. When IE7 loses focus and UIDeactivate()
-// * is called, IE destroys the caret even though it is
-// * no longer owned by IE. If focus has moved to a control
-// * that shows a caret then the caret disappears. The fix
-// * is to detect this case and restore the caret.
-// */
-// int threadId = OS.GetCurrentThreadId();
-// GUITHREADINFO lpgui1 = new GUITHREADINFO();
-// lpgui1.cbSize = GUITHREADINFO.sizeof;
-// OS.GetGUIThreadInfo(threadId, lpgui1);
-// objIOleInPlaceObject.UIDeactivate();
-// if (lpgui1.hwndCaret != 0) {
-// GUITHREADINFO lpgui2 = new GUITHREADINFO();
-// lpgui2.cbSize = GUITHREADINFO.sizeof;
-// OS.GetGUIThreadInfo(threadId, lpgui2);
-// if (lpgui2.hwndCaret == 0 && lpgui1.hwndCaret == OS.GetFocus()) {
-// if (SWT_RESTORECARET == 0) {
-// SWT_RESTORECARET = OS.RegisterWindowMessage (new TCHAR (0, "SWT_RESTORECARET", true));
-// }
-// /*
-// * If the caret was not restored by SWT, put it back using
-// * the information from GUITHREADINFO. Note that this will
-// * not be correct when the caret has a bitmap. There is no
-// * API to query the bitmap that the caret is using.
-// */
-// if (OS.SendMessage (lpgui1.hwndCaret, SWT_RESTORECARET, 0, 0) == 0) {
-// int width = lpgui1.right - lpgui1.left;
-// int height = lpgui1.bottom - lpgui1.top;
-// OS.CreateCaret (lpgui1.hwndCaret, 0, width, height);
-// OS.SetCaretPos (lpgui1.left, lpgui1.top);
-// OS.ShowCaret (lpgui1.hwndCaret);
-// }
-// }
-// }
-//}
-
+void onFocusIn(Event e) {
+ String progID = getProgramID();
+ if (progID == null) return;
+ if (!progID.startsWith(SHELL_PROG_ID)) {
+ super.onFocusIn(e);
+ return;
+ }
+ if (objIOleInPlaceObject == null) return;
+ if (!isActivated) doVerb(OLE.OLEIVERB_UIACTIVATE);
+ if (isFocusControl()) return;
+ int /*long*/[] phwnd = new int /*long*/[1];
+ objIOleInPlaceObject.GetWindow(phwnd);
+ if (phwnd[0] == 0) return;
+ OS.SetFocus(phwnd[0]);
+}
+void onFocusOut(Event e) {
+ if (objIOleInPlaceObject == null) return;
+ String progID = getProgramID();
+ if (progID == null) return;
+ if (!progID.startsWith(SHELL_PROG_ID)) {
+ super.onFocusOut(e);
+ return;
+ }
+ /*
+ * Bug in Windows. When IE7 loses focus and UIDeactivate()
+ * is called, IE destroys the caret even though it is
+ * no longer owned by IE. If focus has moved to a control
+ * that shows a caret then the caret disappears. The fix
+ * is to detect this case and restore the caret.
+ */
+ int threadId = OS.GetCurrentThreadId();
+ GUITHREADINFO lpgui1 = new GUITHREADINFO();
+ lpgui1.cbSize = GUITHREADINFO.sizeof;
+ OS.GetGUIThreadInfo(threadId, lpgui1);
+ objIOleInPlaceObject.UIDeactivate();
+ if (lpgui1.hwndCaret != 0) {
+ GUITHREADINFO lpgui2 = new GUITHREADINFO();
+ lpgui2.cbSize = GUITHREADINFO.sizeof;
+ OS.GetGUIThreadInfo(threadId, lpgui2);
+ if (lpgui2.hwndCaret == 0 && lpgui1.hwndCaret == OS.GetFocus()) {
+ if (SWT_RESTORECARET == 0) {
+ SWT_RESTORECARET = OS.RegisterWindowMessage (new TCHAR (0, "SWT_RESTORECARET", true));
+ }
+ /*
+ * If the caret was not restored by SWT, put it back using
+ * the information from GUITHREADINFO. Note that this will
+ * not be correct when the caret has a bitmap. There is no
+ * API to query the bitmap that the caret is using.
+ */
+ if (OS.SendMessage (lpgui1.hwndCaret, SWT_RESTORECARET, 0, 0) == 0) {
+ int width = lpgui1.right - lpgui1.left;
+ int height = lpgui1.bottom - lpgui1.top;
+ OS.CreateCaret (lpgui1.hwndCaret, 0, width, height);
+ OS.SetCaretPos (lpgui1.left, lpgui1.top);
+ OS.ShowCaret (lpgui1.hwndCaret);
+ }
+ }
+ }
+}
private int OnFocus(int fGotFocus) {
return COM.S_OK;
}
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleFrame.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleFrame.java
index 2677f94..9e4a5f4 100755
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleFrame.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleFrame.java
@@ -598,7 +598,9 @@ int Release() {
refCount--;
if (refCount == 0){
disposeCOMInterfaces();
- COM.CoFreeUnusedLibraries();
+ if (COM.FreeUnusedLibraries) {
+ COM.CoFreeUnusedLibraries();
+ }
}
return refCount;
}
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/cocoa/Cocoa.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/cocoa/Cocoa.java
index 78c3d07..4478c3c 100755
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/cocoa/Cocoa.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/cocoa/Cocoa.java
@@ -49,6 +49,7 @@ public static final int C_NSMutableDictionary = Cocoa.objc_getClass("NSMutableDi
public static final int C_WebPanelAuthenticationHandler = Cocoa.objc_getClass("WebPanelAuthenticationHandler"); //$NON-NLS-1$
public static final int C_WebScriptObject = Cocoa.objc_getClass("WebScriptObject"); //$NON-NLS-1$
public static final int C_WebUndefined = Cocoa.objc_getClass("WebUndefined"); //$NON-NLS-1$
+public static final int C_NSFileManager = Cocoa.objc_getClass("NSFileManager"); //$NON-NLS-1$
/* Objective-C method selectors */
public static final int S_absoluteString = Cocoa.sel_registerName("absoluteString"); //$NON-NLS-1$
@@ -74,11 +75,13 @@ public static final int S_credentialWithUser = Cocoa.sel_registerName("credentia
public static final int S_cut = Cocoa.sel_registerName("cut:"); //$NON-NLS-1$
public static final int S_dataSource = Cocoa.sel_registerName("dataSource"); //$NON-NLS-1$
public static final int S_defaultCenter = Cocoa.sel_registerName("defaultCenter"); //$NON-NLS-1$
+public static final int S_defaultManager = Cocoa.sel_registerName("defaultManager"); //$NON-NLS-1$
public static final int S_deleteCookie = Cocoa.sel_registerName("deleteCookie:"); //$NON-NLS-1$
public static final int S_dictionaryWithCapacity = Cocoa.sel_registerName("dictionaryWithCapacity:"); //$NON-NLS-1$
public static final int S_documentSource = Cocoa.sel_registerName("documentSource"); //$NON-NLS-1$
public static final int S_doubleValue = Cocoa.sel_registerName("doubleValue"); //$NON-NLS-1$
public static final int S_download = Cocoa.sel_registerName("download"); //$NON-NLS-1$
+public static final int S_fileExistsAtPath = Cocoa.sel_registerName("fileExistsAtPath:"); //$NON-NLS-1$
public static final int S_goBack = Cocoa.sel_registerName("goBack:"); //$NON-NLS-1$
public static final int S_goForward = Cocoa.sel_registerName("goForward:"); //$NON-NLS-1$
public static final int S_handleNotification = Cocoa.sel_registerName("handleNotification:"); //$NON-NLS-1$
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/FoundationFull.bridgesupport.extras b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/FoundationFull.bridgesupport.extras
index c95ad9a..a94303e 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/FoundationFull.bridgesupport.extras
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/FoundationFull.bridgesupport.extras
@@ -315,6 +315,10 @@
<arg name="path" swt_gen="true"></arg>
<retval swt_gen="true"></retval>
</method>
+ <method selector="fileExistsAtPath:" swt_gen="true">
+ <arg name="path" swt_gen="true"></arg>
+ <retval swt_gen="true"></retval>
+ </method>
<method selector="fileExistsAtPath:isDirectory:" swt_gen="true">
<arg name="path" swt_gen="true"></arg>
<arg name="isDirectory" swt_gen="true"></arg>
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFileManager.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFileManager.java
index 7800921..85b4fdf 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFileManager.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFileManager.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -38,6 +38,10 @@ public NSDirectoryEnumerator enumeratorAtPath(NSString path) {
return result != 0 ? new NSDirectoryEnumerator(result) : null;
}
+public boolean fileExistsAtPath(NSString path) {
+ return OS.objc_msgSend_bool(this.id, OS.sel_fileExistsAtPath_, path != null ? path.id : 0);
+}
+
public boolean fileExistsAtPath(NSString path, int /*long*/ isDirectory) {
return OS.objc_msgSend_bool(this.id, OS.sel_fileExistsAtPath_isDirectory_, path != null ? path.id : 0, isDirectory);
}
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java
index 824078d..b71065e 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java
@@ -942,6 +942,7 @@ public static final int /*long*/ sel_expandItem_expandChildren_ = sel_registerNa
public static final int /*long*/ sel_expansionFrameWithFrame_inView_ = sel_registerName("expansionFrameWithFrame:inView:");
public static final int /*long*/ sel_familyName = sel_registerName("familyName");
public static final int /*long*/ sel_fieldEditor_forObject_ = sel_registerName("fieldEditor:forObject:");
+public static final int /*long*/ sel_fileExistsAtPath_ = sel_registerName("fileExistsAtPath:");
public static final int /*long*/ sel_fileExistsAtPath_isDirectory_ = sel_registerName("fileExistsAtPath:isDirectory:");
public static final int /*long*/ sel_fileSystemRepresentation = sel_registerName("fileSystemRepresentation");
public static final int /*long*/ sel_fileURLWithPath_ = sel_registerName("fileURLWithPath:");
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/common_j2me/org/eclipse/swt/internal/Library.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/common_j2me/org/eclipse/swt/internal/Library.java
index b3f735b..f37a4cc 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/common_j2me/org/eclipse/swt/internal/Library.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/common_j2me/org/eclipse/swt/internal/Library.java
@@ -22,7 +22,7 @@ public class Library {
/**
* SWT Minor version number (must be in the range 0..999)
*/
- static int MINOR_VERSION = 555;
+ static int MINOR_VERSION = 557;
/**
* SWT revision number (must be >= 0)
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/common_j2se/org/eclipse/swt/internal/Library.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/common_j2se/org/eclipse/swt/internal/Library.java
index 1f9a8c5..ca01aff 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/common_j2se/org/eclipse/swt/internal/Library.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/common_j2se/org/eclipse/swt/internal/Library.java
@@ -24,7 +24,7 @@ public class Library {
/**
* SWT Minor version number (must be in the range 0..999)
*/
- static int MINOR_VERSION = 555;
+ static int MINOR_VERSION = 557;
/**
* SWT revision number (must be >= 0)
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
index 7e69ea0..d2604c3 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
@@ -5944,6 +5944,24 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1resize)
}
#endif
+#ifndef NO__1gdk_1window_1restack
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1restack)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2)
+{
+ OS_NATIVE_ENTER(env, that, _1gdk_1window_1restack_FUNC);
+/*
+ gdk_window_restack((GdkWindow *)arg0, (GdkWindow *)arg1, (gboolean)arg2);
+*/
+ {
+ LOAD_FUNCTION(fp, gdk_window_restack)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(GdkWindow *, GdkWindow *, gboolean))fp)((GdkWindow *)arg0, (GdkWindow *)arg1, (gboolean)arg2);
+ }
+ }
+ OS_NATIVE_EXIT(env, that, _1gdk_1window_1restack_FUNC);
+}
+#endif
+
#ifndef NO__1gdk_1window_1scroll
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1scroll)
(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h
index 0bb68c3..40e1c14 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h
@@ -112,6 +112,7 @@
#define gtk_status_icon_set_tooltip_LIB "libgtk-x11-2.0.so.0"
#define gtk_window_get_group_LIB "libgtk-x11-2.0.so.0"
#define gtk_window_get_opacity_LIB "libgtk-x11-2.0.so.0"
+#define gdk_window_restack_LIB "libgdk-x11-2.0.so.0"
#define gdk_window_set_keep_above_LIB "libgdk-x11-2.0.so.0"
#define gdk_window_set_accept_focus_LIB "libgdk-x11-2.0.so.0"
#define gtk_window_set_opacity_LIB "libgtk-x11-2.0.so.0"
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c
index 5f5fbe5..27232c7 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c
@@ -18,8 +18,8 @@
#ifdef NATIVE_STATS
-int OS_nativeFunctionCount = 1291;
-int OS_nativeFunctionCallCount[1291];
+int OS_nativeFunctionCount = 1292;
+int OS_nativeFunctionCallCount[1292];
char * OS_nativeFunctionNames[] = {
#ifndef JNI64
"Call__IIII",
@@ -503,6 +503,7 @@ char * OS_nativeFunctionNames[] = {
"_1gdk_1window_1raise",
"_1gdk_1window_1remove_1filter",
"_1gdk_1window_1resize",
+ "_1gdk_1window_1restack",
"_1gdk_1window_1scroll",
"_1gdk_1window_1set_1accept_1focus",
"_1gdk_1window_1set_1back_1pixmap",
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h
index 86a696b..d9d0f63 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h
@@ -511,6 +511,7 @@ typedef enum {
_1gdk_1window_1raise_FUNC,
_1gdk_1window_1remove_1filter_FUNC,
_1gdk_1window_1resize_FUNC,
+ _1gdk_1window_1restack_FUNC,
_1gdk_1window_1scroll_FUNC,
_1gdk_1window_1set_1accept_1focus_FUNC,
_1gdk_1window_1set_1back_1pixmap_FUNC,
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
index 29323e0..116f16d 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
@@ -4887,6 +4887,21 @@ public static final void gdk_window_resize(int /*long*/ window, int width, int h
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param window cast=(GdkWindow *)
+ * @param sibling cast=(GdkWindow *)
+ * @param above cast=(gboolean)
+ */
+public static final native void _gdk_window_restack(int /*long*/ window, int /*long*/ sibling, boolean above);
+public static final void gdk_window_restack(int /*long*/ window, int /*long*/ sibling, boolean above) {
+ lock.lock();
+ try {
+ _gdk_window_restack(window, sibling, above);
+ } finally {
+ lock.unlock();
+ }
+}
/** @param window cast=(GdkWindow *) */
public static final native void _gdk_window_scroll(int /*long*/ window, int dx, int dy);
public static final void gdk_window_scroll(int /*long*/ window, int dx, int dy) {
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COM.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COM.java
index 47e7110..216a29d 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COM.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COM.java
@@ -407,6 +407,8 @@ public class COM extends OS {
public static final short VARIANT_TRUE = -1;
public static final short VARIANT_FALSE = 0;
+ public static boolean FreeUnusedLibraries = true;
+
private static GUID IIDFromString(String lpsz) {
int length = lpsz.length();
char[] buffer = new char[length + 1];
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java
index e56cc5e..4af75c0 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java
@@ -1936,6 +1936,7 @@ public class OS extends C {
public static final int VK_F9 = 0x78;
public static final int VK_HOME = 0x24;
public static final int VK_INSERT = 0x2d;
+ public static final int VK_L = 0x4c;
public static final int VK_LBUTTON = 0x1;
public static final int VK_LEFT = 0x25;
public static final int VK_MBUTTON = 0x4;
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Program/carbon/org/eclipse/swt/program/Program.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Program/carbon/org/eclipse/swt/program/Program.java
index 896fbb7..ea05d52 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Program/carbon/org/eclipse/swt/program/Program.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Program/carbon/org/eclipse/swt/program/Program.java
@@ -14,6 +14,7 @@ package org.eclipse.swt.program;
import org.eclipse.swt.internal.carbon.CFRange;
import org.eclipse.swt.internal.carbon.LSApplicationParameters;
import org.eclipse.swt.internal.carbon.OS;
+import org.eclipse.swt.internal.cocoa.Cocoa;
import org.eclipse.swt.*;
import org.eclipse.swt.graphics.*;
@@ -34,7 +35,6 @@ public final class Program {
static final String PREFIX_HTTP = "http://"; //$NON-NLS-1$
static final String PREFIX_HTTPS = "https://"; //$NON-NLS-1$
- static final String PREFIX_FILE = "file://"; //$NON-NLS-1$
/**
* Prevents uninitialized instances from being created outside the package.
@@ -346,6 +346,37 @@ public static Program [] getPrograms () {
return programs;
}
+static int getURL(String fileName) {
+ char[] chars = new char[fileName.length()];
+ fileName.getChars(0, chars.length, chars, 0);
+ int str = OS.CFStringCreateWithCharacters(0, chars, chars.length);
+ if (str == 0) return 0;
+ int file = str;
+ int fileManager = Cocoa.objc_msgSend(Cocoa.C_NSFileManager, Cocoa.S_defaultManager);
+ if (fileManager != 0 && Cocoa.objc_msgSend(fileManager, Cocoa.S_fileExistsAtPath, str) != 0) {
+ int url = Cocoa.objc_msgSend(Cocoa.C_NSURL, Cocoa.S_fileURLWithPath, str);
+ if (url != 0) {
+ int urlstr = Cocoa.objc_msgSend(url, Cocoa.S_absoluteString);
+ if (urlstr != 0) file = urlstr;
+ }
+ }
+ char[] unescapedChars = new char[] {'%'};
+ String lowercaseName = fileName.toLowerCase ();
+ if (lowercaseName.startsWith (PREFIX_HTTP) || lowercaseName.startsWith (PREFIX_HTTPS)) {
+ unescapedChars = new char[] {'%', '#'};
+ }
+ int unescapedStr = OS.CFStringCreateWithCharacters(0, unescapedChars, unescapedChars.length);
+ int escapedStr = OS.CFURLCreateStringByAddingPercentEscapes(OS.kCFAllocatorDefault, file, unescapedStr, 0, OS.kCFStringEncodingUTF8);
+ int url = 0;
+ if (escapedStr != 0) {
+ url = OS.CFURLCreateWithString(OS.kCFAllocatorDefault, escapedStr, 0);
+ OS.CFRelease(escapedStr);
+ }
+ if (unescapedStr != 0) OS.CFRelease(unescapedStr);
+ OS.CFRelease(str);
+ return url;
+}
+
/**
* Launches the operating system executable associated with the file or
* URL (http:// or https://). If the file is an executable then the
@@ -362,31 +393,10 @@ public static Program [] getPrograms () {
public static boolean launch (String fileName) {
if (fileName == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
int rc = -1;
- char[] unescapedChars = new char[] {'%'};
- String lowercaseName = fileName.toLowerCase ();
- if (lowercaseName.startsWith (PREFIX_HTTP) || lowercaseName.startsWith (PREFIX_HTTPS)) {
- unescapedChars = new char[] {'%', '#'};
- } else {
- if (!lowercaseName.startsWith (PREFIX_FILE)) {
- fileName = PREFIX_FILE + fileName;
- }
- }
- char[] chars = new char[fileName.length()];
- fileName.getChars(0, chars.length, chars, 0);
- int str = OS.CFStringCreateWithCharacters(0, chars, chars.length);
- if (str != 0) {
- int unescapedStr = OS.CFStringCreateWithCharacters(0, unescapedChars, unescapedChars.length);
- int escapedStr = OS.CFURLCreateStringByAddingPercentEscapes(OS.kCFAllocatorDefault, str, unescapedStr, 0, OS.kCFStringEncodingUTF8);
- if (escapedStr != 0) {
- int url = OS.CFURLCreateWithString(OS.kCFAllocatorDefault, escapedStr, 0);
- if (url != 0) {
- rc = OS.LSOpenCFURLRef(url, null);
- OS.CFRelease(url);
- }
- OS.CFRelease(escapedStr);
- }
- if (unescapedStr != 0) OS.CFRelease(unescapedStr);
- OS.CFRelease(str);
+ int url = getURL(fileName);
+ if (url != 0) {
+ rc = OS.LSOpenCFURLRef(url, null);
+ OS.CFRelease(url);
}
return rc == OS.noErr;
}
@@ -418,35 +428,15 @@ public boolean execute (String fileName) {
if (fileName.length() == 0) {
rc = OS.LSOpenApplication(params, null);
} else {
- char[] unescapedChars = new char[] {'%'};
- String lowercaseName = fileName.toLowerCase ();
- if (lowercaseName.startsWith (PREFIX_HTTP) || lowercaseName.startsWith (PREFIX_HTTPS)) {
- unescapedChars = new char[] {'%', '#'};
- } else {
- if (!lowercaseName.startsWith (PREFIX_FILE)) {
- fileName = PREFIX_FILE + fileName;
- }
- }
- char[] chars = new char[fileName.length()];
- fileName.getChars(0, chars.length, chars, 0);
- int str = OS.CFStringCreateWithCharacters(0, chars, chars.length);
- if (str != 0) {
- int unescapedStr = OS.CFStringCreateWithCharacters(0, unescapedChars, unescapedChars.length);
- int escapedStr = OS.CFURLCreateStringByAddingPercentEscapes(OS.kCFAllocatorDefault, str, unescapedStr, 0, OS.kCFStringEncodingUTF8);
- if (escapedStr != 0) {
- int urls = OS.CFArrayCreateMutable(OS.kCFAllocatorDefault, 1, 0);
- if (urls != 0) {
- int url = OS.CFURLCreateWithString(OS.kCFAllocatorDefault, escapedStr, 0);
- if (url != 0) {
- OS.CFArrayAppendValue(urls, url);
- rc = OS.LSOpenURLsWithRole(urls, OS.kLSRolesAll, 0, params, null, 0);
- }
- OS.CFRelease(urls);
- }
- OS.CFRelease(escapedStr);
+ int url = getURL(fileName);
+ if (url != 0) {
+ int urls = OS.CFArrayCreateMutable(OS.kCFAllocatorDefault, 1, 0);
+ if (urls != 0) {
+ OS.CFArrayAppendValue(urls, url);
+ rc = OS.LSOpenURLsWithRole(urls, OS.kLSRolesAll, 0, params, null, 0);
+ OS.CFRelease(urls);
}
- if (unescapedStr != 0) OS.CFRelease(unescapedStr);
- OS.CFRelease(str);
+ OS.CFRelease(url);
}
}
OS.DisposePtr(fsRefPtr);
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Program/cocoa/org/eclipse/swt/program/Program.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Program/cocoa/org/eclipse/swt/program/Program.java
index 00874b2..65d6b0a 100755
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Program/cocoa/org/eclipse/swt/program/Program.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Program/cocoa/org/eclipse/swt/program/Program.java
@@ -30,7 +30,6 @@ import java.util.Vector;
public final class Program {
String name, fullPath, identifier;
- static final String PREFIX_FILE = "file:"; //$NON-NLS-1$
static final String PREFIX_HTTP = "http://"; //$NON-NLS-1$
static final String PREFIX_HTTPS = "https://"; //$NON-NLS-1$
@@ -237,6 +236,25 @@ public static Program [] getPrograms () {
}
}
+static NSURL getURL (String fileName) {
+ NSString unescapedStr;
+ String lowercaseName = fileName.toLowerCase ();
+ if (lowercaseName.startsWith (PREFIX_HTTP) || lowercaseName.startsWith (PREFIX_HTTPS)) {
+ unescapedStr = NSString.stringWith("%#"); //$NON-NLS-1$
+ } else {
+ unescapedStr = NSString.stringWith("%"); //$NON-NLS-1$
+ }
+ NSString fullPath = NSString.stringWith(fileName);
+ if (NSFileManager.defaultManager().fileExistsAtPath(fullPath)) {
+ fullPath = NSURL.fileURLWithPath(fullPath).absoluteString();
+ }
+ int /*long*/ ptr = OS.CFURLCreateStringByAddingPercentEscapes(0, fullPath.id, unescapedStr.id, 0, OS.kCFStringEncodingUTF8);
+ NSString escapedString = new NSString(ptr);
+ NSURL url = NSURL.URLWithString(escapedString);
+ OS.CFRelease(ptr);
+ return url;
+}
+
/**
* Launches the operating system executable associated with the file or
* URL (http:// or https://). If the file is an executable then the
@@ -254,22 +272,9 @@ public static boolean launch (String fileName) {
if (fileName == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
NSAutoreleasePool pool = (NSAutoreleasePool) new NSAutoreleasePool().alloc().init();
try {
- NSString unescapedStr = NSString.stringWith("%"); //$NON-NLS-1$
- String lowercaseName = fileName.toLowerCase ();
- if (lowercaseName.startsWith (PREFIX_HTTP) || lowercaseName.startsWith (PREFIX_HTTPS)) {
- unescapedStr = NSString.stringWith("%#"); //$NON-NLS-1$
- } else {
- if (!lowercaseName.startsWith (PREFIX_FILE)) {
- fileName = PREFIX_FILE + fileName;
- }
- }
- NSString fullPath = NSString.stringWith(fileName);
- int /*long*/ ptr = OS.CFURLCreateStringByAddingPercentEscapes(0, fullPath.id, unescapedStr.id, 0, OS.kCFStringEncodingUTF8);
- NSString escapedString = new NSString(ptr);
+ NSURL url = getURL(fileName);
NSWorkspace workspace = NSWorkspace.sharedWorkspace();
- boolean result = workspace.openURL(NSURL.URLWithString(escapedString));
- OS.CFRelease(ptr);
- return result;
+ return workspace.openURL(url);
} finally {
pool.release();
}
@@ -293,22 +298,9 @@ public boolean execute (String fileName) {
NSAutoreleasePool pool = (NSAutoreleasePool) new NSAutoreleasePool().alloc().init();
try {
NSWorkspace workspace = NSWorkspace.sharedWorkspace();
- String lowercaseName = fileName.toLowerCase ();
- if (lowercaseName.startsWith (PREFIX_HTTP) || lowercaseName.startsWith (PREFIX_HTTPS)) {
- NSString fullPath = NSString.stringWith(fileName);
- NSString unescapedStr = NSString.stringWith("%#"); //$NON-NLS-1$
- int /*long*/ ptr = OS.CFURLCreateStringByAddingPercentEscapes(0, fullPath.id, unescapedStr.id, 0, OS.kCFStringEncodingUTF8);
- NSString escapedString = new NSString(ptr);
- NSArray urls = NSArray.arrayWithObject(NSURL.URLWithString(escapedString));
- OS.CFRelease(ptr);
- return workspace.openURLs(urls, NSString.stringWith(identifier), 0, null, 0);
- } else {
- if (fileName.startsWith (PREFIX_FILE)) {
- fileName = fileName.substring (PREFIX_FILE.length ());
- }
- NSString fullPath = NSString.stringWith (fileName);
- return workspace.openFile (fullPath, NSString.stringWith (name));
- }
+ NSURL url = getURL(fileName);
+ NSArray urls = NSArray.arrayWithObject(url);
+ return workspace.openURLs(urls, NSString.stringWith(identifier), 0, null, 0);
} finally {
pool.release();
}
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Display.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Display.java
index f3a5834..f953f21 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Display.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Display.java
@@ -3960,12 +3960,13 @@ public void syncExec (Runnable runnable) {
int textInputProc (int nextHandler, int theEvent, int userData) {
int theWindow = OS.GetUserFocusWindow ();
if (theWindow != 0) {
- Widget widget = getFocusControl (theWindow, false);
+ int [] theControl = new int [1];
+ OS.GetKeyboardFocus (theWindow, theControl);
+ Widget widget = getWidget (theControl [0]);
if (widget != null) {
MenuTrackingData outData = new MenuTrackingData ();
if (OS.GetMenuTrackingData (0, outData) != OS.noErr) {
/* Stop the default event handler from activating the default button */
- int [] theControl = new int [1];
OS.GetWindowDefaultButton (theWindow, theControl);
OS.SetWindowDefaultButton (theWindow, 0);
int result = widget.textInputProc (nextHandler, theEvent, userData);
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/FileDialog.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/FileDialog.java
index 532f14a..7b4b4d2 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/FileDialog.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/FileDialog.java
@@ -237,7 +237,6 @@ int filterProc (int theItem, int infoPtr, int callBackUD, int filterMode) {
}
}
}
- return 0;
}
}
}
@@ -295,31 +294,33 @@ public String open () {
int extensions = 0;
Callback filterCallback = null, eventCallback = null;
int [] outDialog = new int [1];
- if ((style & SWT.SAVE) != 0) {
- if (!overwrite) options.optionFlags |= OS.kNavDontConfirmReplacement;
- OS.NavCreatePutFileDialog (options, 0, 0, 0, 0, outDialog);
- } else {
- if ((style & SWT.MULTI) != 0) options.optionFlags |= OS.kNavAllowMultipleFiles;
- int filterProc = 0, eventProc = 0;
- if (filterExtensions != null && filterExtensions.length != 0) {
- extensions = options.popupExtension = OS.CFArrayCreateMutable (OS.kCFAllocatorDefault, filterExtensions.length, 0);
- for (int i = 0; i < filterExtensions.length; i++) {
- String str = filterExtensions [i];
- if (filterNames != null && filterNames.length > i) {
- str = filterNames [i];
- }
- char [] chars = new char [str.length ()];
- str.getChars (0, chars.length, chars, 0);
- int ptr = OS.CFStringCreateWithCharacters (OS.kCFAllocatorDefault, chars, chars.length);
- if (ptr != 0) OS.CFArrayAppendValue (extensions, ptr);
- }
+ int filterProc = 0, eventProc = 0;
+ if (filterExtensions != null && filterExtensions.length != 0) {
+ extensions = options.popupExtension = OS.CFArrayCreateMutable (OS.kCFAllocatorDefault, filterExtensions.length, 0);
+ for (int i = 0; i < filterExtensions.length; i++) {
+ String str = filterExtensions [i];
+ if (filterNames != null && filterNames.length > i) {
+ str = filterNames [i];
+ }
+ char [] chars = new char [str.length ()];
+ str.getChars (0, chars.length, chars, 0);
+ int ptr = OS.CFStringCreateWithCharacters (OS.kCFAllocatorDefault, chars, chars.length);
+ if (ptr != 0) OS.CFArrayAppendValue (extensions, ptr);
+ }
+ if ((style & SWT.SAVE) == 0) {
filterCallback = new Callback (this, "filterProc", 4);
filterProc = filterCallback.getAddress();
if (filterProc == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
- eventCallback = new Callback (this, "eventProc", 3);
- eventProc = eventCallback.getAddress();
- if (eventProc == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
}
+ eventCallback = new Callback (this, "eventProc", 3);
+ eventProc = eventCallback.getAddress();
+ if (eventProc == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
+ }
+ if ((style & SWT.SAVE) != 0) {
+ if (!overwrite) options.optionFlags |= OS.kNavDontConfirmReplacement;
+ OS.NavCreatePutFileDialog (options, 0, 0, eventProc, 0, outDialog);
+ } else {
+ if ((style & SWT.MULTI) != 0) options.optionFlags |= OS.kNavAllowMultipleFiles;
OS.NavCreateGetFileDialog(options, 0, eventProc, 0, filterProc, 0, outDialog);
}
if (outDialog [0] != 0) {
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java
index d6c5637..43b0e2b 100755
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java
@@ -1778,7 +1778,16 @@ public int /*long*/ internal_new_GC (GCData data) {
context = graphicsContext.id;
if (!view.isFlipped()) data.state &= ~VISIBLE_REGION;
} else {
- NSGraphicsContext graphicsContext = NSGraphicsContext.graphicsContextWithWindow (view.window ());
+ NSWindow window = view.window();
+ /*
+ * Force the device to be created before attempting
+ * to create a GC on a deferred NSWindow.
+ */
+ if (window.windowNumber() <= 0) {
+ window.orderBack(null);
+ window.orderOut(null);
+ }
+ NSGraphicsContext graphicsContext = NSGraphicsContext.graphicsContextWithWindow (window);
NSGraphicsContext flippedContext = NSGraphicsContext.graphicsContextWithGraphicsPort(graphicsContext.graphicsPort(), true);
graphicsContext = flippedContext;
context = graphicsContext.id;
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Shell.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Shell.java
index fef336c..ca40897 100755
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Shell.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Shell.java
@@ -571,7 +571,7 @@ void createHandle () {
NSScreen primaryScreen = new NSScreen(NSScreen.screens().objectAtIndex(0));
if (parent != null) screen = parent.getShell().window.screen();
if (screen == null) screen = primaryScreen;
- window = window.initWithContentRect(new NSRect(), styleMask, OS.NSBackingStoreBuffered, false, screen);
+ window = window.initWithContentRect(new NSRect(), styleMask, OS.NSBackingStoreBuffered, (style & SWT.ON_TOP) != 0, screen);
if ((style & (SWT.NO_TRIM | SWT.BORDER | SWT.SHELL_TRIM)) == 0 || (style & (SWT.TOOL | SWT.SHEET)) != 0) {
window.setHasShadow (true);
}
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Table.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Table.java
index 3adf440..d74ceda 100755
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Table.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Table.java
@@ -1704,7 +1704,9 @@ public int getTopIndex () {
NSPoint point = new NSPoint();
point.x = rect.x;
point.y = rect.y;
- return (int)/*64*/((NSTableView)view).rowAtPoint(point);
+ int /*64*/ rowAtPoint = (int)/*64*/((NSTableView)view).rowAtPoint(point);
+ if (rowAtPoint == -1) return 0; /* Empty table */
+ return rowAtPoint;
}
void highlightSelectionInClipRect(int /*long*/ id, int /*long*/ sel, int /*long*/ rect) {
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TableColumn.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TableColumn.java
index 72c5e64..65de099 100755
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TableColumn.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TableColumn.java
@@ -419,27 +419,16 @@ public void pack () {
int width = 0;
/* compute header width */
- if (displayText != null) {
- NSTableHeaderCell headerCell = nsColumn.headerCell ();
- Font font = Font.cocoa_new(display, headerCell.font ());
- NSAttributedString attrString = parent.createString(displayText, font, null, 0, false, true, false);
- NSSize stringSize = attrString.size ();
- attrString.release ();
- width += Math.ceil (stringSize.width);
- if (image != null) width += MARGIN; /* space between image and text */
- }
+ NSTableHeaderCell headerCell = nsColumn.headerCell ();
+ NSSize size = headerCell.cellSize();
+ width += Math.ceil (size.width);
if (image != null) {
NSSize imageSize = image.handle.size ();
- width += Math.ceil (imageSize.width);
+ width += Math.ceil (imageSize.width) + MARGIN;
}
if (parent.sortColumn == this && parent.sortDirection != SWT.NONE) {
- NSTableHeaderCell headerCell = nsColumn.headerCell ();
- NSRect rect = new NSRect ();
- rect.width = rect.height = Float.MAX_VALUE;
- NSSize cellSize = headerCell.cellSizeForBounds (rect);
- rect.height = cellSize.height;
- NSRect sortRect = headerCell.sortIndicatorRectForBounds (rect);
- width += Math.ceil (sortRect.width);
+ NSRect sortRect = headerCell.sortIndicatorRectForBounds (new NSRect ());
+ width += Math.ceil (sortRect.width + 2 * MARGIN);
}
/* compute item widths down column */
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TreeColumn.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TreeColumn.java
index 94cc88d..0a0f469 100755
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TreeColumn.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TreeColumn.java
@@ -421,27 +421,16 @@ public void pack () {
int width = 0;
/* compute header width */
- if (displayText != null) {
- NSTableHeaderCell headerCell = nsColumn.headerCell ();
- Font font = Font.cocoa_new(display, headerCell.font ());
- NSAttributedString attrString = parent.createString(displayText, font, null, 0, false, true, false);
- NSSize stringSize = attrString.size ();
- attrString.release ();
- width += Math.ceil (stringSize.width);
- if (image != null) width += MARGIN; /* space between image and text */
- }
+ NSTableHeaderCell headerCell = nsColumn.headerCell ();
+ NSSize size = headerCell.cellSize();
+ width += Math.ceil (size.width);
if (image != null) {
NSSize imageSize = image.handle.size ();
- width += Math.ceil (imageSize.width);
+ width += Math.ceil (imageSize.width) + MARGIN;
}
if (parent.sortColumn == this && parent.sortDirection != SWT.NONE) {
- NSTableHeaderCell headerCell = nsColumn.headerCell ();
- NSRect rect = new NSRect ();
- rect.width = rect.height = Float.MAX_VALUE;
- NSSize cellSize = headerCell.cellSizeForBounds (rect);
- rect.height = cellSize.height;
- NSRect sortRect = headerCell.sortIndicatorRectForBounds (rect);
- width += Math.ceil (sortRect.width);
+ NSRect sortRect = headerCell.sortIndicatorRectForBounds (new NSRect ());
+ width += Math.ceil (sortRect.width + 2 * MARGIN);
}
/* compute item widths down column */
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/library/make_common.mak b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/library/make_common.mak
index 7f77d9e..4be9a86 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/library/make_common.mak
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/library/make_common.mak
@@ -10,5 +10,5 @@
#*******************************************************************************
maj_ver=3
-min_ver=555
-comma_ver=3,5,5,5
+min_ver=557
+comma_ver=3,5,5,7
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngEncoder.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngEncoder.java
index 26fe574..82a9b51 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngEncoder.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngEncoder.java
@@ -245,12 +245,8 @@ void writeImageData() throws IOException {
os.write(filter);
data.getPixels(0, y, width, lineData, 0);
-
- for (int x = 0; x < lineData.length; x++) {
-
- os.write(lineData[x]);
-
- }
+
+ os.write(lineData);
}
@@ -271,40 +267,44 @@ void writeImageData() throws IOException {
int blueShift = data.palette.blueShift;
int blueMask = data.palette.blueMask;
+ byte[] lineBytes = new byte[width * (colorType == 6 ? 4 : 3)];
+
for (int y = 0; y < height; y++) {
-
+
int filter = 0;
os.write(filter);
-
+
data.getPixels(0, y, width, lineData, 0);
-
+
if (colorType == 6) {
data.getAlphas(0, y, width, alphaData, 0);
}
-
+
+ int offset = 0;
for (int x = 0; x < lineData.length; x++) {
-
+
int pixel = lineData[x];
-
+
int r = pixel & redMask;
- r = (redShift < 0) ? r >>> -redShift : r << redShift;
+ lineBytes[offset++] = (byte) ((redShift < 0) ? r >>> -redShift
+ : r << redShift);
int g = pixel & greenMask;
- g = (greenShift < 0) ? g >>> -greenShift : g << greenShift;
+ lineBytes[offset++] = (byte) ((greenShift < 0) ? g >>> -greenShift
+ : g << greenShift);
int b = pixel & blueMask;
- b = (blueShift < 0) ? b >>> -blueShift : b << blueShift;
-
- os.write(r);
- os.write(g);
- os.write(b);
-
+ lineBytes[offset++] = (byte) ((blueShift < 0) ? b >>> -blueShift
+ : b << blueShift);
+
if (colorType == 6) {
- os.write(alphaData[x]);
+ lineBytes[offset++] = alphaData[x];
}
-
+
}
-
+
+ os.write(lineBytes);
+
}
-
+
}
os.flush();
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/version.txt b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/version.txt
index a33f388..0957c2f 100755
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/version.txt
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/version.txt
@@ -1 +1 @@
-version 3.555
\ No newline at end of file
+version 3.557
\ No newline at end of file
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java
index 78c020d..927f94f 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java
@@ -2821,31 +2821,35 @@ void initCairo() {
data.device.checkCairo();
int /*long*/ cairo = data.cairo;
if (cairo != 0) return;
- int /*long*/ xDisplay = OS.GDK_DISPLAY();
- int /*long*/ xVisual = OS.gdk_x11_visual_get_xvisual(OS.gdk_visual_get_system());
- int /*long*/ xDrawable = 0;
- int translateX = 0, translateY = 0;
- int /*long*/ drawable = data.drawable;
- if (data.image != null) {
- xDrawable = OS.GDK_PIXMAP_XID(drawable);
+ if (OS.GTK_VERSION < OS.VERSION(2, 17, 0)) {
+ int /*long*/ xDisplay = OS.GDK_DISPLAY();
+ int /*long*/ xVisual = OS.gdk_x11_visual_get_xvisual(OS.gdk_visual_get_system());
+ int /*long*/ xDrawable = 0;
+ int translateX = 0, translateY = 0;
+ int /*long*/ drawable = data.drawable;
+ if (data.image != null) {
+ xDrawable = OS.GDK_PIXMAP_XID(drawable);
+ } else {
+ if (!data.realDrawable) {
+ int[] x = new int[1], y = new int[1];
+ int /*long*/ [] real_drawable = new int /*long*/ [1];
+ OS.gdk_window_get_internal_paint_info(drawable, real_drawable, x, y);
+ xDrawable = OS.gdk_x11_drawable_get_xid(real_drawable[0]);
+ translateX = -x[0];
+ translateY = -y[0];
+ }
+ }
+ int[] w = new int[1], h = new int[1];
+ OS.gdk_drawable_get_size(drawable, w, h);
+ int width = w[0], height = h[0];
+ int /*long*/ surface = Cairo.cairo_xlib_surface_create(xDisplay, xDrawable, xVisual, width, height);
+ if (surface == 0) SWT.error(SWT.ERROR_NO_HANDLES);
+ Cairo.cairo_surface_set_device_offset(surface, translateX, translateY);
+ data.cairo = cairo = Cairo.cairo_create(surface);
+ Cairo.cairo_surface_destroy(surface);
} else {
- if (!data.realDrawable) {
- int[] x = new int[1], y = new int[1];
- int /*long*/ [] real_drawable = new int /*long*/ [1];
- OS.gdk_window_get_internal_paint_info(drawable, real_drawable, x, y);
- xDrawable = OS.gdk_x11_drawable_get_xid(real_drawable[0]);
- translateX = -x[0];
- translateY = -y[0];
- }
- }
- int[] w = new int[1], h = new int[1];
- OS.gdk_drawable_get_size(drawable, w, h);
- int width = w[0], height = h[0];
- int /*long*/ surface = Cairo.cairo_xlib_surface_create(xDisplay, xDrawable, xVisual, width, height);
- if (surface == 0) SWT.error(SWT.ERROR_NO_HANDLES);
- Cairo.cairo_surface_set_device_offset(surface, translateX, translateY);
- data.cairo = cairo = Cairo.cairo_create(surface);
- Cairo.cairo_surface_destroy(surface);
+ data.cairo = cairo = OS.gdk_cairo_create(data.drawable);
+ }
if (cairo == 0) SWT.error(SWT.ERROR_NO_HANDLES);
data.disposeCairo = true;
Cairo.cairo_set_fill_rule(cairo, Cairo.CAIRO_FILL_RULE_EVEN_ODD);
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
index cabd66b..ba399a0 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
@@ -3332,6 +3332,30 @@ void releaseWidget () {
region = null;
}
+void restackWindow (int /*long*/ window, int /*long*/ sibling, boolean above) {
+ if (OS.GTK_VERSION >= OS.VERSION (2, 17, 11)) {
+ OS.gdk_window_restack (window, sibling, above);
+ } else {
+ /*
+ * Feature in X. If the receiver is a top level, XConfigureWindow ()
+ * will fail (with a BadMatch error) for top level shells because top
+ * level shells are reparented by the window manager and do not share
+ * the same X window parent. This is the correct behavior but it is
+ * unexpected. The fix is to use XReconfigureWMWindow () instead.
+ * When the receiver is not a top level shell, XReconfigureWMWindow ()
+ * behaves the same as XConfigureWindow ().
+ */
+ int /*long*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (window);
+ int /*long*/ xWindow = OS.gdk_x11_drawable_get_xid (window);
+ int xScreen = OS.XDefaultScreen (xDisplay);
+ int flags = OS.CWStackMode | OS.CWSibling;
+ XWindowChanges changes = new XWindowChanges ();
+ changes.sibling = OS.gdk_x11_drawable_get_xid (sibling);
+ changes.stack_mode = above ? OS.Above : OS.Below;
+ OS.XReconfigureWMWindow (xDisplay, xWindow, xScreen, flags, changes);
+ }
+ }
+
boolean sendDragEvent (int button, int stateMask, int x, int y, boolean isStateMask) {
Event event = new Event ();
event.button = button;
@@ -3682,15 +3706,7 @@ public void setEnabled (boolean enabled) {
if (!OS.GDK_WINDOWING_X11 ()) {
OS.gdk_window_raise (enableWindow);
} else {
- int /*long*/ topWindow = OS.GTK_WIDGET_WINDOW (topHandle);
- int /*long*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (topWindow);
- int /*long*/ xWindow = OS.gdk_x11_drawable_get_xid (enableWindow);
- int xScreen = OS.XDefaultScreen (xDisplay);
- int flags = OS.CWStackMode | OS.CWSibling;
- XWindowChanges changes = new XWindowChanges ();
- changes.sibling = OS.gdk_x11_drawable_get_xid (topWindow);
- changes.stack_mode = OS.Above;
- OS.XReconfigureWMWindow (xDisplay, xWindow, xScreen, flags, changes);
+ restackWindow (enableWindow, OS.GTK_WIDGET_WINDOW (topHandle), true);
}
if (OS.GTK_WIDGET_VISIBLE (topHandle)) OS.gdk_window_show_unraised (enableWindow);
}
@@ -3961,10 +3977,18 @@ public void setRedraw (boolean redraw) {
if (--drawCount == 0) {
if (redrawWindow != 0) {
int /*long*/ window = paintWindow ();
+ /*
+ * Bug in GTK. For some reason, the window does not
+ * redraw in versions of GTK greater than 2.18. The fix
+ * is to hide and show it (without changing the z order).
+ */
+ boolean fixRedraw = OS.GTK_VERSION >= OS.VERSION (2, 17, 0) && OS.gdk_window_is_visible(window);
+ if (fixRedraw) OS.gdk_window_hide(window);
/* Explicitly hiding the window avoids flicker on GTK+ >= 2.6 */
OS.gdk_window_hide (redrawWindow);
OS.gdk_window_destroy (redrawWindow);
OS.gdk_window_set_events (window, OS.gtk_widget_get_events (paintHandle ()));
+ if (fixRedraw) OS.gdk_window_show_unraised(window);
redrawWindow = 0;
}
}
@@ -4170,29 +4194,12 @@ void setZOrder (Control sibling, boolean above, boolean fixRelations, boolean fi
OS.gdk_window_lower (window);
}
} else {
- XWindowChanges changes = new XWindowChanges ();
- changes.sibling = OS.gdk_x11_drawable_get_xid (siblingWindow != 0 ? siblingWindow : redrawWindow);
- changes.stack_mode = above ? OS.Above : OS.Below;
- if (redrawWindow != 0 && siblingWindow == 0) changes.stack_mode = OS.Below;
- int /*long*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (window);
- int /*long*/ xWindow = OS.gdk_x11_drawable_get_xid (window);
- int xScreen = OS.XDefaultScreen (xDisplay);
- int flags = OS.CWStackMode | OS.CWSibling;
- /*
- * Feature in X. If the receiver is a top level, XConfigureWindow ()
- * will fail (with a BadMatch error) for top level shells because top
- * level shells are reparented by the window manager and do not share
- * the same X window parent. This is the correct behavior but it is
- * unexpected. The fix is to use XReconfigureWMWindow () instead.
- * When the receiver is not a top level shell, XReconfigureWMWindow ()
- * behaves the same as XConfigureWindow ().
- */
- OS.XReconfigureWMWindow (xDisplay, xWindow, xScreen, flags, changes);
+ int /*long*/ siblingW = siblingWindow != 0 ? siblingWindow : redrawWindow;
+ boolean stack_mode = above;
+ if (redrawWindow != 0 && siblingWindow == 0) stack_mode = false;
+ restackWindow (window, siblingW, stack_mode);
if (enableWindow != 0) {
- changes.sibling = OS.gdk_x11_drawable_get_xid (window);
- changes.stack_mode = OS.Above;
- xWindow = OS.gdk_x11_drawable_get_xid (enableWindow);
- OS.XReconfigureWMWindow (xDisplay, xWindow, xScreen, flags, changes);
+ restackWindow (enableWindow, window, true);
}
}
}
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FileDialog.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FileDialog.java
index 6cbca21..e322326 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FileDialog.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FileDialog.java
@@ -531,7 +531,11 @@ void presetChooserDialog () {
*/
int /*long*/ ptr = OS.realpath (buffer, null);
if (ptr != 0) {
- OS.gtk_file_chooser_set_filename (handle, ptr);
+ if (fileName.length() > 0) {
+ OS.gtk_file_chooser_set_filename (handle, ptr);
+ } else {
+ OS.gtk_file_chooser_set_current_folder (handle, ptr);
+ }
OS.g_free (ptr);
}
}
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java
index 9e3a131..09fda10 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java
@@ -1101,7 +1101,7 @@ int /*long*/ gtk_focus (int /*long*/ widget, int /*long*/ directionType) {
case OS.GTK_DIR_TAB_BACKWARD:
Control control = display.getFocusControl ();
if (control != null) {
- if ((control.state & CANVAS) != 0 && (control.style & SWT.EMBEDDED) != 0) {
+ if ((control.state & CANVAS) != 0 && (control.style & SWT.EMBEDDED) != 0 && control.getShell () == this) {
int traversal = directionType == OS.GTK_DIR_TAB_FORWARD ? SWT.TRAVERSE_TAB_NEXT : SWT.TRAVERSE_TAB_PREVIOUS;
control.traverse (traversal);
return 1;
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/TextLayout.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/TextLayout.java
index d4701a1..e0aaf15 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/TextLayout.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/TextLayout.java
@@ -731,7 +731,9 @@ public void draw (GC gc, int x, int y, int selectionStart, int selectionEnd, Col
if (hFont != lastHFont) {
lastHFont = hFont;
if (gdipFont != 0) Gdip.Font_delete(gdipFont);
+ int /*long*/ oldFont = OS.SelectObject(hdc, hFont);
gdipFont = Gdip.Font_new(hdc, hFont);
+ OS.SelectObject(hdc, oldFont);
if (gdipFont == 0) SWT.error(SWT.ERROR_NO_HANDLES);
if (!Gdip.Font_IsAvailable(gdipFont)) {
Gdip.Font_delete(gdipFont);
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java
index e3a2fee..bfa767c 100755
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java
@@ -878,16 +878,33 @@ static int /*long*/ create32bitDIB (Image image) {
} else if (alpha != -1) {
for (int y = 0, dp = 0; y < imgHeight; ++y) {
for (int x = 0; x < imgWidth; ++x) {
- srcData [dp + 3] = (byte)alpha;
- if (srcData [dp + 3] == 0) srcData [dp + 0] = srcData [dp + 1] = srcData [dp + 2] = 0;
+ int r = ((srcData[dp + 0] & 0xFF) * alpha) + 128;
+ r = (r + (r >> 8)) >> 8;
+ int g = ((srcData[dp + 1] & 0xFF) * alpha) + 128;
+ g = (g + (g >> 8)) >> 8;
+ int b = ((srcData[dp + 2] & 0xFF) * alpha) + 128;
+ b = (b + (b >> 8)) >> 8;
+ srcData[dp+0] = (byte)r;
+ srcData[dp+1] = (byte)g;
+ srcData[dp+2] = (byte)b;
+ srcData[dp+3] = (byte)alpha;
dp += 4;
}
}
} else if (alphaData != null) {
for (int y = 0, dp = 0, ap = 0; y < imgHeight; ++y) {
for (int x = 0; x < imgWidth; ++x) {
- srcData [dp + 3] = alphaData [ap++];
- if (srcData [dp + 3] == 0) srcData [dp + 0] = srcData [dp + 1] = srcData [dp + 2] = 0;
+ int a = alphaData[ap++] & 0xFF;
+ int r = ((srcData[dp + 0] & 0xFF) * a) + 128;
+ r = (r + (r >> 8)) >> 8;
+ int g = ((srcData[dp + 1] & 0xFF) * a) + 128;
+ g = (g + (g >> 8)) >> 8;
+ int b = ((srcData[dp + 2] & 0xFF) * a) + 128;
+ b = (b + (b >> 8)) >> 8;
+ srcData[dp+0] = (byte)r;
+ srcData[dp+1] = (byte)g;
+ srcData[dp+2] = (byte)b;
+ srcData[dp+3] = (byte)a;
dp += 4;
}
}
@@ -1312,8 +1329,21 @@ int /*long*/ foregroundIdleProc (int /*long*/ code, int /*long*/ wParam, int /*l
runAsyncMessages (false);
}
}
+ /*
+ * Bug in Windows. For some reason, input events can be lost
+ * when a message is posted to the queue from a foreground idle
+ * hook. The fix is to detect that there are outstanding input
+ * events and avoid posting the wake event.
+ *
+ * Note that PeekMessage() changes the state of events on the
+ * queue to no longer be considered new. If we peek for input
+ * events and posted messages (PM_QS_INPUT | PM_QS_POSTMESSAGE),
+ * it is possible to cause WaitMessage() to sleep until a new
+ * input event is generated causing sync runnables not to be
+ * executed.
+ */
MSG msg = new MSG();
- int flags = OS.PM_NOREMOVE | OS.PM_NOYIELD | OS.PM_QS_INPUT | OS.PM_QS_POSTMESSAGE;
+ int flags = OS.PM_NOREMOVE | OS.PM_NOYIELD | OS.PM_QS_INPUT;
if (!OS.PeekMessage (msg, 0, 0, 0, flags)) wakeThread ();
}
}
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ProgressBar.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ProgressBar.java
index ea29f26..8f27741 100755
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ProgressBar.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ProgressBar.java
@@ -420,7 +420,7 @@ LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) {
* NOTE: This only happens on Window XP.
*/
if ((style & SWT.INDETERMINATE) != 0) {
- if (OS.COMCTL32_MAJOR >= 6) {
+ if (OS.WIN32_VERSION == OS.VERSION (5,1) || (OS.COMCTL32_MAJOR >= 6 && !OS.IsAppThemed())) {
forceResize ();
RECT rect = new RECT ();
OS.GetClientRect (handle, rect);
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java
index 1f23fba..de69bfa 100755
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java
@@ -6307,6 +6307,17 @@ LRESULT wmNotifyChild (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) {
}
/*
+ * Feature in Windows. When a new table item is inserted
+ * using LVM_INSERTITEM in a table that is transparent
+ * (ie. LVM_SETBKCOLOR has been called with CLR_NONE),
+ * TVM_INSERTITEM calls LVN_GETDISPINFO before the item
+ * has been added to the array. The fix is to check for
+ * null.
+ */
+ TableItem item = _getItem (plvfi.iItem);
+ if (item == null) break;
+
+ /*
* When an item is being deleted from a virtual table, do not
* allow the application to provide data for a new item that
* becomes visible until the item has been removed from the
@@ -6315,23 +6326,12 @@ LRESULT wmNotifyChild (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) {
* in an inconsistent state. Rather than answering the data
* right away, queue a redraw for later.
*/
- if ((style & SWT.VIRTUAL) != 0) {
+ if ((style & SWT.VIRTUAL) != 0 && !item.cached) {
if (ignoreShrink) {
OS.SendMessage (handle, OS.LVM_REDRAWITEMS, plvfi.iItem, plvfi.iItem);
break;
}
}
-
- /*
- * Feature in Windows. When a new table item is inserted
- * using LVM_INSERTITEM in a table that is transparent
- * (ie. LVM_SETBKCOLOR has been called with CLR_NONE),
- * TVM_INSERTITEM calls LVN_GETDISPINFO before the item
- * has been added to the array. The fix is to check for
- * null.
- */
- TableItem item = _getItem (plvfi.iItem);
- if (item == null) break;
/*
* The cached flag is used by both virtual and non-virtual
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolBar.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolBar.java
index cb95765..3b3e279 100755
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolBar.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolBar.java
@@ -735,6 +735,23 @@ void layoutItems () {
}
}
}
+
+ if ((style & (SWT.WRAP | SWT.VERTICAL)) != 0) {
+ int bits = OS.GetWindowLong (handle, OS.GWL_STYLE);
+ if ((bits & OS.TBSTYLE_LIST) != 0) {
+ TBBUTTONINFO info = new TBBUTTONINFO ();
+ info.cbSize = TBBUTTONINFO.sizeof;
+ info.dwMask = OS.TBIF_SIZE;
+ for (int i=0; i<items.length; i++) {
+ ToolItem item = items [i];
+ if (item != null && item.control != null && item.cx > 0) {
+ info.cx = item.cx;
+ OS.SendMessage (handle, OS.TB_SETBUTTONINFO, item.id, info);
+ }
+ }
+ }
+ }
+
for (int i=0; i<items.length; i++) {
ToolItem item = items [i];
if (item != null) item.resizeControl ();
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolItem.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolItem.java
index 27386a4..016a4cc 100755
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolItem.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolItem.java
@@ -44,6 +44,7 @@ public class ToolItem extends Item {
Image disabledImage, hotImage;
Image disabledImage2;
int id;
+ short cx;
/**
* Constructs a new instance of this class given its parent
@@ -877,7 +878,7 @@ public void setWidth (int width) {
TBBUTTONINFO info = new TBBUTTONINFO ();
info.cbSize = TBBUTTONINFO.sizeof;
info.dwMask = OS.TBIF_SIZE;
- info.cx = (short) width;
+ info.cx = cx = (short) width;
OS.SendMessage (hwnd, OS.TB_SETBUTTONINFO, id, info);
parent.layoutItems ();
}
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tracker.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tracker.java
index f45e58c..5e017a1 100755
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tracker.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tracker.java
@@ -51,6 +51,8 @@ public class Tracker extends Widget {
boolean inEvent = false;
int /*long*/ hwndTransparent, hwndOpaque, oldTransparentProc, oldOpaqueProc;
int oldX, oldY;
+
+ static boolean IsVista = !OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (6, 0);
/*
* The following values mirror step sizes on Windows
@@ -353,7 +355,7 @@ Rectangle [] computeProportions (Rectangle [] rects) {
* Draw the rectangles displayed by the tracker.
*/
void drawRectangles (Rectangle [] rects, boolean stippled) {
- if (parent == null && !OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (6, 0)) {
+ if (hwndOpaque != 0) {
RECT rect1 = new RECT();
int bandWidth = stippled ? 3 : 1;
for (int i = 0; i < rects.length; i++) {
@@ -367,8 +369,7 @@ void drawRectangles (Rectangle [] rects, boolean stippled) {
return;
}
int bandWidth = 1;
- int /*long*/ hwndTrack = OS.GetDesktopWindow ();
- if (parent != null) hwndTrack = parent.handle;
+ int /*long*/ hwndTrack = parent == null ? OS.GetDesktopWindow () : parent.handle;
int /*long*/ hDC = OS.GetDCEx (hwndTrack, 0, OS.DCX_CACHE);
int /*long*/ hBitmap = 0, hBrush = 0, oldBrush = 0;
if (stippled) {
@@ -474,57 +475,77 @@ public boolean open () {
cursorOrientation |= hStyle;
}
- /*
- * If this tracker is being created without a mouse drag then
- * we need to create a transparent window that fills the screen
- * in order to get all mouse/keyboard events that occur
- * outside of our visible windows (ie.- over the desktop).
- */
Callback newProc = null;
boolean mouseDown = OS.GetKeyState(OS.VK_LBUTTON) < 0;
- boolean isVista = !OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (6, 0);
- if ((parent == null && isVista) || !mouseDown) {
- int width = OS.GetSystemMetrics (OS.SM_CXSCREEN);
- int height = OS.GetSystemMetrics (OS.SM_CYSCREEN);
+ /*
+ * Bug in Vista. Drawing directly to the screen with XOR does not
+ * perform well. The fix is to draw on layered window instead.
+ *
+ * Note that one window (almost opaque) is used for catching all events and a
+ * second window is used for drawing the rectangles.
+ */
+ if (IsVista && parent == null) {
+ Rectangle bounds = display.getBounds();
hwndTransparent = OS.CreateWindowEx (
- isVista ? OS.WS_EX_LAYERED | OS.WS_EX_NOACTIVATE : OS.WS_EX_TRANSPARENT,
+ OS.WS_EX_LAYERED | OS.WS_EX_NOACTIVATE,
display.windowClass,
null,
OS.WS_POPUP,
- 0, 0,
- width, height,
+ bounds.x, bounds.y,
+ bounds.width, bounds.height,
0,
0,
OS.GetModuleHandle (null),
null);
- if (isVista) {
- OS.SetLayeredWindowAttributes (hwndTransparent, 0xFFFFFF, (byte)0x01, OS.LWA_ALPHA);
- }
- OS.ShowWindow (hwndTransparent, OS.SW_SHOWNOACTIVATE);
+ OS.SetLayeredWindowAttributes (hwndTransparent, 0, (byte)0x01, OS.LWA_ALPHA);
+ hwndOpaque = OS.CreateWindowEx (
+ OS.WS_EX_LAYERED | OS.WS_EX_NOACTIVATE,
+ display.windowClass,
+ null,
+ OS.WS_POPUP,
+ bounds.x, bounds.y,
+ bounds.width, bounds.height,
+ hwndTransparent,
+ 0,
+ OS.GetModuleHandle (null),
+ null);
+ OS.SetLayeredWindowAttributes (hwndOpaque, 0xFFFFFF, (byte)0xFF, OS.LWA_COLORKEY | OS.LWA_ALPHA);
newProc = new Callback (this, "transparentProc", 4); //$NON-NLS-1$
int /*long*/ newProcAddress = newProc.getAddress ();
if (newProcAddress == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
- if (isVista) {
- hwndOpaque = OS.CreateWindowEx (
- OS.WS_EX_LAYERED | OS.WS_EX_NOACTIVATE,
+ oldTransparentProc = OS.GetWindowLongPtr (hwndTransparent, OS.GWLP_WNDPROC);
+ OS.SetWindowLongPtr (hwndTransparent, OS.GWLP_WNDPROC, newProcAddress);
+ oldOpaqueProc = OS.GetWindowLongPtr (hwndOpaque, OS.GWLP_WNDPROC);
+ OS.SetWindowLongPtr (hwndOpaque, OS.GWLP_WNDPROC, newProcAddress);
+ OS.ShowWindow (hwndTransparent, OS.SW_SHOWNOACTIVATE);
+ OS.ShowWindow (hwndOpaque, OS.SW_SHOWNOACTIVATE);
+ } else {
+ /*
+ * If this tracker is being created without a mouse drag then
+ * we need to create a transparent window that fills the screen
+ * in order to get all mouse/keyboard events that occur
+ * outside of our visible windows (ie.- over the desktop).
+ */
+ if (!mouseDown) {
+ Rectangle bounds = display.getBounds();
+ hwndTransparent = OS.CreateWindowEx (
+ OS.WS_EX_TRANSPARENT,
display.windowClass,
null,
OS.WS_POPUP,
- 0, 0,
- width, height,
- hwndTransparent,
+ bounds.x, bounds.y,
+ bounds.width, bounds.height,
+ 0,
0,
OS.GetModuleHandle (null),
null);
- oldOpaqueProc = OS.GetWindowLongPtr (hwndOpaque, OS.GWLP_WNDPROC);
- OS.SetWindowLongPtr (hwndOpaque, OS.GWLP_WNDPROC, newProcAddress);
- } else {
- hwndOpaque = hwndTransparent;
+ newProc = new Callback (this, "transparentProc", 4); //$NON-NLS-1$
+ int /*long*/ newProcAddress = newProc.getAddress ();
+ if (newProcAddress == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
+ oldTransparentProc = OS.GetWindowLongPtr (hwndTransparent, OS.GWLP_WNDPROC);
+ OS.SetWindowLongPtr (hwndTransparent, OS.GWLP_WNDPROC, newProcAddress);
+ OS.ShowWindow (hwndTransparent, OS.SW_SHOWNOACTIVATE);
}
- oldTransparentProc = OS.GetWindowLongPtr (hwndTransparent, OS.GWLP_WNDPROC);
- OS.SetWindowLongPtr (hwndTransparent, OS.GWLP_WNDPROC, newProcAddress);
- OS.SetLayeredWindowAttributes (hwndOpaque, 0xFFFFFF, (byte)0xFF, OS.LWA_COLORKEY | OS.LWA_ALPHA);
- OS.ShowWindow (hwndOpaque, OS.SW_SHOWNOACTIVATE);
}
update ();
@@ -568,14 +589,14 @@ public boolean open () {
}
if (OS.WM_KEYFIRST <= msg.message && msg.message <= OS.WM_KEYLAST) continue;
if (OS.WM_MOUSEFIRST <= msg.message && msg.message <= OS.WM_MOUSELAST) continue;
- if (!(parent == null && isVista)) {
+ if (hwndOpaque == 0) {
if (msg.message == OS.WM_PAINT) {
update ();
drawRectangles (rectangles, stippled);
}
}
OS.DispatchMessage (msg);
- if (!(parent == null && isVista)) {
+ if (hwndOpaque == 0) {
if (msg.message == OS.WM_PAINT) {
drawRectangles (rectangles, stippled);
}
@@ -857,20 +878,17 @@ int /*long*/ transparentProc (int /*long*/ hwnd, int /*long*/ msg, int /*long*/
if (inEvent) return OS.HTTRANSPARENT;
break;
case OS.WM_SETCURSOR:
- if (hwndOpaque == hwnd) {
- if (clientCursor != null) {
- OS.SetCursor (clientCursor.handle);
- return 1;
- }
- if (resizeCursor != 0) {
- OS.SetCursor (resizeCursor);
- return 1;
- }
+ if (clientCursor != null) {
+ OS.SetCursor (clientCursor.handle);
+ return 1;
+ }
+ if (resizeCursor != 0) {
+ OS.SetCursor (resizeCursor);
+ return 1;
}
break;
case OS.WM_PAINT:
- boolean isVista = !OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (6, 0);
- if (parent == null && isVista && hwndOpaque == hwnd) {
+ if (hwndOpaque == hwnd) {
PAINTSTRUCT ps = new PAINTSTRUCT();
int /*long*/ hDC = OS.BeginPaint (hwnd, ps);
int /*long*/ hBitmap = 0, hBrush = 0, oldBrush = 0;
@@ -911,7 +929,7 @@ int /*long*/ transparentProc (int /*long*/ hwnd, int /*long*/ msg, int /*long*/
}
void update () {
- if (parent == null && !OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (6, 0)) return;
+ if (hwndOpaque != 0) return;
if (parent != null) {
if (parent.isDisposed ()) return;
Shell shell = parent.getShell ();
diff --git a/eclipse/plugins/org.eclipse.swt/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.swt/META-INF/MANIFEST.MF
index 8bbcc8c..75995f6 100644
--- a/eclipse/plugins/org.eclipse.swt/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.swt/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.swt; singleton:=true
-Bundle-Version: 3.5.1.qualifier
+Bundle-Version: 3.5.2.qualifier
Bundle-ManifestVersion: 2
Bundle-Localization: plugin
DynamicImport-Package: org.eclipse.swt.accessibility2, org.mozilla.xpcom
diff --git a/eclipse/plugins/org.eclipse.swt/buildnotes_swt.html b/eclipse/plugins/org.eclipse.swt/buildnotes_swt.html
index a1fe641..01e5ece 100755
--- a/eclipse/plugins/org.eclipse.swt/buildnotes_swt.html
+++ b/eclipse/plugins/org.eclipse.swt/buildnotes_swt.html
@@ -11,6 +11,90 @@
Eclipse Platform Build Notes<br>
SWT</h1>
+<h2>SWT Build 3557f - Wednesday February 03, 2010</h2>
+
+<blockquote>
+<a href=https://bugs.eclipse.org/bugs/buglist.cgi?bug_file_loc=;bug_file_loc_type=allwordssubstr;bug_id=;bugidtype=include;chfield=resolution;target_milestone=3.5.1;chfieldfrom=2010-01-19+23%3A15%3A25+%2B0000;chfieldto=2010-02-02+22%3A39%3A26+%2B0000;chfieldvalue=FIXED;classification=Eclipse;component=SWT;email1=;email2=;emailtype1=substring;emailtype2=substring;field-1-0-0=classification;field-1-1-0=product;field-1-2-0=component;field0-0-0=noop;keywords=;keywords_type=allwords;long_desc=;long_desc_type=allwordssubstr;product=Platform;query_format=advanced;remaction=;short_desc=;short_desc_type=allwordssubstr;status_whiteboard=;status_whiteboard_type=allwordssubstr;type-1-0-0=anyexact;type-1-1-0=anyexact;type-1-2-0=anyexact;type0-0-0=noop;value-1-0-0=Eclipse;value-1-1-0=Platform;value-1-2-0=SWT;value0-0-0=;votes=;query_based_on=>Bugs fixed</a>
+</blockquote>
+
+<h2>SWT Build 3557e - Wednesday January 20, 2010</h2>
+
+<blockquote>
+<a href=https://bugs.eclipse.org/bugs/buglist.cgi?bug_file_loc=;bug_file_loc_type=allwordssubstr;bug_id=;bugidtype=include;chfield=resolution;target_milestone=3.5.1;chfieldfrom=2010-01-12+22%3A53%3A06+%2B0000;chfieldto=2010-01-19+23%3A12%3A28+%2B0000;chfieldvalue=FIXED;classification=Eclipse;component=SWT;email1=;email2=;emailtype1=substring;emailtype2=substring;field-1-0-0=classification;field-1-1-0=product;field-1-2-0=component;field0-0-0=noop;keywords=;keywords_type=allwords;long_desc=;long_desc_type=allwordssubstr;product=Platform;query_format=advanced;remaction=;short_desc=;short_desc_type=allwordssubstr;status_whiteboard=;status_whiteboard_type=allwordssubstr;type-1-0-0=anyexact;type-1-1-0=anyexact;type-1-2-0=anyexact;type0-0-0=noop;value-1-0-0=Eclipse;value-1-1-0=Platform;value-1-2-0=SWT;value0-0-0=;votes=;query_based_on=>Bugs fixed</a>
+</blockquote>
+
+<h2>SWT Build 3557d - Wednesday January 13, 2010</h2>
+
+<blockquote>
+<a href=https://bugs.eclipse.org/bugs/buglist.cgi?bug_file_loc=;bug_file_loc_type=allwordssubstr;bug_id=;bugidtype=include;chfield=resolution;target_milestone=3.5.1;chfieldfrom=2010-01-05+21%3A52%3A02+%2B0000;chfieldto=2010-01-12+22%3A50%3A21+%2B0000;chfieldvalue=FIXED;classification=Eclipse;component=SWT;email1=;email2=;emailtype1=substring;emailtype2=substring;field-1-0-0=classification;field-1-1-0=product;field-1-2-0=component;field0-0-0=noop;keywords=;keywords_type=allwords;long_desc=;long_desc_type=allwordssubstr;product=Platform;query_format=advanced;remaction=;short_desc=;short_desc_type=allwordssubstr;status_whiteboard=;status_whiteboard_type=allwordssubstr;type-1-0-0=anyexact;type-1-1-0=anyexact;type-1-2-0=anyexact;type0-0-0=noop;value-1-0-0=Eclipse;value-1-1-0=Platform;value-1-2-0=SWT;value0-0-0=;votes=;query_based_on=>Bugs fixed</a>
+</blockquote>
+
+<h2>SWT Build 3557c - Wednesday January 06, 2010</h2>
+
+<blockquote>
+<a href=https://bugs.eclipse.org/bugs/buglist.cgi?bug_file_loc=;bug_file_loc_type=allwordssubstr;bug_id=;bugidtype=include;chfield=resolution;target_milestone=3.5.1;chfieldfrom=2009-12-15+19%3A55%3A04+%2B0000;chfieldto=2010-01-05+21%3A49%3A24+%2B0000;chfieldvalue=FIXED;classification=Eclipse;component=SWT;email1=;email2=;emailtype1=substring;emailtype2=substring;field-1-0-0=classification;field-1-1-0=product;field-1-2-0=component;field0-0-0=noop;keywords=;keywords_type=allwords;long_desc=;long_desc_type=allwordssubstr;product=Platform;query_format=advanced;remaction=;short_desc=;short_desc_type=allwordssubstr;status_whiteboard=;status_whiteboard_type=allwordssubstr;type-1-0-0=anyexact;type-1-1-0=anyexact;type-1-2-0=anyexact;type0-0-0=noop;value-1-0-0=Eclipse;value-1-1-0=Platform;value-1-2-0=SWT;value0-0-0=;votes=;query_based_on=>Bugs fixed</a>
+</blockquote>
+
+<h2>SWT Build 3557b - Wednesday December 16, 2009</h2>
+
+<blockquote>
+<a href=https://bugs.eclipse.org/bugs/buglist.cgi?bug_file_loc=;bug_file_loc_type=allwordssubstr;bug_id=;bugidtype=include;chfield=resolution;target_milestone=3.5.1;chfieldfrom=2009-12-01+21%3A05%3A00+%2B0000;chfieldto=2009-12-15+19%3A52%3A31+%2B0000;chfieldvalue=FIXED;classification=Eclipse;component=SWT;email1=;email2=;emailtype1=substring;emailtype2=substring;field-1-0-0=classification;field-1-1-0=product;field-1-2-0=component;field0-0-0=noop;keywords=;keywords_type=allwords;long_desc=;long_desc_type=allwordssubstr;product=Platform;query_format=advanced;remaction=;short_desc=;short_desc_type=allwordssubstr;status_whiteboard=;status_whiteboard_type=allwordssubstr;type-1-0-0=anyexact;type-1-1-0=anyexact;type-1-2-0=anyexact;type0-0-0=noop;value-1-0-0=Eclipse;value-1-1-0=Platform;value-1-2-0=SWT;value0-0-0=;votes=;query_based_on=>Bugs fixed</a>
+</blockquote>
+
+<h2>SWT Build 3557a - Wednesday December 02, 2009</h2>
+
+<blockquote>
+<a href=https://bugs.eclipse.org/bugs/buglist.cgi?bug_file_loc=;bug_file_loc_type=allwordssubstr;bug_id=;bugidtype=include;chfield=resolution;target_milestone=3.5.1;chfieldfrom=2009-11-17+22%3A18%3A40+%2B0000;chfieldto=2009-12-01+21%3A02%3A38+%2B0000;chfieldvalue=FIXED;classification=Eclipse;component=SWT;email1=;email2=;emailtype1=substring;emailtype2=substring;field-1-0-0=classification;field-1-1-0=product;field-1-2-0=component;field0-0-0=noop;keywords=;keywords_type=allwords;long_desc=;long_desc_type=allwordssubstr;product=Platform;query_format=advanced;remaction=;short_desc=;short_desc_type=allwordssubstr;status_whiteboard=;status_whiteboard_type=allwordssubstr;type-1-0-0=anyexact;type-1-1-0=anyexact;type-1-2-0=anyexact;type0-0-0=noop;value-1-0-0=Eclipse;value-1-1-0=Platform;value-1-2-0=SWT;value0-0-0=;votes=;query_based_on=>Bugs fixed</a>
+</blockquote>
+
+<h2>SWT Build 3557 - Wednesday November 18, 2009</h2>
+
+<blockquote>
+<a href=https://bugs.eclipse.org/bugs/buglist.cgi?bug_file_loc=;bug_file_loc_type=allwordssubstr;bug_id=;bugidtype=include;chfield=resolution;target_milestone=3.5.1;chfieldfrom=2009-11-10+19%3A54%3A59+%2B0000;chfieldto=2009-11-17+22%3A16%3A27+%2B0000;chfieldvalue=FIXED;classification=Eclipse;component=SWT;email1=;email2=;emailtype1=substring;emailtype2=substring;field-1-0-0=classification;field-1-1-0=product;field-1-2-0=component;field0-0-0=noop;keywords=;keywords_type=allwords;long_desc=;long_desc_type=allwordssubstr;product=Platform;query_format=advanced;remaction=;short_desc=;short_desc_type=allwordssubstr;status_whiteboard=;status_whiteboard_type=allwordssubstr;type-1-0-0=anyexact;type-1-1-0=anyexact;type-1-2-0=anyexact;type0-0-0=noop;value-1-0-0=Eclipse;value-1-1-0=Platform;value-1-2-0=SWT;value0-0-0=;votes=;query_based_on=>Bugs fixed</a>
+</blockquote>
+
+<h2>SWT Build 3556f - Wednesday November 11, 2009</h2>
+
+<blockquote>
+<a href=https://bugs.eclipse.org/bugs/buglist.cgi?bug_file_loc=;bug_file_loc_type=allwordssubstr;bug_id=;bugidtype=include;chfield=resolution;target_milestone=3.5.1;chfieldfrom=2009-11-03+21%3A02%3A17+%2B0000;chfieldto=2009-11-10+19%3A52%3A49+%2B0000;chfieldvalue=FIXED;classification=Eclipse;component=SWT;email1=;email2=;emailtype1=substring;emailtype2=substring;field-1-0-0=classification;field-1-1-0=product;field-1-2-0=component;field0-0-0=noop;keywords=;keywords_type=allwords;long_desc=;long_desc_type=allwordssubstr;product=Platform;query_format=advanced;remaction=;short_desc=;short_desc_type=allwordssubstr;status_whiteboard=;status_whiteboard_type=allwordssubstr;type-1-0-0=anyexact;type-1-1-0=anyexact;type-1-2-0=anyexact;type0-0-0=noop;value-1-0-0=Eclipse;value-1-1-0=Platform;value-1-2-0=SWT;value0-0-0=;votes=;query_based_on=>Bugs fixed</a>
+</blockquote>
+
+<h2>SWT Build 3556e - Wednesday November 04, 2009</h2>
+
+<blockquote>
+<a href=https://bugs.eclipse.org/bugs/buglist.cgi?bug_file_loc=;bug_file_loc_type=allwordssubstr;bug_id=;bugidtype=include;chfield=resolution;target_milestone=3.5.1;chfieldfrom=2009-10-29+20%3A37%3A39+%2B0000;chfieldto=2009-11-03+21%3A00%3A12+%2B0000;chfieldvalue=FIXED;classification=Eclipse;component=SWT;email1=;email2=;emailtype1=substring;emailtype2=substring;field-1-0-0=classification;field-1-1-0=product;field-1-2-0=component;field0-0-0=noop;keywords=;keywords_type=allwords;long_desc=;long_desc_type=allwordssubstr;product=Platform;query_format=advanced;remaction=;short_desc=;short_desc_type=allwordssubstr;status_whiteboard=;status_whiteboard_type=allwordssubstr;type-1-0-0=anyexact;type-1-1-0=anyexact;type-1-2-0=anyexact;type0-0-0=noop;value-1-0-0=Eclipse;value-1-1-0=Platform;value-1-2-0=SWT;value0-0-0=;votes=;query_based_on=>Bugs fixed</a>
+</blockquote>
+
+<h2>SWT Build 3556d - Friday October 30, 2009</h2>
+
+<blockquote>
+<a href=https://bugs.eclipse.org/bugs/buglist.cgi?bug_file_loc=;bug_file_loc_type=allwordssubstr;bug_id=;bugidtype=include;chfield=resolution;target_milestone=3.5.1;chfieldfrom=2009-10-20+18%3A14%3A27+%2B0000;chfieldto=2009-10-29+20%3A35%3A37+%2B0000;chfieldvalue=FIXED;classification=Eclipse;component=SWT;email1=;email2=;emailtype1=substring;emailtype2=substring;field-1-0-0=classification;field-1-1-0=product;field-1-2-0=component;field0-0-0=noop;keywords=;keywords_type=allwords;long_desc=;long_desc_type=allwordssubstr;product=Platform;query_format=advanced;remaction=;short_desc=;short_desc_type=allwordssubstr;status_whiteboard=;status_whiteboard_type=allwordssubstr;type-1-0-0=anyexact;type-1-1-0=anyexact;type-1-2-0=anyexact;type0-0-0=noop;value-1-0-0=Eclipse;value-1-1-0=Platform;value-1-2-0=SWT;value0-0-0=;votes=;query_based_on=>Bugs fixed</a>
+</blockquote>
+
+<h2>SWT Build 3556c - Wednesday October 21, 2009</h2>
+
+<blockquote>
+<a href=https://bugs.eclipse.org/bugs/buglist.cgi?bug_file_loc=;bug_file_loc_type=allwordssubstr;bug_id=;bugidtype=include;chfield=resolution;target_milestone=3.5.1;chfieldfrom=2009-10-13+19%3A39%3A32+%2B0000;chfieldto=2009-10-20+18%3A12%3A32+%2B0000;chfieldvalue=FIXED;classification=Eclipse;component=SWT;email1=;email2=;emailtype1=substring;emailtype2=substring;field-1-0-0=classification;field-1-1-0=product;field-1-2-0=component;field0-0-0=noop;keywords=;keywords_type=allwords;long_desc=;long_desc_type=allwordssubstr;product=Platform;query_format=advanced;remaction=;short_desc=;short_desc_type=allwordssubstr;status_whiteboard=;status_whiteboard_type=allwordssubstr;type-1-0-0=anyexact;type-1-1-0=anyexact;type-1-2-0=anyexact;type0-0-0=noop;value-1-0-0=Eclipse;value-1-1-0=Platform;value-1-2-0=SWT;value0-0-0=;votes=;query_based_on=>Bugs fixed</a>
+</blockquote>
+
+<h2>SWT Build 3556b - Wednesday October 14, 2009</h2>
+
+<blockquote>
+<a href=https://bugs.eclipse.org/bugs/buglist.cgi?bug_file_loc=;bug_file_loc_type=allwordssubstr;bug_id=;bugidtype=include;chfield=resolution;target_milestone=3.5.1;chfieldfrom=2009-10-06+19%3A35%3A20+%2B0000;chfieldto=2009-10-13+19%3A37%3A39+%2B0000;chfieldvalue=FIXED;classification=Eclipse;component=SWT;email1=;email2=;emailtype1=substring;emailtype2=substring;field-1-0-0=classification;field-1-1-0=product;field-1-2-0=component;field0-0-0=noop;keywords=;keywords_type=allwords;long_desc=;long_desc_type=allwordssubstr;product=Platform;query_format=advanced;remaction=;short_desc=;short_desc_type=allwordssubstr;status_whiteboard=;status_whiteboard_type=allwordssubstr;type-1-0-0=anyexact;type-1-1-0=anyexact;type-1-2-0=anyexact;type0-0-0=noop;value-1-0-0=Eclipse;value-1-1-0=Platform;value-1-2-0=SWT;value0-0-0=;votes=;query_based_on=>Bugs fixed</a>
+</blockquote>
+
+<h2>SWT Build 3556a - Wednesday October 07, 2009</h2>
+
+<blockquote>
+<a href=https://bugs.eclipse.org/bugs/buglist.cgi?bug_file_loc=;bug_file_loc_type=allwordssubstr;bug_id=;bugidtype=include;chfield=resolution;target_milestone=3.5.1;chfieldfrom=2009-09-29+20%3A47%3A51+%2B0000;chfieldto=2009-10-06+19%3A33%3A25+%2B0000;chfieldvalue=FIXED;classification=Eclipse;component=SWT;email1=;email2=;emailtype1=substring;emailtype2=substring;field-1-0-0=classification;field-1-1-0=product;field-1-2-0=component;field0-0-0=noop;keywords=;keywords_type=allwords;long_desc=;long_desc_type=allwordssubstr;product=Platform;query_format=advanced;remaction=;short_desc=;short_desc_type=allwordssubstr;status_whiteboard=;status_whiteboard_type=allwordssubstr;type-1-0-0=anyexact;type-1-1-0=anyexact;type-1-2-0=anyexact;type0-0-0=noop;value-1-0-0=Eclipse;value-1-1-0=Platform;value-1-2-0=SWT;value0-0-0=;votes=;query_based_on=>Bugs fixed</a>
+</blockquote>
+
+<h2>SWT Build 3556 - Wednesday September 30, 2009</h2>
+
+<blockquote>
+<a href=https://bugs.eclipse.org/bugs/buglist.cgi?bug_file_loc=;bug_file_loc_type=allwordssubstr;bug_id=;bugidtype=include;chfield=resolution;target_milestone=3.5.1;chfieldfrom=2009-09-16+16%3A20%3A08+%2B0000;chfieldto=2009-09-29+20%3A46%3A07+%2B0000;chfieldvalue=FIXED;classification=Eclipse;component=SWT;email1=;email2=;emailtype1=substring;emailtype2=substring;field-1-0-0=classification;field-1-1-0=product;field-1-2-0=component;field0-0-0=noop;keywords=;keywords_type=allwords;long_desc=;long_desc_type=allwordssubstr;product=Platform;query_format=advanced;remaction=;short_desc=;short_desc_type=allwordssubstr;status_whiteboard=;status_whiteboard_type=allwordssubstr;type-1-0-0=anyexact;type-1-1-0=anyexact;type-1-2-0=anyexact;type0-0-0=noop;value-1-0-0=Eclipse;value-1-1-0=Platform;value-1-2-0=SWT;value0-0-0=;votes=;query_based_on=>Bugs fixed</a>
+</blockquote>
+
<h2>SWT Build 3555a - Thursday September 17, 2009</h2>
<blockquote>
diff --git a/eclipse/plugins/org.eclipse.team.core/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.team.core/META-INF/MANIFEST.MF
index b0a99ff..bba2b8a 100644
--- a/eclipse/plugins/org.eclipse.team.core/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.team.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.team.core; singleton:=true
-Bundle-Version: 3.5.0.qualifier
+Bundle-Version: 3.5.1.qualifier
Bundle-Activator: org.eclipse.team.internal.core.TeamPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/eclipse/plugins/org.eclipse.team.core/buildnotes_team.html b/eclipse/plugins/org.eclipse.team.core/buildnotes_team.html
index 54a94bf..c4edd49 100644
--- a/eclipse/plugins/org.eclipse.team.core/buildnotes_team.html
+++ b/eclipse/plugins/org.eclipse.team.core/buildnotes_team.html
@@ -12,18 +12,47 @@
<h1>Eclipse Platform Build Notes (3.5)<br>
Team, Compare and CVS</h1>
-<p>Integration Build (maj 27, 2009, 12:19 p.m.)</p>
+<p>Integration Build (January 13, 2010, 12:58 p.m.)</p>
<p>Problem reports updated</p>
<p>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=297950">Bug 297950</a>. CompareEditorInputs are leaked when reusing editors (FIXED)<br>
</p>
-<p>Integration Build (maj 22, 2009, 4:10 p.m.)</p>
+<p>Integration Build (September 30, 2009, 10:12 a.m.)</p>
+ <p>Problem reports updated</p>
+ <p>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=263702">Bug 263702</a>. Branch creation problem in CVS (FIXED)<br>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=281348">Bug 281348</a>. [Net] Eclipse Galileo crashes under Japanese version of Windows XP (FIXED)<br>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=281628">Bug 281628</a>. [Net] Should be impossible to edit native proxy setting by double-clicking the entry (FIXED)<br>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=282032">Bug 282032</a>. Radio button group not read correctly by JAWS (FIXED)<br>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=290544">Bug 290544</a>. 'Next Change' does not selected last small diff (button disabled) (FIXED)<br>
+ </p>
+
+<p>Integration Build (August 26, 2009, 3:05 p.m.)</p>
+ <p>Problem reports updated</p>
+ <p>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=263702">Bug 263702</a>. Branch creation problem in CVS (FIXED)<br>
+ </p>
+
+<p>Integration Build (August 06, 2009, 1:10 p.m.)</p>
+ <p>Problem reports updated</p>
+ <p>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=281348">Bug 281348</a>. [Net] Eclipse Galileo crashes under Japanese version of Windows XP (FIXED)<br>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=281628">Bug 281628</a>. [Net] Should be impossible to edit native proxy setting by double-clicking the entry (FIXED)<br>
+ </p>
+
+<p>Integration Build (May 27, 2009, 12:19 p.m.)</p>
+ <p>Problem reports updated</p>
+ <p>
+ </p>
+
+<p>Integration Build (May 22, 2009, 4:10 p.m.)</p>
<p>Problem reports updated</p>
<p>
<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=268321">Bug 268321</a>. [Net] UnixProxyProvider stuck on my RHEL5 gnome system (ASSIGNED)<br>
</p>
-<p>Integration Build (maj 21, 2009, 11:49 p.m.)</p>
+<p>Integration Build (May 21, 2009, 11:49 p.m.)</p>
<p>Problem reports updated</p>
<p>
<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=277128">Bug 277128</a>. Help context for repository view filter dialog (FIXED)<br>
diff --git a/eclipse/plugins/org.eclipse.team.cvs.ui/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.team.cvs.ui/META-INF/MANIFEST.MF
index acf3ea4..8bb6144 100644
--- a/eclipse/plugins/org.eclipse.team.cvs.ui/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.team.cvs.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.team.cvs.ui; singleton:=true
-Bundle-Version: 3.3.201.qualifier
+Bundle-Version: 3.3.202.qualifier
Bundle-Activator: org.eclipse.team.internal.ccvs.ui.CVSUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/eclipse/plugins/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ExtMethodPreferencePage.java b/eclipse/plugins/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ExtMethodPreferencePage.java
index 1fc2f3c..423b612 100644
--- a/eclipse/plugins/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ExtMethodPreferencePage.java
+++ b/eclipse/plugins/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ExtMethodPreferencePage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -10,7 +10,6 @@
*******************************************************************************/
package org.eclipse.team.internal.ccvs.ui;
-
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.preference.IPreferenceStore;
@@ -18,14 +17,14 @@ import org.eclipse.jface.preference.PreferencePage;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.layout.*;
import org.eclipse.swt.widgets.*;
import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin;
import org.eclipse.team.internal.ccvs.core.IConnectionMethod;
import org.eclipse.team.internal.ccvs.core.connection.CVSRepositoryLocation;
import org.eclipse.team.internal.ui.SWTUtils;
import org.eclipse.ui.*;
+import org.eclipse.ui.dialogs.PreferenceLinkArea;
import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer;
public class ExtMethodPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
@@ -43,12 +42,6 @@ public class ExtMethodPreferencePage extends PreferencePage implements IWorkbenc
*/
protected Control createContents(Composite parent) {
Composite composite = new Composite(parent, SWT.NULL);
- GridLayout layout = new GridLayout();
- layout.marginWidth = 0;
- layout.marginHeight = 0;
- layout.numColumns = 1;
- composite.setLayout(layout);
- composite.setLayoutData(new GridData());
SelectionAdapter selectionListener = new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
@@ -56,17 +49,58 @@ public class ExtMethodPreferencePage extends PreferencePage implements IWorkbenc
}
};
+ // create radio buttons in a consecutive manner (see bug 282032)
useExternal = createRadioButton(composite, CVSUIMessages.ExtMethodPreferencePage_0, 1);
useExternal.addSelectionListener(selectionListener);
- external = createExternalArea(composite);
-
useInternal = createRadioButton(composite, CVSUIMessages.ExtMethodPreferencePage_1, 1);
useInternal.addSelectionListener(selectionListener);
+
+ external = createExternalArea(composite);
internal = createInternalArea(composite);
- SWTUtils.createPreferenceLink((IWorkbenchPreferenceContainer) getContainer(), composite, CVSUIMessages.CVSPreferencesPage_52, CVSUIMessages.CVSPreferencesPage_53);
+ PreferenceLinkArea proxyLink = SWTUtils.createPreferenceLink((IWorkbenchPreferenceContainer) getContainer(), composite, CVSUIMessages.CVSPreferencesPage_52, CVSUIMessages.CVSPreferencesPage_53);
+
+ PreferenceLinkArea ssh2Link = SWTUtils.createPreferenceLink((IWorkbenchPreferenceContainer) getContainer(), composite, CVSUIMessages.CVSPreferencesPage_54, CVSUIMessages.CVSPreferencesPage_55);
+
+ // lay out controls in a different order than they were created in
+ FormLayout formLayout = new FormLayout();
+ composite.setLayout(formLayout);
+
+ FormData data = new FormData();
+ data.top = new FormAttachment(0, SWT.DEFAULT);
+ data.left = new FormAttachment(0, 0);
+ data.right = new FormAttachment(100, 0);
+ useExternal.setLayoutData(data);
+
+ data = new FormData();
+ data.top = new FormAttachment(useExternal, 5, SWT.DEFAULT);
+ data.left = new FormAttachment(0, 0);
+ data.right = new FormAttachment(100, 0);
+ external.setLayoutData(data);
+
+ data = new FormData();
+ data.top = new FormAttachment(external, 5, SWT.DEFAULT);
+ data.left = new FormAttachment(0, 0);
+ data.right = new FormAttachment(100, 0);
+ useInternal.setLayoutData(data);
+
+ data = new FormData();
+ data.top = new FormAttachment(useInternal, 5, SWT.DEFAULT);
+ data.left = new FormAttachment(0, 0);
+ data.right = new FormAttachment(100, 0);
+ internal.setLayoutData(data);
+
+ data = new FormData();
+ data.top = new FormAttachment(internal, 5, SWT.DEFAULT);
+ data.left = new FormAttachment(0, 0);
+ data.right = new FormAttachment(100, 0);
+ proxyLink.getControl().setLayoutData(data);
- SWTUtils.createPreferenceLink((IWorkbenchPreferenceContainer) getContainer(), composite, CVSUIMessages.CVSPreferencesPage_54, CVSUIMessages.CVSPreferencesPage_55);
+ data = new FormData();
+ data.top = new FormAttachment(proxyLink.getControl(), 5, SWT.DEFAULT);
+ data.left = new FormAttachment(0, 0);
+ data.right = new FormAttachment(100, 0);
+ ssh2Link.getControl().setLayoutData(data);
initializeDefaults();
PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), IHelpContextIds.EXT_PREFERENCE_PAGE);
diff --git a/eclipse/plugins/org.eclipse.ui.browser/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.ui.browser/META-INF/MANIFEST.MF
index a8fbfae..cb6adfe 100644
--- a/eclipse/plugins/org.eclipse.ui.browser/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.ui.browser/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Plugin.name
Bundle-SymbolicName: org.eclipse.ui.browser; singleton:=true
-Bundle-Version: 3.2.300.qualifier
+Bundle-Version: 3.2.301.qualifier
Bundle-Activator: org.eclipse.ui.internal.browser.WebBrowserUIPlugin
Bundle-Vendor: %Plugin.providerName
Bundle-Localization: plugin
diff --git a/eclipse/plugins/org.eclipse.ui.browser/plugin.xml b/eclipse/plugins/org.eclipse.ui.browser/plugin.xml
index 07866ff..708e377 100644
--- a/eclipse/plugins/org.eclipse.ui.browser/plugin.xml
+++ b/eclipse/plugins/org.eclipse.ui.browser/plugin.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.0"?>
<!--
- Copyright (c) 2005, 2008 IBM Corporation and others.
+ Copyright (c) 2005, 2009 IBM Corporation and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
@@ -8,6 +8,7 @@
Contributors:
IBM Corporation - initial API and implementation
+ Martin Oberhuber (Wind River) - [292882] Default Browser on Solaris
-->
<plugin>
@@ -88,6 +89,7 @@
executable="mozilla"
factoryclass="org.eclipse.ui.internal.browser.browsers.MozillaFactory">
<location>usr/bin/mozilla</location>
+ <location>usr/sfw/lib/mozilla/mozilla</location>
<location>usr/X11/bin/mozilla</location>
</browser>
<browser
diff --git a/eclipse/plugins/org.eclipse.ui.ide/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.ui.ide/META-INF/MANIFEST.MF
index ce784b4..d18407a 100644
--- a/eclipse/plugins/org.eclipse.ui.ide/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.ui.ide/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Plugin.name
Bundle-SymbolicName: org.eclipse.ui.ide; singleton:=true
-Bundle-Version: 3.5.1.qualifier
+Bundle-Version: 3.5.2.qualifier
Bundle-ClassPath: e4-ide.jar,
.
Bundle-Activator: org.eclipse.ui.internal.ide.IDEWorkbenchPlugin
diff --git a/eclipse/plugins/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/CloseResourceAction.java b/eclipse/plugins/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/CloseResourceAction.java
index 91d940c..20675fe 100644
--- a/eclipse/plugins/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/CloseResourceAction.java
+++ b/eclipse/plugins/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/CloseResourceAction.java
@@ -10,12 +10,9 @@
*******************************************************************************/
package org.eclipse.ui.actions;
-import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
-import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IResourceChangeEvent;
@@ -27,28 +24,16 @@ import org.eclipse.core.resources.mapping.IResourceChangeDescriptionFactory;
import org.eclipse.core.resources.mapping.ResourceChangeValidator;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.jobs.ISchedulingRule;
import org.eclipse.core.runtime.jobs.MultiRule;
-import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.window.IShellProvider;
import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.ListSelectionDialog;
import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.ide.ResourceUtil;
import org.eclipse.ui.internal.ide.IDEWorkbenchMessages;
import org.eclipse.ui.internal.ide.IIDEHelpContextIds;
-import org.eclipse.ui.model.AdaptableList;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchPartLabelProvider;
/**
* Standard action for closing the currently selected project(s).
@@ -118,80 +103,6 @@ public class CloseResourceAction extends WorkspaceAction implements
IIDEHelpContextIds.CLOSE_RESOURCE_ACTION);
}
- /**
- * Return a list of dirty editors associated with the given projects. Return
- * editors from all perspectives.
- *
- * @return List the dirty editors
- */
- List getDirtyEditors(List projects) {
- List dirtyEditors = new ArrayList(0);
- IWorkbenchWindow[] windows = PlatformUI.getWorkbench()
- .getWorkbenchWindows();
- for (int i = 0; i < windows.length; i++) {
- IWorkbenchPage[] pages = windows[i].getPages();
- for (int j = 0; j < pages.length; j++) {
- IWorkbenchPage page = pages[j];
- IEditorPart[] editors = page.getDirtyEditors();
- for (int k = 0; k < editors.length; k++) {
- IEditorPart editor = editors[k];
- IFile inputFile = ResourceUtil.getFile(editor.getEditorInput());
- if (inputFile != null) {
- if (projects.contains(inputFile.getProject())) {
- dirtyEditors.add(editor);
- }
- }
- }
- }
- }
- return dirtyEditors;
- }
-
- /**
- * Open a dialog that can be used to select which of the given
- * editors to save. Return the list of editors to save. A value of
- * null implies that the operation was cancelled.
- *
- * @return List the editors to save
- */
- List getEditorsToSave(List dirtyEditors) {
- if (dirtyEditors.isEmpty()) {
- return new ArrayList(0);
- }
-
- // The list may have multiple editors opened for the same input,
- // so process the list for duplicates.
- List saveEditors = new ArrayList(0);
- List dirtyInputs = new ArrayList(0);
- Iterator iter = dirtyEditors.iterator();
- while (iter.hasNext()) {
- IEditorPart editor = (IEditorPart) iter.next();
- IFile inputFile = ResourceUtil.getFile(editor.getEditorInput());
- if (inputFile != null) {
- // if the same file is open in multiple perspectives,
- // we don't want to count it as dirty multiple times
- if (!dirtyInputs.contains(inputFile)) {
- dirtyInputs.add(inputFile);
- saveEditors.add(editor);
- }
- }
- }
- AdaptableList input = new AdaptableList(saveEditors);
- ListSelectionDialog dlg = new ListSelectionDialog(getShell(), input,
- new WorkbenchContentProvider(),
- new WorkbenchPartLabelProvider(), IDEWorkbenchMessages.EditorManager_saveResourcesMessage);
-
- dlg.setInitialSelections(saveEditors.toArray(new Object[saveEditors
- .size()]));
- dlg.setTitle(IDEWorkbenchMessages.EditorManager_saveResourcesTitle);
- int result = dlg.open();
-
- if (result == IDialogConstants.CANCEL_ID) {
- return null;
- }
- return Arrays.asList(dlg.getResult());
- }
-
/* (non-Javadoc)
* Method declared on WorkspaceAction.
*/
@@ -224,7 +135,17 @@ public class CloseResourceAction extends WorkspaceAction implements
* it.
*/
public void run() {
- if (!saveDirtyEditors()) {
+ // Get the items to close.
+ List projects = getSelectedResources();
+ if (projects == null || projects.isEmpty()) {
+ // no action needs to be taken since no projects are selected
+ return;
+ }
+
+ IResource[] projectArray = (IResource[]) projects
+ .toArray(new IResource[projects.size()]);
+
+ if (!IDE.saveAllEditors(projectArray, true)) {
return;
}
if (!validateClose()) {
@@ -242,53 +163,6 @@ public class CloseResourceAction extends WorkspaceAction implements
runInBackground(rule);
}
- /**
- * Causes all dirty editors associated to the resource(s) to be saved, if so
- * specified by the user, and closed.
- */
- boolean saveDirtyEditors() {
- // Get the items to close.
- List projects = getSelectedResources();
- if (projects == null || projects.isEmpty()) {
- // no action needs to be taken since no projects are selected
- return false;
- }
-
- // Collect all the dirty editors that are associated to the projects that are
- // to be closed.
- final List dirtyEditors = getDirtyEditors(projects);
-
- // See which editors should be saved.
- final List saveEditors = getEditorsToSave(dirtyEditors);
- if (saveEditors == null) {
- // the operation was cancelled
- return false;
- }
-
- // Save and close the dirty editors.
- Shell localShell = getShell();
- Display disp = localShell == null ? PlatformUI.getWorkbench()
- .getDisplay() : localShell.getDisplay();
- BusyIndicator.showWhile(disp, new Runnable() {
- public void run() {
- Iterator iter = dirtyEditors.iterator();
- while (iter.hasNext()) {
- IEditorPart editor = (IEditorPart) iter.next();
- IWorkbenchPage page = editor.getEditorSite().getPage();
- if (saveEditors.contains(editor)) {
- // do a direct save vs. using page.saveEditor, so that
- // progress dialogs do not flash up on the screen multiple
- // times
- editor.doSave(new NullProgressMonitor());
- }
- page.closeEditor(editor, false);
- }
- }
- });
-
- return true;
- }
-
/* (non-Javadoc)
* Method declared on WorkspaceAction.
*/
diff --git a/eclipse/plugins/org.eclipse.ui.ide/src/org/eclipse/ui/internal/wizards/datatransfer/ZipFileExporter.java b/eclipse/plugins/org.eclipse.ui.ide/src/org/eclipse/ui/internal/wizards/datatransfer/ZipFileExporter.java
index 7133d7b..49a5eeb 100644
--- a/eclipse/plugins/org.eclipse.ui.ide/src/org/eclipse/ui/internal/wizards/datatransfer/ZipFileExporter.java
+++ b/eclipse/plugins/org.eclipse.ui.ide/src/org/eclipse/ui/internal/wizards/datatransfer/ZipFileExporter.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -18,6 +18,7 @@ import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
@@ -84,6 +85,11 @@ public class ZipFileExporter implements IFileExporter {
entry.setCrc(checksumCalculator.getValue());
}
+ // set the timestamp
+ long localTimeStamp = contents.getLocalTimeStamp();
+ if(localTimeStamp != IResource.NULL_STAMP)
+ entry.setTime(localTimeStamp);
+
outputStream.putNextEntry(entry);
InputStream contentStream = contents.getContents(false);
try {
diff --git a/eclipse/plugins/org.eclipse.ui.ide/src/org/eclipse/ui/wizards/datatransfer/ImportOperation.java b/eclipse/plugins/org.eclipse.ui.ide/src/org/eclipse/ui/wizards/datatransfer/ImportOperation.java
index df78a64..90c088e 100644
--- a/eclipse/plugins/org.eclipse.ui.ide/src/org/eclipse/ui/wizards/datatransfer/ImportOperation.java
+++ b/eclipse/plugins/org.eclipse.ui.ide/src/org/eclipse/ui/wizards/datatransfer/ImportOperation.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -18,6 +18,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
+import java.util.zip.ZipEntry;
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFile;
@@ -43,8 +44,8 @@ import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.actions.WorkspaceModifyOperation;
import org.eclipse.ui.dialogs.ContainerGenerator;
import org.eclipse.ui.dialogs.IOverwriteQuery;
-import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;
import org.eclipse.ui.internal.wizards.datatransfer.DataTransferMessages;
+import org.eclipse.ui.internal.wizards.datatransfer.TarEntry;
import org.eclipse.ui.internal.wizards.datatransfer.TarLeveledStructureProvider;
/**
@@ -556,13 +557,6 @@ public class ImportOperation extends WorkspaceModifyOperation {
}
setResourceAttributes(targetResource,fileObject);
- if (provider instanceof TarLeveledStructureProvider) {
- try {
- targetResource.setResourceAttributes(((TarLeveledStructureProvider) provider).getResourceAttributes(fileObject));
- } catch (CoreException e) {
- errorTable.add(e.getStatus());
- }
- }
} catch (CoreException e) {
errorTable.add(e.getStatus());
} finally {
@@ -587,15 +581,34 @@ public class ImportOperation extends WorkspaceModifyOperation {
*/
private void setResourceAttributes(IFile targetResource, Object fileObject) {
+ long timeStamp = 0;
if(fileObject instanceof File) {
try {
targetResource.setResourceAttributes(ResourceAttributes.fromFile((File) fileObject));
+ timeStamp = ((File)fileObject).lastModified();
} catch (CoreException e) {
- //Inform the log that the attributes reading failed
- IDEWorkbenchPlugin.log(e.getStatus().getMessage(), e);
+ errorTable.add(e.getStatus());
}
- }
+ }else if (fileObject instanceof TarEntry) {
+ try {
+ targetResource.setResourceAttributes(((TarLeveledStructureProvider) provider).getResourceAttributes(fileObject));
+ timeStamp = ((TarEntry)fileObject).getTime()*1000; // TarEntry time is in secs. Convert to msecs
+ } catch (CoreException e) {
+ errorTable.add(e.getStatus());
+ }
+ }else if (fileObject instanceof ZipEntry) {
+ long zipTimeStamp = ((ZipEntry)fileObject).getTime();
+ if(zipTimeStamp != -1)
+ timeStamp = zipTimeStamp;
+ }
+ if(timeStamp!= 0) {
+ try {
+ targetResource.setLocalTimeStamp(timeStamp);
+ } catch (CoreException e) {
+ errorTable.add(e.getStatus());
+ }
+ }
}
/**
diff --git a/eclipse/plugins/org.eclipse.ui.intro/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.ui.intro/META-INF/MANIFEST.MF
index 3c362b5..c075892 100644
--- a/eclipse/plugins/org.eclipse.ui.intro/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.ui.intro/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.ui.intro; singleton:=true
-Bundle-Version: 3.3.1.qualifier
+Bundle-Version: 3.3.2.qualifier
Bundle-Activator: org.eclipse.ui.internal.intro.impl.IntroPlugin
Bundle-Vendor: %provider_name
Bundle-Localization: plugin
diff --git a/eclipse/plugins/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/IntroLink.java b/eclipse/plugins/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/IntroLink.java
index dcafcb0..42eb6fd 100644
--- a/eclipse/plugins/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/IntroLink.java
+++ b/eclipse/plugins/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/IntroLink.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
+ * Copyright (c) 2004, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -64,7 +64,11 @@ public class IntroLink extends AbstractTextElement {
* @return Returns the label.
*/
public String getLabel() {
- return label;
+ IntroModelRoot root = getModelRoot();
+ if (root!=null) {
+ return root.resolveVariables(label);
+ }
+ return label;
}
/**
diff --git a/eclipse/plugins/org.eclipse.ui.navigator/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.ui.navigator/META-INF/MANIFEST.MF
index d74092a..8dc7ec6 100644
--- a/eclipse/plugins/org.eclipse.ui.navigator/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.ui.navigator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Plugin.name
Bundle-SymbolicName: org.eclipse.ui.navigator; singleton:=true
-Bundle-Version: 3.4.1.qualifier
+Bundle-Version: 3.4.2.qualifier
Bundle-Activator: org.eclipse.ui.internal.navigator.NavigatorPlugin
Bundle-Vendor: %Plugin.providerName
Bundle-Localization: plugin
diff --git a/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/ContributorTrackingSet.java b/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/ContributorTrackingSet.java
index cbb62e5..6de867b 100644
--- a/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/ContributorTrackingSet.java
+++ b/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/ContributorTrackingSet.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
+ * Copyright (c) 2009, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -13,9 +13,13 @@ package org.eclipse.ui.internal.navigator;
import java.util.LinkedHashSet;
-import org.eclipse.ui.internal.navigator.extensions.NavigatorContentDescriptor;
+import org.eclipse.ui.navigator.INavigatorContentDescriptor;
/**
+ * Used to associate the NavigatorContentDescriptor (NCD) with an object that it contributes.
+ *
+ * The NCD/object association is tracked using the NavigatorContentService.rememberContribution().
+ *
* @since 3.2
*
*/
@@ -24,7 +28,8 @@ public class ContributorTrackingSet extends LinkedHashSet {
private static final long serialVersionUID = 2516241537206281972L;
- private NavigatorContentDescriptor contributor;
+ private INavigatorContentDescriptor contributor;
+ private INavigatorContentDescriptor firstClassContributor;
private NavigatorContentService contentService;
/**
@@ -54,8 +59,9 @@ public class ContributorTrackingSet extends LinkedHashSet {
* @see java.util.HashSet#add(java.lang.Object)
*/
public boolean add(Object o) {
- if(contributor != null)
- contentService.rememberContribution(contributor, o);
+ if (contributor != null) {
+ contentService.rememberContribution(contributor, firstClassContributor, o);
+ }
return super.add(o);
}
@@ -71,16 +77,26 @@ public class ContributorTrackingSet extends LinkedHashSet {
*
* @return The current contributor.
*/
- public NavigatorContentDescriptor getContributor() {
+ public INavigatorContentDescriptor getContributor() {
return contributor;
}
/**
*
+ * @return The current contributor.
+ */
+ public INavigatorContentDescriptor getFirstClassContributor() {
+ return firstClassContributor;
+ }
+
+ /**
+ *
* @param newContributor The contributor to record for the next series of adds.
+ * @param theFirstClassContributor The first class contributor associated with the newContributor.
*/
- public void setContributor(NavigatorContentDescriptor newContributor) {
+ public void setContributor(INavigatorContentDescriptor newContributor, INavigatorContentDescriptor theFirstClassContributor) {
contributor = newContributor;
+ firstClassContributor = theFirstClassContributor;
}
/**
@@ -90,7 +106,7 @@ public class ContributorTrackingSet extends LinkedHashSet {
super.clear();
if(contents != null)
for (int i = 0; i < contents.length; i++)
- super.add(contents[i]);
+ add(contents[i]);
}
}
diff --git a/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorContentService.java b/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorContentService.java
index 60cd200..e3f50c1 100644
--- a/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorContentService.java
+++ b/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorContentService.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2009 IBM Corporation and others.
+ * Copyright (c) 2003, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -126,6 +126,7 @@ public class NavigatorContentService implements IExtensionActivationListener,
* in the Tree associated with the viewer.
*/
private Map contributionMemory;
+ private Map contributionMemoryFirstClass;
private ILabelProvider labelProvider;
@@ -167,6 +168,7 @@ public class NavigatorContentService implements IExtensionActivationListener,
getActivationService());
getActivationService().addExtensionActivationListener(this);
contributionMemory = new HashMap();
+ contributionMemoryFirstClass = new HashMap();
}
/**
@@ -713,35 +715,32 @@ public class NavigatorContentService implements IExtensionActivationListener,
*/
public void resetContributionMemory() {
contributionMemory.clear();
+ contributionMemoryFirstClass.clear();
}
/**
*
*
- * @param elements
+ * @param firstClassSource
* @param source
+ * @param element
*/
- public void rememberContribution(NavigatorContentDescriptor source, Object[] elements) {
- for (int i = 0; i < elements.length; i++) {
+ public void rememberContribution(INavigatorContentDescriptor source, INavigatorContentDescriptor firstClassSource, Object element) {
+ /*
+ * We want to write to (overwrite) the contributionMemory only if we have never heard of the element before, or if the
+ * element is coming from the same first class NCE, which means that the subsequent NCE is an override. The override will
+ * take precedence over the originally contributing NCE. However in the case of different first class NCEs, the first one
+ * wins, so we don't update the contribution memory.
+ */
+ if (contributionMemory.get(element) == null || contributionMemoryFirstClass.get(element) == firstClassSource) {
if (Policy.DEBUG_RESOLUTION)
- System.out.println("rememberContribution1: " + Policy.getObjectString(elements[i]) + " source: " + source); //$NON-NLS-1$//$NON-NLS-2$
- contributionMemory.put(elements[i], source);
+ System.out.println("rememberContribution: " + Policy.getObjectString(element) + " source: " + source); //$NON-NLS-1$//$NON-NLS-2$
+ contributionMemory.put(element, source);
+ contributionMemoryFirstClass.put(element, firstClassSource);
}
}
/**
- *
- *
- * @param element
- * @param source
- */
- public void rememberContribution(NavigatorContentDescriptor source, Object element) {
- if (Policy.DEBUG_RESOLUTION)
- System.out.println("rememberContribution2: " + Policy.getObjectString(element) + " source: " + source); //$NON-NLS-1$//$NON-NLS-2$
- contributionMemory.put(element, source);
- }
-
- /**
* Forget about the specified element
*
* @param element
@@ -749,6 +748,7 @@ public class NavigatorContentService implements IExtensionActivationListener,
*/
public void forgetContribution(Object element) {
contributionMemory.remove(element);
+ contributionMemoryFirstClass.remove(element);
}
/**
@@ -758,7 +758,6 @@ public class NavigatorContentService implements IExtensionActivationListener,
public NavigatorContentDescriptor getContribution(Object element)
{
NavigatorContentDescriptor desc = (NavigatorContentDescriptor) contributionMemory.get(element);
- contributionMemory.remove(element);
return desc;
}
@@ -878,6 +877,9 @@ public class NavigatorContentService implements IExtensionActivationListener,
NavigatorPlugin.logError(0, msg, e);
}
}
+ if (structuredViewerManager != null) {
+ structuredViewerManager.resetViewerData();
+ }
update();
}
diff --git a/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorContentServiceContentProvider.java b/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorContentServiceContentProvider.java
index 5fb8f62..907a504 100644
--- a/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorContentServiceContentProvider.java
+++ b/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorContentServiceContentProvider.java
@@ -155,6 +155,8 @@ public class NavigatorContentServiceContentProvider implements
contributedChildren = foundExtension.internalGetContentProvider()
.getElements(anInputElement);
+ INavigatorContentDescriptor foundDescriptor = foundExtension.getDescriptor();
+ localSet.setContributor(foundDescriptor, foundDescriptor);
localSet.setContents(contributedChildren);
overridingExtensions = foundExtension
@@ -162,7 +164,7 @@ public class NavigatorContentServiceContentProvider implements
if (overridingExtensions.length > 0) {
localSet = pipelineChildren(anInputElement,
- overridingExtensions, localSet, ELEMENTS);
+ overridingExtensions, foundDescriptor, localSet, ELEMENTS);
}
finalElementsSet.addAll(localSet);
}
@@ -248,12 +250,14 @@ public class NavigatorContentServiceContentProvider implements
overridingExtensions = foundExtension
.getOverridingExtensionsForTriggerPoint(aParentElement);
+ INavigatorContentDescriptor foundDescriptor = foundExtension.getDescriptor();
+ localSet.setContributor(foundDescriptor, foundDescriptor);
localSet.setContents(contributedChildren);
if (overridingExtensions.length > 0) {
// TODO: could pass tree path through pipeline
localSet = pipelineChildren(aParentElement,
- overridingExtensions, localSet, !ELEMENTS);
+ overridingExtensions, foundDescriptor, localSet, !ELEMENTS);
}
finalChildrenSet.addAll(localSet);
}
@@ -300,7 +304,7 @@ public class NavigatorContentServiceContentProvider implements
* @return The set of children to return to the viewer
*/
private ContributorTrackingSet pipelineChildren(Object aParentOrPath,
- NavigatorContentExtension[] theOverridingExtensions,
+ NavigatorContentExtension[] theOverridingExtensions, INavigatorContentDescriptor firstClassDescriptor,
ContributorTrackingSet theCurrentChildren, boolean elements) {
IPipelinedTreeContentProvider pipelinedContentProvider;
NavigatorContentExtension[] overridingExtensions;
@@ -311,7 +315,7 @@ public class NavigatorContentServiceContentProvider implements
if (theOverridingExtensions[i].getContentProvider() instanceof IPipelinedTreeContentProvider) {
pipelinedContentProvider = (IPipelinedTreeContentProvider) theOverridingExtensions[i]
.getContentProvider();
- pipelinedChildren.setContributor((NavigatorContentDescriptor) theOverridingExtensions[i].getDescriptor());
+ pipelinedChildren.setContributor((NavigatorContentDescriptor) theOverridingExtensions[i].getDescriptor(), firstClassDescriptor);
if (elements) {
pipelinedContentProvider.getPipelinedElements(aParentOrPath,
pipelinedChildren);
@@ -320,13 +324,13 @@ public class NavigatorContentServiceContentProvider implements
pipelinedChildren);
}
- pipelinedChildren.setContributor(null);
+ pipelinedChildren.setContributor(null, null);
overridingExtensions = theOverridingExtensions[i]
.getOverridingExtensionsForTriggerPoint(aParentOrPath);
if (overridingExtensions.length > 0) {
pipelinedChildren = pipelineChildren(aParentOrPath,
- overridingExtensions, pipelinedChildren, elements);
+ overridingExtensions, firstClassDescriptor, pipelinedChildren, elements);
}
}
}
@@ -424,7 +428,6 @@ public class NavigatorContentServiceContentProvider implements
* @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)
*/
public synchronized Object getParent(Object anElement) {
- contentService.resetContributionMemory();
Set extensions = contentService
.findContentExtensionsWithPossibleChild(anElement);
diff --git a/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorContentServiceLabelProvider.java b/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorContentServiceLabelProvider.java
index 0d236f5..fc2d93a 100644
--- a/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorContentServiceLabelProvider.java
+++ b/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorContentServiceLabelProvider.java
@@ -124,16 +124,18 @@ public class NavigatorContentServiceLabelProvider extends EventManager
public String getColumnText(Object anElement, int aColumn) {
ILabelProvider[] labelProviders = contentService.findRelevantLabelProviders(anElement);
+ if (labelProviders.length == 0)
+ return NLS.bind(CommonNavigatorMessages.NavigatorContentServiceLabelProvider_Error_no_label_provider_for_0_, makeSmallString(anElement));
String text = null;
for (int i = 0; i < labelProviders.length; i++) {
if (labelProviders[i] instanceof ITableLabelProvider && aColumn != -1)
text = ((ITableLabelProvider)labelProviders[i]).getColumnText(anElement, aColumn);
else
text = labelProviders[i].getText(anElement);
- if (text != null)
+ if (text != null && text.length() > 0)
return text;
}
- return NLS.bind(CommonNavigatorMessages.NavigatorContentServiceLabelProvider_Error_no_label_provider_for_0_, makeSmallString(anElement));
+ return text;
}
/* (non-Javadoc)
@@ -141,13 +143,14 @@ public class NavigatorContentServiceLabelProvider extends EventManager
*/
public StyledString getStyledText(Object anElement) {
Collection extensions = contentService.findPossibleLabelExtensions(anElement);
+ if (extensions.size() == 0)
+ return new StyledString(NLS.bind(CommonNavigatorMessages.NavigatorContentServiceLabelProvider_Error_no_label_provider_for_0_, makeSmallString(anElement)));
- StyledString text = null;
+ StyledString text = null;
for (Iterator itr = extensions.iterator(); itr.hasNext() && text == null; ) {
text = findStyledText((NavigatorContentExtension) itr.next(), anElement);
}
- // decorate the element
- return (text == null) ? new StyledString(NLS.bind(CommonNavigatorMessages.NavigatorContentServiceLabelProvider_Error_no_label_provider_for_0_, makeSmallString(anElement))) : text;
+ return text != null ? text : new StyledString();
}
/**
diff --git a/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorPipelineService.java b/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorPipelineService.java
index 19c710a..66618eb 100644
--- a/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorPipelineService.java
+++ b/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorPipelineService.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others.
+ * Copyright (c) 2006, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -17,7 +17,6 @@ import java.util.LinkedHashSet;
import java.util.Set;
import org.eclipse.jface.viewers.TreePath;
-import org.eclipse.ui.internal.navigator.extensions.NavigatorContentDescriptor;
import org.eclipse.ui.internal.navigator.extensions.NavigatorContentExtension;
import org.eclipse.ui.navigator.INavigatorContentDescriptor;
import org.eclipse.ui.navigator.INavigatorPipelineService;
@@ -81,36 +80,10 @@ public class NavigatorPipelineService implements INavigatorPipelineService {
pipelineInterceptAdd(anAddModification, trackedSet, descriptor);
}
- // for consistency, we register the contribution from our best known match
- registerContribution(anAddModification.getParent(), anAddModification.getChildren().toArray());
return anAddModification;
}
- /**
- * @param parent The object to which data was contributed
- * @param contributions Data contributed to the viewer
- */
- private void registerContribution(Object parent, Object[] contributions) {
-
- // returns an array sorted by priority
- Set possibleContributors = contentService.findDescriptorsByTriggerPoint(parent, false);
- Set possibleMatches = null;
- for (int i = 0; i < contributions.length; i++) {
- // returns an array sorted by reverse priority
- possibleMatches = contentService.findDescriptorsByTriggerPoint(contributions[i], NavigatorContentService.CONSIDER_OVERRIDES);
- NavigatorContentDescriptor[] descriptors = (NavigatorContentDescriptor[]) possibleMatches.toArray(new NavigatorContentDescriptor[possibleMatches.size()]);
- for (int indx = possibleMatches.size()-1; indx > -1; indx--) {
-
- // terminates once the highest priority match is found for this child
- if(possibleContributors.contains(descriptors[indx])) {
- contentService.rememberContribution(descriptors[indx], contributions[i]);
- break;
- }
- }
- }
- }
-
private void pipelineInterceptAdd(PipelinedShapeModification anAddModification, ContributorTrackingSet trackedSet, INavigatorContentDescriptor descriptor) {
if(descriptor.hasOverridingExtensions()) {
Set overridingDescriptors = descriptor.getOverriddingExtensions();
@@ -118,10 +91,10 @@ public class NavigatorPipelineService implements INavigatorPipelineService {
.hasNext();) {
INavigatorContentDescriptor overridingDescriptor = (INavigatorContentDescriptor) overridingDescriptorsItr.next();
if(contentService.isVisible(overridingDescriptor.getId()) && contentService.isActive(overridingDescriptor.getId())) {
- trackedSet.setContributor((NavigatorContentDescriptor) overridingDescriptor);
+ trackedSet.setContributor(overridingDescriptor, descriptor);
NavigatorContentExtension extension = contentService.getExtension(overridingDescriptor);
((IPipelinedTreeContentProvider) extension.internalGetContentProvider()).interceptAdd(anAddModification);
- trackedSet.setContributor(null);
+ trackedSet.setContributor(null, null);
pipelineInterceptAdd(anAddModification, trackedSet, overridingDescriptor);
}
}
@@ -192,11 +165,11 @@ public class NavigatorPipelineService implements INavigatorPipelineService {
for (Iterator extensionsItr = overridingExtensions.iterator(); extensionsItr.hasNext();) {
overridingExtension = (NavigatorContentExtension) extensionsItr.next();
- trackedSet.setContributor((NavigatorContentDescriptor) overridingExtension.getDescriptor());
+ trackedSet.setContributor(overridingExtension.getDescriptor(), null);
if (overridingExtension.getContentProvider() instanceof IPipelinedTreeContentProvider) {
((IPipelinedTreeContentProvider) overridingExtension.getContentProvider()).interceptRemove(aRemoveModification);
}
- trackedSet.setContributor(null);
+ trackedSet.setContributor(null, null);
if(overridingExtension.getDescriptor().hasOverridingExtensions())
pipelineInterceptRemove(aRemoveModification, trackedSet, overridingExtension);
diff --git a/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorPlugin.java b/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorPlugin.java
index 43a665b..278056f 100644
--- a/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorPlugin.java
+++ b/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorPlugin.java
@@ -10,6 +10,10 @@
*******************************************************************************/
package org.eclipse.ui.internal.navigator;
+import java.util.Collections;
+
+import org.eclipse.core.expressions.EvaluationContext;
+import org.eclipse.core.expressions.IEvaluationContext;
import org.eclipse.core.runtime.ILog;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
@@ -18,7 +22,9 @@ import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.graphics.Image;
+import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.eclipse.ui.services.IEvaluationService;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleEvent;
import org.osgi.framework.BundleListener;
@@ -178,6 +184,35 @@ public class NavigatorPlugin extends AbstractUIPlugin {
}
/**
+ * @return an evaluation context
+ */
+ public static IEvaluationContext getApplicationContext() {
+ IEvaluationService es = (IEvaluationService) PlatformUI.getWorkbench().getService(
+ IEvaluationService.class);
+ return es == null ? null : es.getCurrentState();
+ }
+
+ /**
+ * @return an evaluation context
+ */
+ public static IEvaluationContext getEmptyEvalContext() {
+ IEvaluationContext c = new EvaluationContext(getApplicationContext(),
+ Collections.EMPTY_LIST);
+ c.setAllowPluginActivation(true);
+ return c;
+ }
+
+ /**
+ * @param selection
+ * @return an evaluation context
+ */
+ public static IEvaluationContext getEvalContext(Object selection) {
+ IEvaluationContext c = new EvaluationContext(getApplicationContext(), selection);
+ c.setAllowPluginActivation(true);
+ return c;
+ }
+
+ /**
* Create a status associated with this plugin.
*
* @param severity
diff --git a/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/actions/CommonActionProviderDescriptor.java b/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/actions/CommonActionProviderDescriptor.java
index b7544dc..0141280 100644
--- a/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/actions/CommonActionProviderDescriptor.java
+++ b/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/actions/CommonActionProviderDescriptor.java
@@ -10,7 +10,6 @@
*******************************************************************************/
package org.eclipse.ui.internal.navigator.actions;
-import java.util.Collections;
import java.util.Comparator;
import java.util.Iterator;
import java.util.LinkedHashSet;
@@ -227,8 +226,7 @@ public class CommonActionProviderDescriptor implements
if(aStructuredSelection.isEmpty()) {
IEvaluationContext context = null;
- context = new EvaluationContext(null, Collections.EMPTY_LIST);
- context.setAllowPluginActivation(true);
+ context = NavigatorPlugin.getEmptyEvalContext();
try {
if (enablement.evaluate(context) != EvaluationResult.TRUE) {
return false;
@@ -240,9 +238,10 @@ public class CommonActionProviderDescriptor implements
} else {
IEvaluationContext context = null;
+ IEvaluationContext parentContext = NavigatorPlugin.getApplicationContext();
Iterator elements = aStructuredSelection.iterator();
while (elements.hasNext()) {
- context = new EvaluationContext(null, elements.next());
+ context = new EvaluationContext(parentContext, elements.next());
context.setAllowPluginActivation(true);
try {
if (enablement.evaluate(context) != EvaluationResult.TRUE) {
@@ -270,8 +269,7 @@ public class CommonActionProviderDescriptor implements
}
try {
- EvaluationContext context = new EvaluationContext(null, anElement);
- context.setAllowPluginActivation(true);
+ IEvaluationContext context = NavigatorPlugin.getEvalContext(anElement);
return (enablement.evaluate(context) == EvaluationResult.TRUE);
} catch (CoreException e) {
NavigatorPlugin.log(IStatus.ERROR, 0, e.getMessage(), e);
diff --git a/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/dnd/CommonDropAdapterDescriptor.java b/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/dnd/CommonDropAdapterDescriptor.java
index 8853d3c..c141016 100644
--- a/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/dnd/CommonDropAdapterDescriptor.java
+++ b/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/dnd/CommonDropAdapterDescriptor.java
@@ -11,9 +11,9 @@
package org.eclipse.ui.internal.navigator.dnd;
-import org.eclipse.core.expressions.EvaluationContext;
import org.eclipse.core.expressions.EvaluationResult;
import org.eclipse.core.expressions.Expression;
+import org.eclipse.core.expressions.IEvaluationContext;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.jface.viewers.IStructuredSelection;
@@ -86,8 +86,7 @@ public final class CommonDropAdapterDescriptor implements
public boolean isDropElementSupported(Object anElement) {
if (dropExpr != null && anElement != null) {
try {
- EvaluationContext context = new EvaluationContext(null, anElement);
- context.setAllowPluginActivation(true);
+ IEvaluationContext context = NavigatorPlugin.getEvalContext(anElement);
return dropExpr
.evaluate(context) == EvaluationResult.TRUE;
} catch (CoreException e) {
diff --git a/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/LinkHelperDescriptor.java b/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/LinkHelperDescriptor.java
index 060d359..a144411 100644
--- a/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/LinkHelperDescriptor.java
+++ b/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/LinkHelperDescriptor.java
@@ -11,7 +11,6 @@
package org.eclipse.ui.internal.navigator.extensions;
-import org.eclipse.core.expressions.EvaluationContext;
import org.eclipse.core.expressions.EvaluationResult;
import org.eclipse.core.expressions.Expression;
import org.eclipse.core.expressions.IEvaluationContext;
@@ -119,8 +118,7 @@ public class LinkHelperDescriptor implements ILinkHelperExtPtConstants {
}
try {
- EvaluationContext context = new EvaluationContext(null, anInput);
- context.setAllowPluginActivation(true);
+ IEvaluationContext context = NavigatorPlugin.getEvalContext(anInput);
return (editorInputEnablement.evaluate(context) == EvaluationResult.TRUE);
} catch (CoreException e) {
NavigatorPlugin.log(IStatus.ERROR, 0, e.getMessage(), e);
@@ -139,8 +137,7 @@ public class LinkHelperDescriptor implements ILinkHelperExtPtConstants {
return false;
}
- IEvaluationContext context = new EvaluationContext(null, anObject);
- context.setAllowPluginActivation(true);
+ IEvaluationContext context = NavigatorPlugin.getEvalContext(anObject);
try {
if (selectionEnablement.evaluate(context) != EvaluationResult.TRUE) {
return false;
diff --git a/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/NavigatorContentDescriptor.java b/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/NavigatorContentDescriptor.java
index 8794e6c..00bf7bb 100644
--- a/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/NavigatorContentDescriptor.java
+++ b/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/NavigatorContentDescriptor.java
@@ -20,10 +20,10 @@ import java.util.TreeSet;
import org.eclipse.osgi.util.NLS;
import org.eclipse.core.expressions.ElementHandler;
-import org.eclipse.core.expressions.EvaluationContext;
import org.eclipse.core.expressions.EvaluationResult;
import org.eclipse.core.expressions.Expression;
import org.eclipse.core.expressions.ExpressionConverter;
+import org.eclipse.core.expressions.IEvaluationContext;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
@@ -343,8 +343,7 @@ public final class NavigatorContentDescriptor implements
}
try {
- EvaluationContext context = new EvaluationContext(null, anElement);
- context.setAllowPluginActivation(true);
+ IEvaluationContext context = NavigatorPlugin.getEvalContext(anElement);
return (enablement.evaluate(context) == EvaluationResult.TRUE);
} catch (CoreException e) {
NavigatorPlugin.logError(0, e.getMessage(), e);
@@ -376,8 +375,7 @@ public final class NavigatorContentDescriptor implements
}
try {
- EvaluationContext context = new EvaluationContext(null, anElement);
- context.setAllowPluginActivation(true);
+ IEvaluationContext context = NavigatorPlugin.getEvalContext(anElement);
if (possibleChildren != null) {
return (possibleChildren.evaluate(context) == EvaluationResult.TRUE);
} else if (enablement != null) {
diff --git a/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/NavigatorContentExtension.java b/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/NavigatorContentExtension.java
index cd7c691..4634336 100644
--- a/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/NavigatorContentExtension.java
+++ b/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/NavigatorContentExtension.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2009 IBM Corporation and others.
+ * Copyright (c) 2003, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -135,7 +135,7 @@ public class NavigatorContentExtension implements IMementoAware,
.createContentProvider();
if (treeContentProvider != null) {
contentProvider = new SafeDelegateTreeContentProvider(
- treeContentProvider, descriptor, contentService);
+ treeContentProvider);
contentProvider.init(new CommonContentExtensionSite(
getId(), contentService, appliedMemento));
viewerManager.initialize(contentProvider);
diff --git a/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/SafeDelegateTreeContentProvider.java b/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/SafeDelegateTreeContentProvider.java
index 602c413..c4d2ace 100644
--- a/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/SafeDelegateTreeContentProvider.java
+++ b/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/SafeDelegateTreeContentProvider.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2009 IBM Corporation and others.
+ * Copyright (c) 2003, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -21,7 +21,6 @@ import org.eclipse.jface.viewers.StructuredViewer;
import org.eclipse.jface.viewers.TreePath;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.ui.IMemento;
-import org.eclipse.ui.internal.navigator.NavigatorContentService;
import org.eclipse.ui.internal.navigator.NavigatorPlugin;
import org.eclipse.ui.navigator.ICommonContentExtensionSite;
import org.eclipse.ui.navigator.ICommonContentProvider;
@@ -40,17 +39,11 @@ public class SafeDelegateTreeContentProvider implements
private final ITreeContentProvider contentProvider;
- private NavigatorContentDescriptor descriptor;
- private NavigatorContentService contentService;
-
private StructuredViewer viewer;
- SafeDelegateTreeContentProvider(ITreeContentProvider aContentProvider,
- NavigatorContentDescriptor aDescriptor, NavigatorContentService aContentService) {
+ SafeDelegateTreeContentProvider(ITreeContentProvider aContentProvider) {
super();
contentProvider = aContentProvider;
- contentService = aContentService;
- descriptor = aDescriptor;
}
/**
@@ -88,13 +81,11 @@ public class SafeDelegateTreeContentProvider implements
return getChildren(tp);
}
Object[] children = contentProvider.getChildren(aParentElement);
- contentService.rememberContribution(descriptor, children);
return children;
}
public Object[] getElements(Object anInputElement) {
Object[] elements = contentProvider.getElements(anInputElement);
- contentService.rememberContribution(descriptor, elements);
return elements;
}
@@ -274,7 +265,6 @@ public class SafeDelegateTreeContentProvider implements
if (contentProvider instanceof ITreePathContentProvider) {
ITreePathContentProvider tpcp = (ITreePathContentProvider) contentProvider;
Object[] children = tpcp.getChildren(parentPath);
- contentService.rememberContribution(descriptor, children);
return children;
}
return getChildren(parentPath.getLastSegment());
diff --git a/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/StructuredViewerManager.java b/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/StructuredViewerManager.java
index 8c65d3c..a5497af 100644
--- a/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/StructuredViewerManager.java
+++ b/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/StructuredViewerManager.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2009 IBM Corporation and others.
+ * Copyright (c) 2003, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -75,6 +75,7 @@ public class StructuredViewerManager {
}
public void associate(Object element, Item item) {
NavigatorContentDescriptor desc = contentService.getContribution(element);
+ contentService.forgetContribution(element);
synchronized (viewerDataMap) {
if (viewerDataMap.containsKey(element)) {
if (Policy.DEBUG_VIEWER_MAP)
@@ -110,6 +111,15 @@ public class StructuredViewerManager {
}
/**
+ * Used when NCEs associated with the viewer are changed.
+ */
+ public void resetViewerData() {
+ synchronized (viewerDataMap) {
+ viewerDataMap.clear();
+ }
+ }
+
+ /**
*
* @param aViewer
* @param contentService
diff --git a/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/CoreExpressionFilter.java b/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/CoreExpressionFilter.java
index e643534..5321c41 100644
--- a/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/CoreExpressionFilter.java
+++ b/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/CoreExpressionFilter.java
@@ -11,9 +11,9 @@
package org.eclipse.ui.internal.navigator.filters;
-import org.eclipse.core.expressions.EvaluationContext;
import org.eclipse.core.expressions.EvaluationResult;
import org.eclipse.core.expressions.Expression;
+import org.eclipse.core.expressions.IEvaluationContext;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerFilter;
@@ -47,8 +47,8 @@ public class CoreExpressionFilter extends ViewerFilter {
public boolean select(Viewer viewer, Object parentElement, Object element) {
try {
- return (filterExpression.evaluate(new EvaluationContext(null,
- element)) != EvaluationResult.TRUE);
+ IEvaluationContext context = NavigatorPlugin.getEvalContext(element);
+ return (filterExpression.evaluate(context) != EvaluationResult.TRUE);
} catch (CoreException e) {
NavigatorPlugin.logError(0, e.getMessage(), e);
}
diff --git a/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/sorters/CommonSorterDescriptor.java b/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/sorters/CommonSorterDescriptor.java
index 14a1230..a7febf4 100644
--- a/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/sorters/CommonSorterDescriptor.java
+++ b/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/sorters/CommonSorterDescriptor.java
@@ -11,9 +11,9 @@
package org.eclipse.ui.internal.navigator.sorters;
-import org.eclipse.core.expressions.EvaluationContext;
import org.eclipse.core.expressions.EvaluationResult;
import org.eclipse.core.expressions.Expression;
+import org.eclipse.core.expressions.IEvaluationContext;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.jface.viewers.ViewerSorter;
@@ -75,8 +75,7 @@ public class CommonSorterDescriptor implements INavigatorContentExtPtConstants {
}
if (parentExpression != null) {
- EvaluationContext context = new EvaluationContext(null, aParent);
- context.setAllowPluginActivation(true);
+ IEvaluationContext context = NavigatorPlugin.getEvalContext(aParent);
try {
return parentExpression.evaluate(context) == EvaluationResult.TRUE;
} catch (CoreException e) {
diff --git a/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/wizards/CommonWizardDescriptor.java b/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/wizards/CommonWizardDescriptor.java
index b19ddd1..5ae385f 100644
--- a/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/wizards/CommonWizardDescriptor.java
+++ b/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/wizards/CommonWizardDescriptor.java
@@ -109,10 +109,11 @@ public class CommonWizardDescriptor implements INavigatorContentExtPtConstants,
}
IEvaluationContext context = null;
+ IEvaluationContext parentContext = NavigatorPlugin.getApplicationContext();
Iterator elements = aStructuredSelection.iterator();
while (elements.hasNext()) {
- context = new EvaluationContext(null, elements.next());
+ context = new EvaluationContext(parentContext, elements.next());
context.setAllowPluginActivation(true);
try {
if (enablement.evaluate(context) == EvaluationResult.FALSE) {
@@ -140,8 +141,7 @@ public class CommonWizardDescriptor implements INavigatorContentExtPtConstants,
}
try {
- EvaluationContext context = new EvaluationContext(null, anElement);
- context.setAllowPluginActivation(true);
+ IEvaluationContext context = NavigatorPlugin.getEvalContext(anElement);
return (enablement.evaluate(context) == EvaluationResult.TRUE);
} catch (CoreException e) {
NavigatorPlugin.log(IStatus.ERROR, 0, e.getMessage(), e);
diff --git a/eclipse/plugins/org.eclipse.ui.workbench.texteditor/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.ui.workbench.texteditor/META-INF/MANIFEST.MF
index e4b1ee0..2152805 100644
--- a/eclipse/plugins/org.eclipse.ui.workbench.texteditor/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.ui.workbench.texteditor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.ui.workbench.texteditor; singleton:=true
-Bundle-Version: 3.5.0.qualifier
+Bundle-Version: 3.5.1.qualifier
Bundle-Activator: org.eclipse.ui.internal.texteditor.TextEditorPlugin
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %providerName
diff --git a/eclipse/plugins/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractTextEditor.java b/eclipse/plugins/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractTextEditor.java
index 2cabb82..0fecd76 100644
--- a/eclipse/plugins/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractTextEditor.java
+++ b/eclipse/plugins/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractTextEditor.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -735,6 +735,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit
Font blockFont= JFaceResources.getFont(BLOCK_SELECTION_MODE_FONT);
setFont(fSourceViewer, blockFont);
disposeFont();
+ updateCaret();
return;
}
if (getFontPropertyPreferenceKey().equals(property) && !isBlockSelectionModeEnabled()) {
@@ -7231,8 +7232,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit
StyledText styledText= viewer.getTextWidget();
if (styledText != null) {
/*
- * Font switching. block selection mode needs a monospace font. We try to adapt the
- * column font size to the current (normal) font size.
+ * Font switching. block selection mode needs a monospace font.
* - set the font _before enabling_ block selection mode in order to maintain the
* selection
* - revert the font _after disabling_ block selection mode in order to maintain the
@@ -7242,27 +7242,18 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit
Font blockFont= JFaceResources.getFont(BLOCK_SELECTION_MODE_FONT);
Font normalFont= styledText.getFont();
if (!blockFont.equals(normalFont) && !normalFont.getFontData()[0].equals(blockFont.getFontData()[0])) {
- int size= normalFont.getFontData()[0].getHeight();
- FontData[] fontData= blockFont.getFontData();
- boolean created= false;
- if (fontData[0].getHeight() != size) {
- for (int i= 0; i < fontData.length; i++) {
- fontData[i].setHeight(size);
- }
- blockFont= new Font(blockFont.getDevice(), fontData);
- created= true;
- }
setFont(viewer, blockFont);
disposeFont();
- if (created)
- fFont= blockFont;
+ updateCaret();
}
}
styledText.setBlockSelection(enable);
- if (!enable)
+ if (!enable) {
initializeViewerFont(viewer);
+ updateCaret();
+ }
}
}
}
diff --git a/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkingSetManager.java b/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkingSetManager.java
index 355a832..bfe2f3c 100644
--- a/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkingSetManager.java
+++ b/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkingSetManager.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -15,16 +15,17 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStreamReader;
-
import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.widgets.Shell;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
import org.eclipse.ui.IMemento;
import org.eclipse.ui.IWorkingSet;
import org.eclipse.ui.IWorkingSetManager;
import org.eclipse.ui.WorkbenchException;
import org.eclipse.ui.XMLMemento;
+import org.eclipse.ui.statushandlers.IStatusAdapterConstants;
+import org.eclipse.ui.statushandlers.StatusAdapter;
+import org.eclipse.ui.statushandlers.StatusManager;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleListener;
@@ -109,18 +110,15 @@ public class WorkingSetManager extends AbstractWorkingSetManager implements
restoreMruList(memento);
reader.close();
} catch (IOException e) {
- MessageDialog
- .openError(
- (Shell) null,
- WorkbenchMessages.ProblemRestoringWorkingSetState_title,
- WorkbenchMessages.ProblemRestoringWorkingSetState_message);
+ handleInternalError(
+ e,
+ WorkbenchMessages.ProblemRestoringWorkingSetState_title,
+ WorkbenchMessages.ProblemRestoringWorkingSetState_message);
} catch (WorkbenchException e) {
- ErrorDialog
- .openError(
- (Shell) null,
- WorkbenchMessages.ProblemRestoringWorkingSetState_title,
- WorkbenchMessages.ProblemRestoringWorkingSetState_message,
- e.getStatus());
+ handleInternalError(
+ e,
+ WorkbenchMessages.ProblemRestoringWorkingSetState_title,
+ WorkbenchMessages.ProblemRestoringWorkingSetState_message);
}
}
}
@@ -138,7 +136,7 @@ public class WorkingSetManager extends AbstractWorkingSetManager implements
saveState(stateFile);
} catch (IOException e) {
stateFile.delete();
- MessageDialog.openError((Shell) null,
+ handleInternalError(e,
WorkbenchMessages.ProblemSavingWorkingSetState_title,
WorkbenchMessages.ProblemSavingWorkingSetState_message);
}
@@ -160,4 +158,16 @@ public class WorkingSetManager extends AbstractWorkingSetManager implements
saveState();
super.workingSetChanged(changedWorkingSet, propertyChangeId, oldValue);
}
+
+ /**
+ * Show and Log the exception using StatusManager.
+ */
+ private void handleInternalError(Exception exp, String title, String message) {
+ Status status = new Status(IStatus.ERROR, WorkbenchPlugin.PI_WORKBENCH,
+ message, exp);
+ StatusAdapter sa = new StatusAdapter(status);
+ sa.setProperty(IStatusAdapterConstants.TITLE_PROPERTY, title);
+ StatusManager.getManager().handle(sa,
+ StatusManager.SHOW | StatusManager.LOG);
+ }
}
diff --git a/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/BindingPersistence.java b/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/BindingPersistence.java
index 007aeed..8fadd0a 100644
--- a/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/BindingPersistence.java
+++ b/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/BindingPersistence.java
@@ -23,7 +23,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.StringTokenizer;
-
import org.eclipse.core.commands.Command;
import org.eclipse.core.commands.ParameterizedCommand;
import org.eclipse.core.commands.common.HandleObject;
@@ -815,9 +814,10 @@ public final class BindingPersistence extends PreferencePersistence {
String schemeId, String contextId, String locale, List bindings,
String modifiedSequence, String[] platforms) throws ParseException {
+
KeyBinding originalBinding = new KeyBinding(keySequence,
- null, schemeId, contextId, locale,
- null, null, Binding.SYSTEM);
+ parameterizedCommand, schemeId, contextId, locale, null, null,
+ Binding.SYSTEM);
bindings.add(originalBinding);
String platform = SWT.getPlatform();
diff --git a/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/model/KeyController.java b/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/model/KeyController.java
index bd8d2a3..b97af1b 100644
--- a/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/model/KeyController.java
+++ b/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/model/KeyController.java
@@ -522,7 +522,9 @@ public class KeyController {
for (int i = 0; i < bindingElements.length; i++) {
final BindingElement be = (BindingElement) bindingElements[i];
if (be.getTrigger() == null
- || be.getTrigger().isEmpty()) {
+ || be.getTrigger().isEmpty()
+ || be.getContext() == null
+ || be.getContext().getName() == null) {
continue;
}
StringBuffer buffer = new StringBuffer();
diff --git a/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/JobInfo.java b/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/JobInfo.java
index abf3e41..a56caea 100644
--- a/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/JobInfo.java
+++ b/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/JobInfo.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
+ * Copyright (c) 2003, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -111,6 +111,7 @@ class JobInfo extends JobTreeElement {
* @see org.eclipse.ui.internal.progress.JobTreeElement#isJobInfo()
*/
void clearTaskInfo() {
+ FinishedJobs.getInstance().remove(taskInfo);
taskInfo = null;
}
diff --git a/eclipse/plugins/org.eclipse.ui.workbench/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.ui.workbench/META-INF/MANIFEST.MF
index de396c1..2021c54 100644
--- a/eclipse/plugins/org.eclipse.ui.workbench/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.ui.workbench/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.ui.workbench; singleton:=true
-Bundle-Version: 3.5.1.qualifier
+Bundle-Version: 3.5.2.qualifier
Bundle-ClassPath: e4-workbench.jar,
compatibility.jar,
.
diff --git a/eclipse/plugins/org.eclipse.ui/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.ui/META-INF/MANIFEST.MF
index bcac46e..5544b7c 100644
--- a/eclipse/plugins/org.eclipse.ui/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Plugin.name
Bundle-SymbolicName: org.eclipse.ui; singleton:=true
-Bundle-Version: 3.5.1.qualifier
+Bundle-Version: 3.5.2.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.ui.internal.UIPlugin
Bundle-ActivationPolicy: lazy
diff --git a/eclipse/plugins/org.eclipse.ui/buildnotes_workbench.html b/eclipse/plugins/org.eclipse.ui/buildnotes_workbench.html
index be7f9d0..869559d 100644
--- a/eclipse/plugins/org.eclipse.ui/buildnotes_workbench.html
+++ b/eclipse/plugins/org.eclipse.ui/buildnotes_workbench.html
@@ -12,6 +12,69 @@
<h1>Eclipse Platform Build Notes (3.5)<br>
JFace and Workbench</h1>
+<p>Integration Build (January 19, 2010, 8:01 p.m.)</p>
+ <p>Problem reports updated</p>
+ <p>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=295803">Bug 295803</a>. [CommonNavigator] Source of Contribution set to lowest priority NCE, not the NCE providing the children (FIXED)<br>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=296728">Bug 296728</a>. [CommonNavigator] Problem with enablement on navigatorContent extension point (FIXED)<br>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=299438">Bug 299438</a>. [CommonNavigator] CNF viewer state non properly reset when NCEs are activated or deactivated (FIXED)<br>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=299706">Bug 299706</a>. [CommonNavigator] org.eclipse.ui.navigator bundle needs to be incremented in 3.5.2 stream (FIXED)<br>
+ </p>
+
+<p>Integration Build (January 13, 2010, 2:10 a.m.)</p>
+ <p>Problem reports updated</p>
+ <p>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=285095">Bug 285095</a>. [Viewers] New column scrolling breaks on first cell selection if you have scrolled the table (NEW)<br>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=289090">Bug 289090</a>. [CommonNavigator] labels are missing (FIXED)<br>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=293235">Bug 293235</a>. [backport][Import/Export] Timestamps updated on archive export and on project import (FIXED)<br>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=295557">Bug 295557</a>. [KeyBindings] Exporting key preferences to CSV does not allow context being null (FIXED)<br>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=296253">Bug 296253</a>. [CommonNavigator] An empty label is not properly shown when it is the only contributed label (FIXED)<br>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=299246">Bug 299246</a>. [CommonNavigator] Add model objects for new CNF tests (FIXED)<br>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=299249">Bug 299249</a>. [CommonNavigator] Add ResourceWrapperContent/Label provider for new CNF tests (FIXED)<br>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=299251">Bug 299251</a>. [CommonNavigator] Model label and content providers for additional pipeline CNF tests (FIXED)<br>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=299255">Bug 299255</a>. [CommonNavigator] Hook new CNF tests to plugin.xml (FIXED)<br>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=299304">Bug 299304</a>. [CommonNavigator] Test contribution for CNF (FIXED)<br>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=299322">Bug 299322</a>. [CommonNavigator] Test contribution for CNF (FIXED)<br>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=299324">Bug 299324</a>. [CommonNavigator] Add new test Pipeline content provider (FIXED)<br>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=299325">Bug 299325</a>. [CommonNavigator] Add plugin.xml configuration for new pipeline tests (FIXED)<br>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=299326">Bug 299326</a>. [CommonNavigator] Add new test for CNF pipelining (FIXED)<br>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=299331">Bug 299331</a>. [CommonNavigator] Compile errors in new CNF tests (FIXED)<br>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=299340">Bug 299340</a>. [CommonNavigator] Enable new CNF tests (FIXED)<br>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=299345">Bug 299345</a>. [CommonNavigator] Move expanded HEAD CNF tests to 3.5.2 (FIXED)<br>
+ </p>
+
+<p>Integration Build (January 07, 2010, 11:21 a.m.)</p>
+ <p>Problem reports updated</p>
+ <p>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=296142">Bug 296142</a>. [KeyBindings] Set extension point "org.eclipse.ui.bindings" 's element 'sequenceModifier' becomes disabled key bindings. (FIXED)<br>
+ </p>
+
+<p>Integration Build (January 07, 2010, 9:31 a.m.)</p>
+ <p>Problem reports updated</p>
+ <p>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=296142">Bug 296142</a>. [KeyBindings] Set extension point "org.eclipse.ui.bindings" 's element 'sequenceModifier' becomes disabled key bindings. (FIXED)<br>
+ </p>
+
+<p>Integration Build (January 07, 2010, 1:09 a.m.)</p>
+ <p>Problem reports updated</p>
+ <p>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=296142">Bug 296142</a>. [KeyBindings] Set extension point "org.eclipse.ui.bindings" 's element 'sequenceModifier' becomes disabled key bindings. (FIXED)<br>
+ </p>
+
+<p>Integration Build (November 17, 2009, 4:52 p.m.)</p>
+ <p>Problem reports updated</p>
+ <p>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=283283">Bug 283283</a>. [WorkingSets] WorkingSetManager hides exception message (FIXED)<br>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=294462">Bug 294462</a>. [FieldAssist] ControlDecoration#showHoverText doesn't check if the widget is visible (FIXED)<br>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=294702">Bug 294702</a>. Backport of bug 283283 into 3.5.x is required (FIXED)<br>
+ </p>
+
+<p>Integration Build (November 10, 2009, 3:56 p.m.)</p>
+ <p>Problem reports updated</p>
+ <p>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=286107">Bug 286107</a>. [ViewMgmt] [GlobalActions] Closing project ignores Saveables (FIXED)<br>
+ </p>
+
<p>Integration Build (September 02, 2009, 8:41 a.m.)</p>
<p>Problem reports updated</p>
<p>
diff --git a/eclipse/plugins/org.hamcrest.core.source_1.1.0.v20090501071000.jar b/eclipse/plugins/org.hamcrest.core.source_1.1.0.v20090501071000.jar
index 14b9cda..cd7feb6 100644
Binary files a/eclipse/plugins/org.hamcrest.core.source_1.1.0.v20090501071000.jar and b/eclipse/plugins/org.hamcrest.core.source_1.1.0.v20090501071000.jar differ
diff --git a/eclipse/plugins/org.junit.source_3.8.2.v20090203-1005.jar b/eclipse/plugins/org.junit.source_3.8.2.v20090203-1005.jar
index d68acf6..5d18463 100644
Binary files a/eclipse/plugins/org.junit.source_3.8.2.v20090203-1005.jar and b/eclipse/plugins/org.junit.source_3.8.2.v20090203-1005.jar differ
diff --git a/eclipse/plugins/org.junit_3.8.2.v20090203-1005/META-INF/ECLIPSEF.RSA b/eclipse/plugins/org.junit_3.8.2.v20090203-1005/META-INF/ECLIPSEF.RSA
index fab8608..558670e 100644
Binary files a/eclipse/plugins/org.junit_3.8.2.v20090203-1005/META-INF/ECLIPSEF.RSA and b/eclipse/plugins/org.junit_3.8.2.v20090203-1005/META-INF/ECLIPSEF.RSA differ
diff --git a/eclipse/plugins/org.junit_3.8.2.v20090203-1005/META-INF/ECLIPSEF.SF b/eclipse/plugins/org.junit_3.8.2.v20090203-1005/META-INF/ECLIPSEF.SF
index de7a4f9..bfeaa89 100644
--- a/eclipse/plugins/org.junit_3.8.2.v20090203-1005/META-INF/ECLIPSEF.SF
+++ b/eclipse/plugins/org.junit_3.8.2.v20090203-1005/META-INF/ECLIPSEF.SF
@@ -1,5 +1,5 @@
Signature-Version: 1.0
-SHA1-Digest-Manifest: fMA2c4D+dsgfOb4WXU/rfxvFvfg=
+SHA1-Digest-Manifest: XH/OvLPNs/CaNYVojDApukgC7L4=
Created-By: 1.6.0 (IBM Corporation)
SHA1-Digest-Manifest-Main-Attributes: 7z1AYCA2GipycLQZpj8d+bU1e2c=
@@ -7,7 +7,7 @@ Name: META-INF/eclipse.inf
SHA1-Digest: Z+e4UrhAmTCBR1UpP/RqMf9OX00=
Name: junit.jar
-SHA1-Digest: tSgW22JcbCFdqUQ+epDdPFi4YkQ=
+SHA1-Digest: 0EWOCYs5OmWpQltX4OIHYoTIQNs=
Name: about.html
SHA1-Digest: OB4tUYTIdwsIAbpHUAzVaDJ+OHQ=
diff --git a/eclipse/plugins/org.junit_3.8.2.v20090203-1005/META-INF/MANIFEST.MF b/eclipse/plugins/org.junit_3.8.2.v20090203-1005/META-INF/MANIFEST.MF
index d39aee2..36ddb43 100644
--- a/eclipse/plugins/org.junit_3.8.2.v20090203-1005/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.junit_3.8.2.v20090203-1005/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Name: META-INF/eclipse.inf
SHA1-Digest: u+F8j/GAE8tzrDry9+wT3Cvg81Y=
Name: junit.jar
-SHA1-Digest: dfHtf8meaFO/JjKcarPE3E9V2bw=
+SHA1-Digest: m8XJuGtgGg2Sglwt9Z6WdDeQRG4=
Name: about_files/cpl-v10.html
SHA1-Digest: o0b19ceZ+HQHVX0Ops751AQVdwM=
diff --git a/eclipse/plugins/org.mortbay.jetty.server.source_6.1.15.v200905151201.jar b/eclipse/plugins/org.mortbay.jetty.server.source_6.1.15.v200905151201.jar
index f1221cc..ad63e86 100644
Binary files a/eclipse/plugins/org.mortbay.jetty.server.source_6.1.15.v200905151201.jar and b/eclipse/plugins/org.mortbay.jetty.server.source_6.1.15.v200905151201.jar differ
diff --git a/eclipse/plugins/org.mortbay.jetty.util.source_6.1.15.v200905182336.jar b/eclipse/plugins/org.mortbay.jetty.util.source_6.1.15.v200905182336.jar
index a751023..e88d43e 100644
Binary files a/eclipse/plugins/org.mortbay.jetty.util.source_6.1.15.v200905182336.jar and b/eclipse/plugins/org.mortbay.jetty.util.source_6.1.15.v200905182336.jar differ
diff --git a/eclipse/plugins/org.objectweb.asm.source_3.1.0.v200803061910.jar b/eclipse/plugins/org.objectweb.asm.source_3.1.0.v200803061910.jar
index 4090075..4be6215 100644
Binary files a/eclipse/plugins/org.objectweb.asm.source_3.1.0.v200803061910.jar and b/eclipse/plugins/org.objectweb.asm.source_3.1.0.v200803061910.jar differ
diff --git a/eclipse/removed-jars b/eclipse/removed-jars
index 753b040..6f01803 100644
--- a/eclipse/removed-jars
+++ b/eclipse/removed-jars
@@ -39,5 +39,5 @@ plugins/org.mortbay.jetty.server_6.1.15.v200905151201.jar
plugins/org.mortbay.jetty.util_6.1.15.v200905182336.jar
plugins/org.mortbay.jetty_5.1.14.v200806031611.jar
plugins/org.objectweb.asm_3.1.0.v200803061910.jar
-plugins/org.sat4j.core_2.1.0.v20090520.jar
-plugins/org.sat4j.pb_2.1.0.v20090520.jar
+plugins/org.sat4j.core_2.1.1.v20090825.jar
+plugins/org.sat4j.pb_2.1.1.v20090825.jar
diff --git a/patches/eclipse-add-archs-executable.patch b/patches/eclipse-add-archs-executable.patch
index ecab35e..1238a52 100644
--- a/patches/eclipse-add-archs-executable.patch
+++ b/patches/eclipse-add-archs-executable.patch
@@ -1,5 +1,12 @@
---- features/org.eclipse.equinox.executable/target.build.properties.real 2009-10-21 14:21:08.843594049 +0300
-+++ features/org.eclipse.equinox.executable/target.build.properties 2009-10-21 14:22:18.142845083 +0300
+### Eclipse Workspace Patch 1.0
+#P org.eclipse.equinox.executable
+Index: target.build.properties
+===================================================================
+RCS file: /cvsroot/rt/org.eclipse.equinox/framework/bundles/org.eclipse.equinox.executable/target.build.properties,v
+retrieving revision 1.16
+diff -u -r1.16 target.build.properties
+--- target.build.properties 7 May 2009 15:02:06 -0000 1.16
++++ target.build.properties 11 Feb 2010 21:05:52 -0000
@@ -19,12 +19,48 @@
root.win32.win32.ia64=file:contributed/win32/win32/ia64/launcher.exe
root.win32.wpf.x86=file:bin/wpf/win32/x86/launcher.exe
@@ -51,23 +58,25 @@
root.macosx.carbon.ppc=bin/carbon/macosx/ppc
root.macosx.carbon.ppc.permissions.755=${launcherName}.app/Contents/MacOS/${launcherName}
-@@ -49,9 +85,6 @@
- root.solaris.gtk.x86=bin/gtk/solaris/x86
- root.solaris.gtk.sparc=bin/gtk/solaris/sparc
-
--root.linux.gtk.x86_64=bin/gtk/linux/x86_64,gtk_root
--root.linux.gtk.x86_64.permissions.755=libcairo-swt.so
--
+@@ -55,4 +91,4 @@
root.qnx.photon.x86=bin/photon/qnx/x86
root.linux.motif.x86=bin/motif/linux/x86,motif_root
-
---- features/org.eclipse.equinox.executable/feature.xml.real 2009-10-21 14:35:44.818598403 +0300
-+++ features/org.eclipse.equinox.executable/feature.xml 2009-10-21 14:37:07.063593607 +0300
-@@ -89,6 +89,66 @@
+-root.linux.motif.x86.permissions.755=libXm.so.2,libcairo-swt.so
+\ No newline at end of file
++root.linux.motif.x86.permissions.755=libXm.so.2,libcairo-swt.so
+Index: feature.xml
+===================================================================
+RCS file: /cvsroot/rt/org.eclipse.equinox/framework/bundles/org.eclipse.equinox.executable/feature.xml,v
+retrieving revision 1.15.2.1
+diff -u -r1.15.2.1 feature.xml
+--- feature.xml 29 Sep 2009 20:06:31 -0000 1.15.2.1
++++ feature.xml 11 Feb 2010 21:05:52 -0000
+@@ -88,6 +88,66 @@
+ version="0.0.0"
fragment="true"/>
- <plugin
++ <plugin
+ id="org.eclipse.equinox.launcher.gtk.linux.alpha"
+ os="linux"
+ ws="gtk"
@@ -127,10 +136,9 @@
+ version="0.0.0"
+ fragment="true"/>
+
-+ <plugin
+ <plugin
id="org.eclipse.equinox.launcher.gtk.linux.ppc"
os="linux"
- ws="gtk"
@@ -98,6 +158,56 @@
version="0.0.0"
fragment="true"/>
@@ -144,7 +152,7 @@
+ install-size="0"
+ version="0.0.0"
+ fragment="true"/>
-+
++
+ <plugin
+ id="org.eclipse.equinox.launcher.gtk.linux.s390"
+ os="linux"
@@ -188,7 +196,7 @@
<plugin
id="org.eclipse.equinox.launcher.gtk.linux.x86"
os="linux"
-@@ -198,25 +308,5 @@
+@@ -198,24 +308,4 @@
version="0.0.0"
fragment="true"/>
@@ -212,5 +220,4 @@
- version="0.0.0"
- fragment="true"/>
-
-
</feature>
diff --git a/patches/eclipse-help-toolbar.patch b/patches/eclipse-help-toolbar.patch
deleted file mode 100644
index 9cd3604..0000000
--- a/patches/eclipse-help-toolbar.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-### Eclipse Workspace Patch 1.0
-#P org.eclipse.help.webapp
-Index: advanced/tocToolbar.jsp
-===================================================================
-RCS file: /cvsroot/eclipse/org.eclipse.help.webapp/advanced/tocToolbar.jsp,v
-retrieving revision 1.14
-diff -u -r1.14 tocToolbar.jsp
---- plugins/org.eclipse.help.webapp/advanced/tocToolbar.jsp 22 Jan 2009 22:19:55 -0000 1.14
-+++ plugins/org.eclipse.help.webapp/advanced/tocToolbar.jsp 21 Sep 2009 20:55:27 -0000
-@@ -16,6 +16,9 @@
- String printError = UrlUtil.JavaScriptEncode(ServletResources.getString("PrintError", request));
- String menuData = printTopicLabel + "=printTopic(\\'" + printError + "\\')," + printTocLabel + "=printToc(\\'" + printError + "\\')";
- String quickSearchError = UrlUtil.JavaScriptEncode(ServletResources.getString("QuickSearchError", request));
-+ // See Bug 290064 for an explanation of why these constants are used
-+ final String ON = "on";
-+ final String OFF = "off";
- %>
-
- <jsp:include page="toolbar.jsp">
-@@ -62,6 +65,6 @@
- <jsp:param name="image" value="auto_synch_toc.gif"/>
- <jsp:param name="action" value="toggleAutosynch"/>
- <jsp:param name="param" value=""/>
-- <jsp:param name="state" value="<%=((new CookiesData(application, request, response)).isSynchToc() ? "on" : "off")%>"/>
-+ <jsp:param name="state" value="<%=((new CookiesData(application, request, response)).isSynchToc() ? ON : OFF)%>"/>
-
- </jsp:include>
-\ No newline at end of file
-Index: advanced/searchToolbar.jsp
-===================================================================
-RCS file: /cvsroot/eclipse/org.eclipse.help.webapp/advanced/searchToolbar.jsp,v
-retrieving revision 1.12
-diff -u -r1.12 searchToolbar.jsp
---- plugins/org.eclipse.help.webapp/advanced/searchToolbar.jsp 29 Aug 2007 22:45:40 -0000 1.12
-+++ plugins/org.eclipse.help.webapp/advanced/searchToolbar.jsp 21 Sep 2009 20:55:27 -0000
-@@ -1,5 +1,5 @@
- <%--
-- Copyright (c) 2000, 2007 IBM Corporation and others.
-+ Copyright (c) 2000, 2009 IBM Corporation and others.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
-@@ -9,6 +9,11 @@
- IBM Corporation - initial API and implementation
- --%>
- <%@ include file="header.jsp"%>
-+<%
-+ // See Bug 290064 for an explanation of why these constants are used
-+ final String ON = "on";
-+ final String OFF = "off";
-+%>
-
-
- <jsp:include page="toolbar.jsp">
-@@ -27,13 +32,13 @@
- <jsp:param name="image" value="show_categories.gif"/>
- <jsp:param name="action" value="toggleShowCategories"/>
- <jsp:param name="param" value=""/>
-- <jsp:param name="state" value="<%=((new SearchData(application, request, response)).isShowCategories() ? "on" : "off")%>"/>
-+ <jsp:param name="state" value="<%=((new SearchData(application, request, response)).isShowCategories() ? ON : OFF)%>"/>
-
- <jsp:param name="name" value="show_descriptions"/>
- <jsp:param name="tooltip" value='show_descriptions'/>
- <jsp:param name="image" value="show_descriptions.gif"/>
- <jsp:param name="action" value="toggleShowDescriptions"/>
- <jsp:param name="param" value=""/>
-- <jsp:param name="state" value="<%=((new SearchData(application, request, response)).isShowDescriptions() ? "on" : "off")%>"/>
-+ <jsp:param name="state" value="<%=((new SearchData(application, request, response)).isShowDescriptions() ? ON : OFF)%>"/>
-
- </jsp:include>
-\ No newline at end of file
diff --git a/patches/gtk2.18zorder.patch b/patches/gtk2.18zorder.patch
deleted file mode 100644
index 94efb52..0000000
--- a/patches/gtk2.18zorder.patch
+++ /dev/null
@@ -1,218 +0,0 @@
-### Eclipse Workspace Patch 1.0
-#P org.eclipse.swt
-Index: Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
-===================================================================
-RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java,v
-retrieving revision 1.380.2.1
-diff -u -r1.380.2.1 Control.java
---- Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java 7 Aug 2009 18:50:38 -0000 1.380.2.1
-+++ Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java 30 Sep 2009 16:19:55 -0000
-@@ -3332,6 +3332,30 @@
- region = null;
- }
-
-+void restackWindow (int /*long*/ window, int /*long*/ sibling, boolean above) {
-+ if (OS.GTK_VERSION >= OS.VERSION (2, 17, 11)) {
-+ OS.gdk_window_restack (window, sibling, above);
-+ } else {
-+ /*
-+ * Feature in X. If the receiver is a top level, XConfigureWindow ()
-+ * will fail (with a BadMatch error) for top level shells because top
-+ * level shells are reparented by the window manager and do not share
-+ * the same X window parent. This is the correct behavior but it is
-+ * unexpected. The fix is to use XReconfigureWMWindow () instead.
-+ * When the receiver is not a top level shell, XReconfigureWMWindow ()
-+ * behaves the same as XConfigureWindow ().
-+ */
-+ int /*long*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (window);
-+ int /*long*/ xWindow = OS.gdk_x11_drawable_get_xid (window);
-+ int xScreen = OS.XDefaultScreen (xDisplay);
-+ int flags = OS.CWStackMode | OS.CWSibling;
-+ XWindowChanges changes = new XWindowChanges ();
-+ changes.sibling = OS.gdk_x11_drawable_get_xid (sibling);
-+ changes.stack_mode = above ? OS.Above : OS.Below;
-+ OS.XReconfigureWMWindow (xDisplay, xWindow, xScreen, flags, changes);
-+ }
-+ }
-+
- boolean sendDragEvent (int button, int stateMask, int x, int y, boolean isStateMask) {
- Event event = new Event ();
- event.button = button;
-@@ -3682,15 +3706,7 @@
- if (!OS.GDK_WINDOWING_X11 ()) {
- OS.gdk_window_raise (enableWindow);
- } else {
-- int /*long*/ topWindow = OS.GTK_WIDGET_WINDOW (topHandle);
-- int /*long*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (topWindow);
-- int /*long*/ xWindow = OS.gdk_x11_drawable_get_xid (enableWindow);
-- int xScreen = OS.XDefaultScreen (xDisplay);
-- int flags = OS.CWStackMode | OS.CWSibling;
-- XWindowChanges changes = new XWindowChanges ();
-- changes.sibling = OS.gdk_x11_drawable_get_xid (topWindow);
-- changes.stack_mode = OS.Above;
-- OS.XReconfigureWMWindow (xDisplay, xWindow, xScreen, flags, changes);
-+ restackWindow (enableWindow, OS.GTK_WIDGET_WINDOW (topHandle), true);
- }
- if (OS.GTK_WIDGET_VISIBLE (topHandle)) OS.gdk_window_show_unraised (enableWindow);
- }
-@@ -4170,29 +4186,12 @@
- OS.gdk_window_lower (window);
- }
- } else {
-- XWindowChanges changes = new XWindowChanges ();
-- changes.sibling = OS.gdk_x11_drawable_get_xid (siblingWindow != 0 ? siblingWindow : redrawWindow);
-- changes.stack_mode = above ? OS.Above : OS.Below;
-- if (redrawWindow != 0 && siblingWindow == 0) changes.stack_mode = OS.Below;
-- int /*long*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (window);
-- int /*long*/ xWindow = OS.gdk_x11_drawable_get_xid (window);
-- int xScreen = OS.XDefaultScreen (xDisplay);
-- int flags = OS.CWStackMode | OS.CWSibling;
-- /*
-- * Feature in X. If the receiver is a top level, XConfigureWindow ()
-- * will fail (with a BadMatch error) for top level shells because top
-- * level shells are reparented by the window manager and do not share
-- * the same X window parent. This is the correct behavior but it is
-- * unexpected. The fix is to use XReconfigureWMWindow () instead.
-- * When the receiver is not a top level shell, XReconfigureWMWindow ()
-- * behaves the same as XConfigureWindow ().
-- */
-- OS.XReconfigureWMWindow (xDisplay, xWindow, xScreen, flags, changes);
-+ int /*long*/ siblingW = siblingWindow != 0 ? siblingWindow : redrawWindow;
-+ boolean stack_mode = above;
-+ if (redrawWindow != 0 && siblingWindow == 0) stack_mode = false;
-+ restackWindow (window, siblingW, stack_mode);
- if (enableWindow != 0) {
-- changes.sibling = OS.gdk_x11_drawable_get_xid (window);
-- changes.stack_mode = OS.Above;
-- xWindow = OS.gdk_x11_drawable_get_xid (enableWindow);
-- OS.XReconfigureWMWindow (xDisplay, xWindow, xScreen, flags, changes);
-+ restackWindow (enableWindow, window, true);
- }
- }
- }
-Index: Eclipse SWT PI/gtk/library/os_stats.h
-===================================================================
-RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h,v
-retrieving revision 1.180
-diff -u -r1.180 os_stats.h
---- Eclipse SWT PI/gtk/library/os_stats.h 29 May 2009 21:30:13 -0000 1.180
-+++ Eclipse SWT PI/gtk/library/os_stats.h 30 Sep 2009 16:19:54 -0000
-@@ -511,6 +511,7 @@
- _1gdk_1window_1raise_FUNC,
- _1gdk_1window_1remove_1filter_FUNC,
- _1gdk_1window_1resize_FUNC,
-+ _1gdk_1window_1restack_FUNC,
- _1gdk_1window_1scroll_FUNC,
- _1gdk_1window_1set_1accept_1focus_FUNC,
- _1gdk_1window_1set_1back_1pixmap_FUNC,
-Index: Eclipse SWT PI/gtk/library/os_custom.h
-===================================================================
-RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h,v
-retrieving revision 1.80
-diff -u -r1.80 os_custom.h
---- Eclipse SWT PI/gtk/library/os_custom.h 29 May 2009 21:30:14 -0000 1.80
-+++ Eclipse SWT PI/gtk/library/os_custom.h 30 Sep 2009 16:19:54 -0000
-@@ -112,6 +112,7 @@
- #define gtk_status_icon_set_tooltip_LIB "libgtk-x11-2.0.so.0"
- #define gtk_window_get_group_LIB "libgtk-x11-2.0.so.0"
- #define gtk_window_get_opacity_LIB "libgtk-x11-2.0.so.0"
-+#define gdk_window_restack_LIB "libgdk-x11-2.0.so.0"
- #define gdk_window_set_keep_above_LIB "libgdk-x11-2.0.so.0"
- #define gdk_window_set_accept_focus_LIB "libgdk-x11-2.0.so.0"
- #define gtk_window_set_opacity_LIB "libgtk-x11-2.0.so.0"
-Index: Eclipse SWT PI/gtk/library/os_stats.c
-===================================================================
-RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c,v
-retrieving revision 1.180
-diff -u -r1.180 os_stats.c
---- Eclipse SWT PI/gtk/library/os_stats.c 29 May 2009 21:30:13 -0000 1.180
-+++ Eclipse SWT PI/gtk/library/os_stats.c 30 Sep 2009 16:19:54 -0000
-@@ -8,7 +8,7 @@
- * the LGPL accompanying this distribution and there is any conflict
- * between the two license versions, the terms of the LGPL accompanying
- * this distribution shall govern.
-- *
-+ *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-@@ -18,8 +18,8 @@
-
- #ifdef NATIVE_STATS
-
--int OS_nativeFunctionCount = 1291;
--int OS_nativeFunctionCallCount[1291];
-+int OS_nativeFunctionCount = 1292;
-+int OS_nativeFunctionCallCount[1292];
- char * OS_nativeFunctionNames[] = {
- #ifndef JNI64
- "Call__IIII",
-@@ -503,6 +503,7 @@
- "_1gdk_1window_1raise",
- "_1gdk_1window_1remove_1filter",
- "_1gdk_1window_1resize",
-+ "_1gdk_1window_1restack",
- "_1gdk_1window_1scroll",
- "_1gdk_1window_1set_1accept_1focus",
- "_1gdk_1window_1set_1back_1pixmap",
-Index: Eclipse SWT PI/gtk/library/os.c
-===================================================================
-RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c,v
-retrieving revision 1.272
-diff -u -r1.272 os.c
---- Eclipse SWT PI/gtk/library/os.c 29 May 2009 21:30:14 -0000 1.272
-+++ Eclipse SWT PI/gtk/library/os.c 30 Sep 2009 16:19:54 -0000
-@@ -5944,6 +5944,24 @@
- }
- #endif
-
-+#ifndef NO__1gdk_1window_1restack
-+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1restack)
-+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2)
-+{
-+ OS_NATIVE_ENTER(env, that, _1gdk_1window_1restack_FUNC);
-+/*
-+ gdk_window_restack((GdkWindow *)arg0, (GdkWindow *)arg1, (gboolean)arg2);
-+*/
-+ {
-+ LOAD_FUNCTION(fp, gdk_window_restack)
-+ if (fp) {
-+ ((void (CALLING_CONVENTION*)(GdkWindow *, GdkWindow *, gboolean))fp)((GdkWindow *)arg0, (GdkWindow *)arg1, (gboolean)arg2);
-+ }
-+ }
-+ OS_NATIVE_EXIT(env, that, _1gdk_1window_1restack_FUNC);
-+}
-+#endif
-+
- #ifndef NO__1gdk_1window_1scroll
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1scroll)
- (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
-Index: Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
-===================================================================
-RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java,v
-retrieving revision 1.525.2.1
-diff -u -r1.525.2.1 OS.java
---- Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java 20 Aug 2009 19:16:37 -0000 1.525.2.1
-+++ Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java 30 Sep 2009 16:19:55 -0000
-@@ -4887,6 +4887,21 @@
- lock.unlock();
- }
- }
-+/**
-+ * @method flags=dynamic
-+ * @param window cast=(GdkWindow *)
-+ * @param sibling cast=(GdkWindow *)
-+ * @param above cast=(gboolean)
-+ */
-+public static final native void _gdk_window_restack(int /*long*/ window, int /*long*/ sibling, boolean above);
-+public static final void gdk_window_restack(int /*long*/ window, int /*long*/ sibling, boolean above) {
-+ lock.lock();
-+ try {
-+ _gdk_window_restack(window, sibling, above);
-+ } finally {
-+ lock.unlock();
-+ }
-+}
- /** @param window cast=(GdkWindow *) */
- public static final native void _gdk_window_scroll(int /*long*/ window, int dx, int dy);
- public static final void gdk_window_scroll(int /*long*/ window, int dx, int dy) {
diff --git a/patches/tests-BZ295666.patch b/patches/tests-BZ295666.patch
new file mode 100644
index 0000000..3d21db6
--- /dev/null
+++ b/patches/tests-BZ295666.patch
@@ -0,0 +1,10 @@
+--- plugins/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/ListViewerTest.java 2009-12-08 16:19:39.740154009 -0500
++++ plugins/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/ListViewerTest.java-new 2009-12-08 16:22:14.261155406 -0500
+@@ -87,6 +87,7 @@
+ fRootElement = TestElement.createModel(1, i);
+ fModel = fRootElement.getModel();
+ fViewer.setInput(fRootElement);
++ processEvents();
+ for (int j = 30; j < fRootElement.getChildCount(); j++) {
+ fViewer.setSelection(new StructuredSelection(fRootElement
+ .getFirstChild()), true);
diff --git a/pdebuild.properties b/pdebuild.properties
index 46e8fc2..b64cdd2 100644
--- a/pdebuild.properties
+++ b/pdebuild.properties
@@ -2,8 +2,8 @@ buildArch=x86
ws=gtk
os=linux
-buildId=M20090917-0800
-buildTag=R3_5_1
+buildId=M20100210-0800
+buildTag=vM20100210-0800
bootclasspath=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
#build.compiler=org.eclipse.jdt.core.JDTCompilerAdapter
diff --git a/pdebuild.xml b/pdebuild.xml
index b1db35a..a7e759f 100644
--- a/pdebuild.xml
+++ b/pdebuild.xml
@@ -40,6 +40,16 @@
<file name="org.eclipse.equinox.frameworkadmin.equinox" />
<file name="org.eclipse.equinox.p2.jarprocessor" />
<file name="org.eclipse.equinox.security" />
+ <file name="org.eclipse.core.net" />
+ <file name="org.eclipse.equinox.concurrent" />
+ <file name="org.eclipse.ecf.ssl" />
+ <file name="org.eclipse.ecf.identity" />
+ <file name="org.eclipse.ecf" />
+ <file name="org.eclipse.ecf.filetransfer" />
+ <file name="org.eclipse.ecf.provider.filetransfer" />
+ <file name="org.eclipse.ecf.provider.filetransfer.ssl" />
+ <file name="org.eclipse.ecf.provider.filetransfer.httpclient" />
+ <file name="org.eclipse.ecf.provider.filetransfer.httpclient.ssl" />
<file name="org.eclipse.equinox.p2.repository" />
<file name="org.eclipse.equinox.p2.artifact.repository" />
<file name="org.eclipse.equinox.p2.metadata.repository" />
@@ -57,7 +67,6 @@
<file name="org.eclipse.osgi.services" />
<file name="org.eclipse.equinox.p2.console" />
<file name="org.eclipse.equinox.p2.director.app" />
- <file name="org.eclipse.core.net" />
<file name="org.eclipse.update.core" />
<file name="org.eclipse.equinox.p2.garbagecollector" />
<file name="org.eclipse.equinox.p2.exemplarysetup" />
@@ -97,7 +106,6 @@
<fileset dir="${sdkSource}/plugins" id="orbitDeps">
<include name="org.junit_*/" />
<include name="com.ibm.icu_*" />
- <include name="org.eclipse.ecf*" />
<include name="org.apache.ant_*/**" />
<include name="org.mortbay.jetty*" />
<include name="org.apache.lucene*" />
diff --git a/regenerateBootstrapFiles.sh b/regenerateBootstrapFiles.sh
new file mode 100644
index 0000000..b962e8f
--- /dev/null
+++ b/regenerateBootstrapFiles.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+baseDir=$(pwd)
+workDirectory=
+buildID=R3_5_1
+baseBuilder=
+eclipseBuilder=
+baseBuilderTag="R3_5"
+eclipseBuilderTag="R3_5_1"
+fetchTests="no"
+orbitRepoZip=orbitRepo-R20090825191606.zip
+ecfBundlesZip=ecf-R3_5_1.zip
+ecfTag="v20090604-1131"
+
+java -jar \
+/usr/lib/eclipse/plugins/org.eclipse.equinox.launcher_*.jar \
+-consolelog \
+-data build/eclipse-vM20100210-0800-fetched-src \
+-application org.eclipse.ant.core.antRunner \
+-f pdebuild.xml generateScripts \
+-DbuildDirectory=build/eclipse-vM20100210-0800-fetched-src \
+-DskipBase=true \
+-DsdkSource=build/eclipse-vM20100210-0800-fetched-src \
+2>&1 | tee ./generatePdeBuildScripts.log
hooks/post-receive
--
eclipse - Powerful IDE written in java - Debian package.
More information about the pkg-java-commits
mailing list