[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master-3.6, updated. eclipse-ppa/maverick-192-g7a6726b
Benjamin Drung
bdrung at alioth.debian.org
Thu Mar 31 12:35:53 UTC 2011
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, master-3.6 has been updated
via 7a6726b069eb60ec7cea87e09fe200f513006ee7 (commit)
via 87574fcfe8e6b79354259e824ca3e565079baa7f (commit)
via ce3e1314de425cf4385647df754276f00acd834d (commit)
via 985a679c50b06b3ff14eb309fe6077f2ab328f12 (commit)
from c8119405f5861d89069738c590a94f2dddbf2e11 (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 7a6726b069eb60ec7cea87e09fe200f513006ee7
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Thu Mar 31 14:35:48 2011 +0200
Update version to 3.6.2-1.
commit 87574fcfe8e6b79354259e824ca3e565079baa7f
Merge: c811940 ce3e131
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Thu Mar 31 14:35:15 2011 +0200
Merge branch 'upstream-3.6' into master-3.6
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 27 +
build.properties | 44 +-
build.xml | 17 +-
buildEclipseBuildSource.sh | 21 +-
buildSDKSource.sh | 30 +-
debian/changelog | 4 +-
eclipse-build-feature/ChangeLog | 4 +
eclipse-build-feature/feature.xml | 2 +-
eclipse/directory.txt | 329 ++--
eclipse/featureVersions.properties | 40 +-
eclipse/features/master-equinox/feature.xml | 2 +-
eclipse/features/master-jetty/feature.xml | 2 +-
eclipse/features/org.eclipse.cvs/feature.xml | 8 +-
.../org.eclipse.equinox.compendium.sdk/feature.xml | 2 +-
.../org.eclipse.equinox.core.sdk/feature.xml | 2 +-
.../org.eclipse.equinox.executable/feature.xml | 12 +-
.../library/eclipse.c | 27 +-
.../library/eclipseMain.c | 4 +-
.../library/eclipseMozilla.c | 72 +-
.../library/gtk/build.sh | 12 +-
.../library/gtk/eclipseGtkInit.c | 16 +-
.../library/gtk/make_aix.mak | 104 +
.../library/make_version.mak | 2 +-
.../library/win32/eclipseWin.c | 16 +-
.../target.build.properties | 1 +
.../target.build.xml | 9 +
.../feature.xml | 2 +-
.../org.eclipse.equinox.p2.sdk/feature.xml | 2 +-
.../org.eclipse.equinox.sdk/feature.properties | 4 +-
.../features/org.eclipse.equinox.sdk/feature.xml | 2 +-
.../org.eclipse.equinox.server.core/feature.xml | 2 +-
.../org.eclipse.equinox.server.p2/feature.xml | 2 +-
.../org.eclipse.equinox.serverside.sdk/feature.xml | 4 +-
eclipse/features/org.eclipse.help/feature.xml | 15 +-
eclipse/features/org.eclipse.jdt/feature.xml | 4 +-
.../features/org.eclipse.pde/feature.properties | 4 +-
eclipse/features/org.eclipse.pde/feature.xml | 2 +-
.../sourceTemplateFeature/feature.properties | 4 +-
.../sourceTemplatePlugin/about.properties | 4 +-
eclipse/features/org.eclipse.platform/feature.xml | 18 +-
.../rootfiles/readme/readme_eclipse.html | 2971 +++++---------------
.../sourceTemplateFeature/build.properties | 2 +-
eclipse/features/org.eclipse.rcp/feature.xml | 6 +-
eclipse/features/org.eclipse.sdk/feature.xml | 2 +-
eclipse/label.properties | 6 +-
eclipse/maps/org.eclipse.releng/maps/ant.map | 4 +-
eclipse/maps/org.eclipse.releng/maps/compare.map | 6 +-
eclipse/maps/org.eclipse.releng/maps/core.map | 65 +-
eclipse/maps/org.eclipse.releng/maps/doc.map | 8 +-
eclipse/maps/org.eclipse.releng/maps/feature.map | 34 +-
eclipse/maps/org.eclipse.releng/maps/jdtapt.map | 2 +-
eclipse/maps/org.eclipse.releng/maps/jdtcore.map | 16 +-
eclipse/maps/org.eclipse.releng/maps/jdtdebug.map | 6 +-
eclipse/maps/org.eclipse.releng/maps/jdtui.map | 4 +-
eclipse/maps/org.eclipse.releng/maps/p2.map | 65 +-
eclipse/maps/org.eclipse.releng/maps/pde.map | 8 +-
eclipse/maps/org.eclipse.releng/maps/rcp.map | 2 +-
eclipse/maps/org.eclipse.releng/maps/releng.map | 6 +-
eclipse/maps/org.eclipse.releng/maps/swt.map | 63 +-
eclipse/maps/org.eclipse.releng/maps/team.map | 10 +-
eclipse/maps/org.eclipse.releng/maps/ui.map | 20 +-
.../maps/org.eclipse.releng/maps/userassist.map | 8 +-
eclipse/pluginVersions.properties | 212 +-
.../org.eclipse.ant.core/META-INF/MANIFEST.MF | 2 +-
.../org/eclipse/ant/core/AntCorePreferences.java | 18 +-
.../org.eclipse.ant.launching/META-INF/MANIFEST.MF | 2 +-
.../ant/internal/launching/AntLaunching.java | 4 +-
.../org.eclipse.compare.core/META-INF/MANIFEST.MF | 2 +-
.../compare/internal/core/ComparePlugin.java | 18 +-
.../src/org/eclipse/compare/internal/core/LCS.java | 6 +-
.../compare/rangedifferencer/RangeDifferencer.java | 2 +-
.../org.eclipse.compare.win32/META-INF/MANIFEST.MF | 2 +-
.../compare/internal/win32/WordComparison.java | 52 +-
.../compare/internal/win32/WordMergeViewer.java | 23 +-
.../org.eclipse.compare/META-INF/MANIFEST.MF | 2 +-
.../compare/internal/ComparePreferencePage.java | 11 +-
.../eclipse/compare/internal/CompareUIPlugin.java | 5 +
.../compare/internal/merge/DocumentMerger.java | 47 +-
.../plugins/org.eclipse.compare/plugin.properties | 1 +
.../META-INF/MANIFEST.MF | 2 +-
.../core/internal/localstore/FileStoreRoot.java | 14 +-
.../core/internal/resources/CharsetManager.java | 344 ++-
.../core/internal/resources/NatureManager.java | 51 +-
.../eclipse/core/internal/resources/Project.java | 13 +-
.../internal/resources/ProjectPreferences.java | 67 +-
.../eclipse/core/internal/resources/Workspace.java | 4 +-
.../org/eclipse/core/internal/utils/Messages.java | 3 +-
.../core/internal/utils/messages.properties | 3 +-
.../org.eclipse.debug.ui/META-INF/MANIFEST.MF | 2 +-
.../eclipse/debug/internal/ui/DebugUIPlugin.java | 4 +-
.../LaunchConfigurationsDialog.java | 1 +
.../launchConfigurations/PerspectiveManager.java | 16 +-
.../ui/viewers/model/TreeModelLabelProvider.java | 17 +
.../internal/ui/views/ViewContextService.java | 75 +-
.../memory/MemoryViewTreeModelContentProvider.java | 6 +-
.../org.eclipse.ecf.filetransfer/.classpath | 2 +-
.../org.eclipse.ecf.filetransfer/.gitignore | 1 +
.../.settings/org.eclipse.jdt.core.prefs | 6 +-
.../.settings/org.eclipse.pde.api.tools.prefs | 94 +
.../META-INF/MANIFEST.MF | 7 +-
.../org.eclipse.ecf.filetransfer/build.properties | 2 +-
.../eclipse/ecf/filetransfer/FileTransferJob.java | 5 +-
.../ecf/filetransfer/identity/FileIDFactory.java | 23 +-
.../eclipse/ecf/filetransfer/identity/IFileID.java | 13 +-
.../ecf/filetransfer/identity/IFileIDFactory.java | 89 +
.../ecf/internal/filetransfer/Messages.java | 31 -
.../ecf/internal/filetransfer/messages.properties | 2 -
.../plugins/org.eclipse.ecf.identity/.gitignore | 1 +
eclipse/plugins/org.eclipse.ecf.identity/.options | 15 -
.../.settings/org.eclipse.pde.api.tools.prefs | 94 +
.../org.eclipse.ecf.identity/META-INF/MANIFEST.MF | 9 +-
.../src/org/eclipse/ecf/core/identity/GUID.java | 17 +-
.../org/eclipse/ecf/core/identity/IDFactory.java | 96 +-
.../src/org/eclipse/ecf/core/identity/LongID.java | 5 +-
.../org/eclipse/ecf/core/identity/StringID.java | 8 +-
.../src/org/eclipse/ecf/core/util/Trace.java | 96 +-
.../ecf/internal/core/identity/Activator.java | 42 +-
.../core/identity/IdentityDebugOptions.java | 23 -
.../ecf/internal/core/identity/Messages.java | 34 -
.../ecf/internal/core/identity/messages.properties | 5 -
.../.gitignore | 1 +
.../.settings/org.eclipse.pde.api.tools.prefs | 94 +
.../.gitignore | 0
.../.settings/org.eclipse.pde.api.tools.prefs | 7 +-
.../.gitignore | 1 +
.../.settings/org.eclipse.pde.api.tools.prefs | 94 +
.../.gitignore | 1 +
.../.settings/org.eclipse.pde.api.tools.prefs | 94 +
.../META-INF/MANIFEST.MF | 2 +-
.../schema/browseFileTransferProtocolFactory.exsd | 45 +-
.../retrieveFileTransferProtocolFactory.exsd | 45 +-
.../schema/sendFileTransferProtocolFactory.exsd | 45 +-
.../internal/provider/filetransfer/Activator.java | 58 +-
.../IFileTransferProtocolToFactoryMapper.java | 69 +
.../filetransfer/identity/FileTransferID.java | 42 +-
.../identity/FileTransferNamespace.java | 7 +-
.../outgoing/MultiProtocolOutgoingAdapter.java | 37 +-
.../retrieve/MultiProtocolRetrieveAdapter.java | 34 +-
eclipse/plugins/org.eclipse.ecf.ssl/.gitignore | 1 +
.../.settings/org.eclipse.pde.api.tools.prefs | 94 +
.../.gitignore | 0
.../.settings/org.eclipse.pde.api.tools.prefs | 94 +
.../plugins/org.eclipse.ecf/META-INF/MANIFEST.MF | 5 +-
eclipse/plugins/org.eclipse.ecf/buckminster.cspex | 42 +
eclipse/plugins/org.eclipse.ecf/javadoc.xml | 49 +-
.../org/eclipse/ecf/core/AbstractContainer.java | 3 +-
.../src/org/eclipse/ecf/core/BaseContainer.java | 7 +-
.../src/org/eclipse/ecf/core/ContainerFactory.java | 18 +-
.../core/provider/BaseContainerInstantiator.java | 3 +-
.../eclipse/ecf/core/security/BooleanCallback.java | 6 +-
.../eclipse/ecf/core/security/NameCallback.java | 6 +-
.../ecf/core/security/PassphraseCallback.java | 6 +-
.../ecf/core/security/PasswordCallback.java | 6 +-
.../ecf/core/status/SerializableMultiStatus.java | 45 +-
.../ecf/core/status/SerializableStatus.java | 7 +-
.../org/eclipse/ecf/internal/core/ECFPlugin.java | 65 +-
.../org/eclipse/ecf/internal/core/Messages.java | 37 -
.../eclipse/ecf/internal/core/messages.properties | 22 -
.../META-INF/MANIFEST.MF | 2 +-
.../internal/DefaultRegistryHttpContext.java | 25 +-
.../META-INF/MANIFEST.MF | 2 +-
.../org/eclipse/equinox/jsp/jasper/JspServlet.java | 25 +-
.../META-INF/MANIFEST.MF | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
.../.project | 22 +
.../META-INF/MANIFEST.MF | 10 +
.../about.html | 0
.../build.properties | 7 +
.../customBuildCallbacks.xml | 0
.../launcher.gtk.aix.ppc64.properties | 12 +
.../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 +-
.../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 +-
.../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 +-
.../META-INF/MANIFEST.MF | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
.../.project | 22 +
.../META-INF/MANIFEST.MF | 10 +
.../about.html | 0
.../build.properties | 7 +
.../customBuildCallbacks.xml | 0
.../launcher.gtk.aix.ppc64.properties | 12 +
.../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 +-
.../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 +-
.../META-INF/MANIFEST.MF | 2 +-
.../src/org/eclipse/equinox/launcher/Main.java | 31 +-
.../META-INF/MANIFEST.MF | 2 +-
.../equinox/internal/p2/core/StringPool.java | 73 -
.../META-INF/MANIFEST.MF | 2 +-
.../equinox/internal/p2/director/Projector.java | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
.../p2/directorywatcher/RepositoryListener.java | 49 +-
.../META-INF/MANIFEST.MF | 6 +-
.../p2/discovery/compatibility/Activator.java | 47 +
.../p2/discovery/compatibility/Messages.java | 13 +-
.../RemoteBundleDiscoveryStrategy.java | 7 +-
.../p2/discovery/compatibility/messages.properties | 6 +
.../discovery/compatibility/util/CacheManager.java | 218 ++
.../compatibility/util/TransportUtil.java | 47 +-
.../META-INF/MANIFEST.MF | 2 +-
.../internal/p2/engine/DownloadManager.java | 28 +-
.../META-INF/MANIFEST.MF | 2 +-
.../EclipseInstallGeneratorInfoProvider.java | 3 +-
.../META-INF/MANIFEST.MF | 5 +-
.../META-INF/MANIFEST.MF | 2 +-
.../internal/p2/reconciler/dropins/Activator.java | 55 +-
.../dropins/DropinsRepositoryListener.java | 10 +-
.../p2/reconciler/dropins/ProfileSynchronizer.java | 5 +
.../META-INF/MANIFEST.MF | 2 +-
.../equinox/internal/p2/persistence/XMLParser.java | 21 +-
.../equinox/internal/p2/repository/Messages.java | 5 +-
.../p2/repository/RepositoryTransport.java | 7 +-
.../internal/p2/repository/messages.properties | 3 +-
.../META-INF/MANIFEST.MF | 3 +-
.../internal/p2/touchpoint/eclipse/Util.java | 82 +-
.../eclipse/actions/InstallBundleAction.java | 9 +-
.../eclipse/actions/MarkStartedAction.java | 14 +-
.../eclipse/actions/SetStartLevelAction.java | 14 +-
.../eclipse/actions/UninstallBundleAction.java | 8 +-
.../META-INF/MANIFEST.MF | 2 +-
.../p2/touchpoint/natives/actions/RmdirAction.java | 10 +-
.../META-INF/MANIFEST.MF | 2 +-
.../org.eclipse.help.base/META-INF/MANIFEST.MF | 2 +-
.../help/internal/base/remote/HttpsUtility.java | 12 -
.../org.eclipse.help.ui/META-INF/MANIFEST.MF | 2 +-
.../help/ui/internal/views/BrowserPart.java | 7 +-
.../help/ui/internal/views/ContextHelpPart.java | 13 +
.../org.eclipse.help.webapp/META-INF/MANIFEST.MF | 2 +-
.../org.eclipse.help.webapp/advanced/content.jsp | 2 +-
.../org.eclipse.help.webapp/advanced/helptree.js | 48 +-
.../advanced/helptreechildren.js | 31 +-
.../advanced/indexToolbar.jsp | 8 +
.../advanced/searchToolbar.jsp | 7 +
.../advanced/tocToolbar.jsp | 7 +
.../org.eclipse.help.webapp/advanced/toolbar.jsp | 12 +-
.../org.eclipse.help.webapp/basic/index.jsp | 4 +-
.../help/internal/webapp/data/RequestScope.java | 5 +
.../help/internal/webapp/data/TopicFinder.java | 58 +-
.../org.eclipse.jdt.apt.core/META-INF/MANIFEST.MF | 2 +-
.../org.eclipse.jdt.apt.core/build_notes.html | 5 +
.../jdt/apt/core/internal/APTDispatchRunnable.java | 45 +-
.../org.eclipse.jdt.core/META-INF/MANIFEST.MF | 2 +-
.../internal/compiler/batch/messages.properties | 4 +-
.../org.eclipse.jdt.core/buildnotes_jdt-core.html | 109 +
.../jdt/internal/codeassist/CompletionEngine.java | 5 +-
.../jdt/internal/compiler/ast/Assignment.java | 8 +-
.../jdt/internal/compiler/ast/DoStatement.java | 2 +-
.../jdt/internal/compiler/ast/ForStatement.java | 2 +-
.../internal/compiler/ast/LocalDeclaration.java | 4 +-
.../jdt/internal/compiler/ast/Statement.java | 2 +-
.../jdt/internal/compiler/ast/TryStatement.java | 29 +-
.../jdt/internal/compiler/ast/WhileStatement.java | 2 +-
.../compiler/flow/ConditionalFlowInfo.java | 8 +
.../jdt/internal/compiler/flow/FlowInfo.java | 8 +
.../compiler/flow/UnconditionalFlowInfo.java | 37 +-
.../internal/compiler/lookup/InvocationSite.java | 2 +-
.../internal/compiler/lookup/LocalTypeBinding.java | 2 +-
.../jdt/internal/compiler/lookup/MethodScope.java | 2 +-
.../internal/compiler/lookup/MethodVerifier15.java | 4 +-
.../lookup/ParameterizedGenericMethodBinding.java | 2 +-
.../jdt/internal/compiler/parser/Scanner.java | 25 +-
.../org/eclipse/jdt/core/dom/CompilationUnit.java | 2 +-
.../core/dom/rewrite/ASTRewriteAnalyzer.java | 2 +-
.../org/eclipse/jdt/core/ICompilationUnit.java | 2 +-
.../org/eclipse/jdt/core/IPackageFragment.java | 2 +-
.../model/org/eclipse/jdt/core/ITypeHierarchy.java | 2 +-
.../model/org/eclipse/jdt/core/IWorkingCopy.java | 2 +-
.../eclipse/jdt/internal/core/DeltaProcessor.java | 7 +-
.../internal/core/DiscardWorkingCopyOperation.java | 4 +-
.../jdt/internal/core/ExternalFoldersManager.java | 3 +-
.../jdt/internal/core/JavaModelManager.java | 6 +-
.../eclipse/jdt/internal/core/JavadocContents.java | 6 +-
.../eclipse/jdt/internal/core/ModelUpdater.java | 4 +-
.../jdt/internal/core/hierarchy/TypeHierarchy.java | 2 +-
.../jdt/internal/core/util/PublicScanner.java | 25 +-
.../org/eclipse/jdt/internal/core/util/Util.java | 58 +-
.../jdt/internal/core/search/PatternSearchJob.java | 5 +-
.../core/search/TypeNameMatchRequestorWrapper.java | 5 +-
.../core/search/matching/MatchLocator.java | 7 +-
.../org.eclipse.jdt.debug.ui/META-INF/MANIFEST.MF | 2 +-
.../debug/ui/propertypages/JavaBreakpointPage.java | 3 +
.../org.eclipse.jdt.doc.isv/META-INF/MANIFEST.MF | 2 +-
.../plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt | 2 +-
.../org.eclipse.jdt.doc.isv/jdtaptOptions.txt | 2 +-
.../org.eclipse.jdt.launching/META-INF/MANIFEST.MF | 2 +-
.../jdt/internal/launching/LaunchingPlugin.java | 150 +-
.../jdt/internal/launching/StandardVMType.java | 8 +-
.../org.eclipse.jdt.ui/META-INF/MANIFEST.MF | 2 +-
.../proposals/ChangeCorrectionProposal.java | 51 +-
.../plugins/org.eclipse.jface/META-INF/MANIFEST.MF | 2 +-
.../eclipse/jface/wizard/ProgressMonitorPart.java | 1 +
.../META-INF/MANIFEST.MF | 2 +-
.../core/refactoring/UndoDocumentChange.java | 2 +-
.../plugins/org.eclipse.osgi/META-INF/MANIFEST.MF | 2 +-
.../framework/internal/core/AbstractBundle.java | 47 +-
.../osgi/internal/module/GroupingChecker.java | 48 +-
.../osgi/internal/module/ResolverConstraint.java | 4 -
.../eclipse/osgi/internal/module/ResolverImpl.java | 4 +-
.../supplement/META-INF/MANIFEST.MF | 2 +-
.../org.eclipse.pde.build/META-INF/MANIFEST.MF | 2 +-
.../internal/build/AbstractScriptGenerator.java | 15 +-
.../org.eclipse.pde.core/META-INF/MANIFEST.MF | 2 +-
.../eclipse/pde/core/plugin/PluginRegistry.java | 9 +-
.../eclipse/pde/internal/core/schema/Schema.java | 2088 +++++++-------
.../eclipse/pde/internal/core/util/SchemaUtil.java | 43 +-
.../org.eclipse.pde.doc.user/META-INF/MANIFEST.MF | 2 +-
eclipse/plugins/org.eclipse.pde.doc.user/build.xml | 98 -
.../org.eclipse.pde.doc.user/pdeOptions.txt | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
.../platformOptions.txt | 8 +-
.../META-INF/MANIFEST.MF | 2 +-
.../gettingStarted/qs-36b.htm | 4 +-
.../images/Image219_pref_cv2.png | Bin 55951 -> 49993 bytes
.../reference/ref-11.htm | 7 +
.../reference/ref-32.htm | 4 +-
.../reference/ref-9.htm | 4 +-
.../reference/ref-cvs-decorations.htm | 4 +-
.../org.eclipse.platform/META-INF/MANIFEST.MF | 2 +-
.../plugins/org.eclipse.platform/about.properties | 4 +-
.../plugins/org.eclipse.platform/plugin.properties | 4 +-
eclipse/plugins/org.eclipse.platform/splash.bmp | Bin 403616 -> 403614 bytes
.../plugins/org.eclipse.sdk/META-INF/MANIFEST.MF | 2 +-
eclipse/plugins/org.eclipse.sdk/plugin.properties | 6 +-
.../META-INF/MANIFEST.MF | 2 +-
.../org.eclipse.swt.carbon.macosx/build.xml | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
.../org.eclipse.swt.cocoa.macosx.x86_64/build.xml | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
.../plugins/org.eclipse.swt.cocoa.macosx/build.xml | 2 +-
.../plugins/org.eclipse.swt.gtk.aix.ppc64/.project | 11 +
.../META-INF/MANIFEST.MF | 19 +
.../org.eclipse.swt.gtk.aix.ppc64}/about.html | 0
.../about_files/IJG_README | 0
.../about_files/about_cairo.html | 0
.../about_files/lgpl-v21.txt | 0
.../about_files/mpl-v11.txt | 0
.../about_files/pixman-licenses.txt | 0
.../about_files/webkit-bsd.txt | 0
.../build.properties | 0
.../org.eclipse.swt.gtk.aix.ppc64/build.xml | 12 +
.../fragment.properties | 0
.../META-INF/MANIFEST.MF | 2 +-
.../org.eclipse.swt.gtk.linux.ppc/build.xml | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
.../org.eclipse.swt.gtk.linux.ppc64/build.xml | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
.../org.eclipse.swt.gtk.linux.s390/build.xml | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
.../org.eclipse.swt.gtk.linux.s390x/build.xml | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
.../org.eclipse.swt.gtk.linux.x86/build.xml | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
.../org.eclipse.swt.gtk.linux.x86_64/build.xml | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
.../org.eclipse.swt.gtk.solaris.sparc/build.xml | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
.../org.eclipse.swt.gtk.solaris.x86/build.xml | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
.../org.eclipse.swt.motif.aix.ppc/build.xml | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
.../org.eclipse.swt.motif.hpux.ia64_32/build.xml | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
.../org.eclipse.swt.motif.linux.x86/build.xml | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
.../org.eclipse.swt.motif.solaris.sparc/build.xml | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
.../org.eclipse.swt.photon.qnx.x86/build.xml | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
.../org.eclipse.swt.win32.wce_ppc.arm/build.xml | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
.../org.eclipse.swt.win32.win32.x86/build.xml | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
.../org.eclipse.swt.win32.win32.x86_64/build.xml | 2 +-
.../swt/accessibility/AccessibleObject.java | 40 +-
.../win32/org/eclipse/swt/browser/IE.java | 30 +-
.../carbon/org/eclipse/swt/dnd/HTMLTransfer.java | 43 +-
.../org/eclipse/swt/browser/MozillaDelegate.java | 25 +-
.../common/org/eclipse/swt/browser/Mozilla.java | 2 -
.../org/eclipse/swt/ole/win32/OleClientSite.java | 12 +-
.../org/eclipse/swt/ole/win32/OleControlSite.java | 16 +-
.../win32/org/eclipse/swt/ole/win32/OleFrame.java | 3 +
.../Eclipse SWT PI/cairo/library/cairo_custom.h | 16 +-
.../carbon/org/eclipse/swt/internal/carbon/OS.java | 1 +
.../Eclipse SWT PI/cocoa/library/os.c | 25 +-
.../Eclipse SWT PI/cocoa/library/os_stats.c | 11 +-
.../Eclipse SWT PI/cocoa/library/os_stats.h | 7 +-
.../internal/cocoa/AppKitFull.bridgesupport.extras | 33 +-
.../org/eclipse/swt/internal/cocoa/NSObject.java | 18 +-
.../eclipse/swt/internal/cocoa/NSTableView.java | 11 +-
.../cocoa/org/eclipse/swt/internal/cocoa/OS.java | 7 +
.../org/eclipse/swt/internal/Library.java | 2 +-
.../org/eclipse/swt/internal/Library.java | 2 +-
.../Eclipse SWT PI/gtk/library/build.sh | 55 +-
.../Eclipse SWT PI/gtk/library/make_aix.mak | 198 ++
.../Eclipse SWT PI/gtk/library/os.c | 48 +
.../Eclipse SWT PI/gtk/library/os_custom.c | 31 +-
.../Eclipse SWT PI/gtk/library/os_custom.h | 469 ++--
.../Eclipse SWT PI/gtk/library/os_stats.c | 8 +-
.../Eclipse SWT PI/gtk/library/os_stats.h | 4 +
.../gtk/org/eclipse/swt/internal/gtk/OS.java | 27 +-
.../org/eclipse/swt/internal/ole/win32/COM.java | 24 +-
.../Eclipse SWT Program/gnome/library/gnome.h | 14 +-
.../gtk/org/eclipse/swt/program/Program.java | 13 +-
.../Eclipse SWT WebKit/gtk/library/webkitgtk.c | 16 +-
.../gtk/org/eclipse/swt/browser/WebKit.java | 6 +-
.../org/eclipse/swt/internal/webkit/WebKitGTK.java | 16 +-
.../carbon/org/eclipse/swt/widgets/Combo.java | 9 +-
.../carbon/org/eclipse/swt/widgets/Control.java | 25 +-
.../carbon/org/eclipse/swt/widgets/Display.java | 4 +
.../carbon/org/eclipse/swt/widgets/Shell.java | 13 +-
.../carbon/org/eclipse/swt/widgets/Text.java | 1 +
.../carbon/org/eclipse/swt/widgets/Tracker.java | 4 +
.../cocoa/org/eclipse/swt/graphics/GC.java | 4 +
.../cocoa/org/eclipse/swt/widgets/Button.java | 4 +
.../cocoa/org/eclipse/swt/widgets/Control.java | 8 +-
.../cocoa/org/eclipse/swt/widgets/Display.java | 15 +
.../cocoa/org/eclipse/swt/widgets/Label.java | 4 +
.../cocoa/org/eclipse/swt/widgets/Table.java | 62 +-
.../cocoa/org/eclipse/swt/widgets/Text.java | 2 +
.../cocoa/org/eclipse/swt/widgets/Tracker.java | 8 +
.../cocoa/org/eclipse/swt/widgets/Tree.java | 61 +-
.../cocoa/org/eclipse/swt/widgets/Widget.java | 16 +
.../Eclipse SWT/common/library/make_common.mak | 4 +-
.../Eclipse SWT/common/library/swt.h | 7 +-
.../org.eclipse.swt/Eclipse SWT/common/version.txt | 2 +-
.../gtk/org/eclipse/swt/graphics/Device.java | 25 +-
.../win32/org/eclipse/swt/widgets/Control.java | 4 +-
.../plugins/org.eclipse.swt/META-INF/MANIFEST.MF | 2 +-
eclipse/plugins/org.eclipse.swt/build.xml | 2 +-
.../plugins/org.eclipse.swt/buildnotes_swt.html | 60 +
eclipse/plugins/org.eclipse.swt/tasks/build.xml | 51 +-
.../org.eclipse.team.core/META-INF/MANIFEST.MF | 2 +-
.../org.eclipse.team.core/buildnotes_team.html | 26 +
.../variants/ResourceVariantTreeSubscriber.java | 4 +-
.../org.eclipse.team.cvs.core/META-INF/MANIFEST.MF | 2 +-
.../internal/ccvs/core/CVSMergeSubscriber.java | 16 +-
.../team/internal/ccvs/core/CVSMergeSyncInfo.java | 18 +-
.../org.eclipse.team.cvs.ui/META-INF/MANIFEST.MF | 2 +-
.../team/internal/ccvs/ui/wizards/MergeWizard.java | 13 +-
.../org.eclipse.team.ui/META-INF/MANIFEST.MF | 2 +-
.../actions/StatusLineContributionGroup.java | 18 +-
.../org.eclipse.ui.browser/META-INF/MANIFEST.MF | 2 +-
eclipse/plugins/org.eclipse.ui.browser/plugin.xml | 5 +-
.../internal/browser/WebBrowserPreferencePage.java | 21 +-
.../ui/internal/carbon/CloseDialogHandler.java | 8 +-
.../ui/internal/cocoa/CloseDialogHandler.java | 9 +-
.../org.eclipse.ui.ide/META-INF/MANIFEST.MF | 2 +-
.../ui/dialogs/WizardExportResourcesPage.java | 2 +
.../ui/internal/ide/ContentTypeDecorator.java | 6 +-
.../ui/internal/ide/actions/BuildUtilities.java | 20 +-
.../WizardFileSystemResourceImportPage1.java | 49 +-
.../.settings/.api_filters | 74 +-
.../META-INF/MANIFEST.MF | 2 +-
.../org.eclipse.ui.views/META-INF/MANIFEST.MF | 2 +-
.../eclipse/ui/views/properties/PropertySheet.java | 6 +-
.../org/eclipse/ui/internal/ProductProperties.java | 25 +-
.../org/eclipse/ui/internal/WWinPartService.java | 6 +-
.../org/eclipse/ui/internal/Workbench.java | 20 +-
.../org/eclipse/ui/internal/WorkbenchMessages.java | 2 +-
.../org/eclipse/ui/internal/WorkbenchWindow.java | 6 +
.../org/eclipse/ui/internal/WorkingSetManager.java | 5 +-
.../internal/dialogs/FilteredPreferenceDialog.java | 3 +-
.../ui/internal/keys/model/KeyController.java | 4 +-
.../org/eclipse/ui/internal/messages.properties | 2 +-
.../ui/internal/registry/UIExtensionTracker.java | 8 +-
.../org/eclipse/ui/part/PageBookView.java | 6 +-
.../org.eclipse.ui.workbench/META-INF/MANIFEST.MF | 2 +-
.../plugins/org.eclipse.ui/META-INF/MANIFEST.MF | 2 +-
.../org.eclipse.ui/buildnotes_workbench.html | 54 +
eclipse/sourceReferences.properties | 212 +-
patches/donotstorebuildlogsinfiles.patch | 2 +-
patches/eclipse-add-archs-executable.patch | 2 +-
patches/eclipse-add-archs-swt.patch | 10 +-
patches/eclipse-addArchesAnd64bitSWT.patch | 12 +-
patches/eclipse-buildswtnatives.patch | 2 +-
patches/eclipse-help-webapps-xss-BZ329582.patch | 25 -
patches/eclipse-swt-buildagainstxulrunner.patch | 2 +-
patches/java-home.patch | 2 +-
patches/no-gnome-vfs.patch | 96 +
patches/webkitgtk.patch | 11 +
pdebuild.properties | 44 +-
507 files changed, 7981 insertions(+), 6134 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index dfc577b..1e78614 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+2011-03-28 Alexander Kurtakov <akurtako at redhat.com>
+
+ * patches/webkitgtk.patch: Change patch to use pkg-config instead of hardcoding options.
+
+2011-03-28 Alexander Kurtakov <akurtako at redhat.com>
+
+ * patches/no-gnome-vfs.patch: New file.
+ * build.xml: Apply patch to fix working without gnome-vfs.
+
+2011-03-16 Stephen Shaw <sshaw at decriptor.com>
+
+ * build.properties:
+ * pdebuild.properties: accounts for jvm being in
+ /usr/lib64 on 64bit machines
+
+2011-03-11 Alexander Kurtakov <akurtako at redhat.com>
+
+ * buildEclipseBuildSource.sh: Adapt for the move to git.
+
+2011-03-09 Alexander Kurtakov <akurtako at redhat.com>
+
+ * build.xml: Override files when symlinking.
+
+2011-03-07 Alexander Kurtakov <akurtako at redhat.com>
+
+ * buildSDKSource.sh: Cleanup temp resources.
+
2011-01-19 Andrew Overholt <overholt at redhat.com>
* build.xml: Aggregate test results with proper JUNIT.XSL.
diff --git a/build.properties b/build.properties
index 77c0ccf..96844d8 100644
--- a/build.properties
+++ b/build.properties
@@ -1,9 +1,9 @@
#baseLocation=${basedir}/bootstrap
# Note: this is also in pdebuild.properties
-buildId=M20100909-0800
+buildId=M20110210-1200
buildTag=vI20100603-1500
-label=3.6.1
-testsBuildLabel=3.6.1
+label=3.6.2
+testsBuildLabel=3.6.2
testframework=org.eclipse.test_3.3.0
p2.director.version=${testsBuildLabel}
testsBuildId=v20100211
@@ -28,7 +28,7 @@ generateAPIDescription=false
collectingFolder=eclipse
archivePrefix=eclipse
generateFeatureVersionSuffix=true
-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
+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:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
build.compiler=org.eclipse.jdt.core.JDTCompilerAdapter
JavaSE-1.6=${bootclasspath}
CDC-1.0/Foundation-1.0=${bootclasspath}
@@ -49,21 +49,21 @@ CDC-1.0/PersonalJava-1.0=${bootclasspath}
CDC-1.1/PersonalBasis-1.1=${bootclasspath}
CDC-1.1/PersonalJava-1.1=${bootclasspath}
# Somehow bootclasspath isn't expanded when used by antRunner
-JavaSE-1.6=/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
-CDC-1.0/Foundation-1.0=/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
-CDC-1.1/Foundation-1.1=/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
-OSGi/Minimum-1.0=/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
-OSGi/Minimum-1.1=/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
-OSGi/Minimum-1.2=/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
-JRE-1.1=/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
-J2SE-1.2=/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
-J2SE-1.3=/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
-J2SE-1.4=/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
-J2SE-1.5=/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
-JavaSE-1.6=/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
-PersonalJava-1.1=/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
-PersonalJava-1.2=/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
-CDC-1.0/PersonalBasis-1.0=/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
-CDC-1.0/PersonalJava-1.0=/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
-CDC-1.1/PersonalBasis-1.1=/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
-CDC-1.1/PersonalJava-1.1=/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
+JavaSE-1.6=/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:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+CDC-1.0/Foundation-1.0=/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:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+CDC-1.1/Foundation-1.1=/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:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+OSGi/Minimum-1.0=/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:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+OSGi/Minimum-1.1=/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:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+OSGi/Minimum-1.2=/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:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+JRE-1.1=/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:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+J2SE-1.2=/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:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+J2SE-1.3=/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:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+J2SE-1.4=/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:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+J2SE-1.5=/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:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+JavaSE-1.6=/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:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+PersonalJava-1.1=/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:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+PersonalJava-1.2=/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:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+CDC-1.0/PersonalBasis-1.0=/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:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+CDC-1.0/PersonalJava-1.0=/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:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+CDC-1.1/PersonalBasis-1.1=/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:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+CDC-1.1/PersonalJava-1.1=/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:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
diff --git a/build.xml b/build.xml
index a622819..cf3d05d 100644
--- a/build.xml
+++ b/build.xml
@@ -309,17 +309,18 @@
<patch patchfile="${basedir}/patches/bz318912.patch" dir="${buildDirectory}" strip="0" />
<patch patchfile="${basedir}/patches/osgi-util.patch" dir="${buildDirectory}" strip="1" />
<patch patchfile="${basedir}/patches/eclipse-swt-compile-xpt.patch" dir="${buildDirectory}" strip="1" />
+ <patch patchfile="${basedir}/patches/no-gnome-vfs.patch" dir="${buildDirectory}" strip="0" />
<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 -->
<!-- back-ported patches -->
- <patch patchfile="${basedir}/patches/eclipse-help-webapps-xss-BZ329582.patch" dir="${buildDirectory}" strip="0" />
<patch patchfile="${basedir}/patches/bz319476-compile-jar-in-jar-loader.patch" dir="${buildDirectory}/plugins/org.eclipse.jdt.ui" strip="0" />
<!-- 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}" />
<patch patchfile="${basedir}/patches/java-home.patch" dir="${buildDirectory}" strip="2" />
+ <patch patchfile="${basedir}/patches/webkitgtk.patch" dir="${buildDirectory}" strip="0" />
<echo file="patch-stamp" />
</target>
@@ -945,23 +946,23 @@
<copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse32.png" tofile="${destDir}${prefix}/share/icons/hicolor/32x32/apps/eclipse.png" />
<copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse48.png" tofile="${destDir}${prefix}/share/icons/hicolor/48x48/apps/eclipse.png" />
<mkdir dir="${destDir}${prefix}/share/pixmaps" />
- <symlink link="${destDir}${prefix}/share/pixmaps/eclipse.png" resource="../icons/hicolor/48x48/apps/eclipse.png" />
+ <symlink link="${destDir}${prefix}/share/pixmaps/eclipse.png" resource="../icons/hicolor/48x48/apps/eclipse.png" overwrite="true"/>
<!--shared dropins folder for architecture-independent plugins-->
<mkdir dir="${destDir}${prefix}/share/eclipse/dropins" />
<!-- eclipse binary -->
<mkdir dir="${destDir}${prefix}/bin" />
- <symlink link="${destDir}${prefix}/bin/eclipse" resource="../${libDir}/eclipse/eclipse" />
+ <symlink link="${destDir}${prefix}/bin/eclipse" resource="../${libDir}/eclipse/eclipse" overwrite="true"/>
<!-- FIXME: we really shouldn't need this anymore but at least pdebuild.sh will need to be updated -->
<!-- Create the "startup.jar" symlink -->
<fileset dir="${installationDir}/plugins" includes="org.eclipse.equinox.launcher_*" id="startupjar" />
<property name="startupjarpath" refid="startupjar" />
- <symlink link="${installationDir}/startup.jar" resource="plugins/${startupjarpath}" />
+ <symlink link="${installationDir}/startup.jar" resource="plugins/${startupjarpath}" overwrite="true"/>
<!-- Create the "swt.jar" and friends symlinks -->
<fileset dir="${installationDir}/plugins" includes="org.eclipse.swt.gtk.linux.${buildArch}_*" id="swtjar" />
<property name="swtjarpath" refid="swtjar" />
- <symlink link="${installationDir}/swt-gtk-${label}.jar" resource="plugins/${swtjarpath}" />
- <symlink link="${installationDir}/swt-gtk.jar" resource="plugins/${swtjarpath}" />
- <symlink link="${installationDir}/swt.jar" resource="plugins/${swtjarpath}" />
+ <symlink link="${installationDir}/swt-gtk-${label}.jar" resource="plugins/${swtjarpath}" overwrite="true"/>
+ <symlink link="${installationDir}/swt-gtk.jar" resource="plugins/${swtjarpath}" overwrite="true"/>
+ <symlink link="${installationDir}/swt.jar" resource="plugins/${swtjarpath}" overwrite="true"/>
<echo append="true" file="${installationDir}/eclipse.ini" message="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${prefix}/share/eclipse/dropins" />
@@ -1054,7 +1055,7 @@
<!-- Move config file to /etc -->
<mkdir dir="${destDir}/etc" />
<move file="${installationDir}/eclipse.ini" tofile="${destDir}/etc/eclipse.ini" />
- <symlink link="${installationDir}/eclipse.ini" resource="/etc/eclipse.ini" />
+ <symlink link="${installationDir}/eclipse.ini" resource="/etc/eclipse.ini" overwrite="true"/>
</target>
diff --git a/buildEclipseBuildSource.sh b/buildEclipseBuildSource.sh
old mode 100755
new mode 100644
index 716391e..da0fc02
--- a/buildEclipseBuildSource.sh
+++ b/buildEclipseBuildSource.sh
@@ -2,9 +2,9 @@
baseDir=$(pwd)
workDirectory=
-eclipsebuildTag="0.5.0"
+eclipsebuildTag="master"
-usage="usage: <eclipse-build tag (ex. 0.5.0)> [-workdir <working directory>] [-eclipseBuildTag <eclipse-build tag to check out>]"
+usage="usage: <eclipse-build tag (ex. 0.7.0)> [-workdir <working directory>] [-eclipseBuildTag <eclipse-build tag to check out>]"
while [ $# -gt 0 ]
do
@@ -29,15 +29,22 @@ fi
echo "Going to create source tarball for eclipse-build ${eclipsebuildTag}."
-mkdir -p "${workDirectory}"
+mkdir "${workDirectory}"
cd "${workDirectory}"
-svn export svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/eclipse-build/tags/${eclipsebuildTag}/eclipse-build
-mv eclipse-build eclipse-build-${eclipsebuildTag}
+git clone git://git.eclipse.org/gitroot/linuxtools/org.eclipse.linuxtools.eclipse-build.git .
+cd "${workDirectory}"
+git archive --format=tar --prefix=eclipse-build-${eclipsebuildTag}/ ${eclipsebuildTag} | gzip >eclipse-build-${eclipsebuildTag}-tmp.tar.gz
+tar -xf eclipse-build-${eclipsebuildTag}-tmp.tar.gz
cd eclipse-build-${eclipsebuildTag}
+mv eclipse-build eclipse-build-${eclipsebuildTag}
rm -rf .project .settings
-svn export svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/eclipse-build/tags/${eclipsebuildTag}/eclipse-build-config
-svn export svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/eclipse-build/tags/${eclipsebuildTag}/eclipse-build-feature
+mv -f eclipse-build-config eclipse-build-${eclipsebuildTag}
+mv -f eclipse-build-feature eclipse-build-${eclipsebuildTag}
+mv -f eclipse-build-${eclipsebuildTag}/* .
+rm -fr eclipse-build-${eclipsebuildTag}
cd ..
+
+
tar caf eclipse-build-${eclipsebuildTag}.tar.bz2 eclipse-build-${eclipsebuildTag}
cd "${baseDir}"
diff --git a/buildSDKSource.sh b/buildSDKSource.sh
old mode 100755
new mode 100644
index da0e89e..677846c
--- a/buildSDKSource.sh
+++ b/buildSDKSource.sh
@@ -6,10 +6,10 @@ workDirectory=
baseBuilder=
eclipseBuilder=
-buildID="R3_6_1"
+buildID="R3_6_2"
baseBuilderTag="R3_6_1"
eclipseBuilderTag="R3_6_1"
-label="3.6.1"
+label="3.6.2"
fetchTests="yes"
ecfTag="R-Release_3_3-sdk_feature-22-2010_09_13"
@@ -126,32 +126,36 @@ pushd plugins/org.eclipse.osgi.util
unzip -q -d src src.zip
popd
-# Source for ECF bits that aren't part of SDK map files
+git clone git://git.eclipse.org/gitroot/ecf/org.eclipse.ecf.git
+cd org.eclipse.ecf
+git archive --format=tar --prefix=ecf-3.4.0/ R-Release_3_4-sdk_feature-8_2010-10-29_09-13-51 | gzip >ecf-3.4.0.tar.gz
+cp ecf-3.4.0.tar.gz ../
+cd ..
+rm -fr org.eclipse.ecf
+tar -xf ecf-3.4.0.tar.gz
+rm -fr ecf-3.4.0.tar.gz
+cd ecf-3.4.0
+
+# Source for ECF bthat aren't part of SDK map files
for f in \
org.eclipse.ecf \
org.eclipse.ecf.filetransfer \
org.eclipse.ecf.identity \
org.eclipse.ecf.ssl \
; do
-cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/rt \
-export -r ${ecfTag} org.eclipse.ecf/framework/bundles/$f;
+mv framework/bundles/$f ../plugins;
done
-mv org.eclipse.ecf/framework/bundles/* plugins
-rm -fr org.eclipse.ecf/framework
-
for f in \
org.eclipse.ecf.provider.filetransfer \
org.eclipse.ecf.provider.filetransfer.httpclient \
org.eclipse.ecf.provider.filetransfer.httpclient.ssl \
org.eclipse.ecf.provider.filetransfer.ssl \
; do
-cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/rt \
-export -r ${ecfTag} org.eclipse.ecf/providers/bundles/$f;
+mv providers/bundles/$f ../plugins;
done
-
-mv org.eclipse.ecf/providers/bundles/* plugins
-rm -fr org.eclipse.ecf
+cd ..
+rm -fr ecf-3.4.0
cd "${fetchDirectory}"
# We don't want to re-ship these as those bundles inside will already be
diff --git a/debian/changelog b/debian/changelog
index 86005c9..aa6eebc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-eclipse (3.6.1-1) UNRELEASED; urgency=low
+eclipse (3.6.2-1) UNRELEASED; urgency=low
[ Benjamin Drung ]
* New upstream version (Closes: #587742, LP: #604390).
@@ -20,7 +20,7 @@ eclipse (3.6.1-1) UNRELEASED; urgency=low
* Bumped B-D on icu4j.
* Added B-D to build swt with webkit support.
- -- Benjamin Drung <bdrung at ubuntu.com> Sat, 02 Oct 2010 17:20:30 +0200
+ -- Benjamin Drung <bdrung at debian.org> Thu, 31 Mar 2011 14:35:19 +0200
eclipse (3.5.2-5) unstable; urgency=medium
diff --git a/eclipse-build-feature/ChangeLog b/eclipse-build-feature/ChangeLog
index 2918100..681e569 100644
--- a/eclipse-build-feature/ChangeLog
+++ b/eclipse-build-feature/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-09 Alexander Kurtakov <akurtako at redhat.com>
+
+ * feature.xml: Update to 3.6.2.
+
2010-07-14 Andrew Overholt <overholt at redhat.com>
* build.properties: Remove svn:executable property.
diff --git a/eclipse-build-feature/feature.xml b/eclipse-build-feature/feature.xml
index ae3037b..2129124 100644
--- 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.6.0.qualifier">
+ version="3.6.2.qualifier">
<includes
id="master-jetty"
diff --git a/eclipse/directory.txt b/eclipse/directory.txt
index 15e3d1b..bc08b3c 100644
--- a/eclipse/directory.txt
+++ b/eclipse/directory.txt
@@ -1,8 +1,8 @@
!*************** ANT CONTRIBUTION ********************************************************
#plugin at org.apache.ant=v20070416,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ant.core=v20100427,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ant.launching=v20100427,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ant.core=v20110203_r362,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ant.launching=v20101020_r362,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.ant.ui=v20100427,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
@@ -13,9 +13,9 @@ plugin at org.eclipse.ant.tests.core=v20091214,:pserver:anonymous at dev.eclipse.org:/
plugin at org.eclipse.ant.tests.ui=v20100602-1000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
!*************** COMPARE CONTRIBUTION ********************************************************
-plugin at org.eclipse.compare=I20100526-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.compare/plugins/org.eclipse.compare
-plugin at org.eclipse.compare.core=I20100526-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.compare/plugins/org.eclipse.compare.core
-plugin at org.eclipse.compare.win32=I20100505-1245,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.compare/plugins/org.eclipse.compare.win32
+plugin at org.eclipse.compare=R36x_v20100929-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.compare/plugins/org.eclipse.compare
+plugin at org.eclipse.compare.core=R36x_v20100929-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.compare/plugins/org.eclipse.compare.core
+plugin at org.eclipse.compare.win32=R36x_v20101103-0618,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.compare/plugins/org.eclipse.compare.win32
plugin at org.eclipse.compare.examples=I20100505-1245,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.compare.examples.xml=I20100505-1245,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
@@ -33,7 +33,7 @@ plugin at org.eclipse.core.variables=v20100505,:pserver:anonymous at dev.eclipse.org:/
!*************** CORE CONTRIBUTION ********************************************************
!**** OSGi
-plugin at org.eclipse.osgi=R36x_v20100806,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.osgi
+plugin at org.eclipse.osgi=R36x_v20110210,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.osgi
plugin at org.eclipse.osgi.services=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.osgi.services
plugin at org.eclipse.osgi.util=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.osgi.util
@@ -41,7 +41,7 @@ plugin at org.eclipse.osgi.util=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsro
plugin at org.eclipse.equinox.common=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/components/bundles/org.eclipse.equinox.common
plugin at org.eclipse.equinox.preferences=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.preferences
plugin at org.eclipse.equinox.registry=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/components/bundles/org.eclipse.equinox.registry
-plugin at org.eclipse.equinox.supplement=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.osgi/supplement
+plugin at org.eclipse.equinox.supplement=R36x_v20101021,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.osgi/supplement
plugin at org.eclipse.equinox.app=R36x_v20100803,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.app
plugin at org.eclipse.equinox.device=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.device
plugin at org.eclipse.equinox.event=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.event
@@ -53,10 +53,10 @@ plugin at org.eclipse.equinox.http.jetty,2.0.0=v20100503,:pserver:anonymous at dev.ecl
plugin at org.eclipse.equinox.http.jetty,1.1.100=v20100519,: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=v20100503,: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=v20100503,: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=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/server-side/bundles/org.eclipse.equinox.http.registry
+plugin at org.eclipse.equinox.http.registry=R36x_v20101103,: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=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/server-side/bundles/org.eclipse.equinox.servletbridge
fragment at org.eclipse.equinox.servletbridge.extensionbundle=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/server-side/bundles/org.eclipse.equinox.servletbridge.extensionbundle
-bundle at org.eclipse.equinox.jsp.jasper=v20100421,: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=R36x_v20101103,: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=v20100503,: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=v20100520,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.cm
plugin at org.eclipse.equinox.concurrent=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/components/bundles/org.eclipse.equinox.concurrent
@@ -86,31 +86,32 @@ plugin at org.eclipse.equinox.weaving.caching.j9=v20100503,:pserver:anonymous at dev.e
fragment at org.eclipse.equinox.weaving.hook=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/weaving/bundles/org.eclipse.equinox.weaving.hook
!****launcher, startup.jar
-plugin at org.eclipse.equinox.launcher=v20100507,: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=R36x_v20100810,: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=R36x_v20100810,: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=R36x_v20100810,: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=R36x_v20100810,: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=R36x_v20100810,: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=R36x_v20100810,: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=R36x_v20100810,: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=R36x_v20100810,: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=R36x_v20100810,: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=R36x_v20100810,: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.gtk.linux.ppc64=R36x_v20100810,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.ppc64
-fragment at org.eclipse.equinox.launcher.motif.hpux.ia64_32=R36x_v20100810,: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=R36x_v20100810,: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=R36x_v20100810,: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=R36x_v20100810,: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.releng=v20100208,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/releng/org.eclipse.equinox.launcher.releng
+plugin at org.eclipse.equinox.launcher=R36x_v20101122_1400,: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=R36x_v20101222,: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=R36x_v20101222,: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=R36x_v20101222,: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=R36x_v20101222,: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=R36x_v20101019_1345,: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=R36x_v20101019_1345,: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=R36x_v20101019_1345,: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=R36x_v20101019_1345,: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=R36x_v20101019_1345,: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=R36x_v20101019_1345,: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.gtk.linux.ppc64=R36x_v20101019_1345,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.ppc64
+fragment at org.eclipse.equinox.launcher.gtk.aix.ppc64=R36x_v20101102,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.aix.ppc64
+fragment at org.eclipse.equinox.launcher.motif.hpux.ia64_32=R36x_v20101019_1345,: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=R36x_v20101019_1345,: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=R36x_v20101019_1345,: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=R36x_v20101019_1345,: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.releng=R36x_v20101019,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/releng/org.eclipse.equinox.launcher.releng
!****contributed fragments
-fragment at org.eclipse.equinox.launcher.gtk.linux.s390=R36x_v20100823,: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=R36x_v20100823,: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=R36x_v20100810,: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=R36x_v20100810,: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=R36x_v20110125,: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=R36x_v20110125,: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=R36x_v20101019_1345,: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=R36x_v20101019_1345,: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=R36x_v20100823,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.executable
+feature at org.eclipse.equinox.executable=R36x_v20110125,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.executable
!**** Runtime
plugin at org.eclipse.core.runtime=v20100505,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
@@ -122,7 +123,7 @@ plugin at org.eclipse.core.expressions=v20100505,:pserver:anonymous at dev.eclipse.org
plugin at org.eclipse.core.expressions.tests=v20091203,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
!**** Resources
-plugin at org.eclipse.core.resources=R36x_v20100825-0600,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.resources=R36x_v20110131-1630,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
fragment at org.eclipse.core.resources.win32=v20100505-1235,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
fragment at org.eclipse.core.resources.win32.x86=v20100505-1345,: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,
@@ -146,24 +147,24 @@ plugin at org.eclipse.core.runtime.compatibility.auth=v20100517,:pserver:anonymous@
fragment at org.eclipse.core.runtime.compatibility.registry=v20100520,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
!**** Other Core Code
-plugin at org.eclipse.pde.build=R36x_v20100823,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/build/org.eclipse.pde.build
-plugin at org.eclipse.pde.build.tests=R36x_v20100817,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/build/org.eclipse.pde.build.tests
+plugin at org.eclipse.pde.build=R36x_20110203,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/build/org.eclipse.pde.build
+plugin at org.eclipse.pde.build.tests=R36x_v20110111,: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=v20100505-1235,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.core.tests.resources=R36x_v20100825-0600,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.core.tests.runtime=R36x_v20100719,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.osgi.tests=R36x_v20100723,:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.osgi.tests
+plugin at org.eclipse.core.tests.resources=R36x_v20110131-1630,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.tests.runtime=R36x_v20101213,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.osgi.tests=R36x_v20101103,: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=r361_v20100825-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.platform.doc.isv=r361_v20100713,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.platform.doc.user=r362_v20101117-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.platform.doc.isv=r362_v20110111,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.jdt.doc.user=r361_v20100721-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.doc.isv=r361_v20100714-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.doc.isv=r362_v20101117-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.pde.doc.user=v20100727_r361,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/doc/org.eclipse.pde.doc.user
+plugin at org.eclipse.pde.doc.user=v20101118_r362,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/doc/org.eclipse.pde.doc.user
!*************** Equinox Incubator Contribution ***************************
!**** Initializer bundle
@@ -193,12 +194,12 @@ plugin at org.eclipse.swt.jmx=v20100503,:pserver:anonymous at dev.eclipse.org:/cvsroot
plugin at org.eclipse.core.resources.jmx=v20100503,: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=r361_v20100714-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.sdk
-plugin at org.eclipse.sdk=r361_v20100714-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+feature at org.eclipse.sdk=r362_v20100929,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.sdk
+plugin at org.eclipse.sdk=r362_v20110202,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-feature at org.eclipse.jdt=r361_v20100714-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.jdt-feature
+feature at org.eclipse.jdt=r362_v20101117-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.jdt-feature
-feature at org.eclipse.pde=r361_v20100727,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.pde-feature
+feature at org.eclipse.pde=r362_v20110203,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.pde-feature
feature at org.eclipse.pde.api.tools.ee.cdcfoundation10_feature=v20091027-1300,: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=v20091027-1300,: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=v20091027-1300,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.j2se12-feature
@@ -211,33 +212,33 @@ feature at org.eclipse.pde.api.tools.ee.osgiminimum10_feature=v20091027-1300,:pserv
feature at org.eclipse.pde.api.tools.ee.osgiminimum11_feature=v20091027-1300,: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=v20091027-1300,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12-feature
-feature at org.eclipse.platform=r361_v20100909,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.platform-feature
-plugin at org.eclipse.platform=r361_v20100714-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+feature at org.eclipse.platform=r362_v20110210,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.platform-feature
+plugin at org.eclipse.platform=r362_v20110120,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-feature at org.eclipse.sdk.examples=v20100527,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk.examples-feature
+feature at org.eclipse.sdk.examples=r362_v20101014,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk.examples-feature
plugin at org.eclipse.sdk.examples=v20100527,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
feature at org.eclipse.sdk.tests=r361_v20100714-0800,: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.sdk=r361_v20100903,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.equinox.sdk
+feature at org.eclipse.equinox.sdk=r362_v20110210b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.equinox.sdk
-feature at org.eclipse.cvs=v20100427,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.cvs-feature
+feature at org.eclipse.cvs=r362_v20101111,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.cvs-feature
plugin at org.eclipse.cvs=v20100414,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/plugins/org.eclipse.cvs
-feature at org.eclipse.help=v20100427,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.help-feature
+feature at org.eclipse.help=r362_v20101111,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.help-feature
feature at org.eclipse.equinox.p2.user.ui=r361_v20100903,: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.sdk=CVS,tag=v20100503,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.p2.discovery.feature=CVS,tag=v20100510,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/features/org.eclipse.equinox.p2.discovery.feature
-feature at org.eclipse.equinox.core.sdk=CVS,tag=v20100603,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=v20100421,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.p2.sdk=CVS,tag=R36x_v20110120,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.p2.discovery.feature=CVS,tag=R36x_v20110210,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/features/org.eclipse.equinox.p2.discovery.feature
+feature at org.eclipse.equinox.core.sdk=CVS,tag=r36x_v20110210,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=R36x_v20101014,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=v20100421,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.equinox.server.core=CVS,tag=v20100510,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/server-side/features/org.eclipse.equinox.server.core
+feature at org.eclipse.equinox.serverside.sdk=CVS,tag=R36x_v20101014,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.equinox.server.core=CVS,tag=R36x_v20101007,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/server-side/features/org.eclipse.equinox.server.core
feature at org.eclipse.equinox.server.jetty=CVS,tag=v20100510,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/server-side/features/org.eclipse.equinox.server.jetty
-feature at org.eclipse.equinox.server.p2=CVS,tag=v20100503,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/server-side/features/org.eclipse.equinox.server.p2
+feature at org.eclipse.equinox.server.p2=CVS,tag=R36x_v20101007,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/server-side/features/org.eclipse.equinox.server.p2
feature at org.eclipse.equinox.server.servletbridge=CVS,tag=v20100510,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/server-side/features/org.eclipse.equinox.server.servletbridge
feature at org.eclipse.equinox.server.simple=CVS,tag=v20100510,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/server-side/features/org.eclipse.equinox.server.simple
@@ -247,7 +248,7 @@ feature at org.eclipse.pde.api.tools.ee.fragments=v20100427,:pserver:anonymous at dev.
!*************** JDT APT CONTRIBUTION *******************************************
-plugin at org.eclipse.jdt.apt.core=R36_v20100727-0110,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.apt.core=R36_v20110120-1000,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.jdt.apt.ui=v20100513-0845,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.jdt.apt.tests=R36x_v20100707-0100,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
fragment at org.eclipse.jdt.compiler.apt=v20100513-0845,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
@@ -255,23 +256,23 @@ plugin at org.eclipse.jdt.compiler.apt.tests=v20100513-0845,:pserver:anonymous at dev.
plugin at org.eclipse.jdt.apt.pluggable.core=R36_v20100727-0110,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.jdt.apt.pluggable.tests=v20100513-0845,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-!*************** JDT CORE CONTRIBUTION [20100901-0800] *******************************************
+!*********************************** JDT CORE CONTRIBUTION *******************************************
-plugin at org.eclipse.jdt.core=v_A68_R36x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.jdt.compiler.tool=v_A68_R36x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.core=v_A76_R36x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.jdt.compiler.tool=v_A76_R36x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.core.tests.builder=v_A68_R36x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.core.tests.compiler=v_A68_R36x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.core.tests.model=v_A68_R36x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.core.tests.performance=v_A68_R36x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.compiler.tool.tests=v_A68_R36x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.core.tests.builder=v_A76_R36x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.core.tests.compiler=v_A76_R36x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.core.tests.model=v_A76_R36x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.core.tests.performance=v_A76_R36x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.compiler.tool.tests=v_A76_R36x,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
!*************** DEBUG CONTRIBUTION ********************************************************
plugin at org.eclipse.debug.core=v20100519,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.debug.ui=v20100901_r361,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.debug.ui=v20101201_r362,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.jdt.debug=v20100715_r361,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.debug.ui=v20100602-0830,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.launching=v20100526,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.debug.ui=v20100928a_r362,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.launching=v20110105_r362,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.jdt.launching.macosx=v20100505,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.jdt.launching.ui.macosx=v20100505,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
@@ -286,7 +287,7 @@ plugin at org.eclipse.debug.examples.ui=v20100526,:pserver:anonymous at dev.eclipse.or
plugin at org.eclipse.search=v20100520-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.search.tests=v20100520-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ltk.core.refactoring=v20100526-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ltk.core.refactoring=r362_v20101117-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.ltk.core.refactoring.tests=v20100520-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.ltk.ui.refactoring=v20100526-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.ltk.ui.refactoring.tests=v20100520-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
@@ -295,7 +296,7 @@ plugin at org.eclipse.jdt=r361_v20100714-0800,:pserver:anonymous at dev.eclipse.org:/c
plugin at org.eclipse.jdt.core.manipulation=v20100520-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.ui=r361_v20100825-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.ui=r362_v20110203,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.jdt.ui.tests=r361_v20100818-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.jdt.ui.tests.refactoring=v20100526-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
@@ -373,28 +374,27 @@ plugin at org.eclipse.equinox.frameworkadmin.equinox=CVS,tag=v20100505,cvsRoot=:pse
plugin at org.eclipse.equinox.frameworkadmin.test=CVS,tag=v20100503,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=R36x_v20100901,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=v20100601,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=R36x_v20100804,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=R36x_v20100823,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.core=CVS,tag=R36x_v20110111,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=R36x_v20101117-1018,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=R36x_v20100823,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=R36x_v20100727,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.directorywatcher=CVS,tag=R36x_v20101220,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.discovery=CVS,tag=v20100503,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.discovery
-plugin at org.eclipse.equinox.p2.discovery.compatibility=CVS,tag=v20100518,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.discovery.compatibility
-plugin at org.eclipse.equinox.p2.engine=CVS,tag=v20100606,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.discovery.compatibility=CVS,tag=v20110204-1323,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.discovery.compatibility
+plugin at org.eclipse.equinox.p2.engine=CVS,tag=R36x_v20110201,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.extensionlocation=CVS,tag=v20100518,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=v20100503,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=v20100503a,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=v20100503a,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=v20100601,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=v20100503a,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=R36x_v20101202,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=R36x_v20101208-1400,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=v20100513,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.operations=CVS,tag=v20100510,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.operations
plugin at org.eclipse.equinox.p2.publisher=CVS,tag=v20100824-2220,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=v20100525,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=R36x_v20100823,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.reconciler.dropins=CVS,tag=R36x_v20110114,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=R36x_v20110111-1500,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=R36x_v20100823,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=_api_cleanup_v20091125,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.touchpoint.eclipse=CVS,tag=R36x_v20100823,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=v20100503a,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.touchpoint.eclipse=CVS,tag=R36x_v20101202,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=R36x_v20110111,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=v20100518,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=v20100503,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.discovery=CVS,tag=v20100519,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui.discovery
@@ -405,7 +405,7 @@ plugin at org.eclipse.equinox.p2.updatechecker=CVS,tag=R36x_v20100823,cvsRoot=:pser
plugin at org.eclipse.equinox.p2.updatesite=CVS,tag=R36x_v20100823,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=v20100503,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=v20100503,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=R36x_v20100901,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=CVS,tag=R36x_v20101202,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.discovery=CVS,tag=v20100503,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests.discovery
plugin at org.eclipse.equinox.p2.tests.ui=CVS,tag=v20100513,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.p2.tests.verifier=CVS,tag=v20100503,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests.verifier
@@ -423,43 +423,35 @@ plugin at org.eclipse.equinox.p2.examples.rcp.sdknoautoupdates=CVS,tag=v20100604,cv
plugin at org.eclipse.equinox.p2.examples.rcp.sdkui=CVS,tag=v20100604,cvsRoot=:pserver:anonymous at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/examples/org.eclipse.equinox.p2.examples.rcp.sdkui
!# Bundles from ECF
-plugin at org.eclipse.ecf,3.1.0=GET,http://www.eclipse.org/external/rt/ecf/integration/platform/v2010-05-29_00-32-38/plugins/org.eclipse.ecf_3.1.0.v20100529-0735.jar,usetimestamp=true
-plugin at org.eclipse.ecf.source,3.1.0=GET,http://www.eclipse.org/external/rt/ecf/integration/platform/v2010-05-29_00-32-38/plugins/org.eclipse.ecf.source_3.1.0.v20100529-0735.jar,usetimestamp=true
-fragment at org.eclipse.ecf.ssl,1.0.0=GET,http://www.eclipse.org/external/rt/ecf/integration/platform/v2010-05-29_00-32-38/plugins/org.eclipse.ecf.ssl_1.0.0.v20100529-0735.jar,usetimestamp=true
-fragment at org.eclipse.ecf.ssl.source,1.0.0=GET,http://www.eclipse.org/external/rt/ecf/integration/platform/v2010-05-29_00-32-38/plugins/org.eclipse.ecf.ssl.source_1.0.0.v20100529-0735.jar,usetimestamp=true
-plugin at org.eclipse.ecf.identity,3.1.0=GET,http://www.eclipse.org/external/rt/ecf/integration/platform/v2010-05-29_00-32-38/plugins/org.eclipse.ecf.identity_3.1.0.v20100529-0735.jar,usetimestamp=true
-plugin at org.eclipse.ecf.identity.source,3.1.0=GET,http://www.eclipse.org/external/rt/ecf/integration/platform/v2010-05-29_00-32-38/plugins/org.eclipse.ecf.identity.source_3.1.0.v20100529-0735.jar,usetimestamp=true
-plugin at org.eclipse.ecf.filetransfer,4.0.0=GET,http://www.eclipse.org/external/rt/ecf/integration/platform/v2010-05-29_00-32-38/plugins/org.eclipse.ecf.filetransfer_4.0.0.v20100529-0735.jar,usetimestamp=true
-plugin at org.eclipse.ecf.filetransfer.source,4.0.0=GET,http://www.eclipse.org/external/rt/ecf/integration/platform/v2010-05-29_00-32-38/plugins/org.eclipse.ecf.filetransfer.source_4.0.0.v20100529-0735.jar,usetimestamp=true
-plugin at org.eclipse.ecf.provider.filetransfer,3.1.0=GET,http://www.eclipse.org/external/rt/ecf/integration/platform/v2010-05-29_00-32-38/plugins/org.eclipse.ecf.provider.filetransfer_3.1.0.v20100529-0735.jar,usetimestamp=true
-plugin at org.eclipse.ecf.provider.filetransfer.source,3.1.0=GET,http://www.eclipse.org/external/rt/ecf/integration/platform/v2010-05-29_00-32-38/plugins/org.eclipse.ecf.provider.filetransfer.source_3.1.0.v20100529-0735.jar,usetimestamp=true
-fragment at org.eclipse.ecf.provider.filetransfer.ssl,1.0.0=GET,http://www.eclipse.org/external/rt/ecf/integration/platform/v2010-05-29_00-32-38/plugins/org.eclipse.ecf.provider.filetransfer.ssl_1.0.0.v20100529-0735.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/v2010-05-29_00-32-38/plugins/org.eclipse.ecf.provider.filetransfer.ssl.source_1.0.0.v20100529-0735.jar,usetimestamp=true
-plugin at org.eclipse.ecf.provider.filetransfer.httpclient,4.0.0=GET,http://www.eclipse.org/external/rt/ecf/integration/platform/v2010-05-29_00-32-38/plugins/org.eclipse.ecf.provider.filetransfer.httpclient_4.0.0.v20100529-0735.jar,usetimestamp=true
-plugin at org.eclipse.ecf.provider.filetransfer.httpclient.source,4.0.0=GET,http://www.eclipse.org/external/rt/ecf/integration/platform/v2010-05-29_00-32-38/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.source_4.0.0.v20100529-0735.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/v2010-05-29_00-32-38/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.v20100529-0735.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/v2010-05-29_00-32-38/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source_1.0.0.v20100529-0735.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
+plugin at org.eclipse.ecf,3.1.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf_3.1.0.v20100906-1425.jar,usetimestamp=true
+plugin at org.eclipse.ecf.source,3.1.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.source_3.1.0.v20100906-1425.jar,usetimestamp=true
+fragment at org.eclipse.ecf.ssl,1.0.100=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.ssl_1.0.100.v20100906-1425.jar,usetimestamp=true
+fragment at org.eclipse.ecf.ssl.source,1.0.100=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.ssl.source_1.0.100.v20100906-1425.jar,usetimestamp=true
+plugin at org.eclipse.ecf.identity,3.1.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.identity_3.1.0.v20100906-1425.jar,usetimestamp=true
+plugin at org.eclipse.ecf.identity.source,3.1.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.identity.source_3.1.0.v20100906-1425.jar,usetimestamp=true
+plugin at org.eclipse.ecf.filetransfer,4.0.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.filetransfer_4.0.0.v20100906-1425.jar,usetimestamp=true
+plugin at org.eclipse.ecf.filetransfer.source,4.0.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.filetransfer.source_4.0.0.v20100906-1425.jar,usetimestamp=true
+plugin at org.eclipse.ecf.provider.filetransfer,3.1.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.provider.filetransfer_3.1.0.v20100906-1425.jar,usetimestamp=true
+plugin at org.eclipse.ecf.provider.filetransfer.source,3.1.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.provider.filetransfer.source_3.1.0.v20100906-1425.jar,usetimestamp=true
+fragment at org.eclipse.ecf.provider.filetransfer.ssl,1.0.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.provider.filetransfer.ssl_1.0.0.v20100906-1425.jar,usetimestamp=true
+fragment at org.eclipse.ecf.provider.filetransfer.ssl.source,1.0.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.provider.filetransfer.ssl.source_1.0.0.v20100906-1425.jar,usetimestamp=true
+plugin at org.eclipse.ecf.provider.filetransfer.httpclient,4.0.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.provider.filetransfer.httpclient_4.0.0.v20100906-1425.jar,usetimestamp=true
+plugin at org.eclipse.ecf.provider.filetransfer.httpclient.source,4.0.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.source_4.0.0.v20100906-1425.jar,usetimestamp=true
+fragment at org.eclipse.ecf.provider.filetransfer.httpclient.ssl,1.0.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.v20100906-1425.jar,usetimestamp=true
+fragment at org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source,1.0.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source_1.0.0.v20100906-1425.jar,usetimestamp=true
!*************** PDE CONTRIBUTION ********************************************************
plugin at org.eclipse.pde=v20100625_r361,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde
-plugin at org.eclipse.pde.core=v20100902_r361,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.core
+plugin at org.eclipse.pde.core=v20110210_r362,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.core
plugin at org.eclipse.pde.junit.runtime=v20100601,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.junit.runtime
plugin at org.eclipse.pde.runtime=v20100601,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.runtime
plugin at org.eclipse.pde.launching=v20100601,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.launching
-plugin at org.eclipse.pde.ui=v20100810_r361,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.ui
+plugin at org.eclipse.pde.ui=v20110210_r362,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.ui
plugin at org.eclipse.pde.ui.templates=v20100601,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.ui.templates
-plugin at org.eclipse.pde.ui.tests=v20100820_r361,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.ui.tests
+plugin at org.eclipse.pde.ui.tests=v20101210_r362,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.ui.tests
-plugin at org.eclipse.ui.views.log=v20100423,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.ui.views.log
+plugin at org.eclipse.ui.views.log=v20110210_r362,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.ui.views.log
plugin at org.eclipse.pde.api.tools=v20100820_r361,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools
plugin at org.eclipse.pde.api.tools.ui=v20100820_r361,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ui
plugin at org.eclipse.pde.api.tools.tests=v20100820_r361,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.tests
@@ -481,15 +473,15 @@ plugin at org.eclipse.pde.ds.tests=v20100601,:pserver:anonymous at dev.eclipse.org:/cv
plugin at org.eclipse.pde.ua.core=v20100504,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ua/org.eclipse.pde.ua.core
plugin at org.eclipse.pde.ua.ui=v20100504,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,pde/ua/org.eclipse.pde.ua.ui
-feature at org.eclipse.rcp=r361_v20100827,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.rcp
+feature at org.eclipse.rcp=r362_v20101104,: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=v20100527-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/plugins/org.eclipse.rcp
!**************** RELENG CONTRIBUTION ********************************************************
feature at master=v20091019,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/master
-feature at master-equinox=v20100521,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/master-equinox
+feature at master-equinox=r362_v20101118,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/master-equinox
feature at master-equinox-p2=v20091106,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/master-equinox-p2
feature at master-equinox-weaving=v20090817,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/master-equinox-weaving
-feature at master-jetty=v20090305,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/master-jetty
+feature at master-jetty=r362_v20101014,: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 com.ibm.icu.base=v20090119,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/com.ibm.icu.base
@@ -497,7 +489,7 @@ feature at com.ibm.icu.base=v20090119,:pserver:anonymous at dev.eclipse.org:/cvsroot/e
feature at org.eclipse.releng.tools=v20100427,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.releng.tools
plugin at org.eclipse.releng.tools=v20100531,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.releng.tests=r361_v20100831,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.releng.tests=r362_v20110203,: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
@@ -506,52 +498,53 @@ feature at org.eclipse.jdt.test.feature.sample=HEAD,:pserver:anonymous at dev.eclipse.
!*************** SWT CONTRIBUTION ********************************************************
!*** SWT Plugin
-plugin at org.eclipse.swt=v3655c,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt=v3659c,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
!*** SWT Platform Fragments
-fragment at org.eclipse.swt.carbon.macosx=v3655c,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.cocoa.macosx=v3655c,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.cocoa.macosx.x86_64=v3655c,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.gtk.linux.ppc=v3655c,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.gtk.linux.ppc64=v3655c,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.gtk.linux.x86=v3655c,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.gtk.linux.x86_64=v3655c,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.gtk.solaris.sparc=v3655c,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.gtk.solaris.x86=v3655c,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.motif.aix.ppc=v3655c,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.motif.hpux.ia64_32=v3655c,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.motif.linux.x86=v3655c,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.motif.solaris.sparc=v3655c,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.photon.qnx.x86=v3655c,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.win32.wce_ppc.arm=v3655c,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.win32.win32.x86=v3655c,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.win32.win32.x86_64=v3655c,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.win32.win32.ia64=v3655c,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-
-fragment at org.eclipse.swt.gtk.linux.s390=v3655c,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.gtk.linux.s390x=v3655c,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.carbon.macosx=v3659b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.cocoa.macosx=v3659b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.cocoa.macosx.x86_64=v3659b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.gtk.linux.ppc=v3659b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.gtk.linux.ppc64=v3659b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.gtk.linux.x86=v3659b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.gtk.linux.x86_64=v3659b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.gtk.solaris.sparc=v3659b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.gtk.solaris.x86=v3659b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.gtk.aix.ppc64=v3659b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.motif.aix.ppc=v3659b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.motif.hpux.ia64_32=v3659b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.motif.linux.x86=v3659b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.motif.solaris.sparc=v3659b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.photon.qnx.x86=v3659b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.win32.wce_ppc.arm=v3659c,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.win32.win32.x86=v3659c,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.win32.win32.x86_64=v3659c,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.win32.win32.ia64=v3659c,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+
+fragment at org.eclipse.swt.gtk.linux.s390=v3659b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.gtk.linux.s390x=v3659b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
!*** SWT Examples
-plugin at org.eclipse.swt.examples=v3655c,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.swt.examples.browser=v3655c,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.swt.examples.browser.demos=v3655c,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.swt.examples.controls=v3655c,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.swt.examples.launcher=v3655c,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.swt.examples.layouts=v3655c,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.swt.examples.ole.win32=v3655c,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.swt.examples.paint=v3655c,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.examples=v3659b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.examples.browser=v3659b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.examples.browser.demos=v3659b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.examples.controls=v3659b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.examples.launcher=v3659b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.examples.layouts=v3659b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.examples.ole.win32=v3659b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.examples.paint=v3659b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
!*** SWT Tests and Tools
-plugin at org.eclipse.swt.tests=v3655c,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.swt.tools=v3655c,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.tests=v3659b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.tools=v3659b,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
!*************** TEAM CONTRIBUTION ********************************************************
-plugin at org.eclipse.team.core=R36x_v20100825-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.team.cvs.core=I20100526-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.team.core=R36x_v20110203-1036,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.team.cvs.core=R36x_v20110119-0815,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.team.cvs.ssh=I20100526-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.team.cvs.ssh2=I20100526-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.team.ui=R36x_v20100825-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.team.cvs.ui=R36x_v20100825-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.team.ui=R36x_v20110203-1036,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.team.cvs.ui=R36x_v20110203-1036,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.core.net=I20100511-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.ui.net=I20100505-1245,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
@@ -563,7 +556,7 @@ plugin at org.eclipse.jsch.tests=I20100505-1245,:pserver:anonymous at dev.eclipse.org:
plugin at org.eclipse.team.examples.filesystem=I20100526-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.team.tests.core=I20100511-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.team.tests.cvs.core=I20100526-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.team.tests.cvs.core=R36x_v20110119-0815,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
fragment at org.eclipse.core.net.win32.x86=I20100511-0800,: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=R36x_v20100825-0800,: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.linux.x86_64=I20100505-1245,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64
@@ -599,22 +592,22 @@ plugin at org.eclipse.jdt.text.tests=v20100526-0800,:pserver:anonymous at dev.eclipse.
!*************** UI CONTRIBUTION *********************************************************
plugin at org.eclipse.core.commands=I20100512-1500,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jface=M20100825-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jface=M20110210-1200,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.core.databinding=I20100601-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.core.databinding.observable=I20100601-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.core.databinding.property=I20100601-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.core.databinding.beans=I20100601-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.jface.databinding=I20100601-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui=M20100826-1330,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.ide=M20100825-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui=M20110203-1100,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.ide=M20101201-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.ui.ide.application=M20100707-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.ui.presentations.r21=I20100517-1500,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.views=I20100527-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.workbench=M20100826-1330,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.views=M20110202-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.workbench=M20110210-1200,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
fragment at org.eclipse.ui.workbench.compatibility=I20100511-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
fragment at org.eclipse.ui.win32=I20100509-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.ui.carbon=M20100825-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.ui.cocoa=M20100825-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.ui.carbon=M20101124-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.ui.cocoa=M20101124-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.jface.examples.databinding=I20100601-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
@@ -627,7 +620,7 @@ plugin at org.eclipse.ui.examples.fieldassist=I20100601-0800,:pserver:anonymous at dev
plugin at org.eclipse.ui.examples.contributions=I20100509-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.ui.navigator=I20100601-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.navigator.resources=M20100707-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.navigator.resources=M20101124-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.ui.views.properties.tabbed=I20100509-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
@@ -635,8 +628,8 @@ plugin at org.eclipse.jface.tests.databinding=I20100601-0800,:pserver:anonymous at dev
plugin at org.eclipse.jface.tests.databinding.conformance=I20090818-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.ui.tests=M20100825-0800,: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=I20100601-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.navigator=M20101201-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.tests.views.properties.tabbed=M20110202-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.ui.tests.performance=I20100601-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.ui.tests.harness=I20100601-0800,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
!*************** UPDATE CONTRIBUTION ********************************************************
@@ -655,9 +648,9 @@ plugin at org.eclipse.update.tests.core=v20100512,:pserver:anonymous at dev.eclipse.or
!**** Help
plugin at org.eclipse.help=v20100524,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.help.appserver=v20100427,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.help.base=r36_r20100816,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.help.ui=r36_v20100702,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.help.webapp=r36_r20100816,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.help.base=r36_20101123,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.help.ui=r36_20101116,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.help.webapp=r36_20101130,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
!**** Welcome
plugin at org.eclipse.ui.intro=v20100427,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
@@ -667,7 +660,7 @@ plugin at org.eclipse.ui.intro.universal=r36_v20100702,:pserver:anonymous at dev.eclip
plugin at org.eclipse.ui.cheatsheets=v20100427,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
!**** Browser
-plugin at org.eclipse.ui.browser=v20100517,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.browser=r36_20101216,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
!**** Forms
plugin at org.eclipse.ui.forms=r36_v20100702,:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse,
diff --git a/eclipse/featureVersions.properties b/eclipse/featureVersions.properties
index 2f24e2e..9e7778f 100644
--- a/eclipse/featureVersions.properties
+++ b/eclipse/featureVersions.properties
@@ -1,35 +1,35 @@
-#Fri Oct 01 11:18:00 EDT 2010
-org.eclipse.equinox.compendium.sdk,0.0.0=v20100421
+#Tue Mar 08 14:12:31 EST 2011
+org.eclipse.equinox.compendium.sdk,0.0.0=R36x_v20101014
org.eclipse.equinox.weaving.sdk,0.0.0=v20100421
-org.eclipse.platform,0.0.0=r361_v20100909
-master-equinox,0.0.0=v20100521
-org.eclipse.rcp,0.0.0=r361_v20100827
-org.eclipse.equinox.p2.sdk,0.0.0=v20100503
+org.eclipse.platform,0.0.0=r362_v20110210
+master-equinox,0.0.0=r362_v20101118
+org.eclipse.rcp,0.0.0=r362_v20101104
+org.eclipse.equinox.p2.sdk,0.0.0=R36x_v20110120
com.ibm.icu.base,0.0.0=v20090119
master,0.0.0=v20091019
-org.eclipse.cvs,0.0.0=v20100427
+org.eclipse.cvs,0.0.0=r362_v20101111
org.eclipse.equinox.server.simple,0.0.0=v20100510
-org.eclipse.equinox.server.core,0.0.0=v20100510
+org.eclipse.equinox.server.core,0.0.0=R36x_v20101007
org.eclipse.releng.tools,0.0.0=v20100427
-org.eclipse.equinox.p2.discovery.feature,0.0.0=v20100510
-org.eclipse.equinox.core.sdk,0.0.0=v20100603
+org.eclipse.equinox.p2.discovery.feature,0.0.0=R36x_v20110210
+org.eclipse.equinox.core.sdk,0.0.0=r36x_v20110210
org.eclipse.equinox.p2.user.ui,0.0.0=r361_v20100903
-org.eclipse.equinox.server.p2,0.0.0=v20100503
-org.eclipse.sdk,0.0.0=r361_v20100714-0800
+org.eclipse.equinox.server.p2,0.0.0=R36x_v20101007
+org.eclipse.sdk,0.0.0=r362_v20100929
master-equinox-weaving,0.0.0=v20090817
-master-jetty,0.0.0=v20090305
-org.eclipse.jdt,0.0.0=r361_v20100714-0800
+master-jetty,0.0.0=r362_v20101014
+org.eclipse.jdt,0.0.0=r362_v20101117-0800
org.eclipse.equinox.jmx.server.feature,0.0.0=v20081124
org.eclipse.equinox.server.servletbridge,0.0.0=v20100510
master-ecf,0.0.0=v20090316
org.eclipse.equinox.jmx.client.feature,0.0.0=v20081124
-org.eclipse.sdk.examples,0.0.0=v20100527
+org.eclipse.sdk.examples,0.0.0=r362_v20101014
org.eclipse.equinox.jmx.common.feature,0.0.0=v20070507
-org.eclipse.equinox.sdk,0.0.0=r361_v20100903
+org.eclipse.equinox.sdk,0.0.0=r362_v20110210b
org.eclipse.pde.api.tools.ee.fragments,0.0.0=v20100427
-org.eclipse.equinox.serverside.sdk,0.0.0=v20100421
-org.eclipse.pde,0.0.0=r361_v20100727
+org.eclipse.equinox.serverside.sdk,0.0.0=R36x_v20101014
+org.eclipse.pde,0.0.0=r362_v20110203
org.eclipse.equinox.server.jetty,0.0.0=v20100510
-org.eclipse.equinox.executable,0.0.0=R36x_v20100823
-org.eclipse.help,0.0.0=v20100427
+org.eclipse.equinox.executable,0.0.0=R36x_v20110125
+org.eclipse.help,0.0.0=r362_v20101111
master-equinox-p2,0.0.0=v20091106
diff --git a/eclipse/features/master-equinox/feature.xml b/eclipse/features/master-equinox/feature.xml
index 0d1a865..f1fd3b9 100644
--- a/eclipse/features/master-equinox/feature.xml
+++ b/eclipse/features/master-equinox/feature.xml
@@ -2,7 +2,7 @@
<feature
id="master-equinox"
label="build utility feature for equinox plugins"
- version="1.1.0.qualifier">
+ version="1.1.1.qualifier">
<includes
id="org.eclipse.equinox.sdk"
diff --git a/eclipse/features/master-jetty/feature.xml b/eclipse/features/master-jetty/feature.xml
index a23c475..7151d93 100644
--- a/eclipse/features/master-jetty/feature.xml
+++ b/eclipse/features/master-jetty/feature.xml
@@ -2,7 +2,7 @@
<feature
id="master-jetty"
label="build utility feature for equinox http jetty plugins"
- version="1.0.0.qualifier">
+ version="1.0.1.qualifier">
<plugin
id="org.eclipse.osgi"
diff --git a/eclipse/features/org.eclipse.cvs/feature.xml b/eclipse/features/org.eclipse.cvs/feature.xml
index 4fe956e..41353a0 100644
--- a/eclipse/features/org.eclipse.cvs/feature.xml
+++ b/eclipse/features/org.eclipse.cvs/feature.xml
@@ -2,16 +2,16 @@
<feature
id="org.eclipse.cvs"
label="%featureName"
- version="1.2.0.qualifier"
+ version="1.2.1.qualifier"
provider-name="%providerName">
<description>
%description
</description>
-
+
<copyright>
%copyright
- </copyright>
+ </copyright>
<license url="%licenseURL">
%license
@@ -39,7 +39,7 @@
download-size="0"
install-size="0"
version="0.0.0"
- unpack="false"/>
+ unpack="false"/>
<plugin
id="org.eclipse.team.cvs.ssh2"
diff --git a/eclipse/features/org.eclipse.equinox.compendium.sdk/feature.xml b/eclipse/features/org.eclipse.equinox.compendium.sdk/feature.xml
index 06daf5f..54ee035 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.6.0.qualifier"
+ version="3.6.1.qualifier"
provider-name="%providerName">
<description>
diff --git a/eclipse/features/org.eclipse.equinox.core.sdk/feature.xml b/eclipse/features/org.eclipse.equinox.core.sdk/feature.xml
index d83351c..c0e9d25 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.6.0.qualifier"
+ version="3.6.1.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 8014539..b8b7ea3 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.4.1.qualifier">
+ version="3.4.2.qualifier">
<description>
%description
@@ -139,6 +139,16 @@
fragment="true"/>
<plugin
+ id="org.eclipse.equinox.launcher.gtk.aix.ppc64"
+ os="aix"
+ ws="gtk"
+ arch="ppc64"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ fragment="true"/>
+
+ <plugin
id="org.eclipse.equinox.launcher.motif.hpux.ia64_32"
os="hpux"
ws="motif"
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/eclipse.c b/eclipse/features/org.eclipse.equinox.executable/library/eclipse.c
index bec693c..4709007 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/eclipse.c
+++ b/eclipse/features/org.eclipse.equinox.executable/library/eclipse.c
@@ -346,6 +346,7 @@ static const _TCHAR* getVMArch();
#ifdef _WIN32
static void createConsole();
+static void fixDLLSearchPath();
static int isConsoleLauncher();
#endif
static int consoleLauncher = 0;
@@ -406,6 +407,9 @@ JNIEXPORT int run(int argc, _TCHAR* argv[], _TCHAR* vmArgs[])
#elif _WIN32
/* this must be before doing any console stuff, platforms other than win32 leave this set to 0 */
consoleLauncher = isConsoleLauncher();
+
+ /*fix the DLL search path for security */
+ fixDLLSearchPath();
#endif
/* Find the directory where the Eclipse program is installed. */
@@ -1183,7 +1187,7 @@ static _TCHAR* findStartupJar(){
/* startup jar was specified on the command line */
ch = _tcsdup(startupArg);
/* check path will check relative paths against programDir and workingDir */
- file = checkPath(ch, programDir, 0);
+ file = checkPath(ch, programDir, 1);
if(file != ch)
free(ch);
/* check existence */
@@ -1216,7 +1220,7 @@ static _TCHAR* findStartupJar(){
/* old startup.jar? */
ch = OLD_STARTUP;
- file = checkPath(ch, programDir, 0);
+ file = checkPath(ch, programDir, 1);
if (_tstat( file, &stats ) == 0)
return (file == ch) ? _tcsdup(ch) : file;
@@ -1315,6 +1319,23 @@ static int isConsoleLauncher() {
}
return 0;
}
+
+static void fixDLLSearchPath() {
+#ifdef UNICODE
+ _TCHAR* functionName = _T_ECLIPSE("SetDllDirectoryW");
+#else
+ _TCHAR* functionName = _T_ECLIPSE("SetDllDirectoryA");
+#endif
+
+ BOOL (WINAPI *SetDLLDirectory)(LPCTSTR);
+ void * handle = loadLibrary(_T_ECLIPSE("Kernel32.dll"));
+ if (handle != NULL) {
+ if ( (SetDLLDirectory = findSymbol(handle, functionName)) != NULL) {
+ SetDLLDirectory(_T_ECLIPSE(""));
+ }
+ }
+}
+
#endif
/* Set the vm to use based on the given .ee file.
@@ -1373,7 +1394,7 @@ static int determineVM(_TCHAR** msg) {
vmName[length - 1] = 0;
}
- vmName = checkPath(vmName, programDir, 0);
+ vmName = checkPath(vmName, programDir, 1);
type = checkProvidedVMType(vmName);
switch (type) {
case VM_DIRECTORY:
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/eclipseMain.c b/eclipse/features/org.eclipse.equinox.executable/library/eclipseMain.c
index 3e9c13d..fe52730 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/eclipseMain.c
+++ b/eclipse/features/org.eclipse.equinox.executable/library/eclipseMain.c
@@ -56,7 +56,7 @@ static _TCHAR* checkForIni(int argc, _TCHAR* argv[]);
static int initialArgc;
static _TCHAR** initialArgv;
-_TCHAR* eclipseLibrary; /* path to the eclipse shared library */
+_TCHAR* eclipseLibrary = NULL; /* path to the eclipse shared library */
#ifdef UNICODE
extern int main(int, char**);
@@ -396,7 +396,7 @@ static _TCHAR* findLibrary(_TCHAR* library, _TCHAR* program)
struct _stat stats;
if (library != NULL) {
- path = checkPath(library, programDir, 0);
+ path = checkPath(library, programDir, 1);
if (_tstat(path, &stats) == 0 && (stats.st_mode & S_IFDIR) != 0)
{
/* directory, find the highest version eclipse_* library */
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/eclipseMozilla.c b/eclipse/features/org.eclipse.equinox.executable/library/eclipseMozilla.c
index 04d30fa..956ae17 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/eclipseMozilla.c
+++ b/eclipse/features/org.eclipse.equinox.executable/library/eclipseMozilla.c
@@ -27,12 +27,15 @@
int filter(const struct dirent *dir)
{
char* prefixes[] = {
- "xulrunner-",
- "mozilla-seamonkey-",
- "seamonkey-",
- "mozilla-",
- "mozilla-firefox-",
- "firefox-",
+ "xulrunner\0",
+ "xulrunner-1",
+ "mozilla-seamonkey-1",
+ "seamonkey-1",
+ "mozilla-1",
+ "mozilla-firefox-2",
+ "firefox-2",
+ "mozilla-firefox-3",
+ "firefox-3",
NULL
};
int XULRUNNER_INDEX = 0;
@@ -63,29 +66,21 @@ int filter(const struct dirent *dir)
int prefixLength = strlen(prefix);
if (strncmp(dirname, prefix, prefixLength) == 0)
{
+ /* If a xulrunner install is found then success is immediate since
+ * xulrunner always provides an embeddable GRE.
+ */
if (index == XULRUNNER_INDEX) return 1; /* include in scandir result */
- /* Check if the first character following the prefix is a numeric digit.
- * This ensures that the suffix represents a version number like
- * "mozilla-1.7.3", and not a different product like "mozilla-thunderbird".
- */
int dirLength = strlen(dirname);
- if ('0' <= dirname[prefixLength] && dirname[prefixLength] <= '9') {
- /* If a xulrunner install is found then success is immediate since
- * xulrunner always provides an embeddable GRE.
- */
- if (index == XULRUNNER_INDEX) return 1; /* include in scandir result */
-
- char* testpath = malloc (strlen(root) + dirLength + strlen(testlib) + 1);
- strcpy(testpath, root);
- strcat(testpath, dirname);
- strcat(testpath, testlib);
- int success = stat(testpath, &buf) == 0;
- free(testpath);
- if (success)
- {
- return 1; /* include in scandir result */
- }
+ char* testpath = malloc (strlen(root) + dirLength + strlen(testlib) + 1);
+ strcpy(testpath, root);
+ strcat(testpath, dirname);
+ strcat(testpath, testlib);
+ int success = stat(testpath, &buf) == 0;
+ free(testpath);
+ if (success)
+ {
+ return 1; /* include in scandir result */
}
}
prefix = prefixes [++index];
@@ -202,7 +197,7 @@ void fixEnvForMozilla() {
/* Try some common installation locations. */
if (grePath == NULL)
{
- /* try xulrunner-*, mozilla-*, firefox-* directories in /usr/lib/ */
+ /* try xulrunner-1*, mozilla-1*, firefox-2/3*, seamonkey-1* directories in /usr/lib/ */
#if defined(__amd64__) || defined(__x86_64__) || defined(__powerpc64__)
char* dir = "/usr/lib64/";
#else
@@ -217,8 +212,8 @@ void fixEnvForMozilla() {
int count = scandir(dir, &namelist, filter, alphasort);
if (count > 0)
{
- /* count-1 is used below in an attempt to get the matched directory
- * with the latest version number.
+ /* count-1 is used below in an attempt to choose XULRunner
+ * any time one is found
*/
char* name = namelist [count - 1]->d_name;
#endif
@@ -310,11 +305,20 @@ void fixEnvForMozilla() {
if (grePath != NULL)
{
- ldPath = (char*)realloc(ldPath, strlen(ldPath) + strlen(grePath) + 2);
- if (strlen(ldPath) > 0) strcat(ldPath, ":");
- strcat(ldPath, grePath);
- setenv("LD_LIBRARY_PATH", ldPath, 1);
-
+ /* If grePath contains "xul" then do not change the LD_LIBRARY_PATH,
+ * since it is likely that a xulrunner (not a mozilla or firefox)
+ * will be found at runtime. Note that MOZILLA_FIVE_HOME is still
+ * updated if grePath contains "xul" since this variable can act as
+ * a backup GRE to try if an initially-detected one fails to load.
+ */
+ char* current = strrchr(grePath, 'x');
+ if (current == NULL || strncmp(current, "xul", 3) != 0) {
+ ldPath = (char*)realloc(ldPath, strlen(ldPath) + strlen(grePath) + 2);
+ if (strlen(ldPath) > 0) strcat(ldPath, ":");
+ strcat(ldPath, grePath);
+ setenv("LD_LIBRARY_PATH", ldPath, 1);
+ }
+
if (mozillaFiveHome == NULL) setenv("MOZILLA_FIVE_HOME", grePath, 1);
free(grePath);
}
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/gtk/build.sh b/eclipse/features/org.eclipse.equinox.executable/library/gtk/build.sh
index 30606e2..f821793 100755
--- a/eclipse/features/org.eclipse.equinox.executable/library/gtk/build.sh
+++ b/eclipse/features/org.eclipse.equinox.executable/library/gtk/build.sh
@@ -94,6 +94,12 @@ case $OS in
;;
esac
;;
+ "AIX")
+ makefile="make_aix.mak"
+ defaultOS="aix"
+ defaultOSArch="ppc64"
+ javaHome="/bluebird/teamswt/swt-builddir/JDKs/AIX/PPC64/j564/sdk"
+ ;;
"SunOS")
makefile="make_solaris.mak"
defaultOS="solaris"
@@ -161,7 +167,11 @@ if [ -n $javaHome ]; then
fi
if [ "$defaultOSArch" = "ppc64" ]; then
- M_ARCH=-m64
+ if [ "$defaultOS" = "aix" ]; then
+ M_ARCH=-maix64
+ else
+ M_ARCH=-m64
+ fi
export M_ARCH
elif [ "$defaultOSArch" = "s390" ]; then
M_ARCH=-m31
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/gtk/eclipseGtkInit.c b/eclipse/features/org.eclipse.equinox.executable/library/gtk/eclipseGtkInit.c
index c6f888c..995c7cf 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/gtk/eclipseGtkInit.c
+++ b/eclipse/features/org.eclipse.equinox.executable/library/gtk/eclipseGtkInit.c
@@ -94,11 +94,17 @@ static int loadGtkSymbols( void * library, FN_TABLE * table) {
}
int loadGtk() {
- void * objLib = dlopen(GOBJ_LIB, RTLD_LAZY);
- void * gdkLib = dlopen(GDK_LIB, RTLD_LAZY);
- void * pixLib = dlopen(PIXBUF_LIB, RTLD_LAZY);
- void * gtkLib = dlopen(GTK_LIB, RTLD_LAZY);
- void * x11Lib = dlopen(X11_LIB, RTLD_LAZY);
+#ifdef AIX
+#define FLAGS RTLD_LAZY | RTLD_MEMBER
+#else
+#define FLAGS RTLD_LAZY
+#endif
+
+ void * objLib = dlopen(GOBJ_LIB, FLAGS);
+ void * gdkLib = dlopen(GDK_LIB, FLAGS);
+ void * pixLib = dlopen(PIXBUF_LIB, FLAGS);
+ void * gtkLib = dlopen(GTK_LIB, FLAGS);
+ void * x11Lib = dlopen(X11_LIB, FLAGS);
/* initialize ptr struct to 0's */
memset(>k, 0, sizeof(struct GTK_PTRS));
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/gtk/make_aix.mak b/eclipse/features/org.eclipse.equinox.executable/library/gtk/make_aix.mak
new file mode 100644
index 0000000..05b8acd
--- /dev/null
+++ b/eclipse/features/org.eclipse.equinox.executable/library/gtk/make_aix.mak
@@ -0,0 +1,104 @@
+#*******************************************************************************
+# Copyright (c) 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
+# Kevin Cornell (Rational Software Corporation)
+# Tom Tromey (Red Hat, Inc.)
+#*******************************************************************************
+include ../make_version.mak
+# Makefile for creating the GTK eclipse launcher program.
+#
+# This makefile expects the utility "pkg-config" to be in the PATH.
+
+# This makefile expects the following environment variables set:
+#
+# PROGRAM_OUTPUT - the filename of the output executable
+# DEFAULT_OS - the default value of the "-os" switch
+# DEFAULT_OS_ARCH - the default value of the "-arch" switch
+# DEFAULT_WS - the default value of the "-ws" switch
+# JAVA_HOME - JAVA_HOME for jni headers
+#default value for PROGRAM_OUTPUT
+
+PROGRAM_OUTPUT=eclipse
+PROGRAM_LIBRARY=$(PROGRAM_OUTPUT)_$(LIB_VERSION).so
+
+
+# Define the object modules to be compiled and flags.
+CC=gcc
+MAIN_OBJS = eclipseMain.o
+COMMON_OBJS = eclipseConfig.o eclipseCommon.o eclipseGtkCommon.o eclipseGtkInit.o
+DLL_OBJS = eclipse.o eclipseGtk.o eclipseUtil.o eclipseJNI.o eclipseMozilla.o eclipseShm.o eclipseNix.o
+
+EXEC = $(PROGRAM_OUTPUT)
+DLL = $(PROGRAM_LIBRARY)
+#LIBS = `pkg-config --libs-only-L gtk+-2.0` -lgtk-x11-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0 -lgdk-x11-2.0 -lpthread -ldl -lX11
+LIBS = -lpthread -ldl
+GTK_LIBS = -DGTK_LIB="\"libgtk-x11-2.0.a(libgtk-x11-2.0.so.0)\"" -DGDK_LIB="\"libgdk-x11-2.0.a(libgdk-x11-2.0.so.0)\"" -DPIXBUF_LIB="\"libgdk_pixbuf-2.0.a(libgdk_pixbuf-2.0.so.0)\"" -DGOBJ_LIB="\"libgobject-2.0.a(libgobject-2.0.so.0)\"" -DX11_LIB="\"libX11.a(shr_64.o)\""
+LFLAGS = ${M_ARCH} -shared
+CFLAGS = ${M_ARCH} -g -s -Wall\
+ -fpic \
+ -DAIX \
+ -DMOZILLA_FIX \
+ -DDEFAULT_OS="\"$(DEFAULT_OS)\"" \
+ -DDEFAULT_OS_ARCH="\"$(DEFAULT_OS_ARCH)\"" \
+ -DDEFAULT_WS="\"$(DEFAULT_WS)\"" \
+ -D$(DEFAULT_JAVA) \
+ $(GTK_LIBS) \
+ -I. \
+ -I.. \
+ -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux \
+ `pkg-config --cflags gtk+-2.0`
+
+all: $(EXEC) $(DLL)
+
+eclipse.o: ../eclipse.c ../eclipseOS.h ../eclipseCommon.h ../eclipseJNI.h
+ $(CC) $(CFLAGS) -c ../eclipse.c -o eclipse.o
+
+eclipseMain.o: ../eclipseUnicode.h ../eclipseCommon.h ../eclipseMain.c
+ $(CC) $(CFLAGS) -c ../eclipseMain.c -o eclipseMain.o
+
+eclipseCommon.o: ../eclipseCommon.h ../eclipseUnicode.h ../eclipseCommon.c
+ $(CC) $(CFLAGS) -c ../eclipseCommon.c
+
+eclipseGtkCommon.o: ../eclipseCommon.h ../eclipseOS.h eclipseGtk.h eclipseGtkCommon.c
+ $(CC) $(CFLAGS) -c eclipseGtkCommon.c -o eclipseGtkCommon.o
+
+eclipseGtkInit.o: ../eclipseCommon.h eclipseGtk.h eclipseGtkInit.c
+ $(CC) $(CFLAGS) -c eclipseGtkInit.c -o eclipseGtkInit.o
+
+eclipseUtil.o: ../eclipseUtil.c ../eclipseUtil.h ../eclipseOS.h
+ $(CC) $(CFLAGS) -c ../eclipseUtil.c -o eclipseUtil.o
+
+eclipseJNI.o: ../eclipseJNI.c ../eclipseCommon.h ../eclipseOS.h ../eclipseJNI.h
+ $(CC) $(CFLAGS) -c ../eclipseJNI.c -o eclipseJNI.o
+
+eclipseConfig.o: ../eclipseConfig.c ../eclipseConfig.h ../eclipseOS.h
+ $(CC) $(CFLAGS) -c ../eclipseConfig.c -o eclipseConfig.o
+
+eclipseMozilla.o: ../eclipseMozilla.c ../eclipseMozilla.h ../eclipseOS.h
+ $(CC) $(CFLAGS) -c ../eclipseMozilla.c -o eclipseMozilla.o
+
+eclipseShm.o: ../eclipseShm.h ../eclipseUnicode.h ../eclipseShm.c
+ $(CC) $(CFLAGS) -c ../eclipseShm.c -o eclipseShm.o
+
+eclipseNix.o: ../eclipseNix.c
+ $(CC) $(CFLAGS) -c ../eclipseNix.c -o eclipseNix.o
+
+$(EXEC): $(MAIN_OBJS) $(COMMON_OBJS)
+ $(CC) ${M_ARCH} -o $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS)
+
+$(DLL): $(DLL_OBJS) $(COMMON_OBJS)
+ $(CC) $(LFLAGS) -o $(DLL) $(DLL_OBJS) $(COMMON_OBJS) $(LIBS)
+
+install: all
+ cp $(EXEC) $(OUTPUT_DIR)
+ cp $(DLL) $(LIBRARY_DIR)
+ rm -f $(EXEC) $(DLL) $(MAIN_OBJS) $(COMMON_OBJS) $(DLL_OBJS)
+
+clean:
+ rm -f $(EXEC) $(DLL) $(MAIN_OBJS) $(COMMON_OBJS) $(DLL_OBJS)
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 bd05746..05aaff2 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=309
+min_ver=312
LIB_VERSION = $(maj_ver)$(min_ver)
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/win32/eclipseWin.c b/eclipse/features/org.eclipse.equinox.executable/library/win32/eclipseWin.c
index 8033224..770b464 100644
--- a/eclipse/features/org.eclipse.equinox.executable/library/win32/eclipseWin.c
+++ b/eclipse/features/org.eclipse.equinox.executable/library/win32/eclipseWin.c
@@ -286,6 +286,7 @@ _TCHAR * findVMLibrary( _TCHAR* command ) {
void adjustSearchPath( _TCHAR* vmLib ){
_TCHAR ** paths;
+ _TCHAR* cwd = NULL;
_TCHAR * path = NULL, *newPath = NULL;
_TCHAR * c;
int i, length;
@@ -293,12 +294,20 @@ void adjustSearchPath( _TCHAR* vmLib ){
paths = getVMLibrarySearchPath(vmLib);
+ /* bug 325902 - add current working dir to the end of the search path */
+ length = GetCurrentDirectory(0, NULL);
+ cwd = malloc((length + 1)* sizeof(_TCHAR));
+ GetCurrentDirectory(length, cwd);
+ cwd[length - 1] = pathSeparator;
+ cwd[length] = 0;
+
/* first call to GetEnvironmentVariable tells us how big to make the buffer */
length = GetEnvironmentVariable(_T_ECLIPSE("PATH"), path, 0);
if (length > 0) {
+ _TCHAR* current [] = { cwd, NULL };
path = malloc(length * sizeof(_TCHAR));
GetEnvironmentVariable(_T_ECLIPSE("PATH"), path, length);
- needAdjust = !containsPaths(path, paths);
+ needAdjust = !containsPaths(path, paths) || !containsPaths(path, current);
freePath = 1;
} else {
path = _T_ECLIPSE("");
@@ -308,8 +317,8 @@ void adjustSearchPath( _TCHAR* vmLib ){
if (needAdjust) {
c = concatStrings(paths);
- newPath = malloc((_tcslen(c) + length + 1) * sizeof(_TCHAR));
- _stprintf(newPath, _T_ECLIPSE("%s%s"), c, path);
+ newPath = malloc((_tcslen(c) + length + 1 + _tcslen(cwd) + 1) * sizeof(_TCHAR));
+ _stprintf(newPath, _T_ECLIPSE("%s%s%c%s"), c, path, pathSeparator, cwd);
SetEnvironmentVariable( _T_ECLIPSE("PATH"), newPath);
free(c);
free(newPath);
@@ -318,6 +327,7 @@ void adjustSearchPath( _TCHAR* vmLib ){
for (i = 0; paths[i] != NULL; i++)
free(paths[i]);
free(paths);
+ free(cwd);
if (freePath)
free(path);
}
diff --git a/eclipse/features/org.eclipse.equinox.executable/target.build.properties b/eclipse/features/org.eclipse.equinox.executable/target.build.properties
index 8f0e254..b3817cd 100644
--- a/eclipse/features/org.eclipse.equinox.executable/target.build.properties
+++ b/eclipse/features/org.eclipse.equinox.executable/target.build.properties
@@ -43,6 +43,7 @@ root.macosx.cocoa.x86_64=bin/cocoa/macosx/x86_64
root.macosx.cocoa.x86_64.permissions.755=${launcherName}.app/Contents/MacOS/${launcherName}
root.aix.motif.ppc=bin/motif/aix/ppc
+root.aix.gtk.ppc64=bin/gtk/aix/ppc64
root.hpux.motif.PA_RISC=bin/motif/hpux/PA_RISC
root.hpux.motif.ia64_32=bin/motif/hpux/ia64_32
diff --git a/eclipse/features/org.eclipse.equinox.executable/target.build.xml b/eclipse/features/org.eclipse.equinox.executable/target.build.xml
index 346a52c..ed649f2 100644
--- a/eclipse/features/org.eclipse.equinox.executable/target.build.xml
+++ b/eclipse/features/org.eclipse.equinox.executable/target.build.xml
@@ -154,6 +154,14 @@
</copy>
<chmod perm="755" dir="${feature.base}/linux.gtk.ppc64/${collectingFolder}" includes="launcher" />
</target>
+ <target name="rootFilesaix_gtk_ppc64">
+ <mkdir dir="${feature.base}/aix.gtk.ppc64/${collectingFolder}"/>
+ <copy todir="${feature.base}/aix.gtk.ppc64/${collectingFolder}" failonerror="true" overwrite="true">
+ <fileset dir="${basedir}/bin/gtk/aix/ppc64" includes="**" />
+ <fileset dir="${basedir}/gtk_root" includes="**" />
+ </copy>
+ <chmod perm="755" dir="${feature.base}/aix.gtk.ppc64/${collectingFolder}" includes="launcher" />
+ </target>
<target name="rootFileslinux_gtk_x86_64">
<mkdir dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}"/>
<copy todir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" failonerror="true" overwrite="true">
@@ -269,6 +277,7 @@
<antcall target="rootFilessolaris_gtk_x86"/>
<antcall target="rootFilessolaris_motif_sparc"/>
<antcall target="rootFilesaix_motif_ppc"/>
+ <antcall target="rootFilesaix_gtk_ppc64"/>
<antcall target="rootFileshpux_motif_PA_RISC"/>
<antcall target="rootFileshpux_motif_ia64"/>
<antcall target="rootFileshpux_motif_ia64_32"/>
diff --git a/eclipse/features/org.eclipse.equinox.p2.discovery.feature/feature.xml b/eclipse/features/org.eclipse.equinox.p2.discovery.feature/feature.xml
index 5faa18b..3b4abb6 100644
--- a/eclipse/features/org.eclipse.equinox.p2.discovery.feature/feature.xml
+++ b/eclipse/features/org.eclipse.equinox.p2.discovery.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.equinox.p2.discovery.feature"
label="%featureName"
- version="1.0.0.qualifier"
+ version="1.0.1.qualifier"
provider-name="%providerName">
<description>
diff --git a/eclipse/features/org.eclipse.equinox.p2.sdk/feature.xml b/eclipse/features/org.eclipse.equinox.p2.sdk/feature.xml
index a0a9fcf..c5b9753 100644
--- a/eclipse/features/org.eclipse.equinox.p2.sdk/feature.xml
+++ b/eclipse/features/org.eclipse.equinox.p2.sdk/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.equinox.p2.sdk"
label="%featureName"
- version="3.6.0.qualifier"
+ version="3.6.2.qualifier"
provider-name="%providerName">
<description>
diff --git a/eclipse/features/org.eclipse.equinox.sdk/feature.properties b/eclipse/features/org.eclipse.equinox.sdk/feature.properties
index c80d1e0..e07bdb6 100644
--- a/eclipse/features/org.eclipse.equinox.sdk/feature.properties
+++ b/eclipse/features/org.eclipse.equinox.sdk/feature.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2009, 2010 EclipseSource and others.
+# Copyright (c) 2009, 2011 EclipseSource 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
@@ -34,7 +34,7 @@ deployed with end-user systems.
# "copyright" property - text of the "Feature Update Copyright"
copyright=\
-Copyright (c) 2009, 2010 EclipseSource and others.\n\
+Copyright (c) 2009, 2011 EclipseSource 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.equinox.sdk/feature.xml b/eclipse/features/org.eclipse.equinox.sdk/feature.xml
index a6fe06d..e172d16 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.6.1.qualifier"
+ version="3.6.2.qualifier"
provider-name="%providerName">
<description>
diff --git a/eclipse/features/org.eclipse.equinox.server.core/feature.xml b/eclipse/features/org.eclipse.equinox.server.core/feature.xml
index 5e830b8..87e158d 100644
--- a/eclipse/features/org.eclipse.equinox.server.core/feature.xml
+++ b/eclipse/features/org.eclipse.equinox.server.core/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.equinox.server.core"
label="%featureName"
- version="1.0.0.qualifier"
+ version="1.0.1.qualifier"
provider-name="%providerName">
<copyright>
diff --git a/eclipse/features/org.eclipse.equinox.server.p2/feature.xml b/eclipse/features/org.eclipse.equinox.server.p2/feature.xml
index 03e7910..5d9fbd4 100644
--- a/eclipse/features/org.eclipse.equinox.server.p2/feature.xml
+++ b/eclipse/features/org.eclipse.equinox.server.p2/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.equinox.server.p2"
label="%featureName"
- version="1.0.0.qualifier"
+ version="1.0.1.qualifier"
provider-name="%providerName">
<copyright url="%copyrightURL">
diff --git a/eclipse/features/org.eclipse.equinox.serverside.sdk/feature.xml b/eclipse/features/org.eclipse.equinox.serverside.sdk/feature.xml
index 0e3cd98..2292b9a 100644
--- a/eclipse/features/org.eclipse.equinox.serverside.sdk/feature.xml
+++ b/eclipse/features/org.eclipse.equinox.serverside.sdk/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.equinox.serverside.sdk"
label="%featureName"
- version="3.6.0.qualifier"
+ version="3.6.1.qualifier"
provider-name="%providerName">
<description>
@@ -211,6 +211,6 @@
install-size="0"
version="0.0.0"
fragment="true"
- unpack="false"/>
+ unpack="false"/>
</feature>
diff --git a/eclipse/features/org.eclipse.help/feature.xml b/eclipse/features/org.eclipse.help/feature.xml
index 67bff27..ab10824 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.2.0.qualifier"
+ version="1.2.1.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.xml b/eclipse/features/org.eclipse.jdt/feature.xml
index f302e0f..3899b9f 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.6.1.qualifier"
+ version="3.6.2.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg">
@@ -24,7 +24,7 @@
</url>
<requires>
- <import feature="org.eclipse.platform" version="3.6.1" match="greaterOrEqual"/>
+ <import feature="org.eclipse.platform" version="3.6.2" match="greaterOrEqual"/>
</requires>
<plugin
diff --git a/eclipse/features/org.eclipse.pde/feature.properties b/eclipse/features/org.eclipse.pde/feature.properties
index 0cdd53e..48e5445 100644
--- a/eclipse/features/org.eclipse.pde/feature.properties
+++ b/eclipse/features/org.eclipse.pde/feature.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2000, 2010 IBM Corporation and others.
+# Copyright (c) 2000, 2011 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 plug-in development environment.
# "copyright" property - text of the "Feature Update Copyright"
copyright=\
-Copyright (c) 2000, 2010 IBM Corporation and others.\n\
+Copyright (c) 2000, 2011 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 27f4daf..575ef86 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.6.1.qualifier"
+ version="3.6.2.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg">
diff --git a/eclipse/features/org.eclipse.pde/sourceTemplateFeature/feature.properties b/eclipse/features/org.eclipse.pde/sourceTemplateFeature/feature.properties
index 7f1f574..a9fc762 100644
--- a/eclipse/features/org.eclipse.pde/sourceTemplateFeature/feature.properties
+++ b/eclipse/features/org.eclipse.pde/sourceTemplateFeature/feature.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2004, 2010 IBM Corporation and others.
+# Copyright (c) 2004, 2011 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 plug-in development environment, including documentation and
# "copyright" property - text of the "Feature Update Copyright"
copyright=\
-Copyright (c) 2000, 2010 IBM Corporation and others.\n\
+Copyright (c) 2000, 2011 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/sourceTemplatePlugin/about.properties b/eclipse/features/org.eclipse.pde/sourceTemplatePlugin/about.properties
index b4d259a..7809899 100644
--- a/eclipse/features/org.eclipse.pde/sourceTemplatePlugin/about.properties
+++ b/eclipse/features/org.eclipse.pde/sourceTemplatePlugin/about.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2000, 2010 IBM Corporation and others.
+# Copyright (c) 2000, 2011 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,6 +21,6 @@ blurb=Eclipse Plug-in Development Environment Developer Resources\n\
Version: {featureVersion}\n\
Build id: {0}\n\
\n\
-(c) Copyright Eclipse contributors and others 2000, 2010. All rights reserved.\n\
+(c) Copyright Eclipse contributors and others 2000, 2011. All rights reserved.\n\
Visit http://www.eclipse.org/pde
diff --git a/eclipse/features/org.eclipse.platform/feature.xml b/eclipse/features/org.eclipse.platform/feature.xml
index 90becef..60babec 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.6.1.qualifier"
+ version="3.6.2.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg">
@@ -116,7 +116,7 @@
version="0.0.0"
fragment="true"
unpack="false"/>
-
+
<plugin
id="org.eclipse.core.net.linux.x86_64"
os="linux"
@@ -126,7 +126,7 @@
version="0.0.0"
fragment="true"
unpack="false"/>
-
+
<plugin
id="org.eclipse.core.net.win32.x86_64"
os="win32"
@@ -135,8 +135,8 @@
install-size="0"
version="0.0.0"
fragment="true"
- unpack="false"/>
-
+ unpack="false"/>
+
<plugin
id="org.eclipse.core.net.linux.x86"
os="linux"
@@ -152,7 +152,7 @@
download-size="0"
install-size="0"
version="0.0.0"
- unpack="false"/>
+ unpack="false"/>
<plugin
id="org.eclipse.core.runtime.compatibility"
@@ -188,7 +188,7 @@
install-size="0"
version="0.0.0"
unpack="false"/>
-
+
<plugin
id="org.eclipse.equinox.event"
download-size="0"
@@ -419,7 +419,7 @@
install-size="0"
version="0.0.0"
fragment="true"/>
-
+
<plugin
id="org.eclipse.core.filesystem.aix.ppc"
os="aix"
@@ -439,7 +439,7 @@
version="0.0.0"
fragment="true"
unpack="false"/>
-
+
<plugin
id="org.eclipse.core.filesystem.linux.ppc"
os="linux"
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 6c9580e..80476fc 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 xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
-<title>Eclipse Project Release Notes 3.6</title>
+<title>Eclipse Project Release Notes 3.6.2</title>
</head>
<body>
<h1>Eclipse Project Release Notes</h1>
-<p>Release 3.6.1<br/>
- Last revised September 8, 2010</p>
+<p>Release 3.6.2<br/>
+ Last revised February 10, 2011</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>
@@ -1625,3678 +1625,2005 @@ Eclipse 3.6 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.6.1 since 3.6.0</h3>
-<p>Release 3.6.1 is a maintenance release to fix serious defects present in
-release 3.6.0 These changes only affect some plug-ins and
+<h3>7.1 Defects fixed in release 3.6.2 since 3.6.1</h3>
+<p>Release 3.6.2 is a maintenance release to fix serious defects present in
+release 3.6.1 These changes only affect some plug-ins and
features.</p>
-<p>Maintenance release 3.6.1 contains fixes for the following defects and others:</p>
+<p>Maintenance release 3.6.2 contains fixes for the following defects and others:</p>
<p>
-Note: Bug fixes since the 3.6 release can be obtained by the following the Bugzilla query: </p>
+Note: Bug fixes since the 3.6.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.6.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.6.1;value0-0-0=|;query_based_on=">Bugs fixed in the 3.6.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.6.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.6.1;value0-0-0=|;query_based_on=">Bugs fixed in the 3.6.2 release</a>
</p>
+
+
+
<table class="bz_buglist" cellspacing="0" cellpadding="4" width="100%">
-
- <tr class="bz_buglist_header bz_first_buglist_header" align="left">
+ <tr class="bz_buglist_header bz_first_buglist_header">
<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.6.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.6.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.6.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.6.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_minor bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b169959"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=169959">169959</a>
- <span style="display: none"></span>
- </td>
-
- <td >Exclusion filter for source folders unclear
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b240657"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=240657">240657</a>
- <span style="display: none"></span>
- </td>
-
- <td >Combo.setText() doesnt set the text if the string is a substring of the strings in combo
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b243529"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=243529">243529</a>
- <span style="display: none"></span>
- </td>
-
- <td >[DND] [Mac] Erratic DND behaviour on Mac OS X
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b244757"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=244757">244757</a>
- <span style="display: none"></span>
- </td>
-
- <td >[ActivityMgmt] ConcurrentModificationException when activities added dynamically
- </td>
-
- </tr>
-
-
-
-
-
<tr class="bz_bugitem
bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
- <td class="first-child">
- <a name="b268833"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=268833">268833</a>
+ <td class="first-child bz_id_column">
+ <a name="b210027"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=210027">210027</a>
<span style="display: none"></span>
</td>
- <td >[rulers] NullPointerException in org.eclipse.jface.text.source.LineNumberRulerColumn.getWidth
+ <td
+ class="bz_short_desc_column">TreeModelLabelProvider does not cancel stale updates.
</td>
</tr>
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
- <td class="first-child">
- <a name="b270472"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=270472">270472</a>
+ <td class="first-child bz_id_column">
+ <a name="b283320"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=283320">283320</a>
<span style="display: none"></span>
</td>
- <td >[JFace] Orca cannot read Eclipse status line
+ <td
+ class="bz_short_desc_column">[SWT] Widgets flashing when moving mouse while holding Alt button
</td>
</tr>
-
-
-
<tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b277574"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=277574">277574</a>
- <span style="display: none"></span>
- </td>
-
- <td >JDI thread evaluations (Error: Exception processing async thread queue)
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b278598"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=278598">278598</a>
- <span style="display: none"></span>
- </td>
-
- <td >[product] ignore certain program arguments when initializing from a launch config
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
+ bz_normal bz_P2 bz_RESOLVED bz_FIXED bz_row_odd ">
- <td class="first-child">
- <a name="b284269"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=284269">284269</a>
+ <td class="first-child bz_id_column">
+ <a name="b301894"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=301894">301894</a>
<span style="display: none"></span>
</td>
- <td >[KeyBindings] Reduce memory footprint of BindingManager
+ <td
+ class="bz_short_desc_column">OutOfMemory error when building a large project with annotations
</td>
</tr>
-
-
-
<tr class="bz_bugitem
- bz_trivial 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="b294761"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=294761">294761</a>
+ <td class="first-child bz_id_column">
+ <a name="b302184"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=302184">302184</a>
<span style="display: none"></span>
</td>
- <td >Gripper icon on Mac status bar should be transparent
+ <td
+ class="bz_short_desc_column">[About] About dialog text - needs to not cache system property values
</td>
</tr>
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
- <td class="first-child">
- <a name="b294860"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=294860">294860</a>
+ <td class="first-child bz_id_column">
+ <a name="b307345"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=307345">307345</a>
<span style="display: none"></span>
</td>
- <td >Left arrow buttons point to the right (Carbon)
+ <td
+ class="bz_short_desc_column">[Browser][Mozilla][Mac]Can't use ctrl+f2 to move focus to the menu bar in Mozilla browser
</td>
</tr>
-
-
-
<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="b299451"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=299451">299451</a>
+ <td class="first-child bz_id_column">
+ <a name="b312189"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=312189">312189</a>
<span style="display: none"></span>
</td>
- <td >[DND] Tracker rectangle appears on wrong screen when dragging part
+ <td
+ class="bz_short_desc_column">[quick assist] BadLocationException when applying proposal while preview is computed
</td>
</tr>
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
- <td class="first-child">
- <a name="b304652"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=304652">304652</a>
+ <td class="first-child bz_id_column">
+ <a name="b317771"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=317771">317771</a>
<span style="display: none"></span>
</td>
- <td >Export of a feature based product with source bundles fails
+ <td
+ class="bz_short_desc_column">FUP of 315978: Add performance tracking test for scenario fixed by bug# 315978
</td>
</tr>
-
-
-
<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="b306464"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=306464">306464</a>
+ <td class="first-child bz_id_column">
+ <a name="b319123"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=319123">319123</a>
<span style="display: none"></span>
</td>
- <td >NPE in ProblemReporter.missingTypeInMethod(ProblemReporter.java:5113)
+ <td
+ class="bz_short_desc_column">[launcher] Application becomes unresponsive when code completion tooltip shows
</td>
</tr>
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
- <td class="first-child">
- <a name="b308402"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=308402">308402</a>
+ <td class="first-child bz_id_column">
+ <a name="b319337"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=319337">319337</a>
<span style="display: none"></span>
</td>
- <td >[index] PatternSearchJob ignores participant index entries
+ <td
+ class="bz_short_desc_column">[Win32] WindowXP command "Close Group" can not close all the Eclipse window that in one group
</td>
</tr>
-
-
-
<tr class="bz_bugitem
- bz_major 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="b309269"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=309269">309269</a>
+ <td class="first-child bz_id_column">
+ <a name="b321155"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=321155">321155</a>
<span style="display: none"></span>
</td>
- <td >[Widgets] Table selection event does not return a correct table item
+ <td
+ class="bz_short_desc_column">[DynamicGUI] UIExtensionTracker calling Display.syncExec() on disposed Display
</td>
</tr>
-
-
-
<tr class="bz_bugitem
- bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
+ bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
- <td class="first-child">
- <a name="b311217"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=311217">311217</a>
+ <td class="first-child bz_id_column">
+ <a name="b323514"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=323514">323514</a>
<span style="display: none"></span>
</td>
- <td >[Help] New Child macro does not pick-up child topics at the toc level - Fix for Eclipse 3.6.1
+ <td
+ class="bz_short_desc_column">[indexing] The Java Indexer is taking longer to run in eclipse 3.6 when opening projects
</td>
</tr>
-
-
-
<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="b311579"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=311579">311579</a>
+ <td class="first-child bz_id_column">
+ <a name="b323763"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=323763">323763</a>
<span style="display: none"></span>
</td>
- <td >[DS] Factory component configurations are not disposed when cannot be activated
+ <td
+ class="bz_short_desc_column">Eclipse 3.7 M1 crashes as it is starting up - detected by Java Runtime Environment
</td>
</tr>
-
-
-
<tr class="bz_bugitem
- bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
+ bz_critical bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
- <td class="first-child">
- <a name="b312140"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=312140">312140</a>
+ <td class="first-child bz_id_column">
+ <a name="b324102"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=324102">324102</a>
<span style="display: none"></span>
</td>
- <td >PDE build uses incorrect profile area if Eclipse is read-only
+ <td
+ class="bz_short_desc_column">Backspace key, delete key and tab stop working when my application is minimized
</td>
</tr>
-
-
-
<tr class="bz_bugitem
- bz_enhancement 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="b312254"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=312254">312254</a>
+ <td class="first-child bz_id_column">
+ <a name="b324236"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=324236">324236</a>
<span style="display: none"></span>
</td>
- <td >Plan verifier to allow third party plugin to veto a provisioning plan
+ <td
+ class="bz_short_desc_column">[Browser-Mozilla] Links and JS actions opening a new window do not work
</td>
</tr>
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
- <td class="first-child">
- <a name="b312365"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=312365">312365</a>
+ <td class="first-child bz_id_column">
+ <a name="b324596"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=324596">324596</a>
<span style="display: none"></span>
</td>
- <td >Carbon: DnD fails when dropping object to a child control.
+ <td
+ class="bz_short_desc_column">[releng][p2] consume ECF build for 3.6.1 maintenance
</td>
</tr>
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
- <td class="first-child">
- <a name="b313121"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=313121">313121</a>
- <span style="display: none"></span>
- </td>
-
- <td >Font dialog doesn't return selected Font (when opened after MULTI Text)
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b313153"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=313153">313153</a>
- <span style="display: none"></span>
- </td>
-
- <td >Too many blocked "Refreshing external folders" jobs (FUP of bug 302295)
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b313234"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=313234">313234</a>
- <span style="display: none"></span>
- </td>
-
- <td >-console <port> terminating OSGi framework in 3.6.RC1
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b313324"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=313324">313324</a>
+ <td class="first-child bz_id_column">
+ <a name="b324801"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=324801">324801</a>
<span style="display: none"></span>
</td>
- <td >Suspicious fall-through
+ <td
+ class="bz_short_desc_column">enable WebKitGTK on Linux-PPC
</td>
</tr>
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b313409"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=313409">313409</a>
- <span style="display: none"></span>
- </td>
-
- <td >NPE during Add Artifact to Target Platform
- </td>
-
- </tr>
-
-
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
- <td class="first-child">
- <a name="b313447"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=313447">313447</a>
+ <td class="first-child bz_id_column">
+ <a name="b324892"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=324892">324892</a>
<span style="display: none"></span>
</td>
- <td >Avoid MD5 computation for publishing from dropins reconciler
+ <td
+ class="bz_short_desc_column">Wrong constant values for some IA2 events
</td>
</tr>
-
-
-
<tr class="bz_bugitem
- bz_normal bz_P3 bz_CLOSED bz_FIXED bz_row_even ">
+ bz_critical bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
- <td class="first-child">
- <a name="b313454"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=313454">313454</a>
+ <td class="first-child bz_id_column">
+ <a name="b325028"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=325028">325028</a>
<span style="display: none"></span>
</td>
- <td >[publisher] Add a new flag to the UpdateSitePublisherApplication to generate the JRE's IU.
+ <td
+ class="bz_short_desc_column">[a11y] Frequent crashes in editor resulting from atk_object_get_attributes()
</td>
</tr>
-
-
-
<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="b313530"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=313530">313530</a>
+ <td class="first-child bz_id_column">
+ <a name="b325161"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=325161">325161</a>
<span style="display: none"></span>
</td>
- <td >[hovering] HTMLPrinter should refresh colors if corresponding OS colors change
+ <td
+ class="bz_short_desc_column">NPE in Java breakpoint properties page with JavaStratumLineBreakpoint
</td>
</tr>
-
-
-
<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="b313593"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=313593">313593</a>
+ <td class="first-child bz_id_column">
+ <a name="b325227"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=325227">325227</a>
<span style="display: none"></span>
</td>
- <td >[Accessibility] Implement retrieval of visible children
+ <td
+ class="bz_short_desc_column">[Backport] NatureManager is NOT threadsafe causing incorrect responses to isNatureEnabled() (and others)
</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_secure bz_secure_mode_manual bz_row_odd ">
- <td class="first-child">
- <a name="b313651"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=313651">313651</a>
- <span style="display: none"></span>
+ <td class="first-child bz_id_column">
+ <a name="b325294"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=325294">325294</a>
+ <span style="display: none">[SEC]</span>
</td>
- <td >[formatter] format comments (differs between paste and save action)
+ <td
+ class="bz_short_desc_column">[launcher] DLL hijacking exploit
</td>
</tr>
-
-
-
<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="b313668"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=313668">313668</a>
+ <td class="first-child bz_id_column">
+ <a name="b325557"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=325557">325557</a>
<span style="display: none"></span>
</td>
- <td >[search] Call hierarchy doesn't show all calls of the method in workspace
+ <td
+ class="bz_short_desc_column">Associating a Launch with Perspective "None" is not persisted
</td>
</tr>
-
-
-
<tr class="bz_bugitem
bz_major bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
- <td class="first-child">
- <a name="b313740"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=313740">313740</a>
- <span style="display: none"></span>
- </td>
-
- <td >Unable to select any window when JFace warning dialog and file browse dialog are both open
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_CLOSED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b313744"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=313744">313744</a>
- <span style="display: none"></span>
- </td>
-
- <td >SimpleArtifactRepository does not allow the user to limit the number of threads used for downloads
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_CLOSED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b313747"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=313747">313747</a>
- <span style="display: none"></span>
- </td>
-
- <td >SimpleArtifactRepository fails to transfer files when its location is relative
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_CLOSED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b313789"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=313789">313789</a>
- <span style="display: none"></span>
- </td>
-
- <td >[comparator] False Positive comparing with different inner class info ordering
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b313825"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=313825">313825</a>
+ <td class="first-child bz_id_column">
+ <a name="b325797"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=325797">325797</a>
<span style="display: none"></span>
</td>
- <td >Erroneous local variable's problems reported at surrounding ParenthesizedExpression
+ <td
+ class="bz_short_desc_column">views automatically opened based on debug context are hidden/closed on perspective switch
</td>
</tr>
-
-
-
<tr class="bz_bugitem
bz_major bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
- <td class="first-child">
- <a name="b313905"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=313905">313905</a>
+ <td class="first-child bz_id_column">
+ <a name="b325885"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=325885">325885</a>
<span style="display: none"></span>
</td>
- <td >[reconciler] Second startup after update also slow
+ <td
+ class="bz_short_desc_column">Dynamic import resolver bug
</td>
</tr>
-
-
-
<tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b313943"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=313943">313943</a>
- <span style="display: none"></span>
- </td>
-
- <td >[hovering] Java source hovers not readable using Ubuntu 10.04 (white-on-black tooltips)
- </td>
+ bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_secure bz_secure_mode_manual bz_row_odd ">
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b313952"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=313952">313952</a>
- <span style="display: none"></span>
- </td>
-
- <td >NPE from import page crashes Eclipse
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b313953"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=313953">313953</a>
- <span style="display: none"></span>
+ <td class="first-child bz_id_column">
+ <a name="b325902"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=325902">325902</a>
+ <span style="display: none">[SEC]</span>
</td>
- <td >[performance] [reconciler] [query] Super slow startup time after deleting files in dropins
+ <td
+ class="bz_short_desc_column">[launcher] Windows LoadLibrary search cwd DLL exploit
</td>
</tr>
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
- <td class="first-child">
- <a name="b313994"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=313994">313994</a>
+ <td class="first-child bz_id_column">
+ <a name="b325946"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=325946">325946</a>
<span style="display: none"></span>
</td>
- <td >[Webapp] If a toc satisfies a criterion but its children do not it is still displayed - Fix for Eclipse 3.6.1
+ <td
+ class="bz_short_desc_column">[backport] Provide a way to disable capping in the comparison algorithm
</td>
</tr>
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b313996"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=313996">313996</a>
- <span style="display: none"></span>
- </td>
-
- <td >[Intro] Slate theme Overview page looks odd with non-white window background - Fix for Eclipse 3.6.1
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_minor bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b314243"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=314243">314243</a>
- <span style="display: none"></span>
- </td>
-
- <td >[Widgets] Tooltip for tool item in inactive shell not updated when mouse moved to other item
- </td>
-
- </tr>
-
-
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
- <td class="first-child">
- <a name="b314256"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=314256">314256</a>
+ <td class="first-child bz_id_column">
+ <a name="b326152"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=326152">326152</a>
<span style="display: none"></span>
</td>
- <td >[Help] Duplicate links in F1 help - Fix in 3.6.1
+ <td
+ class="bz_short_desc_column">[Memory View] new monitors added while Memory view is hidden or closed are not shown in the tree
</td>
</tr>
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
- <td class="first-child">
- <a name="b314324"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=314324">314324</a>
+ <td class="first-child bz_id_column">
+ <a name="b326263"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=326263">326263</a>
<span style="display: none"></span>
</td>
- <td >[Help] Ton's of EofException/s - Fix in Eclipse 3.6.1
+ <td
+ class="bz_short_desc_column">Windows File Locks are obtained on bundles exporting extension points and not released.
</td>
</tr>
-
-
-
-
- <tr class="bz_bugitem
- bz_major bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b314343"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=314343">314343</a>
- <span style="display: none"></span>
- </td>
-
- <td >[console] IllegalStateException can happen on shutdown if you disconnect from standard console
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b314456"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=314456">314456</a>
- <span style="display: none"></span>
- </td>
-
- <td >NPE at org.eclipse.pde.internal.core.target.provisional.LoadTargetDefinitionJob.handleReload(LoadTargetDefinitionJob.java:370)
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b314589"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=314589">314589</a>
- <span style="display: none"></span>
- </td>
-
- <td >[Help] NPE creating new scope in search view - Fix for 3.6.1
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_CLOSED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b314768"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=314768">314768</a>
- <span style="display: none"></span>
- </td>
-
- <td >AbstractRepositoryManager eats exception
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b314830"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=314830">314830</a>
- <span style="display: none"></span>
- </td>
-
- <td >[compiler] Switching on a null expression doesn't always throw NullPointerException
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b314900"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=314900">314900</a>
- <span style="display: none"></span>
- </td>
-
- <td >Compare task doesn't report added or removed api components
- </td>
-
- </tr>
-
-
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
- <td class="first-child">
- <a name="b314946"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=314946">314946</a>
- <span style="display: none"></span>
- </td>
-
- <td >[Accessibility] Title override values not reported in ControlsWithAccessibleNames example
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b314951"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=314951">314951</a>
- <span style="display: none"></span>
- </td>
-
- <td >[Accessibility] Spinners report back as 'unknown'
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b315092"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=315092">315092</a>
+ <td class="first-child bz_id_column">
+ <a name="b326351"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=326351">326351</a>
<span style="display: none"></span>
</td>
- <td >API Baseline becomes empty
+ <td
+ class="bz_short_desc_column">remove p2.selfhosting bundle from org.eclipse.releng/maps/p2.map
</td>
</tr>
-
-
-
<tr class="bz_bugitem
bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
- <td class="first-child">
- <a name="b315620"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=315620">315620</a>
+ <td class="first-child bz_id_column">
+ <a name="b326354"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=326354">326354</a>
<span style="display: none"></span>
</td>
- <td >[Progress] WorkbenchWindow is leaked
+ <td
+ class="bz_short_desc_column">[3.6][compiler][regression] Compiler in 3.6 and 3.6.1 generates bad code
</td>
</tr>
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
- <td class="first-child">
- <a name="b315710"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=315710">315710</a>
+ <td class="first-child bz_id_column">
+ <a name="b326395"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=326395">326395</a>
<span style="display: none"></span>
</td>
- <td >headless build fails with java.lang.ClassCastException
+ <td
+ class="bz_short_desc_column">[Backport] Cannot compare word documents
</td>
</tr>
-
-
-
<tr class="bz_bugitem
bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
- <td class="first-child">
- <a name="b315732"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=315732">315732</a>
+ <td class="first-child bz_id_column">
+ <a name="b326434"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=326434">326434</a>
<span style="display: none"></span>
</td>
- <td >[formatter] NullPointerException (always) on inserting a custom template proposal into java code when "Use code formatter" is on
+ <td
+ class="bz_short_desc_column">New issues with NPE refreshing external folders with 3.6.1
</td>
</tr>
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
- <td class="first-child">
- <a name="b315746"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=315746">315746</a>
- <span style="display: none"></span>
- </td>
-
- <td >--launcher.openFile on Solaris fails with error about unresolved symbol sem_open
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_major bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b315757"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=315757">315757</a>
- <span style="display: none"></span>
- </td>
-
- <td >[publisher][regression] Cannot provide -contextMetadata to publisher application
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_major bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b315762"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=315762">315762</a>
+ <td class="first-child bz_id_column">
+ <a name="b326453"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=326453">326453</a>
<span style="display: none"></span>
</td>
- <td >bundles with compile errors never published even through p2.publishonerror is set to "true"
+ <td
+ class="bz_short_desc_column">releng compare tool and pde api tooling should compare against 3.6.1 in 3.6.2 maintenance stream
</td>
</tr>
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
- <td class="first-child">
- <a name="b315792"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=315792">315792</a>
+ <td class="first-child bz_id_column">
+ <a name="b326516"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=326516">326516</a>
<span style="display: none"></span>
</td>
- <td >NPE is thrown during the headless build
+ <td
+ class="bz_short_desc_column">3.6.2 feature versions need to be incremented
</td>
</tr>
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
- <td class="first-child">
- <a name="b315812"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=315812">315812</a>
+ <td class="first-child bz_id_column">
+ <a name="b326532"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=326532">326532</a>
<span style="display: none"></span>
</td>
- <td >[accessibility] text-based ToolItems read out their help/tooltip text instead of text
+ <td
+ class="bz_short_desc_column">run compare tool against p2 repos instead of sdk (backport to 3.6.2)
</td>
</tr>
-
-
-
<tr class="bz_bugitem
- bz_major 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="b315839"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=315839">315839</a>
+ <td class="first-child bz_id_column">
+ <a name="b326541"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=326541">326541</a>
<span style="display: none"></span>
</td>
- <td >[CommonNavigator] NPE in WorkingSetsContentProvider
+ <td
+ class="bz_short_desc_column">Plan Verifier results not checked in reconciler
</td>
</tr>
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
- <td class="first-child">
- <a name="b315894"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=315894">315894</a>
+ <td class="first-child bz_id_column">
+ <a name="b326673"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=326673">326673</a>
<span style="display: none"></span>
</td>
- <td >non composable key combinations erases first char in text editors
+ <td
+ class="bz_short_desc_column">[WorkingSets] FileNotFoundException in WorkingSetManager
</td>
</tr>
-
-
-
<tr class="bz_bugitem
- bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b315932"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=315932">315932</a>
- <span style="display: none"></span>
- </td>
-
- <td >[printing] Print selection prints whole file
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_critical bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b315939"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=315939">315939</a>
- <span style="display: none"></span>
- </td>
-
- <td >[launcher] Crash in formatVmCommandMsg
- </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="b315948"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=315948">315948</a>
+ <td class="first-child bz_id_column">
+ <a name="b326958"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=326958">326958</a>
<span style="display: none"></span>
</td>
- <td >SWT doesnt work on WinCE 6.0 since v3312. Missing check on OS.IsWinCE
+ <td
+ class="bz_short_desc_column">default ANT home directory lower than the Ant plugin version
</td>
</tr>
-
-
-
<tr class="bz_bugitem
- bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
+ bz_trivial bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
- <td class="first-child">
- <a name="b315978"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=315978">315978</a>
+ <td class="first-child bz_id_column">
+ <a name="b327138"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=327138">327138</a>
<span style="display: none"></span>
</td>
- <td >Big regression, eclipse compiles my workspace in 3 mins instead of few seconds
+ <td
+ class="bz_short_desc_column">[Import/Export] WizardExportResourcesPage's Finish button isn't sensitive to Select/Deselect All
</td>
</tr>
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
- <td class="first-child">
- <a name="b316011"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=316011">316011</a>
+ <td class="first-child bz_id_column">
+ <a name="b327233"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=327233">327233</a>
<span style="display: none"></span>
</td>
- <td >[Help] Restore defaults button does not read remoteHelpPreferred preference correctly. - Fix in Eclipse 3.6.1
+ <td
+ class="bz_short_desc_column">p2 and equinox feature versions need to be incremented in 3.6.2 stream
</td>
</tr>
-
-
-
-
- <tr class="bz_bugitem
- bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b316078"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=316078">316078</a>
- <span style="display: none"></span>
- </td>
-
- <td >Extra ending comment tag in helloworld-feature.xml
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b316164"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=316164">316164</a>
- <span style="display: none"></span>
- </td>
-
- <td >[view management] view activation should be triggered by stack frames in default model
- </td>
-
- </tr>
-
-
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
- <td class="first-child">
- <a name="b316238"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=316238">316238</a>
+ <td class="first-child bz_id_column">
+ <a name="b327234"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=327234">327234</a>
<span style="display: none"></span>
</td>
- <td >[Widgets] Main menu lost when using "open in new window"
+ <td
+ class="bz_short_desc_column">version of org.eclipse.core.resources needs to be incremented in 3.6.x stream
</td>
</tr>
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
- <td class="first-child">
- <a name="b316252"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=316252">316252</a>
+ <td class="first-child bz_id_column">
+ <a name="b327362"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=327362">327362</a>
<span style="display: none"></span>
</td>
- <td >[Mozilla][Browser]Wrong usage of C.free()
+ <td
+ class="bz_short_desc_column">setUrl() call navigates to about:blank prior to real url breaks IEWebHistory
</td>
</tr>
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
- <td class="first-child">
- <a name="b316432"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=316432">316432</a>
+ <td class="first-child bz_id_column">
+ <a name="b327425"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=327425">327425</a>
<span style="display: none"></span>
</td>
- <td >[widgets] SWT Cocoa, StructuredViewer dispatches selectionChanged on refresh()/setInput()
+ <td
+ class="bz_short_desc_column">[backport] New option to not use capped algorithm misses documentation
</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="b316456"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=316456">316456</a>
+ <td class="first-child bz_id_column">
+ <a name="b327446"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=327446">327446</a>
<span style="display: none"></span>
</td>
- <td >[1.5][compiler] Annotation values can access private class members
+ <td
+ class="bz_short_desc_column">Launch's wait for build logic does not check for autobuild correctly
</td>
</tr>
-
-
-
<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="b316619"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=316619">316619</a>
+ <td class="first-child bz_id_column">
+ <a name="b327560"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=327560">327560</a>
<span style="display: none"></span>
</td>
- <td >Debug context activation causes expressions view updates when hidden if selection is empty
+ <td
+ class="bz_short_desc_column">Failed to create Citrix Client v12
</td>
</tr>
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
- <td class="first-child">
- <a name="b316643"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=316643">316643</a>
+ <td class="first-child bz_id_column">
+ <a name="b327654"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=327654">327654</a>
<span style="display: none"></span>
</td>
- <td >Cannot enter Report Conversion Patterns on API Use Report External Tool Launch
+ <td
+ class="bz_short_desc_column">FUP of bug 317264: Refactoring is not possible if the commons-lang.jar is in the path
</td>
</tr>
-
-
-
<tr class="bz_bugitem
- bz_enhancement 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="b316645"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=316645">316645</a>
+ <td class="first-child bz_id_column">
+ <a name="b327706"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=327706">327706</a>
<span style="display: none"></span>
</td>
- <td >API Use Report provides no Common tab
+ <td
+ class="bz_short_desc_column">Headless build failure with Eclipse 3.6.1
</td>
</tr>
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
- <td class="first-child">
- <a name="b316650"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=316650">316650</a>
+ <td class="first-child bz_id_column">
+ <a name="b327772"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=327772">327772</a>
<span style="display: none"></span>
</td>
- <td >PathUtil doesn't make paths relative correctly across volumes
+ <td
+ class="bz_short_desc_column">equinox.serverside.sdk version needs to be incremented to 3.6.1 in R3_6_maintenance stream
</td>
</tr>
-
-
-
<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="b316701"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=316701">316701</a>
+ <td class="first-child bz_id_column">
+ <a name="b327790"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=327790">327790</a>
<span style="display: none"></span>
</td>
- <td >[Contributions] Service initialization wrong! Sources must be initialized before Handlers
+ <td
+ class="bz_short_desc_column">[Widgets] Controls with null background inside Group or TabFolder do not display correctly in Cocoa
</td>
</tr>
-
-
-
<tr class="bz_bugitem
- bz_major 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="b316780"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=316780">316780</a>
+ <td class="first-child bz_id_column">
+ <a name="b327827"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=327827">327827</a>
<span style="display: none"></span>
</td>
- <td >[ds] ClassCircularityError
+ <td
+ class="bz_short_desc_column">[Webapp] Fix for Eclipse 3.6.2 - Eclipse help system content panel tree component is unusable by people using screen readers
</td>
</tr>
-
-
-
<tr class="bz_bugitem
- bz_normal bz_P2 bz_RESOLVED bz_FIXED bz_row_odd ">
+ bz_major bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
- <td class="first-child">
- <a name="b316824"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=316824">316824</a>
+ <td class="first-child bz_id_column">
+ <a name="b328145"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=328145">328145</a>
<span style="display: none"></span>
</td>
- <td >[Help] Search Index makes remote server calls when building if remote priority preference is selected - Fix in Eclipse 3.6.1
+ <td
+ class="bz_short_desc_column">[cocoa, gef] Guide markers not fully visible on Cocoa
</td>
</tr>
-
-
-
<tr class="bz_bugitem
- bz_major 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="b316839"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=316839">316839</a>
+ <td class="first-child bz_id_column">
+ <a name="b328151"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=328151">328151</a>
<span style="display: none"></span>
</td>
- <td >JobManager.yieldRule() does not update lock graph correctly for jobs that manage rules
+ <td
+ class="bz_short_desc_column">[launcher] 3.6.2: Remember to compile for S390(x)
</td>
</tr>
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
- <td class="first-child">
- <a name="b316875"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=316875">316875</a>
+ <td class="first-child bz_id_column">
+ <a name="b328177"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=328177">328177</a>
<span style="display: none"></span>
</td>
- <td >[backport] Commit, Apply Patch and Synchronize no longer take keybindings
+ <td
+ class="bz_short_desc_column">Project ant builder cannot run in headless context as it attempts to load a UI AntInputHandler (even when not in use)
</td>
</tr>
-
-
-
-
- <tr class="bz_bugitem
- bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b316889"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=316889">316889</a>
- <span style="display: none"></span>
- </td>
-
- <td >Internal compiler error: java.lang.NullPointerException with a specific use of recursive generics
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b316938"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=316938">316938</a>
- <span style="display: none"></span>
- </td>
-
- <td >Incorrect signature for OS.XGetWindowProperty
- </td>
-
- </tr>
-
-
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
- <td class="first-child">
- <a name="b316975"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=316975">316975</a>
+ <td class="first-child bz_id_column">
+ <a name="b328295"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=328295">328295</a>
<span style="display: none"></span>
</td>
- <td >[launcher] memory leak on failure to read launcher.ini file
+ <td
+ class="bz_short_desc_column">Launch button disabled after failed launch
</td>
</tr>
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
- <td class="first-child">
- <a name="b316997"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=316997">316997</a>
+ <td class="first-child bz_id_column">
+ <a name="b328345"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=328345">328345</a>
<span style="display: none"></span>
</td>
- <td >[Forms] FormText: IllegalArgumentException when copying empty selection - Fix in Eclipse 3.6.1
+ <td
+ class="bz_short_desc_column">version of org.eclipse.equinox.supplement needs to be incremented in 3.6.2 stream
</td>
</tr>
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
- <td class="first-child">
- <a name="b317051"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=317051">317051</a>
+ <td class="first-child bz_id_column">
+ <a name="b328350"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=328350">328350</a>
<span style="display: none"></span>
</td>
- <td >reducing item count can send Selection event
+ <td
+ class="bz_short_desc_column">update location of platform zips used in p2 tests
</td>
</tr>
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b317054"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=317054">317054</a>
- <span style="display: none"></span>
- </td>
-
- <td >Table/Tree item selection can send multiple Selection events
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_critical bz_P3 bz_VERIFIED bz_FIXED bz_secure bz_secure_mode_manual bz_row_even ">
-
- <td class="first-child">
- <a name="b317055"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=317055">317055</a>
- <span style="display: none">[SEC]</span>
- </td>
-
- <td >[Webapp][Security] URLEncode url requests from local users
- </td>
-
- </tr>
-
-
-
-
-
<tr class="bz_bugitem
bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
- <td class="first-child">
- <a name="b317068"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=317068">317068</a>
- <span style="display: none"></span>
- </td>
-
- <td >[breadcrumb] BreadcrumbItems not disposed when editor closed
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b317100"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=317100">317100</a>
+ <td class="first-child bz_id_column">
+ <a name="b328400"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=328400">328400</a>
<span style="display: none"></span>
</td>
- <td >Debug breadcrumb does not allow to switch threads
+ <td
+ class="bz_short_desc_column">TextEdit computed incorrectly for inserting annotation before package declaration
</td>
</tr>
-
-
-
-
- <tr class="bz_bugitem
- bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b317264"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=317264">317264</a>
- <span style="display: none"></span>
- </td>
-
- <td >[search] Refactoring is impossible with commons.lang added to project
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b317282"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=317282">317282</a>
- <span style="display: none"></span>
- </td>
-
- <td >[implementation] AbstractTextEditor does not dispose its SaveAction.
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b317283"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=317283">317283</a>
- <span style="display: none"></span>
- </td>
-
- <td >[breadcrumb] BreadcrumbItems not disposed when editor closed
- </td>
-
- </tr>
-
-
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
- <td class="first-child">
- <a name="b317390"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=317390">317390</a>
- <span style="display: none"></span>
- </td>
-
- <td >Editors hang for several seconds when processing input when Windows On-Screen Keyboard accessory is running
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b317468"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=317468">317468</a>
+ <td class="first-child bz_id_column">
+ <a name="b328826"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=328826">328826</a>
<span style="display: none"></span>
</td>
- <td >Adding elements to an enum body with trailing comma generates bad code
+ <td
+ class="bz_short_desc_column">content.xml is too big (20 MB+)
</td>
</tr>
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b317755"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=317755">317755</a>
- <span style="display: none"></span>
- </td>
-
- <td >[JUnit] JUnit -> Activate on Error/Failure Only not working
- </td>
- </tr>
-
-
<tr class="bz_bugitem
- bz_normal bz_P3 bz_CLOSED bz_FIXED bz_row_odd ">
+ bz_major bz_P3 bz_RESOLVED bz_FIXED bz_secure bz_secure_mode_manual bz_row_odd ">
- <td class="first-child">
- <a name="b317760"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=317760">317760</a>
- <span style="display: none"></span>
+ <td class="first-child bz_id_column">
+ <a name="b328975"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=328975">328975</a>
+ <span style="display: none">[SEC]</span>
</td>
- <td >SimpleArtifactRepository behaviour change
+ <td
+ class="bz_short_desc_column">[Webapp] Possible security issue with JSP code exposure.
</td>
</tr>
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
- <td class="first-child">
- <a name="b317782"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=317782">317782</a>
+ <td class="first-child bz_id_column">
+ <a name="b329129"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=329129">329129</a>
<span style="display: none"></span>
</td>
- <td >TextTransfer generates incorrect UTF16 in pasteboard when copying strings from SWT application
+ <td
+ class="bz_short_desc_column">[Mac] Unhandled event loop exception when closing Error Log Event Details
</td>
</tr>
-
-
-
<tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b317841"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=317841">317841</a>
- <span style="display: none"></span>
- </td>
-
- <td >[incremental build] unnecessary 'structural changes' due to annotation parameters
- </td>
-
- </tr>
-
-
+ bz_major bz_P3 bz_RESOLVED bz_FIXED bz_secure bz_secure_mode_manual bz_row_odd ">
-
-
-
- <tr class="bz_bugitem
- bz_critical bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b317902"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=317902">317902</a>
- <span style="display: none"></span>
- </td>
-
- <td >Segmentation Fault When Widget looses focus
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_trivial bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b317972"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=317972">317972</a>
- <span style="display: none"></span>
+ <td class="first-child bz_id_column">
+ <a name="b329193"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=329193">329193</a>
+ <span style="display: none">[SEC]</span>
</td>
- <td >Fix for wrong usages of affect* and effect*
+ <td
+ class="bz_short_desc_column">[Webapp] Possible security issue with JSP code exposure.
</td>
</tr>
-
-
-
<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="b318020"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=318020">318020</a>
+ <td class="first-child bz_id_column">
+ <a name="b329212"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=329212">329212</a>
<span style="display: none"></span>
</td>
- <td >[compiler] wrong initialization flow info with if (true) throw... pattern in else block
+ <td
+ class="bz_short_desc_column">OSGI app binaries do not inherit Java 2 security
</td>
</tr>
-
-
-
<tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
+ bz_enhancement bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
- <td class="first-child">
- <a name="b318072"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=318072">318072</a>
+ <td class="first-child bz_id_column">
+ <a name="b329222"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=329222">329222</a>
<span style="display: none"></span>
</td>
- <td >[Webapp] In org.eclipse.help.webapp, schema folder is not included in build.properties
+ <td
+ class="bz_short_desc_column">Request for AIX 64-bit gtk build in 3.6.2
</td>
</tr>
-
-
-
<tr class="bz_bugitem
- bz_normal bz_P2 bz_CLOSED bz_FIXED bz_row_even ">
+ bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
- <td class="first-child">
- <a name="b318114"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=318114">318114</a>
+ <td class="first-child bz_id_column">
+ <a name="b329223"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=329223">329223</a>
<span style="display: none"></span>
</td>
- <td >The 3.6 director should use running system for default os/ws/arch values
+ <td
+ class="bz_short_desc_column">Need 3.6.2 launcher for AIX 64 GTK
</td>
</tr>
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
- <td class="first-child">
- <a name="b318144"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=318144">318144</a>
+ <td class="first-child bz_id_column">
+ <a name="b329267"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=329267">329267</a>
<span style="display: none"></span>
</td>
- <td >transformRepos target in genericTargets.xml doesn't transform if directory contains non-repository files
+ <td
+ class="bz_short_desc_column">3.6.1 download page should contain link to 3.6 new & noteworthy
</td>
</tr>
-
-
-
<tr class="bz_bugitem
bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
- <td class="first-child">
- <a name="b318162"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=318162">318162</a>
+ <td class="first-child bz_id_column">
+ <a name="b329288"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=329288">329288</a>
<span style="display: none"></span>
</td>
- <td >[backport] Resource filters do not work in CDT 7.0 projects
+ <td
+ class="bz_short_desc_column">Fetching parameter names literally hangs on a class with a lot of methods
</td>
</tr>
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b318170"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=318170">318170</a>
- <span style="display: none"></span>
- </td>
-
- <td >[Backport] Need symlink support in eclipse for windows vista
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b318205"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=318205">318205</a>
- <span style="display: none"></span>
- </td>
-
- <td >Translation Question - WSW36#397
- </td>
-
- </tr>
-
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
- <td class="first-child">
- <a name="b318221"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=318221">318221</a>
+ <td class="first-child bz_id_column">
+ <a name="b329303"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=329303">329303</a>
<span style="display: none"></span>
</td>
- <td >[Doc] Translation Question - WSW36#406
+ <td
+ class="bz_short_desc_column">Port AIX GTK 64 back to 3.6.2
</td>
</tr>
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
- <td class="first-child">
- <a name="b318333"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=318333">318333</a>
+ <td class="first-child bz_id_column">
+ <a name="b329333"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=329333">329333</a>
<span style="display: none"></span>
</td>
- <td >equals compares objects of different types
+ <td
+ class="bz_short_desc_column">[Backport] Concurrent access to file while decorating
</td>
</tr>
-
-
-
<tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b318540"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=318540">318540</a>
- <span style="display: none"></span>
- </td>
-
- <td >Validation dialog is now modal
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b318557"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=318557">318557</a>
- <span style="display: none"></span>
- </td>
-
- <td >[backport] Exception when trying to commit a lot of projects
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b318597"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=318597">318597</a>
- <span style="display: none"></span>
- </td>
-
- <td >Backport valid 3.6.1 fix candidates
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b318782"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=318782">318782</a>
- <span style="display: none"></span>
- </td>
-
- <td >[DataBinding] StringIndexOutOfBoundsException exception when clearing a Text with SWT.SEARCH
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_critical 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="b318797"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=318797">318797</a>
+ <td class="first-child bz_id_column">
+ <a name="b329485"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=329485">329485</a>
<span style="display: none"></span>
</td>
- <td >[implementation] Deadlock in SharedASTProvider.getAST() (on breakpoint creation)
+ <td
+ class="bz_short_desc_column">[Help] Fix for 3.6.2 On WinXP bookmarks added from help view get name "N/A"
</td>
</tr>
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
- <td class="first-child">
- <a name="b318862"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=318862">318862</a>
+ <td class="first-child bz_id_column">
+ <a name="b329494"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=329494">329494</a>
<span style="display: none"></span>
</td>
- <td >[Viewers] [Provider] ClassCastException happened at jface when selecting tree with using picture-capture software.
+ <td
+ class="bz_short_desc_column">[Help] Fix in Eclipse 3.6.2 - Jaws does not give enough context info when in Help pane
</td>
</tr>
-
-
-
<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="b318893"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=318893">318893</a>
+ <td class="first-child bz_id_column">
+ <a name="b329713"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=329713">329713</a>
<span style="display: none"></span>
</td>
- <td >[implementation] NPE in SourceViewer
+ <td
+ class="bz_short_desc_column">[Webapp] Fix in 3.6.2 Wrong topic was selected in the TOC tree
</td>
</tr>
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
- <td class="first-child">
- <a name="b318916"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=318916">318916</a>
- <span style="display: none"></span>
- </td>
-
- <td >Fix for wrong usages of affect* and effect*
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b319037"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=319037">319037</a>
- <span style="display: none"></span>
- </td>
-
- <td >apitooling.apideprecation_reportconversion task has incorrect parameters listed in doc
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_critical bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b319274"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=319274">319274</a>
+ <td class="first-child bz_id_column">
+ <a name="b329838"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=329838">329838</a>
<span style="display: none"></span>
</td>
- <td >Baseline is not valid while generating performance results for maintenance builds
+ <td
+ class="bz_short_desc_column">[KeyBindings] Exporting key preferences to CSV does not allow context being null
</td>
</tr>
-
-
-
<tr class="bz_bugitem
- bz_major bz_P3 bz_VERIFIED bz_FIXED bz_secure bz_secure_mode_manual bz_row_odd ">
+ bz_major bz_P3 bz_RESOLVED bz_FIXED bz_secure bz_secure_mode_manual bz_row_odd ">
- <td class="first-child">
- <a name="b319344"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=319344">319344</a>
+ <td class="first-child bz_id_column">
+ <a name="b330026"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=330026">330026</a>
<span style="display: none">[SEC]</span>
</td>
- <td >[Webapp][Security] Phishing on help application
+ <td
+ class="bz_short_desc_column">[Webapp][Security] Fix for Eclipse 3.6.2 Eclipse Help Server XSS
</td>
</tr>
-
-
-
<tr class="bz_bugitem
- bz_enhancement 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="b319378"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=319378">319378</a>
+ <td class="first-child bz_id_column">
+ <a name="b330030"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=330030">330030</a>
<span style="display: none"></span>
</td>
- <td >Preferences->Java Compiler-> Errors/Warnings -> switch case fall through enhancement
+ <td
+ class="bz_short_desc_column">P2 Nullpointer Exception at RepositoryTransport.download
</td>
</tr>
-
-
-
<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="b319562"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=319562">319562</a>
+ <td class="first-child bz_id_column">
+ <a name="b330047"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=330047">330047</a>
<span style="display: none"></span>
</td>
- <td >update R3_6_maintenance build scripts to include 3.6.1 feature versions
+ <td
+ class="bz_short_desc_column">PluginRegistry.findModel* throws IllegalArgumentExceptions
</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="b319582"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=319582">319582</a>
+ <td class="first-child bz_id_column">
+ <a name="b330081"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=330081">330081</a>
<span style="display: none"></span>
</td>
- <td >AIOOBE calling IAHyperlink methods
+ <td
+ class="bz_short_desc_column">[compiler] ArrayIndexOutOfBoundsException when Switched from C/C++ Perspective to Java Perspective
</td>
</tr>
-
-
-
<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="b319603"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=319603">319603</a>
+ <td class="first-child bz_id_column">
+ <a name="b330122"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=330122">330122</a>
<span style="display: none"></span>
</td>
- <td >[1.5][compiler] eclipse fails with 2 generics methods with the same name while javac succeeds
+ <td
+ class="bz_short_desc_column">[3.6 maint] HTMLTransfer broken from Firefox --> SWT [Carbon]
</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="b319645"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=319645">319645</a>
+ <td class="first-child bz_id_column">
+ <a name="b330285"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=330285">330285</a>
<span style="display: none"></span>
</td>
- <td >Click throughs still says 3.5
+ <td
+ class="bz_short_desc_column">[Commands] Stackoverflow in BindingSystem
</td>
</tr>
-
-
-
<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="b319677"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=319677">319677</a>
+ <td class="first-child bz_id_column">
+ <a name="b330310"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=330310">330310</a>
<span style="display: none"></span>
</td>
- <td >VoiceOver doesn't read tooltip (help tag)
+ <td
+ class="bz_short_desc_column">[webapp] Regression: Capability filtering and "Show All" are missing in Eclipse 3.6
</td>
</tr>
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
- <td class="first-child">
- <a name="b319688"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=319688">319688</a>
+ <td class="first-child bz_id_column">
+ <a name="b330438"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=330438">330438</a>
<span style="display: none"></span>
</td>
- <td >[Backport] libunix interface broken for readlink()
+ <td
+ class="bz_short_desc_column">[ltk] NPE in UndoDocumentChange
</td>
</tr>
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
- <td class="first-child">
- <a name="b319700"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=319700">319700</a>
+ <td class="first-child bz_id_column">
+ <a name="b330460"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=330460">330460</a>
<span style="display: none"></span>
</td>
- <td >[doc] Broken Link, Customizing the p2_UI
+ <td
+ class="bz_short_desc_column">[planner] p2 director does not install source bundles from optional features
</td>
</tr>
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
- <td class="first-child">
- <a name="b319701"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=319701">319701</a>
+ <td class="first-child bz_id_column">
+ <a name="b330463"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=330463">330463</a>
<span style="display: none"></span>
</td>
- <td >[doc] Broken Link, Repository management
+ <td
+ class="bz_short_desc_column">Optimize manifest TouchPointData memory footprint for MetadataRepositories
</td>
</tr>
-
-
-
<tr class="bz_bugitem
- bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b319781"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=319781">319781</a>
- <span style="display: none"></span>
- </td>
-
- <td >Reference to java.util.Timer(String, boolean) not reported as error under 1.4
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b319786"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=319786">319786</a>
- <span style="display: none"></span>
- </td>
-
- <td >Change API freeze check in 3.6.x stream to compare against 3.6
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b319860"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=319860">319860</a>
- <span style="display: none"></span>
- </td>
-
- <td >[organize imports] Unused import added for reference to nested type from Javadoc
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_minor bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b319900"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=319900">319900</a>
- <span style="display: none"></span>
- </td>
-
- <td >StringLiteral#setLiteralValue needlessly escapes apostrophes (')
- </td>
-
- </tr>
-
-
-
-
-
-
- <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="b319944"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=319944">319944</a>
+ <td class="first-child bz_id_column">
+ <a name="b330515"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=330515">330515</a>
<span style="display: none"></span>
</td>
- <td >PDE feature must be increased to 3.6.1
+ <td
+ class="bz_short_desc_column">[Help] Fix in 3.6.2 Remote Help HTTPS support is setting java.protocol.handler.pkgs=javax.net.ssl
</td>
</tr>
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
- <td class="first-child">
- <a name="b320005"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=320005">320005</a>
+ <td class="first-child bz_id_column">
+ <a name="b330549"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=330549">330549</a>
<span style="display: none"></span>
</td>
- <td >[launcher] --launcher.XXMaxPermSize: isSunVM should return true for Oracle
+ <td
+ class="bz_short_desc_column">[Wizards] cancelable parameter does not disable Wizard progress bar cancel button
</td>
</tr>
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
- <td class="first-child">
- <a name="b320064"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=320064">320064</a>
- <span style="display: none"></span>
- </td>
-
- <td >StyledText and CCombo should also use preceding CLabel as accessible name
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_CLOSED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b320066"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=320066">320066</a>
- <span style="display: none"></span>
- </td>
-
- <td >DROP_DOWN ToolItems need accessible name
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b320123"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=320123">320123</a>
+ <td class="first-child bz_id_column">
+ <a name="b330584"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=330584">330584</a>
<span style="display: none"></span>
</td>
- <td >NPE : Cannot import project as source from target platform
+ <td
+ class="bz_short_desc_column">org.eclipse.equinox.core.sdk needed to be tagged in 3.6.2 stream
</td>
</tr>
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
- <td class="first-child">
- <a name="b320124"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=320124">320124</a>
+ <td class="first-child bz_id_column">
+ <a name="b330605"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=330605">330605</a>
<span style="display: none"></span>
</td>
- <td >ArrayIndexOutOfBoundsException can occur when using bundle command in the console
+ <td
+ class="bz_short_desc_column">test 3.6.2 build with bundles from M20101117-1123 to fix p2 source generation problem
</td>
</tr>
-
-
-
-
- <tr class="bz_bugitem
- bz_blocker bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b320167"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=320167">320167</a>
- <span style="display: none"></span>
- </td>
-
- <td >Auto-Activation works only once
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b320195"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=320195">320195</a>
- <span style="display: none"></span>
- </td>
-
- <td >Eclipse hangs when processing annotation
- </td>
-
- </tr>
-
-
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
- <td class="first-child">
- <a name="b320342"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=320342">320342</a>
- <span style="display: none"></span>
- </td>
-
- <td >Test failure in YieldTest.testResumingThreadJobIsNotRescheduled
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b320414"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=320414">320414</a>
+ <td class="first-child bz_id_column">
+ <a name="b330611"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=330611">330611</a>
<span style="display: none"></span>
</td>
- <td >Compiler produces incorrect bytecode for null pointer check
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_CLOSED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b320427"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=320427">320427</a>
- <span style="display: none"></span>
- </td>
-
- <td >MirrorSelector uses 1.5 methods
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_secure bz_secure_mode_manual bz_row_even ">
-
- <td class="first-child">
- <a name="b320547"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=320547">320547</a>
- <span style="display: none">[SEC]</span>
- </td>
-
- <td >[Webapp][Security] Misuse of /topic/file
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_secure bz_secure_mode_manual bz_row_odd ">
-
- <td class="first-child">
- <a name="b320548"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=320548">320548</a>
- <span style="display: none">[SEC]</span>
- </td>
-
- <td >[Webapp][Security] Ability to read files not in bundles
+ <td
+ class="bz_short_desc_column">[launcher] Add mechanism for ignoring user specified config.ini values
</td>
</tr>
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
- <td class="first-child">
- <a name="b320581"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=320581">320581</a>
+ <td class="first-child bz_id_column">
+ <a name="b330815"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=330815">330815</a>
<span style="display: none"></span>
</td>
- <td >[Widgets] [GTK2.18] JVM crash when call Control.moveAbove(Control control)
+ <td
+ class="bz_short_desc_column">perf_35x baselines failing due to relocated archives
</td>
</tr>
-
-
-
- <tr class="bz_bugitem
- bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b320583"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=320583">320583</a>
- <span style="display: none"></span>
- </td>
-
- <td >Target platform gets out of sync at each Eclipse restart
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b320754"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=320754">320754</a>
- <span style="display: none"></span>
- </td>
-
- <td >[formatter] formatter:off/on tags does not work correctly
- </td>
-
- </tr>
-
-
-
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
- <td class="first-child">
- <a name="b320760"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=320760">320760</a>
+ <td class="first-child bz_id_column">
+ <a name="b330824"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=330824">330824</a>
<span style="display: none"></span>
</td>
- <td >Eclipse Help System WAR has a deadlock at startup
+ <td
+ class="bz_short_desc_column">[Graphics] Splash screen for SR2 should be updated to use Oracle's copyrights
</td>
</tr>
-
-
-
<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="b320802"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=320802">320802</a>
+ <td class="first-child bz_id_column">
+ <a name="b330927"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=330927">330927</a>
<span style="display: none"></span>
</td>
- <td >ASTParser.createASTs(..) fails silently on multiple missing parameter types.
+ <td
+ class="bz_short_desc_column">[backport] Default external web browser not found when running 32-bit Eclipse on 64-bit Ubuntu 9.04
</td>
</tr>
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
- <td class="first-child">
- <a name="b320884"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=320884">320884</a>
+ <td class="first-child bz_id_column">
+ <a name="b331303"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=331303">331303</a>
<span style="display: none"></span>
</td>
- <td >Update link to J2SE 1.4 Javadocs
+ <td
+ class="bz_short_desc_column">[backport] Regression: Convert line delimiter action enablement is broken
</td>
</tr>
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
- <td class="first-child">
- <a name="b320946"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=320946">320946</a>
+ <td class="first-child bz_id_column">
+ <a name="b331563"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=331563">331563</a>
<span style="display: none"></span>
</td>
- <td >Bad comparison in ProfileBundleContainer.isContentEqual()
+ <td
+ class="bz_short_desc_column">Backport: [Import/Export] Import file system doesn't include the top folder you select
</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="b320959"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=320959">320959</a>
+ <td class="first-child bz_id_column">
+ <a name="b331758"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=331758">331758</a>
<span style="display: none"></span>
</td>
- <td >The Eclipse Platform version specified in .eclipseproduct in Helios is wrong
+ <td
+ class="bz_short_desc_column">[backport] performance regression caused by fix in 298835
</td>
</tr>
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
- <td class="first-child">
- <a name="b321359"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=321359">321359</a>
+ <td class="first-child bz_id_column">
+ <a name="b331762"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=331762">331762</a>
<span style="display: none"></span>
</td>
- <td >Purple-icons drawing image with cairo in Solaris-sparc (big-endian)
+ <td
+ class="bz_short_desc_column">[repository] Share StringPool for Composite Repositories
</td>
</tr>
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
- <td class="first-child">
- <a name="b321386"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=321386">321386</a>
+ <td class="first-child bz_id_column">
+ <a name="b332041"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=332041">332041</a>
<span style="display: none"></span>
</td>
- <td >Eclipse exits with 0 exit code when application is throwing an exception
+ <td
+ class="bz_short_desc_column">Backport bug 162079: [PropertiesView] Properties view should be a post selection listener
</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="b321505"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=321505">321505</a>
+ <td class="first-child bz_id_column">
+ <a name="b332095"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=332095">332095</a>
<span style="display: none"></span>
</td>
- <td >[Backport][Import/Export] importing file from big disk hangs UI
+ <td
+ class="bz_short_desc_column">[query] Repository query takes a long time when deleting a lot of IUs (from dropins)
</td>
</tr>
-
-
-
<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="b321850"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=321850">321850</a>
+ <td class="first-child bz_id_column">
+ <a name="b332098"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=332098">332098</a>
<span style="display: none"></span>
</td>
- <td >Launch config dialog wrongly asks to save unsaved changes
+ <td
+ class="bz_short_desc_column">Metadata generator should not create mkdir/rmdir actions for reconciler bundle
</td>
</tr>
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
- <td class="first-child">
- <a name="b321921"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=321921">321921</a>
+ <td class="first-child bz_id_column">
+ <a name="b332148"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=332148">332148</a>
<span style="display: none"></span>
</td>
- <td >Create 3.6.1 freeze plan
+ <td
+ class="bz_short_desc_column">[native] Don't fail install when rmdir cannot delete empty directory
</td>
</tr>
-
-
-
<tr class="bz_bugitem
- bz_critical 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="b321926"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=321926">321926</a>
+ <td class="first-child bz_id_column">
+ <a name="b332637"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=332637">332637</a>
<span style="display: none"></span>
</td>
- <td >Erroneously deems null check conditional branch to be dead code, and produces incorrect bytecode
+ <td
+ class="bz_short_desc_column">Dead Code detection removing code that isn't dead
</td>
</tr>
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
- <td class="first-child">
- <a name="b321942"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=321942">321942</a>
+ <td class="first-child bz_id_column">
+ <a name="b332639"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=332639">332639</a>
<span style="display: none"></span>
</td>
- <td >Eclipse will not Launch with certain .bundledata.## file in ORG.ECLIPSE.OSGI folder
+ <td
+ class="bz_short_desc_column">[backport] There are no changes for models showing in the Synchronize view with Team > Merge operation.
</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="b322001"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=322001">322001</a>
+ <td class="first-child bz_id_column">
+ <a name="b332640"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=332640">332640</a>
<span style="display: none"></span>
</td>
- <td >[1.5][compiler] Name Clash error occurs
+ <td
+ class="bz_short_desc_column">[backport] Team > Merge operation for project contains logical model always show no changes between two branches
</td>
</tr>
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
- <td class="first-child">
- <a name="b322137"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=322137">322137</a>
+ <td class="first-child bz_id_column">
+ <a name="b332686"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=332686">332686</a>
<span style="display: none"></span>
</td>
- <td >SWT.ON_TOP shells do not stay above all applications
+ <td
+ class="bz_short_desc_column">[backport][Browser] Search for external browser in Preferences finds > 40 instances of firefox on Ubuntu 64bit, if started in /usr/bin
</td>
</tr>
-
-
-
<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="b322154"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=322154">322154</a>
+ <td class="first-child bz_id_column">
+ <a name="b332709"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=332709">332709</a>
<span style="display: none"></span>
</td>
- <td >Compiler bug that does not occur in Galileo 3.5.2
+ <td
+ class="bz_short_desc_column">Use JNI add an window callback function to Shell, function can not be called.
</td>
</tr>
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
- <td class="first-child">
- <a name="b322222"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=322222">322222</a>
+ <td class="first-child bz_id_column">
+ <a name="b333416"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=333416">333416</a>
<span style="display: none"></span>
</td>
- <td >[Widgets] segfault in pango_layout_new when closing a dialog
+ <td
+ class="bz_short_desc_column">[backport] Call to IResource.setEncoding() persists derived file's encoding setting in .settings\org.eclipse.core.resources.prefs
</td>
</tr>
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
- <td class="first-child">
- <a name="b322291"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=322291">322291</a>
+ <td class="first-child bz_id_column">
+ <a name="b333493"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=333493">333493</a>
<span style="display: none"></span>
</td>
- <td >[launcher] remember to compile for S390(x)
+ <td
+ class="bz_short_desc_column">disposed widget exception when closing editor with Browser with Ctrl+F4
</td>
</tr>
-
-
-
<tr class="bz_bugitem
bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
- <td class="first-child">
- <a name="b322374"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=322374">322374</a>
+ <td class="first-child bz_id_column">
+ <a name="b333576"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=333576">333576</a>
<span style="display: none"></span>
</td>
- <td >[Webapp][Security] Setting sys prop -Dserver_host=127.0.0.1 does NOT force webserver to listen only on 127.0.0.1 interface
+ <td
+ class="bz_short_desc_column">[jre] "JRE System Library" default not used properly after Java update
</td>
</tr>
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
- <td class="first-child">
- <a name="b322438"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=322438">322438</a>
+ <td class="first-child bz_id_column">
+ <a name="b333898"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=333898">333898</a>
<span style="display: none"></span>
</td>
- <td >[Browser-Webkit] Mouse events have wrong button values (0,1,2 instead of 1,2,3)
+ <td
+ class="bz_short_desc_column">[Preferences] [accessibility] Preferences Dialog menu button needs a tooltip
</td>
</tr>
-
-
-
<tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b322887"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=322887">322887</a>
- <span style="display: none"></span>
- </td>
-
- <td >[Mac] [Commands] Command from 'org.eclipse.ui.cocoa' fragment references category defined in 'org.eclipse.ui.cheatsheets'
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_CLOSED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b323056"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=323056">323056</a>
- <span style="display: none"></span>
- </td>
-
- <td >[Accessibility] get_hyperlink returns incorrect address for accessible
- </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="b323134"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=323134">323134</a>
+ <td class="first-child bz_id_column">
+ <a name="b334048"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=334048">334048</a>
<span style="display: none"></span>
</td>
- <td >[JUnit] JUnit view loses several action states on restart
+ <td
+ class="bz_short_desc_column">[3.6.2] Clicking on a checkbox in a CheckboxTreeViewer selects the row.
</td>
</tr>
-
-
-
<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="b323197"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=323197">323197</a>
+ <td class="first-child bz_id_column">
+ <a name="b334160"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=334160">334160</a>
<span style="display: none"></span>
</td>
- <td >NPE in pdebuild if a dropins/somefile.link has a path that doesn't exist
+ <td
+ class="bz_short_desc_column">[reconciler] Provide mechanism for specifying multiple non-default drop-ins folders
</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="b323246"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=323246">323246</a>
+ <td class="first-child bz_id_column">
+ <a name="b334161"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=334161">334161</a>
<span style="display: none"></span>
</td>
- <td >IBundleProjectService.setBundleRoot() does not accept null argument
+ <td
+ class="bz_short_desc_column">Eclipse crashes if link to PDF with anchor is clicked twice from Browser Widget
</td>
</tr>
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_CLOSED bz_FIXED bz_row_odd ">
- <td class="first-child">
- <a name="b323318"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=323318">323318</a>
+ <td class="first-child bz_id_column">
+ <a name="b334707"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=334707">334707</a>
<span style="display: none"></span>
</td>
- <td >Making a few fields protected for Tycho
+ <td
+ class="bz_short_desc_column">[discovery] Cache jars downloaded by RemoteBundleDiscoveryStrategy
</td>
</tr>
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_CLOSED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b323319"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=323319">323319</a>
- <span style="display: none"></span>
- </td>
-
- <td >[planner] Non greedy handling in the slicer brings in complete repositories
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_blocker bz_P3 bz_CLOSED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b323322"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=323322">323322</a>
- <span style="display: none"></span>
- </td>
-
- <td >[planner] Resolution is not stable
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b323539"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=323539">323539</a>
- <span style="display: none"></span>
- </td>
-
- <td >[Dialogs] Open Resource now interprets "." as "*.", unlike 3.5
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b323600"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=323600">323600</a>
- <span style="display: none"></span>
- </td>
-
- <td >3.6 SWT source and binary no longer a project
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_VERIFIED bz_FIXED bz_row_even ">
-
- <td class="first-child">
- <a name="b323693"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=323693">323693</a>
- <span style="display: none"></span>
- </td>
-
- <td >[1.5][compiler] Compiler fails to diagnose name clash
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_major bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b323953"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=323953">323953</a>
- <span style="display: none"></span>
- </td>
-
- <td >External Tools Launch delegate no longer supports launch in background
- </td>
-
- </tr>
-
-
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
- <td class="first-child">
- <a name="b323995"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=323995">323995</a>
+ <td class="first-child bz_id_column">
+ <a name="b334725"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=334725">334725</a>
<span style="display: none"></span>
</td>
- <td >[Accessibility] StyledText selection incorrect after caret moved event
+ <td
+ class="bz_short_desc_column">Something whacky with the build ids
</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="b324072"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=324072">324072</a>
+ <td class="first-child bz_id_column">
+ <a name="b334916"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=334916">334916</a>
<span style="display: none"></span>
</td>
- <td >Debug view "Terminate/Disconnect All" doesn't work
+ <td
+ class="bz_short_desc_column">About text needs to be updated to 2011
</td>
</tr>
-
-
-
<tr class="bz_bugitem
bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
- <td class="first-child">
- <a name="b324099"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=324099">324099</a>
- <span style="display: none"></span>
- </td>
-
- <td >p2.user.ui feature version should be incremented in 3.6.1 stream
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_critical bz_P3 bz_VERIFIED bz_FIXED bz_row_odd ">
-
- <td class="first-child">
- <a name="b324154"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=324154">324154</a>
+ <td class="first-child bz_id_column">
+ <a name="b334919"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=334919">334919</a>
<span style="display: none"></span>
</td>
- <td >NPE in FlowContext while building
- </td>
-
- </tr>
-
-
-
-
-
-
- <tr class="bz_bugitem
- bz_critical bz_P3 bz_RESOLVED bz_FIXED bz_secure bz_secure_mode_manual bz_row_even ">
-
- <td class="first-child">
- <a name="b324223"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=324223">324223</a>
- <span style="display: none">[SEC]</span>
- </td>
-
- <td >Security Vulnerabilities in Eclipse Help
+ <td
+ class="bz_short_desc_column">org.eclipse.equinox.p2.sdk feature version needs to be incremented in 3.6.2 stream
</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="b324336"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=324336">324336</a>
+ <td class="first-child bz_id_column">
+ <a name="b334947"
+ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=334947">334947</a>
<span style="display: none"></span>
</td>
- <td >version 0.0.0 for .target resolves to '0 plug-ins available' when newer plug-ins are available in other software sites
+ <td
+ class="bz_short_desc_column">swt bundles still have version 3.6.1 in 3.6.2 stream
</td>
</tr>
+</table>
-
- <tr class="bz_bugitem
- bz_normal bz_P3 bz_RESOLVED bz_FIXED bz_row_even ">
- <td class="first-child">
- <a name="b324413"
- href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=324413">324413</a>
- <span style="display: none"></span>
- </td>
- <td >declare 3.6.1RC3
- </td>
- </tr>
+<span class="bz_result_count">115 bugs found.
+</span>
-
- </table>
-<span class="bz_result_count">192 bugs found.
-</span>
-<br>
<hr/>
diff --git a/eclipse/features/org.eclipse.platform/sourceTemplateFeature/build.properties b/eclipse/features/org.eclipse.platform/sourceTemplateFeature/build.properties
index 95b630b..fc2a706 100644
--- a/eclipse/features/org.eclipse.platform/sourceTemplateFeature/build.properties
+++ b/eclipse/features/org.eclipse.platform/sourceTemplateFeature/build.properties
@@ -18,7 +18,7 @@ license.html
generate.feature at org.eclipse.rcp.source=org.eclipse.rcp,plugin at com.ibm.icu.source;version=4.2.1.qualifier;unpack="false"
generate.feature at org.eclipse.equinox.p2.user.ui.source=org.eclipse.equinox.p2.user.ui,\
plugin at org.eclipse.ecf.source;version=3.0.0.qualifier;unpack="false",\
- plugin at org.eclipse.ecf.ssl.source;version=1.0.0.qualifier;unpack="false",\
+ plugin at org.eclipse.ecf.ssl.source;version=1.0.100.qualifier;unpack="false",\
plugin at org.eclipse.ecf.identity.source;version=3.0.0.qualifier;unpack="false",\
plugin at org.eclipse.ecf.filetransfer.source;version=3.0.0.qualifier;unpack="false",\
plugin at org.eclipse.ecf.provider.filetransfer.source;version=3.0.0.qualifier;unpack="false",\
diff --git a/eclipse/features/org.eclipse.rcp/feature.xml b/eclipse/features/org.eclipse.rcp/feature.xml
index 8802cfa..9c30767 100644
--- a/eclipse/features/org.eclipse.rcp/feature.xml
+++ b/eclipse/features/org.eclipse.rcp/feature.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.rcp"
label="%featureName"
- version="3.6.1.qualifier"
+ version="3.6.2.qualifier"
provider-name="%providerName"
plugin="org.eclipse.rcp"
image="eclipse_update_120.jpg">
@@ -356,7 +356,7 @@
install-size="0"
version="0.0.0"
fragment="true"
- unpack="false"/>
+ unpack="false"/>
<plugin
id="org.eclipse.swt.gtk.aix.ppc64"
os="aix"
ws="gtk"
arch="ppc64"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
<plugin
id="org.eclipse.swt.motif.hpux.ia64_32"
@@ -615,7 +615,7 @@
install-size="0"
version="0.0.0"
fragment="true"/>
-
+
<plugin
id="org.eclipse.equinox.launcher.gtk.aix.ppc64"
os="aix"
ws="gtk"
arch="ppc64"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"/>
<plugin
id="org.eclipse.equinox.launcher.motif.hpux.ia64_32"
os="hpux"
diff --git a/eclipse/features/org.eclipse.sdk/feature.xml b/eclipse/features/org.eclipse.sdk/feature.xml
index 825bf02..f954c4a 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.6.1.qualifier"
+ version="3.6.2.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg">
diff --git a/eclipse/label.properties b/eclipse/label.properties
index 84a49c5..7b78f16 100644
--- a/eclipse/label.properties
+++ b/eclipse/label.properties
@@ -1,6 +1,6 @@
- timestamp=20101001-1111
+ timestamp=20110308-1405
buildType=I
- buildId=I20101001-1111
- buildLabel=I20101001-1111
+ buildId=I20110308-1405
+ buildLabel=I20110308-1405
\ 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 6063e12..4e55039 100644
--- a/eclipse/maps/org.eclipse.releng/maps/ant.map
+++ b/eclipse/maps/org.eclipse.releng/maps/ant.map
@@ -1,8 +1,8 @@
!*************** ANT CONTRIBUTION ********************************************************
#plugin at org.apache.ant=v20070416,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ant.core=v20100427,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ant.launching=v20100427,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ant.core=v20110203_r362,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ant.launching=v20101020_r362,kmoir at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.ant.ui=v20100427,kmoir at dev.eclipse.org:/cvsroot/eclipse,
diff --git a/eclipse/maps/org.eclipse.releng/maps/compare.map b/eclipse/maps/org.eclipse.releng/maps/compare.map
index 7239f62..3257354 100644
--- a/eclipse/maps/org.eclipse.releng/maps/compare.map
+++ b/eclipse/maps/org.eclipse.releng/maps/compare.map
@@ -1,8 +1,8 @@
!*************** COMPARE CONTRIBUTION ********************************************************
-plugin at org.eclipse.compare=I20100526-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.compare/plugins/org.eclipse.compare
-plugin at org.eclipse.compare.core=I20100526-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.compare/plugins/org.eclipse.compare.core
-plugin at org.eclipse.compare.win32=I20100505-1245,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.compare/plugins/org.eclipse.compare.win32
+plugin at org.eclipse.compare=R36x_v20100929-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.compare/plugins/org.eclipse.compare
+plugin at org.eclipse.compare.core=R36x_v20100929-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.compare/plugins/org.eclipse.compare.core
+plugin at org.eclipse.compare.win32=R36x_v20101103-0618,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.compare/plugins/org.eclipse.compare.win32
plugin at org.eclipse.compare.examples=I20100505-1245,kmoir at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.compare.examples.xml=I20100505-1245,kmoir at dev.eclipse.org:/cvsroot/eclipse,
diff --git a/eclipse/maps/org.eclipse.releng/maps/core.map b/eclipse/maps/org.eclipse.releng/maps/core.map
index d974ab6..d7ddfa4 100644
--- a/eclipse/maps/org.eclipse.releng/maps/core.map
+++ b/eclipse/maps/org.eclipse.releng/maps/core.map
@@ -1,7 +1,7 @@
!*************** CORE CONTRIBUTION ********************************************************
!**** OSGi
-plugin at org.eclipse.osgi=R36x_v20100806,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.osgi
+plugin at org.eclipse.osgi=R36x_v20110210,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.osgi
plugin at org.eclipse.osgi.services=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.osgi.services
plugin at org.eclipse.osgi.util=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.osgi.util
@@ -9,7 +9,7 @@ plugin at org.eclipse.osgi.util=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.ec
plugin at org.eclipse.equinox.common=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/components/bundles/org.eclipse.equinox.common
plugin at org.eclipse.equinox.preferences=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.preferences
plugin at org.eclipse.equinox.registry=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/components/bundles/org.eclipse.equinox.registry
-plugin at org.eclipse.equinox.supplement=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.osgi/supplement
+plugin at org.eclipse.equinox.supplement=R36x_v20101021,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.osgi/supplement
plugin at org.eclipse.equinox.app=R36x_v20100803,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.app
plugin at org.eclipse.equinox.device=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.device
plugin at org.eclipse.equinox.event=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.event
@@ -21,10 +21,10 @@ plugin at org.eclipse.equinox.http.jetty,2.0.0=v20100503,kmoir at dev.eclipse.org:/cvs
plugin at org.eclipse.equinox.http.jetty,1.1.100=v20100519,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.http.jetty5
plugin at org.eclipse.equinox.http.servlet=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.http.servlet
plugin at org.eclipse.equinox.http.servletbridge=v20100503,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=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/server-side/bundles/org.eclipse.equinox.http.registry
+plugin at org.eclipse.equinox.http.registry=R36x_v20101103,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/server-side/bundles/org.eclipse.equinox.http.registry
plugin at org.eclipse.equinox.servletbridge=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/server-side/bundles/org.eclipse.equinox.servletbridge
fragment at org.eclipse.equinox.servletbridge.extensionbundle=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/server-side/bundles/org.eclipse.equinox.servletbridge.extensionbundle
-bundle at org.eclipse.equinox.jsp.jasper=v20100421,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=R36x_v20101103,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=v20100503,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=v20100520,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.cm
plugin at org.eclipse.equinox.concurrent=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/components/bundles/org.eclipse.equinox.concurrent
@@ -54,31 +54,32 @@ plugin at org.eclipse.equinox.weaving.caching.j9=v20100503,kmoir at dev.eclipse.org:/c
fragment at org.eclipse.equinox.weaving.hook=v20100503,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/weaving/bundles/org.eclipse.equinox.weaving.hook
!****launcher, startup.jar
-plugin at org.eclipse.equinox.launcher=v20100507,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=R36x_v20100810,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=R36x_v20100810,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=R36x_v20100810,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=R36x_v20100810,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=R36x_v20100810,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=R36x_v20100810,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=R36x_v20100810,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=R36x_v20100810,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=R36x_v20100810,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=R36x_v20100810,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.gtk.linux.ppc64=R36x_v20100810,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.ppc64
-fragment at org.eclipse.equinox.launcher.motif.hpux.ia64_32=R36x_v20100810,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=R36x_v20100810,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=R36x_v20100810,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=R36x_v20100810,kmoir 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.releng=v20100208,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/releng/org.eclipse.equinox.launcher.releng
+plugin at org.eclipse.equinox.launcher=R36x_v20101122_1400,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=R36x_v20101222,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=R36x_v20101222,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=R36x_v20101222,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=R36x_v20101222,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=R36x_v20101019_1345,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=R36x_v20101019_1345,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=R36x_v20101019_1345,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=R36x_v20101019_1345,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=R36x_v20101019_1345,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=R36x_v20101019_1345,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.gtk.linux.ppc64=R36x_v20101019_1345,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.ppc64
+fragment at org.eclipse.equinox.launcher.gtk.aix.ppc64=R36x_v20101102,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.aix.ppc64
+fragment at org.eclipse.equinox.launcher.motif.hpux.ia64_32=R36x_v20101019_1345,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=R36x_v20101019_1345,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=R36x_v20101019_1345,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=R36x_v20101019_1345,kmoir 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.releng=R36x_v20101019,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/releng/org.eclipse.equinox.launcher.releng
!****contributed fragments
-fragment at org.eclipse.equinox.launcher.gtk.linux.s390=R36x_v20100823,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=R36x_v20100823,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=R36x_v20100810,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=R36x_v20100810,kmoir 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=R36x_v20110125,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=R36x_v20110125,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=R36x_v20101019_1345,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=R36x_v20101019_1345,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=R36x_v20100823,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.executable
+feature at org.eclipse.equinox.executable=R36x_v20110125,kmoir at dev.eclipse.org:/cvsroot/rt,,org.eclipse.equinox/framework/bundles/org.eclipse.equinox.executable
!**** Runtime
plugin at org.eclipse.core.runtime=v20100505,kmoir at dev.eclipse.org:/cvsroot/eclipse,
@@ -90,7 +91,7 @@ plugin at org.eclipse.core.expressions=v20100505,kmoir at dev.eclipse.org:/cvsroot/ecl
plugin at org.eclipse.core.expressions.tests=v20091203,kmoir at dev.eclipse.org:/cvsroot/eclipse,
!**** Resources
-plugin at org.eclipse.core.resources=R36x_v20100825-0600,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.resources=R36x_v20110131-1630,kmoir at dev.eclipse.org:/cvsroot/eclipse,
fragment at org.eclipse.core.resources.win32=v20100505-1235,kmoir at dev.eclipse.org:/cvsroot/eclipse,
fragment at org.eclipse.core.resources.win32.x86=v20100505-1345,kmoir at dev.eclipse.org:/cvsroot/eclipse,
fragment at org.eclipse.core.resources.win32.ia64=v20081020,kmoir at dev.eclipse.org:/cvsroot/eclipse,
@@ -114,12 +115,12 @@ plugin at org.eclipse.core.runtime.compatibility.auth=v20100517,kmoir at dev.eclipse.o
fragment at org.eclipse.core.runtime.compatibility.registry=v20100520,kmoir at dev.eclipse.org:/cvsroot/eclipse,
!**** Other Core Code
-plugin at org.eclipse.pde.build=R36x_v20100823,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/build/org.eclipse.pde.build
-plugin at org.eclipse.pde.build.tests=R36x_v20100817,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/build/org.eclipse.pde.build.tests
+plugin at org.eclipse.pde.build=R36x_20110203,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/build/org.eclipse.pde.build
+plugin at org.eclipse.pde.build.tests=R36x_v20110111,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=v20100505-1235,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.core.tests.resources=R36x_v20100825-0600,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.core.tests.runtime=R36x_v20100719,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.osgi.tests=R36x_v20100723,kmoir 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.resources=R36x_v20110131-1630,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.core.tests.runtime=R36x_v20101213,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.osgi.tests=R36x_v20101103,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 71f140f..3919351 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=r361_v20100825-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.platform.doc.isv=r361_v20100713,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.platform.doc.user=r362_v20101117-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.platform.doc.isv=r362_v20110111,kmoir at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.jdt.doc.user=r361_v20100721-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.doc.isv=r361_v20100714-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.doc.isv=r362_v20101117-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.pde.doc.user=v20100727_r361,kmoir 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=v20101118_r362,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/feature.map b/eclipse/maps/org.eclipse.releng/maps/feature.map
index 905d31d..61fd2e9 100644
--- a/eclipse/maps/org.eclipse.releng/maps/feature.map
+++ b/eclipse/maps/org.eclipse.releng/maps/feature.map
@@ -1,10 +1,10 @@
!*************** FEATURE CONTRIBUTION ******************************************************
-feature at org.eclipse.sdk=r361_v20100714-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.sdk
-plugin at org.eclipse.sdk=r361_v20100714-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+feature at org.eclipse.sdk=r362_v20100929,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.sdk
+plugin at org.eclipse.sdk=r362_v20110202,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-feature at org.eclipse.jdt=r361_v20100714-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.jdt-feature
+feature at org.eclipse.jdt=r362_v20101117-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.jdt-feature
-feature at org.eclipse.pde=r361_v20100727,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.pde-feature
+feature at org.eclipse.pde=r362_v20110203,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.pde-feature
feature at org.eclipse.pde.api.tools.ee.cdcfoundation10_feature=v20091027-1300,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=v20091027-1300,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=v20091027-1300,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.j2se12-feature
@@ -17,33 +17,33 @@ feature at org.eclipse.pde.api.tools.ee.osgiminimum10_feature=v20091027-1300,kmoir@
feature at org.eclipse.pde.api.tools.ee.osgiminimum11_feature=v20091027-1300,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=v20091027-1300,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12-feature
-feature at org.eclipse.platform=r361_v20100909,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.platform-feature
-plugin at org.eclipse.platform=r361_v20100714-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+feature at org.eclipse.platform=r362_v20110210,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.platform-feature
+plugin at org.eclipse.platform=r362_v20110120,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-feature at org.eclipse.sdk.examples=v20100527,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk.examples-feature
+feature at org.eclipse.sdk.examples=r362_v20101014,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk.examples-feature
plugin at org.eclipse.sdk.examples=v20100527,kmoir at dev.eclipse.org:/cvsroot/eclipse,
feature at org.eclipse.sdk.tests=r361_v20100714-0800,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.sdk=r361_v20100903,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.equinox.sdk
+feature at org.eclipse.equinox.sdk=r362_v20110210b,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.equinox.sdk
-feature at org.eclipse.cvs=v20100427,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.cvs-feature
+feature at org.eclipse.cvs=r362_v20101111,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.cvs-feature
plugin at org.eclipse.cvs=v20100414,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/plugins/org.eclipse.cvs
-feature at org.eclipse.help=v20100427,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.help-feature
+feature at org.eclipse.help=r362_v20101111,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.help-feature
feature at org.eclipse.equinox.p2.user.ui=r361_v20100903,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.sdk=CVS,tag=v20100503,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/features/org.eclipse.equinox.p2.sdk
-feature at org.eclipse.equinox.p2.discovery.feature=CVS,tag=v20100510,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/features/org.eclipse.equinox.p2.discovery.feature
-feature at org.eclipse.equinox.core.sdk=CVS,tag=v20100603,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=v20100421,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/compendium/features/org.eclipse.equinox.compendium.sdk
+feature at org.eclipse.equinox.p2.sdk=CVS,tag=R36x_v20110120,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/features/org.eclipse.equinox.p2.sdk
+feature at org.eclipse.equinox.p2.discovery.feature=CVS,tag=R36x_v20110210,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/features/org.eclipse.equinox.p2.discovery.feature
+feature at org.eclipse.equinox.core.sdk=CVS,tag=r36x_v20110210,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=R36x_v20101014,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=v20100421,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/server-side/features/org.eclipse.equinox.serverside.sdk
-feature at org.eclipse.equinox.server.core=CVS,tag=v20100510,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/server-side/features/org.eclipse.equinox.server.core
+feature at org.eclipse.equinox.serverside.sdk=CVS,tag=R36x_v20101014,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/server-side/features/org.eclipse.equinox.serverside.sdk
+feature at org.eclipse.equinox.server.core=CVS,tag=R36x_v20101007,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/server-side/features/org.eclipse.equinox.server.core
feature at org.eclipse.equinox.server.jetty=CVS,tag=v20100510,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/server-side/features/org.eclipse.equinox.server.jetty
-feature at org.eclipse.equinox.server.p2=CVS,tag=v20100503,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/server-side/features/org.eclipse.equinox.server.p2
+feature at org.eclipse.equinox.server.p2=CVS,tag=R36x_v20101007,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/server-side/features/org.eclipse.equinox.server.p2
feature at org.eclipse.equinox.server.servletbridge=CVS,tag=v20100510,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/server-side/features/org.eclipse.equinox.server.servletbridge
feature at org.eclipse.equinox.server.simple=CVS,tag=v20100510,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/server-side/features/org.eclipse.equinox.server.simple
diff --git a/eclipse/maps/org.eclipse.releng/maps/jdtapt.map b/eclipse/maps/org.eclipse.releng/maps/jdtapt.map
index 6fca523..390c22f 100644
--- a/eclipse/maps/org.eclipse.releng/maps/jdtapt.map
+++ b/eclipse/maps/org.eclipse.releng/maps/jdtapt.map
@@ -1,7 +1,7 @@
!*************** JDT APT CONTRIBUTION *******************************************
-plugin at org.eclipse.jdt.apt.core=R36_v20100727-0110,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.apt.core=R36_v20110120-1000,kmoir at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.jdt.apt.ui=v20100513-0845,kmoir at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.jdt.apt.tests=R36x_v20100707-0100,kmoir at dev.eclipse.org:/cvsroot/eclipse,
fragment at org.eclipse.jdt.compiler.apt=v20100513-0845,kmoir at dev.eclipse.org:/cvsroot/eclipse,
diff --git a/eclipse/maps/org.eclipse.releng/maps/jdtcore.map b/eclipse/maps/org.eclipse.releng/maps/jdtcore.map
index 5f32a43..7408718 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 [20100901-0800] *******************************************
+!*********************************** JDT CORE CONTRIBUTION *******************************************
-plugin at org.eclipse.jdt.core=v_A68_R36x,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.jdt.compiler.tool=v_A68_R36x,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.core=v_A76_R36x,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.jdt.compiler.tool=v_A76_R36x,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.core.tests.builder=v_A68_R36x,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.core.tests.compiler=v_A68_R36x,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.core.tests.model=v_A68_R36x,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.core.tests.performance=v_A68_R36x,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.compiler.tool.tests=v_A68_R36x,kmoir at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
+plugin at org.eclipse.jdt.core.tests.builder=v_A76_R36x,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.core.tests.compiler=v_A76_R36x,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.core.tests.model=v_A76_R36x,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.core.tests.performance=v_A76_R36x,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.compiler.tool.tests=v_A76_R36x,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 519d0f9..3835400 100644
--- a/eclipse/maps/org.eclipse.releng/maps/jdtdebug.map
+++ b/eclipse/maps/org.eclipse.releng/maps/jdtdebug.map
@@ -1,10 +1,10 @@
!*************** DEBUG CONTRIBUTION ********************************************************
plugin at org.eclipse.debug.core=v20100519,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.debug.ui=v20100901_r361,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.debug.ui=v20101201_r362,kmoir at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.jdt.debug=v20100715_r361,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.debug.ui=v20100602-0830,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.launching=v20100526,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.debug.ui=v20100928a_r362,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.launching=v20110105_r362,kmoir at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.jdt.launching.macosx=v20100505,kmoir at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.jdt.launching.ui.macosx=v20100505,kmoir at dev.eclipse.org:/cvsroot/eclipse,
diff --git a/eclipse/maps/org.eclipse.releng/maps/jdtui.map b/eclipse/maps/org.eclipse.releng/maps/jdtui.map
index 44ef8fc..24c5e66 100644
--- a/eclipse/maps/org.eclipse.releng/maps/jdtui.map
+++ b/eclipse/maps/org.eclipse.releng/maps/jdtui.map
@@ -2,7 +2,7 @@
plugin at org.eclipse.search=v20100520-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.search.tests=v20100520-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ltk.core.refactoring=v20100526-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ltk.core.refactoring=r362_v20101117-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.ltk.core.refactoring.tests=v20100520-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.ltk.ui.refactoring=v20100526-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.ltk.ui.refactoring.tests=v20100520-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
@@ -11,7 +11,7 @@ plugin at org.eclipse.jdt=r361_v20100714-0800,kmoir at dev.eclipse.org:/cvsroot/eclips
plugin at org.eclipse.jdt.core.manipulation=v20100520-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jdt.ui=r361_v20100825-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jdt.ui=r362_v20110203,kmoir at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.jdt.ui.tests=r361_v20100818-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.jdt.ui.tests.refactoring=v20100526-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
diff --git a/eclipse/maps/org.eclipse.releng/maps/p2.map b/eclipse/maps/org.eclipse.releng/maps/p2.map
index 66e0ed7..4a6abff 100644
--- a/eclipse/maps/org.eclipse.releng/maps/p2.map
+++ b/eclipse/maps/org.eclipse.releng/maps/p2.map
@@ -3,28 +3,27 @@ plugin at org.eclipse.equinox.frameworkadmin.equinox=CVS,tag=v20100505,cvsRoot=kmoi
plugin at org.eclipse.equinox.frameworkadmin.test=CVS,tag=v20100503,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=R36x_v20100901,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=v20100601,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=R36x_v20100804,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=R36x_v20100823,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.core=CVS,tag=R36x_v20110111,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=R36x_v20101117-1018,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=R36x_v20100823,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=R36x_v20100727,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.directorywatcher=CVS,tag=R36x_v20101220,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.discovery=CVS,tag=v20100503,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.discovery
-plugin at org.eclipse.equinox.p2.discovery.compatibility=CVS,tag=v20100518,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.discovery.compatibility
-plugin at org.eclipse.equinox.p2.engine=CVS,tag=v20100606,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.discovery.compatibility=CVS,tag=v20110204-1323,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.discovery.compatibility
+plugin at org.eclipse.equinox.p2.engine=CVS,tag=R36x_v20110201,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.extensionlocation=CVS,tag=v20100518,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=v20100503,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=v20100503a,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=v20100503a,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=v20100601,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=v20100503a,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=CVS,tag=R36x_v20101202,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=R36x_v20101208-1400,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=v20100513,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.operations=CVS,tag=v20100510,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.operations
plugin at org.eclipse.equinox.p2.publisher=CVS,tag=v20100824-2220,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=v20100525,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=R36x_v20100823,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.reconciler.dropins=CVS,tag=R36x_v20110114,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=R36x_v20110111-1500,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=R36x_v20100823,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=_api_cleanup_v20091125,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.touchpoint.eclipse=CVS,tag=R36x_v20100823,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=v20100503a,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.touchpoint.eclipse=CVS,tag=R36x_v20101202,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=R36x_v20110111,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=v20100518,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=v20100503,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.discovery=CVS,tag=v20100519,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui.discovery
@@ -35,7 +34,7 @@ plugin at org.eclipse.equinox.p2.updatechecker=CVS,tag=R36x_v20100823,cvsRoot=kmoir
plugin at org.eclipse.equinox.p2.updatesite=CVS,tag=R36x_v20100823,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=v20100503,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=v20100503,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=R36x_v20100901,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=CVS,tag=R36x_v20101202,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.discovery=CVS,tag=v20100503,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests.discovery
plugin at org.eclipse.equinox.p2.tests.ui=CVS,tag=v20100513,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests.ui
plugin at org.eclipse.equinox.p2.tests.verifier=CVS,tag=v20100503,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests.verifier
@@ -53,27 +52,19 @@ plugin at org.eclipse.equinox.p2.examples.rcp.sdknoautoupdates=CVS,tag=v20100604,cv
plugin at org.eclipse.equinox.p2.examples.rcp.sdkui=CVS,tag=v20100604,cvsRoot=kmoir at dev.eclipse.org:/cvsroot/rt,path=org.eclipse.equinox/p2/examples/org.eclipse.equinox.p2.examples.rcp.sdkui
!# Bundles from ECF
-plugin at org.eclipse.ecf,3.1.0=GET,http://www.eclipse.org/external/rt/ecf/integration/platform/v2010-05-29_00-32-38/plugins/org.eclipse.ecf_3.1.0.v20100529-0735.jar,usetimestamp=true
-plugin at org.eclipse.ecf.source,3.1.0=GET,http://www.eclipse.org/external/rt/ecf/integration/platform/v2010-05-29_00-32-38/plugins/org.eclipse.ecf.source_3.1.0.v20100529-0735.jar,usetimestamp=true
-fragment at org.eclipse.ecf.ssl,1.0.0=GET,http://www.eclipse.org/external/rt/ecf/integration/platform/v2010-05-29_00-32-38/plugins/org.eclipse.ecf.ssl_1.0.0.v20100529-0735.jar,usetimestamp=true
-fragment at org.eclipse.ecf.ssl.source,1.0.0=GET,http://www.eclipse.org/external/rt/ecf/integration/platform/v2010-05-29_00-32-38/plugins/org.eclipse.ecf.ssl.source_1.0.0.v20100529-0735.jar,usetimestamp=true
-plugin at org.eclipse.ecf.identity,3.1.0=GET,http://www.eclipse.org/external/rt/ecf/integration/platform/v2010-05-29_00-32-38/plugins/org.eclipse.ecf.identity_3.1.0.v20100529-0735.jar,usetimestamp=true
-plugin at org.eclipse.ecf.identity.source,3.1.0=GET,http://www.eclipse.org/external/rt/ecf/integration/platform/v2010-05-29_00-32-38/plugins/org.eclipse.ecf.identity.source_3.1.0.v20100529-0735.jar,usetimestamp=true
-plugin at org.eclipse.ecf.filetransfer,4.0.0=GET,http://www.eclipse.org/external/rt/ecf/integration/platform/v2010-05-29_00-32-38/plugins/org.eclipse.ecf.filetransfer_4.0.0.v20100529-0735.jar,usetimestamp=true
-plugin at org.eclipse.ecf.filetransfer.source,4.0.0=GET,http://www.eclipse.org/external/rt/ecf/integration/platform/v2010-05-29_00-32-38/plugins/org.eclipse.ecf.filetransfer.source_4.0.0.v20100529-0735.jar,usetimestamp=true
-plugin at org.eclipse.ecf.provider.filetransfer,3.1.0=GET,http://www.eclipse.org/external/rt/ecf/integration/platform/v2010-05-29_00-32-38/plugins/org.eclipse.ecf.provider.filetransfer_3.1.0.v20100529-0735.jar,usetimestamp=true
-plugin at org.eclipse.ecf.provider.filetransfer.source,3.1.0=GET,http://www.eclipse.org/external/rt/ecf/integration/platform/v2010-05-29_00-32-38/plugins/org.eclipse.ecf.provider.filetransfer.source_3.1.0.v20100529-0735.jar,usetimestamp=true
-fragment at org.eclipse.ecf.provider.filetransfer.ssl,1.0.0=GET,http://www.eclipse.org/external/rt/ecf/integration/platform/v2010-05-29_00-32-38/plugins/org.eclipse.ecf.provider.filetransfer.ssl_1.0.0.v20100529-0735.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/v2010-05-29_00-32-38/plugins/org.eclipse.ecf.provider.filetransfer.ssl.source_1.0.0.v20100529-0735.jar,usetimestamp=true
-plugin at org.eclipse.ecf.provider.filetransfer.httpclient,4.0.0=GET,http://www.eclipse.org/external/rt/ecf/integration/platform/v2010-05-29_00-32-38/plugins/org.eclipse.ecf.provider.filetransfer.httpclient_4.0.0.v20100529-0735.jar,usetimestamp=true
-plugin at org.eclipse.ecf.provider.filetransfer.httpclient.source,4.0.0=GET,http://www.eclipse.org/external/rt/ecf/integration/platform/v2010-05-29_00-32-38/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.source_4.0.0.v20100529-0735.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/v2010-05-29_00-32-38/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.v20100529-0735.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/v2010-05-29_00-32-38/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source_1.0.0.v20100529-0735.jar,usetimestamp=true
-
-!# The following apache bundes are obtained from the orbit.map
-!#plugin at org.apache.commons.codec,1.3.0=GET,http://fullmoon.ottawa.ibm.com/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://fullmoon.ottawa.ibm.com/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://fullmoon.ottawa.ibm.com/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://fullmoon.ottawa.ibm.com/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://fullmoon.ottawa.ibm.com/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://fullmoon.ottawa.ibm.com/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.1.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf_3.1.0.v20100906-1425.jar,usetimestamp=true
+plugin at org.eclipse.ecf.source,3.1.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.source_3.1.0.v20100906-1425.jar,usetimestamp=true
+fragment at org.eclipse.ecf.ssl,1.0.100=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.ssl_1.0.100.v20100906-1425.jar,usetimestamp=true
+fragment at org.eclipse.ecf.ssl.source,1.0.100=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.ssl.source_1.0.100.v20100906-1425.jar,usetimestamp=true
+plugin at org.eclipse.ecf.identity,3.1.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.identity_3.1.0.v20100906-1425.jar,usetimestamp=true
+plugin at org.eclipse.ecf.identity.source,3.1.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.identity.source_3.1.0.v20100906-1425.jar,usetimestamp=true
+plugin at org.eclipse.ecf.filetransfer,4.0.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.filetransfer_4.0.0.v20100906-1425.jar,usetimestamp=true
+plugin at org.eclipse.ecf.filetransfer.source,4.0.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.filetransfer.source_4.0.0.v20100906-1425.jar,usetimestamp=true
+plugin at org.eclipse.ecf.provider.filetransfer,3.1.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.provider.filetransfer_3.1.0.v20100906-1425.jar,usetimestamp=true
+plugin at org.eclipse.ecf.provider.filetransfer.source,3.1.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.provider.filetransfer.source_3.1.0.v20100906-1425.jar,usetimestamp=true
+fragment at org.eclipse.ecf.provider.filetransfer.ssl,1.0.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.provider.filetransfer.ssl_1.0.0.v20100906-1425.jar,usetimestamp=true
+fragment at org.eclipse.ecf.provider.filetransfer.ssl.source,1.0.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.provider.filetransfer.ssl.source_1.0.0.v20100906-1425.jar,usetimestamp=true
+plugin at org.eclipse.ecf.provider.filetransfer.httpclient,4.0.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.provider.filetransfer.httpclient_4.0.0.v20100906-1425.jar,usetimestamp=true
+plugin at org.eclipse.ecf.provider.filetransfer.httpclient.source,4.0.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.source_4.0.0.v20100906-1425.jar,usetimestamp=true
+fragment at org.eclipse.ecf.provider.filetransfer.httpclient.ssl,1.0.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.v20100906-1425.jar,usetimestamp=true
+fragment at org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source,1.0.0=GET,http://archive.eclipse.org/rt/ecf/integration/platform/v2010-09-06_07-22-05/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source_1.0.0.v20100906-1425.jar,usetimestamp=true
\ No newline at end of file
diff --git a/eclipse/maps/org.eclipse.releng/maps/pde.map b/eclipse/maps/org.eclipse.releng/maps/pde.map
index 8f711b6..5c15895 100644
--- a/eclipse/maps/org.eclipse.releng/maps/pde.map
+++ b/eclipse/maps/org.eclipse.releng/maps/pde.map
@@ -2,15 +2,15 @@
plugin at org.eclipse.pde=v20100625_r361,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde
-plugin at org.eclipse.pde.core=v20100902_r361,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.core
+plugin at org.eclipse.pde.core=v20110210_r362,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.core
plugin at org.eclipse.pde.junit.runtime=v20100601,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.junit.runtime
plugin at org.eclipse.pde.runtime=v20100601,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.runtime
plugin at org.eclipse.pde.launching=v20100601,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.launching
-plugin at org.eclipse.pde.ui=v20100810_r361,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.ui
+plugin at org.eclipse.pde.ui=v20110210_r362,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.ui
plugin at org.eclipse.pde.ui.templates=v20100601,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.ui.templates
-plugin at org.eclipse.pde.ui.tests=v20100820_r361,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.ui.tests
+plugin at org.eclipse.pde.ui.tests=v20101210_r362,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.pde.ui.tests
-plugin at org.eclipse.ui.views.log=v20100423,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.ui.views.log
+plugin at org.eclipse.ui.views.log=v20110210_r362,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/ui/org.eclipse.ui.views.log
plugin at org.eclipse.pde.api.tools=v20100820_r361,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools
plugin at org.eclipse.pde.api.tools.ui=v20100820_r361,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.ui
plugin at org.eclipse.pde.api.tools.tests=v20100820_r361,kmoir at dev.eclipse.org:/cvsroot/eclipse,,pde/apitools/org.eclipse.pde.api.tools.tests
diff --git a/eclipse/maps/org.eclipse.releng/maps/rcp.map b/eclipse/maps/org.eclipse.releng/maps/rcp.map
index 74ee1af..17fdae2 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=r361_v20100827,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.rcp
+feature at org.eclipse.rcp=r362_v20101104,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=v20100527-0800,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 02e8510..62baa04 100644
--- a/eclipse/maps/org.eclipse.releng/maps/releng.map
+++ b/eclipse/maps/org.eclipse.releng/maps/releng.map
@@ -1,9 +1,9 @@
!**************** RELENG CONTRIBUTION ********************************************************
feature at master=v20091019,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/master
-feature at master-equinox=v20100521,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/master-equinox
+feature at master-equinox=r362_v20101118,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/master-equinox
feature at master-equinox-p2=v20091106,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/master-equinox-p2
feature at master-equinox-weaving=v20090817,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/master-equinox-weaving
-feature at master-jetty=v20090305,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/master-jetty
+feature at master-jetty=r362_v20101014,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,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/com.ibm.icu.base
@@ -11,7 +11,7 @@ feature at com.ibm.icu.base=v20090119,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.e
feature at org.eclipse.releng.tools=v20100427,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.sdk-feature/features/org.eclipse.releng.tools
plugin at org.eclipse.releng.tools=v20100531,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.releng.tests=r361_v20100831,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.releng.tests=r362_v20110203,kmoir at dev.eclipse.org:/cvsroot/eclipse,
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
diff --git a/eclipse/maps/org.eclipse.releng/maps/swt.map b/eclipse/maps/org.eclipse.releng/maps/swt.map
index 096f802..c59eae3 100644
--- a/eclipse/maps/org.eclipse.releng/maps/swt.map
+++ b/eclipse/maps/org.eclipse.releng/maps/swt.map
@@ -1,41 +1,42 @@
!*************** SWT CONTRIBUTION ********************************************************
!*** SWT Plugin
-plugin at org.eclipse.swt=v3655c,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt=v3659c,kmoir at dev.eclipse.org:/cvsroot/eclipse,
!*** SWT Platform Fragments
-fragment at org.eclipse.swt.carbon.macosx=v3655c,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.cocoa.macosx=v3655c,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.cocoa.macosx.x86_64=v3655c,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.gtk.linux.ppc=v3655c,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.gtk.linux.ppc64=v3655c,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.gtk.linux.x86=v3655c,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.gtk.linux.x86_64=v3655c,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.gtk.solaris.sparc=v3655c,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.gtk.solaris.x86=v3655c,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.motif.aix.ppc=v3655c,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.motif.hpux.ia64_32=v3655c,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.motif.linux.x86=v3655c,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.motif.solaris.sparc=v3655c,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.photon.qnx.x86=v3655c,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.win32.wce_ppc.arm=v3655c,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.win32.win32.x86=v3655c,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.win32.win32.x86_64=v3655c,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.win32.win32.ia64=v3655c,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.carbon.macosx=v3659b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.cocoa.macosx=v3659b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.cocoa.macosx.x86_64=v3659b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.gtk.linux.ppc=v3659b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.gtk.linux.ppc64=v3659b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.gtk.linux.x86=v3659b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.gtk.linux.x86_64=v3659b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.gtk.solaris.sparc=v3659b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.gtk.solaris.x86=v3659b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.gtk.aix.ppc64=v3659b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.motif.aix.ppc=v3659b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.motif.hpux.ia64_32=v3659b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.motif.linux.x86=v3659b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.motif.solaris.sparc=v3659b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.photon.qnx.x86=v3659b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.win32.wce_ppc.arm=v3659c,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.win32.win32.x86=v3659c,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.win32.win32.x86_64=v3659c,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.win32.win32.ia64=v3659c,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.gtk.linux.s390=v3655c,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.swt.gtk.linux.s390x=v3655c,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.gtk.linux.s390=v3659b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.swt.gtk.linux.s390x=v3659b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
!*** SWT Examples
-plugin at org.eclipse.swt.examples=v3655c,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.swt.examples.browser=v3655c,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.swt.examples.browser.demos=v3655c,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.swt.examples.controls=v3655c,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.swt.examples.launcher=v3655c,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.swt.examples.layouts=v3655c,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.swt.examples.ole.win32=v3655c,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.swt.examples.paint=v3655c,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.examples=v3659b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.examples.browser=v3659b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.examples.browser.demos=v3659b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.examples.controls=v3659b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.examples.launcher=v3659b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.examples.layouts=v3659b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.examples.ole.win32=v3659b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.examples.paint=v3659b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
!*** SWT Tests and Tools
-plugin at org.eclipse.swt.tests=v3655c,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.swt.tools=v3655c,kmoir at dev.eclipse.org:/cvsroot/eclipse,
\ No newline at end of file
+plugin at org.eclipse.swt.tests=v3659b,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.swt.tools=v3659b,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 2cabf7d..169cce4 100644
--- a/eclipse/maps/org.eclipse.releng/maps/team.map
+++ b/eclipse/maps/org.eclipse.releng/maps/team.map
@@ -1,11 +1,11 @@
!*************** TEAM CONTRIBUTION ********************************************************
-plugin at org.eclipse.team.core=R36x_v20100825-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.team.cvs.core=I20100526-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.team.core=R36x_v20110203-1036,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.team.cvs.core=R36x_v20110119-0815,kmoir at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.team.cvs.ssh=I20100526-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.team.cvs.ssh2=I20100526-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.team.ui=R36x_v20100825-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.team.cvs.ui=R36x_v20100825-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.team.ui=R36x_v20110203-1036,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.team.cvs.ui=R36x_v20110203-1036,kmoir at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.core.net=I20100511-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.ui.net=I20100505-1245,kmoir at dev.eclipse.org:/cvsroot/eclipse,
@@ -17,7 +17,7 @@ plugin at org.eclipse.jsch.tests=I20100505-1245,kmoir at dev.eclipse.org:/cvsroot/ecli
plugin at org.eclipse.team.examples.filesystem=I20100526-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.team.tests.core=I20100511-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.team.tests.cvs.core=I20100526-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.team.tests.cvs.core=R36x_v20110119-0815,kmoir at dev.eclipse.org:/cvsroot/eclipse,
fragment at org.eclipse.core.net.win32.x86=I20100511-0800,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=R36x_v20100825-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86
fragment at org.eclipse.core.net.linux.x86_64=I20100505-1245,kmoir at dev.eclipse.org:/cvsroot/eclipse,,org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64
diff --git a/eclipse/maps/org.eclipse.releng/maps/ui.map b/eclipse/maps/org.eclipse.releng/maps/ui.map
index ec01eaf..4aa5db9 100644
--- a/eclipse/maps/org.eclipse.releng/maps/ui.map
+++ b/eclipse/maps/org.eclipse.releng/maps/ui.map
@@ -1,22 +1,22 @@
!*************** UI CONTRIBUTION *********************************************************
plugin at org.eclipse.core.commands=I20100512-1500,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.jface=M20100825-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.jface=M20110210-1200,kmoir at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.core.databinding=I20100601-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.core.databinding.observable=I20100601-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.core.databinding.property=I20100601-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.core.databinding.beans=I20100601-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.jface.databinding=I20100601-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui=M20100826-1330,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.ide=M20100825-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui=M20110203-1100,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.ide=M20101201-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.ui.ide.application=M20100707-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.ui.presentations.r21=I20100517-1500,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.views=I20100527-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.workbench=M20100826-1330,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.views=M20110202-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.workbench=M20110210-1200,kmoir at dev.eclipse.org:/cvsroot/eclipse,
fragment at org.eclipse.ui.workbench.compatibility=I20100511-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
fragment at org.eclipse.ui.win32=I20100509-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.ui.carbon=M20100825-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-fragment at org.eclipse.ui.cocoa=M20100825-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.ui.carbon=M20101124-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+fragment at org.eclipse.ui.cocoa=M20101124-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.jface.examples.databinding=I20100601-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
@@ -29,7 +29,7 @@ plugin at org.eclipse.ui.examples.fieldassist=I20100601-0800,kmoir at dev.eclipse.org:
plugin at org.eclipse.ui.examples.contributions=I20100509-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.ui.navigator=I20100601-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.ui.navigator.resources=M20100707-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.navigator.resources=M20101124-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.ui.views.properties.tabbed=I20100509-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
@@ -37,7 +37,7 @@ plugin at org.eclipse.jface.tests.databinding=I20100601-0800,kmoir at dev.eclipse.org:
plugin at org.eclipse.jface.tests.databinding.conformance=I20090818-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.ui.tests=M20100825-0800,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=I20100601-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.navigator=M20101201-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.tests.views.properties.tabbed=M20110202-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.ui.tests.performance=I20100601-0800,kmoir at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.ui.tests.harness=I20100601-0800,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 65597b9..1ca80e4 100644
--- a/eclipse/maps/org.eclipse.releng/maps/userassist.map
+++ b/eclipse/maps/org.eclipse.releng/maps/userassist.map
@@ -3,9 +3,9 @@
!**** Help
plugin at org.eclipse.help=v20100524,kmoir at dev.eclipse.org:/cvsroot/eclipse,
plugin at org.eclipse.help.appserver=v20100427,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.help.base=r36_r20100816,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.help.ui=r36_v20100702,kmoir at dev.eclipse.org:/cvsroot/eclipse,
-plugin at org.eclipse.help.webapp=r36_r20100816,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.help.base=r36_20101123,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.help.ui=r36_20101116,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.help.webapp=r36_20101130,kmoir at dev.eclipse.org:/cvsroot/eclipse,
!**** Welcome
plugin at org.eclipse.ui.intro=v20100427,kmoir at dev.eclipse.org:/cvsroot/eclipse,
@@ -15,7 +15,7 @@ plugin at org.eclipse.ui.intro.universal=r36_v20100702,kmoir at dev.eclipse.org:/cvsro
plugin at org.eclipse.ui.cheatsheets=v20100427,kmoir at dev.eclipse.org:/cvsroot/eclipse,
!**** Browser
-plugin at org.eclipse.ui.browser=v20100517,kmoir at dev.eclipse.org:/cvsroot/eclipse,
+plugin at org.eclipse.ui.browser=r36_20101216,kmoir at dev.eclipse.org:/cvsroot/eclipse,
!**** Forms
plugin at org.eclipse.ui.forms=r36_v20100702,kmoir at dev.eclipse.org:/cvsroot/eclipse,
diff --git a/eclipse/pluginVersions.properties b/eclipse/pluginVersions.properties
index 8d4be4d..bcf7f7a 100644
--- a/eclipse/pluginVersions.properties
+++ b/eclipse/pluginVersions.properties
@@ -1,23 +1,24 @@
-#Fri Oct 01 11:18:00 EDT 2010
+#Tue Mar 08 14:12:31 EST 2011
org.eclipse.help.appserver,0.0.0=v20100427
org.eclipse.ui.forms,0.0.0=r36_v20100702
-org.eclipse.swt.gtk.linux.s390x,0.0.0=v3655c
-org.eclipse.jdt.debug.ui,0.0.0=v20100602-0830
+org.eclipse.swt.gtk.linux.s390x,0.0.0=v3659b
+org.eclipse.jdt.debug.ui,0.0.0=v20100928a_r362
org.eclipse.jdt.launching.macosx,0.0.0=v20100505
org.eclipse.equinox.jmx.server.xmlrpc,0.0.0=v20100503
-org.eclipse.equinox.launcher.motif.solaris.sparc,0.0.0=R36x_v20100810
+org.eclipse.equinox.launcher.motif.solaris.sparc,0.0.0=R36x_v20101019_1345
+org.eclipse.equinox.launcher.gtk.aix.ppc64,0.0.0=R36x_v20101102
org.eclipse.core.boot,0.0.0=v20100505
org.eclipse.ui.net,0.0.0=I20100505-1245
-org.eclipse.equinox.launcher.gtk.solaris.x86,0.0.0=R36x_v20100810
+org.eclipse.equinox.launcher.gtk.solaris.x86,0.0.0=R36x_v20101019_1345
org.eclipse.jdt.apt.pluggable.core,0.0.0=R36_v20100727-0110
-org.eclipse.swt.examples.paint,0.0.0=v3655c
+org.eclipse.swt.examples.paint,0.0.0=v3659b
org.eclipse.core.net.win32.x86,0.0.0=I20100511-0800
org.eclipse.core.filesystem.macosx,0.0.0=v20100505
-org.eclipse.equinox.launcher.motif.linux.x86,0.0.0=R36x_v20100810
-org.eclipse.ui.navigator.resources,0.0.0=M20100707-0800
+org.eclipse.equinox.launcher.motif.linux.x86,0.0.0=R36x_v20101019_1345
+org.eclipse.ui.navigator.resources,0.0.0=M20101124-0800
org.eclipse.equinox.p2.metadata.repository,0.0.0=v20100513
-org.eclipse.swt,0.0.0=v3655c
-org.eclipse.swt.win32.win32.x86,0.0.0=v3655c
+org.eclipse.swt,0.0.0=v3659c
+org.eclipse.swt.win32.win32.x86,0.0.0=v3659c
org.eclipse.update.ui,0.0.0=v20100512
org.eclipse.core.filesystem,0.0.0=R36x_v20100727-0745
org.eclipse.core.externaltools,0.0.0=v20100831_r361
@@ -28,43 +29,43 @@ org.eclipse.pde.api.tools.ui,0.0.0=v20100820_r361
org.eclipse.jdt.debug,0.0.0=v20100715_r361
org.eclipse.sdk.examples,0.0.0=v20100527
org.eclipse.pde,0.0.0=v20100625_r361
-org.eclipse.compare.core,0.0.0=I20100526-0800
-org.eclipse.equinox.p2.engine,0.0.0=v20100606
-org.eclipse.equinox.launcher.motif.hpux.ia64_32,0.0.0=R36x_v20100810
+org.eclipse.compare.core,0.0.0=R36x_v20100929-0800
+org.eclipse.equinox.p2.engine,0.0.0=R36x_v20110201
+org.eclipse.equinox.launcher.motif.hpux.ia64_32,0.0.0=R36x_v20101019_1345
org.eclipse.equinox.http,0.0.0=v20100503
-org.eclipse.swt.gtk.linux.x86_64,0.0.0=v3655c
-org.eclipse.swt.photon.qnx.x86,0.0.0=v3655c
+org.eclipse.swt.gtk.linux.x86_64,0.0.0=v3659b
+org.eclipse.swt.photon.qnx.x86,0.0.0=v3659b
org.eclipse.equinox.p2.ui.admin,0.0.0=v20100503
org.eclipse.equinox.weaving.caching.j9,0.0.0=v20100503
org.eclipse.equinox.transforms.xslt,0.0.0=v20100503
org.eclipse.jface.databinding,0.0.0=I20100601-0800
-org.eclipse.equinox.p2.touchpoint.eclipse,0.0.0=R36x_v20100823
-org.eclipse.help.base,0.0.0=r36_r20100816
+org.eclipse.equinox.p2.touchpoint.eclipse,0.0.0=R36x_v20101202
+org.eclipse.help.base,0.0.0=r36_20101123
org.eclipse.ui.presentations.r21,0.0.0=I20100517-1500
org.eclipse.equinox.frameworkadmin,0.0.0=v20100503
org.eclipse.pde.launching,0.0.0=v20100601
org.eclipse.ui.intro,0.0.0=v20100427
org.eclipse.ltk.ui.refactoring,0.0.0=v20100526-0800
-org.eclipse.swt.examples.ole.win32,0.0.0=v3655c
+org.eclipse.swt.examples.ole.win32,0.0.0=v3659b
org.eclipse.ui.workbench.texteditor,0.0.0=r361_v20100714-0800
org.eclipse.ui.examples.multipageeditor,0.0.0=I20100509-0800
org.eclipse.core.filesystem.linux.x86,0.0.0=v20100505-1235
org.eclipse.equinox.p2.ui.discovery,0.0.0=v20100519
org.eclipse.ui.examples.javaeditor,0.0.0=v20100520-0800
-org.eclipse.ant.core,0.0.0=v20100427
+org.eclipse.ant.core,0.0.0=v20110203_r362
org.eclipse.equinox.p2.ui.admin.rcp,0.0.0=R36x_v20100823
org.eclipse.equinox.p2.updatechecker,0.0.0=R36x_v20100823
org.eclipse.debug.core,0.0.0=v20100519
org.eclipse.ui.examples.views.properties.tabbed.article,0.0.0=I20100517-1500
org.eclipse.core.databinding,0.0.0=I20100601-0800
org.eclipse.equinox.transforms.hook,0.0.0=v20100503
-org.eclipse.ui.carbon,0.0.0=M20100825-0800
+org.eclipse.ui.carbon,0.0.0=M20101124-0800
org.eclipse.core.contenttype,0.0.0=v20100505-1235
org.eclipse.text,0.0.0=v20100601-1300
-org.eclipse.help.ui,0.0.0=r36_v20100702
+org.eclipse.help.ui,0.0.0=r36_20101116
org.eclipse.equinox.servletbridge,0.0.0=v20100503
-org.eclipse.jdt.apt.core,0.0.0=R36_v20100727-0110
-org.eclipse.swt.win32.win32.x86_64,0.0.0=v3655c
+org.eclipse.jdt.apt.core,0.0.0=R36_v20110120-1000
+org.eclipse.swt.win32.win32.x86_64,0.0.0=v3659c
org.eclipse.equinox.metatype,0.0.0=v20100503
org.eclipse.pde.ua.ui,0.0.0=v20100504
org.eclipse.equinox.initializer,0.0.0=v20100503
@@ -72,134 +73,134 @@ org.eclipse.jsch.core,0.0.0=I20100505-1245
org.eclipse.equinox.frameworkadmin.equinox,0.0.0=v20100505
org.eclipse.osgi.util,0.0.0=v20100503
org.eclipse.search,0.0.0=v20100520-0800
-org.eclipse.ui.views,0.0.0=I20100527-0800
+org.eclipse.ui.views,0.0.0=M20110202-0800
org.eclipse.equinox.simpleconfigurator,0.0.0=v20100503
-org.eclipse.team.ui,0.0.0=R36x_v20100825-0800
-org.eclipse.equinox.p2.metadata,0.0.0=v20100601
-org.eclipse.swt.cocoa.macosx.x86_64,0.0.0=v3655c
-org.eclipse.swt.gtk.linux.ppc64,0.0.0=v3655c
-org.eclipse.jdt.compiler.tool,0.0.0=v_A68_R36x
-org.eclipse.platform,0.0.0=r361_v20100714-0800
+org.eclipse.team.ui,0.0.0=R36x_v20110203-1036
+org.eclipse.equinox.p2.metadata,0.0.0=R36x_v20101202
+org.eclipse.swt.cocoa.macosx.x86_64,0.0.0=v3659b
+org.eclipse.swt.gtk.linux.ppc64,0.0.0=v3659b
+org.eclipse.jdt.compiler.tool,0.0.0=v_A76_R36x
+org.eclipse.platform,0.0.0=r362_v20110120
org.eclipse.core.databinding.observable,0.0.0=I20100601-0800
org.eclipse.equinox.weaving.aspectj,0.0.0=v20100503
org.eclipse.team.examples.filesystem,0.0.0=I20100526-0800
-org.eclipse.pde.core,0.0.0=v20100902_r361
-org.eclipse.ui.workbench,0.0.0=M20100826-1330
+org.eclipse.pde.core,0.0.0=v20110210_r362
+org.eclipse.ui.workbench,0.0.0=M20110210-1200
org.eclipse.core.runtime,0.0.0=v20100505
org.eclipse.core.resources.win32.x86,0.0.0=v20100505-1345
-org.eclipse.equinox.launcher.gtk.linux.x86_64,0.0.0=R36x_v20100810
+org.eclipse.equinox.launcher.gtk.linux.x86_64,0.0.0=R36x_v20101019_1345
org.eclipse.help,0.0.0=v20100524
org.eclipse.pde.api.tools.ee.j2se15,0.0.0=v20100506-0900
org.junit4,0.0.0=v20100525
org.eclipse.update.scheduler,0.0.0=v20100512
-org.eclipse.equinox.launcher.gtk.linux.s390,0.0.0=R36x_v20100823
+org.eclipse.equinox.launcher.gtk.linux.s390,0.0.0=R36x_v20110125
org.eclipse.pde.junit.runtime,0.0.0=v20100601
org.eclipse.osgi.services,0.0.0=v20100503
-org.eclipse.swt.examples.layouts,0.0.0=v3655c
-org.eclipse.jface,0.0.0=M20100825-0800
+org.eclipse.swt.examples.layouts,0.0.0=v3659b
+org.eclipse.jface,0.0.0=M20110210-1200
org.eclipse.equinox.p2.discovery,0.0.0=v20100503
org.eclipse.pde.api.tools.ee.osgiminimum10,0.0.0=v20100506-0900
org.eclipse.equinox.jmx.server,0.0.0=v20100503
org.eclipse.equinox.jmx.server.rmi,0.0.0=v20100503
-org.eclipse.jdt.ui,0.0.0=r361_v20100825-0800
+org.eclipse.jdt.ui,0.0.0=r362_v20110203
org.eclipse.equinox.security,0.0.0=v20100503
-org.eclipse.equinox.launcher,0.0.0=v20100507
+org.eclipse.equinox.launcher,0.0.0=R36x_v20101122_1400
org.eclipse.core.runtime.compatibility.registry,0.0.0=v20100520
org.eclipse.jdt.junit.core,0.0.0=r361_v20100825-0800
org.eclipse.equinox.http.jetty,2.0.0=v20100503
-org.eclipse.jdt.launching,0.0.0=v20100526
+org.eclipse.jdt.launching,0.0.0=v20110105_r362
org.eclipse.equinox.p2.ql,0.0.0=v20100503a
org.eclipse.ui.console,0.0.0=v20100526
org.eclipse.equinox.weaving.caching,0.0.0=v20100503
-org.eclipse.swt.gtk.linux.s390,0.0.0=v3655c
+org.eclipse.swt.gtk.linux.s390,0.0.0=v3659b
org.eclipse.jdt.apt.ui,0.0.0=v20100513-0845
-org.eclipse.equinox.p2.discovery.compatibility,0.0.0=v20100518
+org.eclipse.equinox.p2.discovery.compatibility,0.0.0=v20110204-1323
org.eclipse.ui.examples.fieldassist,0.0.0=I20100601-0800
org.eclipse.ui.ide.application,0.0.0=M20100707-0800
-org.eclipse.equinox.launcher.gtk.linux.ppc,0.0.0=R36x_v20100810
-org.eclipse.equinox.launcher.carbon.macosx,0.0.0=R36x_v20100810
+org.eclipse.equinox.launcher.gtk.linux.ppc,0.0.0=R36x_v20101019_1345
+org.eclipse.equinox.launcher.carbon.macosx,0.0.0=R36x_v20101019_1345
org.eclipse.jdt.junit,0.0.0=r361_v20100825-0800
org.eclipse.pde.api.tools,0.0.0=v20100820_r361
org.eclipse.core.runtime.compatibility,0.0.0=v20100505
-org.eclipse.equinox.p2.directorywatcher,0.0.0=R36x_v20100727
-org.eclipse.equinox.launcher.gtk.solaris.sparc,0.0.0=R36x_v20100810
+org.eclipse.equinox.p2.directorywatcher,0.0.0=R36x_v20101220
+org.eclipse.equinox.launcher.gtk.solaris.sparc,0.0.0=R36x_v20101019_1345
org.eclipse.core.filesystem.hpux.ia64_32,0.0.0=v20100505
-org.eclipse.swt.motif.aix.ppc,0.0.0=v3655c
+org.eclipse.swt.motif.aix.ppc,0.0.0=v3659b
org.eclipse.ui.examples.undo,0.0.0=I20100509-0800
-org.eclipse.ui.cocoa,0.0.0=M20100825-0800
-org.eclipse.equinox.http.registry,0.0.0=v20100503
+org.eclipse.ui.cocoa,0.0.0=M20101124-0800
+org.eclipse.equinox.http.registry,0.0.0=R36x_v20101103
org.eclipse.pde.api.tools.ee.jre11,0.0.0=v20100506-0900
org.eclipse.core.net.linux.x86_64,0.0.0=I20100505-1245
-org.eclipse.equinox.jsp.jasper,0.0.0=v20100421
+org.eclipse.equinox.jsp.jasper,0.0.0=R36x_v20101103
org.eclipse.pde.api.tools.ee.j2se14,0.0.0=v20100506-0900
org.eclipse.equinox.p2.ui,0.0.0=v20100518
org.eclipse.jdt.launching.ui.macosx,0.0.0=v20100505
org.eclipse.equinox.p2.ui.sdk,0.0.0=v20100513
org.eclipse.compare.examples,0.0.0=I20100505-1245
org.eclipse.pde.ua.core,0.0.0=v20100504
-org.eclipse.platform.doc.isv,0.0.0=r361_v20100713
-org.eclipse.ant.launching,0.0.0=v20100427
+org.eclipse.platform.doc.isv,0.0.0=r362_v20110111
+org.eclipse.ant.launching,0.0.0=v20101020_r362
org.eclipse.equinox.p2.operations,0.0.0=v20100510
-org.eclipse.compare,0.0.0=I20100526-0800
+org.eclipse.compare,0.0.0=R36x_v20100929-0800
org.eclipse.equinox.http.servletbridge,0.0.0=v20100503
org.eclipse.jdt.compiler.apt,0.0.0=v20100513-0845
-org.eclipse.help.webapp,0.0.0=r36_r20100816
+org.eclipse.help.webapp,0.0.0=r36_20101130
org.eclipse.pde.ui.templates,0.0.0=v20100601
-org.eclipse.equinox.p2.repository,0.0.0=R36x_v20100823
-org.eclipse.equinox.p2.metadata.generator,0.0.0=v20100503a
+org.eclipse.equinox.p2.repository,0.0.0=R36x_v20110111-1500
+org.eclipse.equinox.p2.metadata.generator,0.0.0=R36x_v20101208-1400
org.eclipse.equinox.p2.director.app,0.0.0=R36x_v20100823
-org.eclipse.equinox.launcher.motif.aix.ppc,0.0.0=R36x_v20100810
+org.eclipse.equinox.launcher.motif.aix.ppc,0.0.0=R36x_v20101019_1345
org.eclipse.equinox.app,0.0.0=R36x_v20100803
-org.eclipse.swt.motif.hpux.ia64_32,0.0.0=v3655c
-org.eclipse.swt.gtk.solaris.x86,0.0.0=v3655c
+org.eclipse.swt.motif.hpux.ia64_32,0.0.0=v3659b
+org.eclipse.swt.gtk.solaris.x86,0.0.0=v3659b
org.eclipse.pde.ds.ui,0.0.0=v20100601
org.eclipse.core.net.linux.x86,0.0.0=R36x_v20100825-0800
org.eclipse.equinox.p2.console,0.0.0=v20100601
org.eclipse.equinox.http.jetty,0.0.0=v20100503
-org.eclipse.swt.examples.browser.demos,0.0.0=v3655c
-org.eclipse.equinox.launcher.cocoa.macosx.x86_64,0.0.0=R36x_v20100810
+org.eclipse.swt.examples.browser.demos,0.0.0=v3659b
+org.eclipse.equinox.launcher.cocoa.macosx.x86_64,0.0.0=R36x_v20101019_1345
org.eclipse.releng.tools,0.0.0=v20100531
-org.eclipse.pde.doc.user,0.0.0=v20100727_r361
-org.eclipse.swt.motif.linux.x86,0.0.0=v3655c
+org.eclipse.pde.doc.user,0.0.0=v20101118_r362
+org.eclipse.swt.motif.linux.x86,0.0.0=v3659b
org.eclipse.jface.examples.databinding,0.0.0=I20100601-0800
org.eclipse.equinox.jmx.client.rmi,0.0.0=v20100503
org.eclipse.equinox.weaving.hook,0.0.0=v20100503
-org.eclipse.debug.ui,0.0.0=v20100901_r361
+org.eclipse.debug.ui,0.0.0=v20101201_r362
org.eclipse.core.net,0.0.0=I20100511-0800
org.eclipse.core.filesystem.solaris.sparc,0.0.0=v20100505-1235
-org.eclipse.equinox.p2.touchpoint.natives,0.0.0=v20100503a
+org.eclipse.equinox.p2.touchpoint.natives,0.0.0=R36x_v20110111
org.eclipse.pde.api.tools.ee.cdcfoundation11,0.0.0=v20100506-0900
-org.eclipse.equinox.launcher.win32.win32.ia64,0.0.0=R36x_v20100810
-org.eclipse.swt.examples.browser,0.0.0=v3655c
+org.eclipse.equinox.launcher.win32.win32.ia64,0.0.0=R36x_v20101222
+org.eclipse.swt.examples.browser,0.0.0=v3659b
org.eclipse.core.filesystem.linux.x86_64,0.0.0=v20100505-1235
org.eclipse.equinox.event,0.0.0=v20100503
-org.eclipse.ui.ide,0.0.0=M20100825-0800
-org.eclipse.ui.views.log,0.0.0=v20100423
+org.eclipse.ui.ide,0.0.0=M20101201-0800
+org.eclipse.ui.views.log,0.0.0=v20110210_r362
org.eclipse.equinox.p2.jarprocessor,0.0.0=v20100503a
-org.eclipse.ui.browser,0.0.0=v20100517
+org.eclipse.ui.browser,0.0.0=r36_20101216
org.eclipse.core.expressions,0.0.0=v20100505
org.eclipse.core.databinding.beans,0.0.0=I20100601-0800
org.eclipse.equinox.ds,0.0.0=R36x_v20100803
-org.eclipse.equinox.launcher.win32.win32.x86_64,0.0.0=R36x_v20100810
-org.eclipse.equinox.launcher.gtk.linux.x86,0.0.0=R36x_v20100810
+org.eclipse.equinox.launcher.win32.win32.x86_64,0.0.0=R36x_v20101222
+org.eclipse.equinox.launcher.gtk.linux.x86,0.0.0=R36x_v20101019_1345
org.eclipse.update.core.linux,0.0.0=v20100512
org.eclipse.core.databinding.property,0.0.0=I20100601-0800
org.eclipse.ui.examples.propertysheet,0.0.0=I20100509-0800
org.eclipse.core.jobs,0.0.0=R36x_v20100824
-org.eclipse.swt.gtk.linux.ppc,0.0.0=v3655c
-org.eclipse.swt.carbon.macosx,0.0.0=v3655c
+org.eclipse.swt.gtk.linux.ppc,0.0.0=v3659b
+org.eclipse.swt.carbon.macosx,0.0.0=v3659b
org.eclipse.pde.runtime,0.0.0=v20100601
-org.eclipse.pde.build,0.0.0=R36x_v20100823
-org.eclipse.equinox.p2.reconciler.dropins,0.0.0=v20100525
+org.eclipse.pde.build,0.0.0=R36x_20110203
+org.eclipse.equinox.p2.reconciler.dropins,0.0.0=R36x_v20110114
org.eclipse.equinox.device,0.0.0=v20100503
org.eclipse.core.commands,0.0.0=I20100512-1500
org.eclipse.equinox.p2.repository.tools,0.0.0=R36x_v20100823
-org.eclipse.equinox.launcher.gtk.linux.s390x,0.0.0=R36x_v20100823
+org.eclipse.equinox.launcher.gtk.linux.s390x,0.0.0=R36x_v20110125
org.eclipse.update.core,0.0.0=R36x_v20100629
-org.eclipse.team.core,0.0.0=R36x_v20100825-0800
+org.eclipse.team.core,0.0.0=R36x_v20110203-1036
org.eclipse.debug.examples.ui,0.0.0=v20100526
org.eclipse.pde.api.tools.ee.javase16,0.0.0=v20100506-0900
-org.eclipse.compare.win32,0.0.0=I20100505-1245
+org.eclipse.compare.win32,0.0.0=R36x_v20101103-0618
org.eclipse.equinox.p2.installer,0.0.0=v20100503a
org.eclipse.debug.examples.core,0.0.0=v20100505
org.eclipse.rcp,0.0.0=v20100527-0800
@@ -208,71 +209,71 @@ org.eclipse.equinox.registry,0.0.0=v20100503
org.eclipse.ui.examples.readmetool,0.0.0=I20100509-0800
org.eclipse.jdt.core.manipulation,0.0.0=v20100520-0800
org.eclipse.equinox.http.servlet,0.0.0=v20100503
-org.eclipse.equinox.launcher.win32.win32.x86,0.0.0=R36x_v20100810
+org.eclipse.equinox.launcher.win32.win32.x86,0.0.0=R36x_v20101222
org.eclipse.jdt.junit.runtime,0.0.0=v20100526-0800
-org.eclipse.swt.examples.controls,0.0.0=v3655c
+org.eclipse.swt.examples.controls,0.0.0=v3659b
org.eclipse.core.filesystem.linux.ppc,0.0.0=v20100505-1235
org.eclipse.osgi.jmx,0.0.0=v20100503
org.eclipse.ui.workbench.compatibility,0.0.0=I20100511-0800
org.eclipse.core.filesystem.aix.ppc,0.0.0=v20100505-1235
-org.eclipse.swt.cocoa.macosx,0.0.0=v3655c
-org.eclipse.ui,0.0.0=M20100826-1330
+org.eclipse.swt.cocoa.macosx,0.0.0=v3659b
+org.eclipse.ui,0.0.0=M20110203-1100
org.eclipse.equinox.jmx.client.xmlrpc,0.0.0=v20100503
-org.eclipse.swt.win32.wce_ppc.arm,0.0.0=v3655c
+org.eclipse.swt.win32.wce_ppc.arm,0.0.0=v3659c
org.eclipse.compare.examples.xml,0.0.0=I20100505-1245
org.eclipse.equinox.jsp.jasper.registry,0.0.0=v20100503
-org.eclipse.core.resources,0.0.0=R36x_v20100825-0600
+org.eclipse.core.resources,0.0.0=R36x_v20110131-1630
org.eclipse.team.cvs.ssh2,0.0.0=I20100526-0800
org.eclipse.equinox.wireadmin,0.0.0=v20100503
org.eclipse.ant.ui,0.0.0=v20100427
-org.eclipse.swt.gtk.solaris.sparc,0.0.0=v3655c
+org.eclipse.swt.gtk.solaris.sparc,0.0.0=v3659b
org.eclipse.core.net.win32.x86_64,0.0.0=I20100505-1245
-org.eclipse.swt.examples.launcher,0.0.0=v3655c
+org.eclipse.swt.examples.launcher,0.0.0=v3659b
org.eclipse.equinox.preferences.jmx,0.0.0=v20100503
org.eclipse.equinox.p2.garbagecollector,0.0.0=v20100503
org.eclipse.equinox.cm,0.0.0=v20100520
org.eclipse.equinox.common,0.0.0=v20100503
-org.eclipse.equinox.p2.director,0.0.0=R36x_v20100823
+org.eclipse.equinox.p2.director,0.0.0=R36x_v20101117-1018
org.eclipse.equinox.p2.publisher,0.0.0=v20100824-2220
-org.eclipse.jdt.doc.isv,0.0.0=r361_v20100714-0800
-org.eclipse.ltk.core.refactoring,0.0.0=v20100526-0800
-org.eclipse.jdt.core,0.0.0=v_A68_R36x
+org.eclipse.jdt.doc.isv,0.0.0=r362_v20101117-0800
+org.eclipse.ltk.core.refactoring,0.0.0=r362_v20101117-0800
+org.eclipse.jdt.core,0.0.0=v_A76_R36x
org.eclipse.equinox.p2.updatesite,0.0.0=R36x_v20100823
org.eclipse.update.configurator,0.0.0=v20100512
org.eclipse.core.filesystem.win32.x86,0.0.0=R36x_v20100727-0745
-org.eclipse.equinox.p2.core,0.0.0=R36x_v20100804
-org.eclipse.swt.examples,0.0.0=v3655c
+org.eclipse.equinox.p2.core,0.0.0=R36x_v20110111
+org.eclipse.swt.examples,0.0.0=v3659b
org.eclipse.cvs,0.0.0=v20100414
-org.eclipse.swt.gtk.linux.x86,0.0.0=v3655c
+org.eclipse.swt.gtk.linux.x86,0.0.0=v3659b
org.eclipse.equinox.log,0.0.0=v20100503
org.eclipse.equinox.jmx.client,0.0.0=v20100503
org.eclipse.ui.win32,0.0.0=I20100509-0800
org.eclipse.ui.views.properties.tabbed,0.0.0=I20100509-0800
org.eclipse.equinox.security.ui,0.0.0=v20100503
org.eclipse.pde.api.tools.ee.j2se13,0.0.0=v20100506-0900
-org.eclipse.swt.motif.solaris.sparc,0.0.0=v3655c
+org.eclipse.swt.motif.solaris.sparc,0.0.0=v3659b
org.eclipse.equinox.util,0.0.0=v20100503
org.eclipse.equinox.p2.extensionlocation,0.0.0=v20100518
org.eclipse.pde.api.tools.ee.osgiminimum12,0.0.0=v20100506-0900
org.eclipse.equinox.concurrent,0.0.0=v20100503
-org.eclipse.platform.doc.user,0.0.0=r361_v20100825-0800
+org.eclipse.platform.doc.user,0.0.0=r362_v20101117-0800
org.eclipse.equinox.security.macosx,0.0.0=v20100503
-org.eclipse.equinox.supplement,0.0.0=v20100503
-org.eclipse.sdk,0.0.0=r361_v20100714-0800
-org.eclipse.equinox.launcher.gtk.linux.ppc64,0.0.0=R36x_v20100810
+org.eclipse.equinox.supplement,0.0.0=R36x_v20101021
+org.eclipse.sdk,0.0.0=r362_v20110202
+org.eclipse.equinox.launcher.gtk.linux.ppc64,0.0.0=R36x_v20101019_1345
org.eclipse.jsch.ui,0.0.0=I20100505-1245
org.eclipse.core.filesystem.win32.x86_64,0.0.0=R36x_v20100727-0745
org.eclipse.equinox.security.win32.x86,0.0.0=v20100503
org.eclipse.core.variables,0.0.0=v20100505
-org.eclipse.pde.ui,0.0.0=v20100810_r361
+org.eclipse.pde.ui,0.0.0=v20110210_r362
org.eclipse.equinox.p2.artifact.repository,0.0.0=R36x_v20100901
org.eclipse.core.runtime.compatibility.auth,0.0.0=v20100517
-org.eclipse.osgi,0.0.0=R36x_v20100806
+org.eclipse.osgi,0.0.0=R36x_v20110210
org.eclipse.ui.intro.universal,0.0.0=r36_v20100702
org.eclipse.swt.jmx,0.0.0=v20100503
-org.eclipse.equinox.launcher.cocoa.macosx,0.0.0=R36x_v20100810
+org.eclipse.equinox.launcher.cocoa.macosx,0.0.0=R36x_v20101019_1345
org.eclipse.ui.examples.contributions,0.0.0=I20100509-0800
-org.eclipse.team.cvs.ui,0.0.0=R36x_v20100825-0800
+org.eclipse.team.cvs.ui,0.0.0=R36x_v20110203-1036
org.eclipse.ui.cheatsheets,0.0.0=v20100427
org.eclipse.jdt.doc.user,0.0.0=r361_v20100721-0800
org.eclipse.equinox.useradmin,0.0.0=v20100503
@@ -282,16 +283,17 @@ org.eclipse.update.core.win32,0.0.0=v20100512
org.eclipse.ui.externaltools,0.0.0=v20100427
org.eclipse.jdt.junit4.runtime,0.0.0=v20100526-0800
org.eclipse.pde.api.tools.ee.j2se12,0.0.0=v20100506-0900
+org.eclipse.equinox.http.jetty,1.1.100=v20100519
org.eclipse.pde.api.tools.ee.osgiminimum11,0.0.0=v20100506-0900
org.eclipse.ui.navigator,0.0.0=I20100601-0800
-org.eclipse.equinox.http.jetty,1.1.100=v20100519
-org.eclipse.team.cvs.core,0.0.0=I20100526-0800
+org.eclipse.team.cvs.core,0.0.0=R36x_v20110119-0815
org.eclipse.pde.api.tools.ee.cdcfoundation10,0.0.0=v20100506-0900
-org.eclipse.equinox.launcher.wpf.win32.x86,0.0.0=R36x_v20100810
+org.eclipse.equinox.launcher.wpf.win32.x86,0.0.0=R36x_v20101222
org.eclipse.equinox.preferences,0.0.0=v20100503
org.eclipse.equinox.jmx.common,0.0.0=v20100503
org.eclipse.equinox.p2.ui.sdk.scheduler,0.0.0=v20100507-1815
org.eclipse.equinox.jmx.vm,0.0.0=v20100503
+org.eclipse.swt.gtk.aix.ppc64,0.0.0=v3659b
org.eclipse.ui.editors,0.0.0=r361_v20100825-0800
org.eclipse.equinox.servletbridge.extensionbundle,0.0.0=v20100503
org.eclipse.core.filebuffers,0.0.0=v20100520-0800
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 54cd95e..ce39c3b 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.200.qualifier
+Bundle-Version: 3.2.201.qualifier
Bundle-Activator: org.eclipse.ant.core.AntCorePlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/eclipse/plugins/org.eclipse.ant.core/src/org/eclipse/ant/core/AntCorePreferences.java b/eclipse/plugins/org.eclipse.ant.core/src/org/eclipse/ant/core/AntCorePreferences.java
index 3834493..61d38c4 100644
--- a/eclipse/plugins/org.eclipse.ant.core/src/org/eclipse/ant/core/AntCorePreferences.java
+++ b/eclipse/plugins/org.eclipse.ant.core/src/org/eclipse/ant/core/AntCorePreferences.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
@@ -476,11 +476,14 @@ public class AntCorePreferences implements org.eclipse.core.runtime.Preferences.
/**
* Simple algorithm to find the highest version of <code>org.apache.ant</code>
* available. If there are other providers that are not <code>org.apache.ant</code>
- * <code>null</code> is returned so that all bundles will be inspected
- * for contributed libraries.
- * <p>
- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=282851
- * </p>
+ * they are ignored and all versions of <code>org.apache.ant</code> are considered.
+ * <br><br>
+ * See the following bugs for related history:
+ * <ul>
+ * <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=282851">https://bugs.eclipse.org/bugs/show_bug.cgi?id=282851</a></li>
+ * <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=325125">https://bugs.eclipse.org/bugs/show_bug.cgi?id=325125</a></li>
+ * </ul>
+ *
* @param packages the live list of {@link ExportedPackage}s to inspect
* @return the bundle that represents the highest version of <code>org.apache.ant</code> or <code>null</code>
* if there are other providers for the <code>org.apache.ant.tools</code> packages.
@@ -496,9 +499,6 @@ public class AntCorePreferences implements org.eclipse.core.runtime.Preferences.
if("org.apache.ant".equals(bundle.getSymbolicName())) { //$NON-NLS-1$
bundles.add(bundle);
}
- else {
- return null;
- }
}
Bundle highest = null;
Bundle temp = null;
diff --git a/eclipse/plugins/org.eclipse.ant.launching/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.ant.launching/META-INF/MANIFEST.MF
index e8cce3e..dd528aa 100644
--- a/eclipse/plugins/org.eclipse.ant.launching/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.ant.launching/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Localization: plugin
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.ant.launching;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.1.qualifier
Bundle-Activator: org.eclipse.ant.internal.launching.AntLaunching
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.debug.core;bundle-version="[3.6.0,4.0.0)",
diff --git a/eclipse/plugins/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/AntLaunching.java b/eclipse/plugins/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/AntLaunching.java
index 0168eec..930f722 100644
--- a/eclipse/plugins/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/AntLaunching.java
+++ b/eclipse/plugins/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/AntLaunching.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
@@ -31,7 +31,7 @@ public class AntLaunching extends Plugin {
* Boolean attribute indicating if an input handler should be supplied for
* the build Default value is <code>true</code>.
*/
- public static final String SET_INPUTHANDLER = "org.eclipse.ant.ui.SET_INPUTHANDLER"; //$NON-NLS-1$
+ public static final String SET_INPUTHANDLER = "org.eclipse.ant.uiSET_INPUTHANDLER"; //$NON-NLS-1$
/**
* int preference identifier constant which specifies the length of time to
diff --git a/eclipse/plugins/org.eclipse.compare.core/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.compare.core/META-INF/MANIFEST.MF
index a9936f3..84ea7ec 100644
--- a/eclipse/plugins/org.eclipse.compare.core/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.compare.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.compare.core
-Bundle-Version: 3.5.100.qualifier
+Bundle-Version: 3.5.101.qualifier
Bundle-Activator: org.eclipse.compare.internal.core.ComparePlugin
Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)"
diff --git a/eclipse/plugins/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/ComparePlugin.java b/eclipse/plugins/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/ComparePlugin.java
index 4f8aa60..fb52f01 100644
--- a/eclipse/plugins/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/ComparePlugin.java
+++ b/eclipse/plugins/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/ComparePlugin.java
@@ -25,7 +25,9 @@ public class ComparePlugin extends Plugin {
// The shared instance
private static ComparePlugin plugin;
-
+
+ private boolean cappingDisabled;
+
/**
* The constructor
*/
@@ -53,7 +55,7 @@ public class ComparePlugin extends Plugin {
/**
* Returns the shared instance
- *
+ *
* @return the shared instance
*/
public static ComparePlugin getDefault() {
@@ -61,11 +63,19 @@ public class ComparePlugin extends Plugin {
}
public static void log(Throwable e) {
- log(new Status(IStatus.ERROR, PLUGIN_ID, 0, Messages.Activator_1, e));
+ log(new Status(IStatus.ERROR, PLUGIN_ID, 0, Messages.Activator_1, e));
}
-
+
public static void log(IStatus status) {
getDefault().getLog().log(status);
}
+ public void setCappingDisabled(boolean disable) {
+ this.cappingDisabled = disable;
+ }
+
+ public boolean isCappingDisabled() {
+ return this.cappingDisabled;
+ }
+
}
diff --git a/eclipse/plugins/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/LCS.java b/eclipse/plugins/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/LCS.java
index 26b40dd..e458e23 100644
--- a/eclipse/plugins/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/LCS.java
+++ b/eclipse/plugins/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/LCS.java
@@ -52,7 +52,7 @@ public abstract class LCS {
}
this.max_differences = (length1 + length2 + 1) / 2; // ceil((N+M)/2)
- if ((double) length1 * (double) length2 > TOO_LONG) {
+ if (!isCappingDisabled() && (double) length1 * (double) length2 > TOO_LONG) {
// limit complexity to D^POW_LIMIT for long sequences
this.max_differences = (int) Math.pow(this.max_differences, POW_LIMIT - 1.0);
}
@@ -94,6 +94,10 @@ public abstract class LCS {
}
+ private boolean isCappingDisabled() {
+ return ComparePlugin.getDefault().isCappingDisabled();
+ }
+
/**
* The recursive helper function for Myers' LCS. Computes the LCS of
* l1[bottoml1 .. topl1] and l2[bottoml2 .. topl2] fills in the appropriate
diff --git a/eclipse/plugins/org.eclipse.compare.core/src/org/eclipse/compare/rangedifferencer/RangeDifferencer.java b/eclipse/plugins/org.eclipse.compare.core/src/org/eclipse/compare/rangedifferencer/RangeDifferencer.java
index af9a5cb..e39c04d 100644
--- a/eclipse/plugins/org.eclipse.compare.core/src/org/eclipse/compare/rangedifferencer/RangeDifferencer.java
+++ b/eclipse/plugins/org.eclipse.compare.core/src/org/eclipse/compare/rangedifferencer/RangeDifferencer.java
@@ -342,7 +342,7 @@ public final class RangeDifferencer {
* @since 2.0
*/
public static RangeDifference[] findRanges(IProgressMonitor pm, IRangeComparator ancestor, IRangeComparator left, IRangeComparator right) {
- return findRanges(defaultFactory, null, ancestor, left, right);
+ return findRanges(defaultFactory, pm, ancestor, left, right);
}
/**
diff --git a/eclipse/plugins/org.eclipse.compare.win32/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.compare.win32/META-INF/MANIFEST.MF
index 49f71c2..ddc1d40 100644
--- a/eclipse/plugins/org.eclipse.compare.win32/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.compare.win32/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.compare.win32;singleton:=true
-Bundle-Version: 1.0.100.qualifier
+Bundle-Version: 1.0.101.qualifier
Bundle-Vendor: %providerName
Bundle-RequiredExecutionEnvironment: J2SE-1.4
Eclipse-PlatformFilter: (osgi.os=win32)
diff --git a/eclipse/plugins/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordComparison.java b/eclipse/plugins/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordComparison.java
index 06c4b05..fc63c28 100644
--- a/eclipse/plugins/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordComparison.java
+++ b/eclipse/plugins/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordComparison.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
+ * Copyright (c) 2008, 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
@@ -48,6 +48,14 @@ public class WordComparison {
return auto.invoke(property(auto, command), new Variant[0]);
}
+ private static Variant invoke(OleAutomation auto, OleAutomation reference, String command) {
+ return auto.invoke(property(auto, reference, command), new Variant[0]);
+ }
+
+ private static Variant invoke(OleAutomation auto, OleAutomation reference, String command, String value) {
+ return auto.invoke(property(auto, reference, command), new Variant[] { new Variant(value) });
+ }
+
private static Variant invoke(OleAutomation auto, String command, int value) {
return auto.invoke(property(auto, command), new Variant[] { new Variant(value) });
}
@@ -104,6 +112,36 @@ public class WordComparison {
throw new SWTException(NLS.bind(CompareWin32Messages.WordComparison_3, command, value));
}
+
+ /**
+ * <p>This methods workarounds the feature in doc documents. Some properties are not accessible
+ * using names when a diff document is created. The workaround is to obtain the id of the
+ * method from an original document and use it in the newly created one.</p>
+ *
+ * <p>An exception is thrown if the id cannot be retrieved</p>
+ *
+ * Reference information for id assignment: <a href="
+ * http://msdn.microsoft.com/en-us/library/w7a36sdf%28VS.80%29.aspx">http://msdn.microsoft.com/en-us/library/w7a36sdf%28VS.80%29.aspx</a>
+ *
+ * @param auto - object from which we want to get the property, must not be <code>null</code>
+ * @param reference - an reference object from which the property will be obtained.
+ * @param name - the name of the property, must not be <code>null</code>
+ */
+ private static int property(OleAutomation auto, OleAutomation reference, String name) {
+ int[] ids = auto.getIDsOfNames(new String[] { name });
+ if (ids != null) {
+ return ids[0];
+ }
+ if(reference == null) throw new SWTException(NLS.bind(CompareWin32Messages.WordComparison_4, name)) ;
+
+ // the property was not retrieved at that point, try to get it from the reference object
+ ids = reference.getIDsOfNames(new String[] { name });
+ if (ids == null) {
+ throw new SWTException(NLS.bind(CompareWin32Messages.WordComparison_4, name));
+ }
+ return ids[0];
+ }
+
private static int property(OleAutomation auto, String name) {
int[] ids = auto.getIDsOfNames(new String[] { name });
if (ids == null) throw new SWTException(NLS.bind(CompareWin32Messages.WordComparison_4, name));
@@ -154,13 +192,13 @@ public class WordComparison {
compareDocument(document, baseDocument, revisedDocument);
OleAutomation activeDocument = getActiveDocument(application);
try {
- Variant varResult = invoke(activeDocument, "SaveAs", workingCopy); //$NON-NLS-1$
+ Variant varResult = invoke(activeDocument, document, "SaveAs", workingCopy); //$NON-NLS-1$
if (varResult == null)
throw new SWTException(NLS.bind(CompareWin32Messages.WordComparison_6, workingCopy));
varResult.dispose();
} finally {
try {
- closeDocument(activeDocument);
+ closeDocument(activeDocument, document);
} catch (SWTException e) {
// We don't want to throw the exception as we may mask another exception
Activator.log(e);
@@ -170,7 +208,7 @@ public class WordComparison {
}
} finally {
try {
- closeDocument(document);
+ closeDocument(document, null);
} catch (SWTException e) {
// We don't want to throw the exception as we may mask another exception
Activator.log(e);
@@ -183,9 +221,9 @@ public class WordComparison {
}
}
- private void closeDocument(OleAutomation document) {
+ private void closeDocument(OleAutomation document, OleAutomation reference) {
// Close the first document: destination.Close()
- Variant varResult = invoke(document, "Close"); //$NON-NLS-1$
+ Variant varResult = invoke(document, reference, "Close"); //$NON-NLS-1$
if (varResult != null) {
varResult.dispose();
}
@@ -273,7 +311,7 @@ public class WordComparison {
private void disposeSite() {
if (document != null) {
try {
- closeDocument(document);
+ closeDocument(document, null);
} catch (SWTException e) {
Activator.log(e);
}
diff --git a/eclipse/plugins/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordMergeViewer.java b/eclipse/plugins/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordMergeViewer.java
index f03eeaa..ac17d30 100644
--- a/eclipse/plugins/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordMergeViewer.java
+++ b/eclipse/plugins/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordMergeViewer.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
+ * Copyright (c) 2008, 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
@@ -305,8 +305,16 @@ public class WordMergeViewer extends AbstractMergeViewer implements IFlushable,
try {
if (isOneSided()) {
File file = getFileForSingleSide();
- if (file != null)
- wordArea.openDocument(file.getAbsolutePath(), inplace);
+ if (file != null) {
+ try {
+ wordArea.openDocument(file.getAbsolutePath(), inplace);
+ } catch (SWTException e) {
+ throw new CoreException(new Status(IStatus.ERROR,
+ Activator.PLUGIN_ID, NLS.bind(
+ CompareWin32Messages.WordComparison_16,
+ file.getAbsolutePath()), e));
+ }
+ }
} else {
File left = getFileForLeft();
File right = getFileForRight();
@@ -327,7 +335,14 @@ public class WordMergeViewer extends AbstractMergeViewer implements IFlushable,
resultFileTimestamp = result.lastModified();
description.setText(getTextDescription());
}
- wordArea.openDocument(result.getAbsolutePath(), inplace);
+ try {
+ wordArea.openDocument(result.getAbsolutePath(), inplace);
+ } catch (SWTException e) {
+ throw new CoreException(new Status(IStatus.ERROR,
+ Activator.PLUGIN_ID, NLS.bind(
+ CompareWin32Messages.WordComparison_16,
+ result.getAbsolutePath()), e));
+ }
}
}
}
diff --git a/eclipse/plugins/org.eclipse.compare/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.compare/META-INF/MANIFEST.MF
index 399e232..511a171 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.100.qualifier
+Bundle-Version: 3.5.101.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/internal/ComparePreferencePage.java b/eclipse/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java
index 11a62da..d9d18b0 100644
--- a/eclipse/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java
+++ b/eclipse/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java
@@ -20,6 +20,7 @@ import org.eclipse.compare.CompareConfiguration;
import org.eclipse.compare.IEncodedStreamContentAccessor;
import org.eclipse.compare.ITypedElement;
import org.eclipse.compare.contentmergeviewer.TextMergeViewer;
+import org.eclipse.compare.internal.core.ComparePlugin;
import org.eclipse.compare.structuremergeviewer.DiffNode;
import org.eclipse.compare.structuremergeviewer.Differencer;
import org.eclipse.jface.dialogs.Dialog;
@@ -92,6 +93,7 @@ public class ComparePreferencePage extends PreferencePage implements IWorkbenchP
public static final String USE_SINGLE_LINE= PREFIX + "UseSingleLine"; //$NON-NLS-1$
public static final String HIGHLIGHT_TOKEN_CHANGES= PREFIX + "HighlightTokenChanges"; //$NON-NLS-1$
//public static final String USE_RESOLVE_UI= PREFIX + "UseResolveUI"; //$NON-NLS-1$
+ public static final String CAPPING_DISABLED= PREFIX + "CappingDisable"; //$NON-NLS-1$
public static final String PATH_FILTER= PREFIX + "PathFilter"; //$NON-NLS-1$
public static final String ADDED_LINES_REGEX= PREFIX + "AddedLinesRegex"; //$NON-NLS-1$
public static final String REMOVED_LINES_REGEX= PREFIX + "RemovedLinesRegex"; //$NON-NLS-1$
@@ -122,6 +124,7 @@ public class ComparePreferencePage extends PreferencePage implements IWorkbenchP
new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, USE_SINGLE_LINE),
new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, HIGHLIGHT_TOKEN_CHANGES),
//new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, USE_RESOLVE_UI),
+ new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, CAPPING_DISABLED),
new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, PATH_FILTER),
new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, ICompareUIConstants.PREF_NAVIGATION_END_ACTION),
new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, ICompareUIConstants.PREF_NAVIGATION_END_ACTION_LOCAL),
@@ -143,6 +146,7 @@ public class ComparePreferencePage extends PreferencePage implements IWorkbenchP
store.setDefault(USE_SINGLE_LINE, true);
store.setDefault(HIGHLIGHT_TOKEN_CHANGES, true);
//store.setDefault(USE_RESOLVE_UI, false);
+ store.setDefault(CAPPING_DISABLED, false);
store.setDefault(PATH_FILTER, ""); //$NON-NLS-1$
store.setDefault(ICompareUIConstants.PREF_NAVIGATION_END_ACTION, ICompareUIConstants.PREF_VALUE_PROMPT);
store.setDefault(ICompareUIConstants.PREF_NAVIGATION_END_ACTION_LOCAL, ICompareUIConstants.PREF_VALUE_LOOP);
@@ -183,8 +187,12 @@ public class ComparePreferencePage extends PreferencePage implements IWorkbenchP
fOverlayStore.setValue(ADDED_LINES_REGEX, addedLinesRegex.getText());
fOverlayStore.setValue(REMOVED_LINES_REGEX, removedLinesRegex.getText());
- editor.store();
+ editor.store();
fOverlayStore.propagate();
+
+ ComparePlugin.getDefault().setCappingDisabled(
+ getPreferenceStore().getBoolean(
+ ComparePreferencePage.CAPPING_DISABLED));
return true;
}
@@ -343,6 +351,7 @@ public class ComparePreferencePage extends PreferencePage implements IWorkbenchP
addCheckBox(composite, "ComparePreferencePage.useSingleLine.label", USE_SINGLE_LINE, 0); //$NON-NLS-1$
addCheckBox(composite, "ComparePreferencePage.highlightTokenChanges.label", HIGHLIGHT_TOKEN_CHANGES, 0); //$NON-NLS-1$
//addCheckBox(composite, "ComparePreferencePage.useResolveUI.label", USE_RESOLVE_UI, 0); //$NON-NLS-1$
+ addCheckBox(composite, "ComparePreferencePage.disableCapping.label", CAPPING_DISABLED, 0); //$NON-NLS-1$
Composite radioGroup = new Composite(composite, SWT.NULL);
radioGroup.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
diff --git a/eclipse/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java b/eclipse/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java
index b3d058c..4e32e94 100644
--- a/eclipse/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java
+++ b/eclipse/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java
@@ -32,6 +32,7 @@ import org.eclipse.compare.CompareEditorInput;
import org.eclipse.compare.IStreamContentAccessor;
import org.eclipse.compare.IStreamMerger;
import org.eclipse.compare.ITypedElement;
+import org.eclipse.compare.internal.core.ComparePlugin;
import org.eclipse.compare.structuremergeviewer.ICompareInput;
import org.eclipse.compare.structuremergeviewer.IStructureCreator;
import org.eclipse.compare.structuremergeviewer.StructureDiffViewer;
@@ -256,6 +257,10 @@ public final class CompareUIPlugin extends AbstractUIPlugin {
public void start(BundleContext context) throws Exception {
super.start(context);
+
+ ComparePlugin.getDefault().setCappingDisabled(
+ getPreferenceStore().getBoolean(
+ ComparePreferencePage.CAPPING_DISABLED));
}
public void stop(BundleContext context) throws Exception {
diff --git a/eclipse/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/DocumentMerger.java b/eclipse/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/DocumentMerger.java
index 1dc8bb8..e89c3dd 100644
--- a/eclipse/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/DocumentMerger.java
+++ b/eclipse/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/DocumentMerger.java
@@ -11,17 +11,36 @@
package org.eclipse.compare.internal.merge;
import java.lang.reflect.InvocationTargetException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
import org.eclipse.compare.CompareConfiguration;
import org.eclipse.compare.contentmergeviewer.ITokenComparator;
-import org.eclipse.compare.internal.*;
+import org.eclipse.compare.internal.CompareContentViewerSwitchingPane;
+import org.eclipse.compare.internal.CompareMessages;
+import org.eclipse.compare.internal.ComparePreferencePage;
+import org.eclipse.compare.internal.CompareUIPlugin;
+import org.eclipse.compare.internal.DocLineComparator;
+import org.eclipse.compare.internal.MergeViewerContentProvider;
+import org.eclipse.compare.internal.Utilities;
import org.eclipse.compare.internal.core.LCS;
-import org.eclipse.compare.rangedifferencer.*;
+import org.eclipse.compare.rangedifferencer.IRangeComparator;
+import org.eclipse.compare.rangedifferencer.RangeDifference;
+import org.eclipse.compare.rangedifferencer.RangeDifferencer;
import org.eclipse.compare.structuremergeviewer.Differencer;
-import org.eclipse.core.runtime.*;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.text.*;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.BadPositionCategoryException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.Position;
+import org.eclipse.jface.text.Region;
+import org.eclipse.jface.text.TextUtilities;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.Point;
import org.eclipse.ui.PlatformUI;
@@ -412,7 +431,7 @@ public class DocumentMerger {
}
}*/
}
-
+
final Object[] result= new Object[1];
final DocLineComparator sa= sancestor, sl= sleft, sr= sright;
IRunnableWithProgress runnable= new IRunnableWithProgress() {
@@ -446,7 +465,15 @@ public class DocumentMerger {
fAllDiffs.add(diff);
throw new CoreException(new Status(IStatus.ERROR, CompareUIPlugin.PLUGIN_ID, 0, CompareMessages.DocumentMerger_1, ex.getTargetException()));
} catch (InterruptedException ex) {
- //
+ // we create a NOCHANGE range for the whole document
+ Diff diff= new Diff(null, RangeDifference.NOCHANGE,
+ aDoc, aRegion, 0, aDoc != null ? aDoc.getLength() : 0,
+ lDoc, lRegion, 0, lDoc.getLength(),
+ rDoc, rRegion, 0, rDoc.getLength());
+
+ fAllDiffs = new ArrayList();
+ fAllDiffs.add(diff);
+ return;
}
if (isCapped(sa, sl, sr))
@@ -532,6 +559,8 @@ public class DocumentMerger {
private boolean isCapped(DocLineComparator ancestor,
DocLineComparator left, DocLineComparator right) {
+ if (isCappingDisabled())
+ return false;
int aLength = ancestor == null? 0 : ancestor.getRangeCount();
int lLength = left.getRangeCount();
int rLength = right.getRangeCount();
@@ -648,6 +677,10 @@ public class DocumentMerger {
return Utilities.getBoolean(getCompareConfiguration(), CompareConfiguration.IGNORE_WHITESPACE, false);
}
+ private boolean isCappingDisabled() {
+ return CompareUIPlugin.getDefault().getPreferenceStore().getBoolean(ComparePreferencePage.CAPPING_DISABLED);
+ }
+
private IDocument getDocument(char contributor) {
return fInput.getDocument(contributor);
}
diff --git a/eclipse/plugins/org.eclipse.compare/plugin.properties b/eclipse/plugins/org.eclipse.compare/plugin.properties
index c8e2865..a5fb23f 100644
--- a/eclipse/plugins/org.eclipse.compare/plugin.properties
+++ b/eclipse/plugins/org.eclipse.compare/plugin.properties
@@ -130,6 +130,7 @@ ComparePreferencePage.showPseudoConflicts.label= Show &pseudo conflicts
ComparePreferencePage.synchronizeScrolling.label= Synchronize &scrolling between panes in compare viewers
ComparePreferencePage.useSingleLine.label= Connect &ranges with single line
ComparePreferencePage.highlightTokenChanges.label=&Highlight individual changes
+ComparePreferencePage.disableCapping.label=Disable &capping when comparing large documents
ComparePreferencePage.preview.label= Previe&w:
ComparePreferencePage.ancestor.label= Common Ancestor
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 79e14cb..893e00f 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.6.0.qualifier
+Bundle-Version: 3.6.1.qualifier
Bundle-Activator: org.eclipse.core.resources.ResourcesPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/eclipse/plugins/org.eclipse.core.resources/src/org/eclipse/core/internal/localstore/FileStoreRoot.java b/eclipse/plugins/org.eclipse.core.resources/src/org/eclipse/core/internal/localstore/FileStoreRoot.java
index 20e08e8..af219bd 100644
--- a/eclipse/plugins/org.eclipse.core.resources/src/org/eclipse/core/internal/localstore/FileStoreRoot.java
+++ b/eclipse/plugins/org.eclipse.core.resources/src/org/eclipse/core/internal/localstore/FileStoreRoot.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2010 IBM Corporation and others.
+ * Copyright (c) 2005, 2011 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,8 +13,8 @@ package org.eclipse.core.internal.localstore;
import java.io.File;
import java.net.URI;
-import org.eclipse.core.filesystem.*;
-import org.eclipse.core.filesystem.URIUtil;
+import org.eclipse.core.filesystem.EFS;
+import org.eclipse.core.filesystem.IFileStore;
import org.eclipse.core.internal.utils.FileUtil;
import org.eclipse.core.resources.*;
import org.eclipse.core.runtime.*;
@@ -120,9 +120,11 @@ public class FileStoreRoot {
location = localRoot;
else
location = localRoot.append(workspacePath.removeFirstSegments(chop));
- location = URIUtil.toPath(resource.getPathVariableManager().resolveURI(URIUtil.toURI(location)));
- //if path is still relative then path variable could not be resolved
- if (!location.isAbsolute())
+ location = resource.getPathVariableManager().resolvePath(location);
+
+ // if path is still relative then path variable could not be resolved
+ // if path is null, it means path variable refers to a non-local filesystem
+ if (location == null || !location.isAbsolute())
return null;
return location;
}
diff --git a/eclipse/plugins/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/CharsetManager.java b/eclipse/plugins/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/CharsetManager.java
index 8af6f84..b420671 100644
--- a/eclipse/plugins/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/CharsetManager.java
+++ b/eclipse/plugins/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/CharsetManager.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
+ * Copyright (c) 2004, 2011 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
@@ -33,7 +33,7 @@ public class CharsetManager implements IManager {
*/
private class CharsetManagerJob extends Job {
private static final int CHARSET_UPDATE_DELAY = 500;
- private List asyncChanges = new ArrayList();
+ private List/*<Map.Entry<IProject, Boolean>>*/ asyncChanges = new ArrayList/*<Map.Entry<IProject, Boolean>>*/();
public CharsetManagerJob() {
super(Messages.resources_charsetUpdating);
@@ -41,19 +41,19 @@ public class CharsetManager implements IManager {
setPriority(Job.INTERACTIVE);
}
- public void addChanges(Set newChanges) {
+ public void addChanges(Map/*<IProject, Boolean>*/ newChanges) {
if (newChanges.isEmpty())
return;
synchronized (asyncChanges) {
- asyncChanges.addAll(newChanges);
+ asyncChanges.addAll(newChanges.entrySet());
asyncChanges.notify();
}
schedule(CHARSET_UPDATE_DELAY);
}
- public IProject getNextChange() {
+ public Map.Entry/*<IProject, Boolean>*/ getNextChange() {
synchronized (asyncChanges) {
- return asyncChanges.isEmpty() ? null : (IProject) asyncChanges.remove(asyncChanges.size() - 1);
+ return asyncChanges.isEmpty() ? null : (Map.Entry)asyncChanges.remove(asyncChanges.size() - 1);
}
}
@@ -69,22 +69,25 @@ public class CharsetManager implements IManager {
try {
workspace.prepareOperation(rule, monitor);
workspace.beginOperation(true);
- IProject next;
+ Map.Entry/*<IProject, Boolean>*/ next;
while ((next = getNextChange()) != null) {
//just exit if the system is shutting down or has been shut down
//it is too late to change the workspace at this point anyway
if (systemBundle.getState() != Bundle.ACTIVE)
return Status.OK_STATUS;
+ IProject project = (IProject)next.getKey();
try {
- if (next.isAccessible()) {
- Preferences projectPrefs = getPreferences(next, false);
- if (projectPrefs != null)
- projectPrefs.flush();
+ if (project.isAccessible()) {
+ boolean shouldDisableCharsetDeltaJob = ((Boolean)next.getValue()).booleanValue();
+ // flush prefs for non-derived resources
+ flushPreferences(getPreferences(project, false, false, true), shouldDisableCharsetDeltaJob);
+ // flush prefs for derived resources
+ flushPreferences(getPreferences(project, false, true, true), shouldDisableCharsetDeltaJob);
}
} catch (BackingStoreException e) {
// we got an error saving
String detailMessage = Messages.resources_savingEncoding;
- result.add(new ResourceStatus(IResourceStatus.FAILED_SETTING_CHARSET, next.getFullPath(), detailMessage, e));
+ result.add(new ResourceStatus(IResourceStatus.FAILED_SETTING_CHARSET, project.getFullPath(), detailMessage, e));
}
}
monitor.worked(Policy.opWork);
@@ -112,48 +115,106 @@ public class CharsetManager implements IManager {
}
}
- class Listener implements IResourceChangeListener {
+ private class ResourceChangeListener implements IResourceChangeListener {
+ public ResourceChangeListener() {
+ }
- private void processEntryChanges(IResourceDelta projectDelta, Set projectsToSave) {
- // check each resource with user-set encoding to see if it has
- // been moved/deleted
+ private boolean moveSettingsIfDerivedChanged(IResourceDelta parent, IProject currentProject, Preferences projectPrefs, String[] affectedResources) {
boolean resourceChanges = false;
+
+ if ((parent.getFlags() & IResourceDelta.DERIVED_CHANGED) != 0) {
+ // if derived changed, move encoding to correct prefs
+ IPath parentPath = parent.getResource().getProjectRelativePath();
+ for (int i = 0; i < affectedResources.length; i++) {
+ IPath affectedPath = new Path(affectedResources[i]);
+ // if parentPath is an ancestor of affectedPath
+ if (parentPath.isPrefixOf(affectedPath)) {
+ IResource member = currentProject.findMember(affectedPath);
+ if (member != null) {
+ Preferences targetPrefs = getPreferences(currentProject, true, member.isDerived(IResource.CHECK_ANCESTORS));
+ // if new prefs are different than current
+ if (!projectPrefs.absolutePath().equals(targetPrefs.absolutePath())) {
+ // remove encoding from old prefs and save in correct prefs
+ String currentValue = projectPrefs.get(affectedResources[i], null);
+ projectPrefs.remove(affectedResources[i]);
+ targetPrefs.put(affectedResources[i], currentValue);
+ resourceChanges = true;
+ }
+ }
+ }
+ }
+ }
+
+ IResourceDelta[] children = parent.getAffectedChildren();
+ for (int i = 0; i < children.length; i++) {
+ resourceChanges = moveSettingsIfDerivedChanged(children[i], currentProject, projectPrefs, affectedResources) || resourceChanges;
+ }
+ return resourceChanges;
+ }
+
+ private void processEntryChanges(IResourceDelta projectDelta, Map/*<IProject, Boolean>*/ projectsToSave) {
+ // check each resource with user-set encoding to see if it has
+ // been moved/deleted or if derived state has been changed
IProject currentProject = (IProject) projectDelta.getResource();
- Preferences projectPrefs = getPreferences(currentProject, false);
- if (projectPrefs == null)
- // no preferences for this project, just bail
- return;
- String[] affectedResources;
+ Preferences projectRegularPrefs = getPreferences(currentProject, false, false, true);
+ Preferences projectDerivedPrefs = getPreferences(currentProject, false, true, true);
+ Map/*<Boolean, String[]>*/ affectedResourcesMap = new HashMap/*<Boolean, String[]>*/();
try {
- affectedResources = projectPrefs.keys();
+ // no regular preferences for this project
+ if (projectRegularPrefs == null)
+ affectedResourcesMap.put(Boolean.FALSE, new String[0]);
+ else
+ affectedResourcesMap.put(Boolean.FALSE, projectRegularPrefs.keys());
+ // no derived preferences for this project
+ if (projectDerivedPrefs == null)
+ affectedResourcesMap.put(Boolean.TRUE, new String[0]);
+ else
+ affectedResourcesMap.put(Boolean.TRUE, projectDerivedPrefs.keys());
} catch (BackingStoreException e) {
// problems with the project scope... we gonna miss the changes (but will log)
String message = Messages.resources_readingEncoding;
Policy.log(new ResourceStatus(IResourceStatus.FAILED_GETTING_CHARSET, currentProject.getFullPath(), message, e));
return;
}
- for (int i = 0; i < affectedResources.length; i++) {
- IResourceDelta memberDelta = projectDelta.findMember(new Path(affectedResources[i]));
- // no changes for the given resource
- if (memberDelta == null)
- continue;
- if (memberDelta.getKind() == IResourceDelta.REMOVED) {
- resourceChanges = true;
- // remove the setting for the original location - save its value though
- String currentValue = projectPrefs.get(affectedResources[i], null);
- projectPrefs.remove(affectedResources[i]);
- if ((memberDelta.getFlags() & IResourceDelta.MOVED_TO) != 0) {
- // if moving, copy the setting for the new location
- IProject targetProject = workspace.getRoot().getProject(memberDelta.getMovedToPath().segment(0));
- Preferences targetPrefs = getPreferences(targetProject, true);
- targetPrefs.put(getKeyFor(memberDelta.getMovedToPath()), currentValue);
- if (targetProject != currentProject)
- projectsToSave.add(targetProject);
+ for (Iterator/*<Boolean>*/ it = affectedResourcesMap.keySet().iterator(); it.hasNext();) {
+ Boolean isDerived = (Boolean)it.next();
+ String[] affectedResources = (String[])affectedResourcesMap.get(isDerived);
+ Preferences projectPrefs = isDerived.booleanValue() ? projectDerivedPrefs : projectRegularPrefs;
+ for (int i = 0; i < affectedResources.length; i++) {
+ IResourceDelta memberDelta = projectDelta.findMember(new Path(affectedResources[i]));
+ // no changes for the given resource
+ if (memberDelta == null)
+ continue;
+ if (memberDelta.getKind() == IResourceDelta.REMOVED) {
+ boolean shouldDisableCharsetDeltaJobForCurrentProject = false;
+ // remove the setting for the original location - save its value though
+ String currentValue = projectPrefs.get(affectedResources[i], null);
+ projectPrefs.remove(affectedResources[i]);
+ if ((memberDelta.getFlags() & IResourceDelta.MOVED_TO) != 0) {
+ IPath movedToPath = memberDelta.getMovedToPath();
+ IResource resource = workspace.getRoot().findMember(movedToPath);
+ if (resource != null) {
+ Preferences encodingSettings = getPreferences(resource.getProject(), true, resource.isDerived(IResource.CHECK_ANCESTORS));
+ if (currentValue == null || currentValue.trim().length() == 0)
+ encodingSettings.remove(getKeyFor(movedToPath));
+ else
+ encodingSettings.put(getKeyFor(movedToPath), currentValue);
+ IProject targetProject = workspace.getRoot().getProject(movedToPath.segment(0));
+ if (targetProject.equals(currentProject))
+ // if the file was moved inside the same project disable charset listener
+ shouldDisableCharsetDeltaJobForCurrentProject = true;
+ else
+ projectsToSave.put(targetProject, Boolean.FALSE);
+ }
+ }
+ projectsToSave.put(currentProject, Boolean.valueOf(shouldDisableCharsetDeltaJobForCurrentProject));
}
}
+ if (moveSettingsIfDerivedChanged(projectDelta, currentProject, projectPrefs, affectedResources)) {
+ // if settings were moved between prefs files disable charset listener so we don't react to changes made by ourselves
+ projectsToSave.put(currentProject, Boolean.TRUE);
+ }
}
- if (resourceChanges)
- projectsToSave.add(currentProject);
}
/**
@@ -166,7 +227,7 @@ public class CharsetManager implements IManager {
return;
IResourceDelta[] projectDeltas = delta.getAffectedChildren();
// process each project in the delta
- Set projectsToSave = new HashSet();
+ Map/*<IProject, Boolean>*/ projectsToSave = new HashMap/*<IProject, Boolean>*/();
for (int i = 0; i < projectDeltas.length; i++)
//nothing to do if a project has been added/removed/moved
if (projectDeltas[i].getKind() == IResourceDelta.CHANGED && (projectDeltas[i].getFlags() & IResourceDelta.OPEN) == 0)
@@ -175,11 +236,10 @@ public class CharsetManager implements IManager {
}
}
- public static final String ENCODING_PREF_NODE = "encoding"; //$NON-NLS-1$
private static final String PROJECT_KEY = "<project>"; //$NON-NLS-1$
private CharsetDeltaJob charsetListener;
CharsetManagerJob job;
- private IResourceChangeListener listener;
+ private IResourceChangeListener resourceChangeListener;
protected final Bundle systemBundle = Platform.getBundle("org.eclipse.osgi"); //$NON-NLS-1$
Workspace workspace;
@@ -187,6 +247,19 @@ public class CharsetManager implements IManager {
this.workspace = workspace;
}
+ void flushPreferences(Preferences projectPrefs, boolean shouldDisableCharsetDeltaJob) throws BackingStoreException {
+ if (projectPrefs != null) {
+ try {
+ if (shouldDisableCharsetDeltaJob)
+ charsetListener.setDisabled(true);
+ projectPrefs.flush();
+ } finally {
+ if (shouldDisableCharsetDeltaJob)
+ charsetListener.setDisabled(false);
+ }
+ }
+ }
+
/**
* Returns the charset explicitly set by the user for the given resource,
* or <code>null</code>. If no setting exists for the given resource and
@@ -200,22 +273,32 @@ public class CharsetManager implements IManager {
public String getCharsetFor(IPath resourcePath, boolean recurse) {
Assert.isLegal(resourcePath.segmentCount() >= 1);
IProject project = workspace.getRoot().getProject(resourcePath.segment(0));
- Preferences encodingSettings = getPreferences(project, false);
- if (encodingSettings == null)
+
+ Preferences prefs = getPreferences(project, false, false);
+ Preferences derivedPrefs = getPreferences(project, false, true);
+
+ if (prefs == null && derivedPrefs == null)
// no preferences found - for performance reasons, short-circuit
// lookup by falling back to workspace's default setting
return recurse ? ResourcesPlugin.getEncoding() : null;
- return internalGetCharsetFor(resourcePath, encodingSettings, recurse);
+
+ return internalGetCharsetFor(prefs, derivedPrefs, resourcePath, recurse);
}
- String getKeyFor(IPath resourcePath) {
+ private String getKeyFor(IPath resourcePath) {
return resourcePath.segmentCount() > 1 ? resourcePath.removeFirstSegments(1).toString() : PROJECT_KEY;
}
- Preferences getPreferences(IProject project, boolean create) {
+ Preferences getPreferences(IProject project, boolean create, boolean isDerived) {
+ return getPreferences(project, create, isDerived, isDerivedEncodingStoredSeparately(project));
+ }
+
+ Preferences getPreferences(IProject project, boolean create, boolean isDerived, boolean isDerivedEncodingStoredSeparately) {
+ boolean localIsDerived = isDerivedEncodingStoredSeparately ? isDerived : false;
+ String qualifier = localIsDerived ? ProjectPreferences.PREFS_DERIVED_QUALIFIER : ProjectPreferences.PREFS_REGULAR_QUALIFIER;
if (create)
// create all nodes down to the one we are interested in
- return new ProjectScope(project).getNode(ResourcesPlugin.PI_RESOURCES).node(ENCODING_PREF_NODE);
+ return new ProjectScope(project).getNode(qualifier).node(ResourcesPlugin.PREF_ENCODING);
// be careful looking up for our node so not to create any nodes as side effect
Preferences node = Platform.getPreferencesService().getRootNode().node(ProjectScope.SCOPE);
try {
@@ -226,12 +309,12 @@ public class CharsetManager implements IManager {
if (!node.nodeExists(project.getName()))
return null;
node = node.node(project.getName());
- if (!node.nodeExists(ResourcesPlugin.PI_RESOURCES))
+ if (!node.nodeExists(qualifier))
return null;
- node = node.node(ResourcesPlugin.PI_RESOURCES);
- if (!node.nodeExists(ENCODING_PREF_NODE))
+ node = node.node(qualifier);
+ if (!node.nodeExists(ResourcesPlugin.PREF_ENCODING))
return null;
- return node.node(ENCODING_PREF_NODE);
+ return node.node(ResourcesPlugin.PREF_ENCODING);
} catch (BackingStoreException e) {
// nodeExists failed
String message = Messages.resources_readingEncoding;
@@ -239,19 +322,89 @@ public class CharsetManager implements IManager {
}
return null;
}
-
- private String internalGetCharsetFor(IPath resourcePath, Preferences encodingSettings, boolean recurse) {
- String charset = encodingSettings.get(getKeyFor(resourcePath), null);
+
+ private String internalGetCharsetFor(Preferences prefs, Preferences derivedPrefs, IPath resourcePath, boolean recurse) {
+ String charset = null;
+
+ // try to find the encoding in regular and then derived prefs
+ if (prefs != null)
+ charset = prefs.get(getKeyFor(resourcePath), null);
+ // derivedPrefs may be not null, only if #isDerivedEncodingStoredSeparately returns true
+ // so the explicit check against #isDerivedEncodingStoredSeparately is not required
+ if (charset == null && derivedPrefs != null)
+ charset = derivedPrefs.get(getKeyFor(resourcePath), null);
+
if (!recurse)
return charset;
+
while (charset == null && resourcePath.segmentCount() > 1) {
resourcePath = resourcePath.removeLastSegments(1);
- charset = encodingSettings.get(getKeyFor(resourcePath), null);
+ // try to find the encoding in regular and then derived prefs
+ if (prefs != null)
+ charset = prefs.get(getKeyFor(resourcePath), null);
+ if (charset == null && derivedPrefs != null)
+ charset = derivedPrefs.get(getKeyFor(resourcePath), null);
}
+
// ensure we default to the workspace encoding if none is found
return charset == null ? ResourcesPlugin.getEncoding() : charset;
}
+ private boolean isDerivedEncodingStoredSeparately(IProject project) {
+ // be careful looking up for our node so not to create any nodes as side effect
+ Preferences node = Platform.getPreferencesService().getRootNode().node(ProjectScope.SCOPE);
+ try {
+ //TODO once bug 90500 is fixed, should be as simple as this:
+ // String path = project.getName() + IPath.SEPARATOR + ResourcesPlugin.PI_RESOURCES;
+ // return node.nodeExists(path) ? node.node(path).getBoolean(ResourcesPlugin.PREF_SEPARATE_DERIVED_ENCODINGS, false) : false;
+ // for now, take the long way
+ if (!node.nodeExists(project.getName()))
+ return false;
+ node = node.node(project.getName());
+ if (!node.nodeExists(ResourcesPlugin.PI_RESOURCES))
+ return false;
+ node = node.node(ResourcesPlugin.PI_RESOURCES);
+ return node.getBoolean(ProjectPreferences.PREF_SEPARATE_DERIVED_ENCODINGS, false);
+ } catch (BackingStoreException e) {
+ // nodeExists failed
+ String message = Messages.resources_readingEncoding;
+ Policy.log(new ResourceStatus(IResourceStatus.FAILED_GETTING_CHARSET, project.getFullPath(), message, e));
+ return false;
+ }
+ }
+
+ protected void mergeEncodingPreferences(IProject project) {
+ Preferences projectRegularPrefs = null;
+ Preferences projectDerivedPrefs = getPreferences(project, false, true, true);
+ if (projectDerivedPrefs == null)
+ return;
+ try {
+ boolean prefsChanged = false;
+ String[] affectedResources;
+ affectedResources = projectDerivedPrefs.keys();
+ for (int i = 0; i < affectedResources.length; i++) {
+ String path = affectedResources[i];
+ String value = projectDerivedPrefs.get(path, null);
+ projectDerivedPrefs.remove(path);
+ // lazy creation of non-derived prefs
+ if (projectRegularPrefs == null)
+ projectRegularPrefs = getPreferences(project, true, false, false);
+ projectRegularPrefs.put(path, value);
+ prefsChanged = true;
+ }
+ if (prefsChanged) {
+ Map/*<IProject, Boolean>*/ projectsToSave = new HashMap/*<IProject, Boolean>*/();
+ // this is internal change so do not notify charset delta job
+ projectsToSave.put(project, Boolean.TRUE);
+ job.addChanges(projectsToSave);
+ }
+ } catch (BackingStoreException e) {
+ // problems with the project scope... we gonna miss the changes (but will log)
+ String message = Messages.resources_readingEncoding;
+ Policy.log(new ResourceStatus(IResourceStatus.FAILED_GETTING_CHARSET, project.getFullPath(), message, e));
+ }
+ }
+
public void projectPreferencesChanged(IProject project) {
charsetListener.charsetPreferencesChanged(project);
}
@@ -268,36 +421,71 @@ public class CharsetManager implements IManager {
return;
}
// for all other cases, we set a property in the corresponding project
- IProject project = workspace.getRoot().getProject(resourcePath.segment(0));
- Preferences encodingSettings = getPreferences(project, true);
- if (newCharset == null || newCharset.trim().length() == 0)
- encodingSettings.remove(getKeyFor(resourcePath));
- else
- encodingSettings.put(getKeyFor(resourcePath), newCharset);
- try {
- // disable the listener so we don't react to changes made by ourselves
- charsetListener.setDisabled(true);
- // save changes
- encodingSettings.flush();
- } catch (BackingStoreException e) {
- String message = Messages.resources_savingEncoding;
- throw new ResourceException(IResourceStatus.FAILED_SETTING_CHARSET, project.getFullPath(), message, e);
- } finally {
- charsetListener.setDisabled(false);
+ IResource resource = workspace.getRoot().findMember(resourcePath);
+ if (resource != null) {
+ try {
+ // disable the listener so we don't react to changes made by ourselves
+ Preferences encodingSettings = getPreferences(resource.getProject(), true, resource.isDerived(IResource.CHECK_ANCESTORS));
+ if (newCharset == null || newCharset.trim().length() == 0)
+ encodingSettings.remove(getKeyFor(resourcePath));
+ else
+ encodingSettings.put(getKeyFor(resourcePath), newCharset);
+ flushPreferences(encodingSettings, true);
+ } catch (BackingStoreException e) {
+ IProject project = workspace.getRoot().getProject(resourcePath.segment(0));
+ String message = Messages.resources_savingEncoding;
+ throw new ResourceException(IResourceStatus.FAILED_SETTING_CHARSET, project.getFullPath(), message, e);
+ }
}
-
}
public void shutdown(IProgressMonitor monitor) {
- workspace.removeResourceChangeListener(listener);
+ workspace.removeResourceChangeListener(resourceChangeListener);
if (charsetListener != null)
charsetListener.shutdown();
}
+ protected void splitEncodingPreferences(IProject project) {
+ Preferences projectRegularPrefs = getPreferences(project, false, false, false);
+ Preferences projectDerivedPrefs = null;
+ if (projectRegularPrefs == null)
+ return;
+ try {
+ boolean prefsChanged = false;
+ String[] affectedResources;
+ affectedResources = projectRegularPrefs.keys();
+ for (int i = 0; i < affectedResources.length; i++) {
+ String path = affectedResources[i];
+ IResource resource = project.findMember(path);
+ if (resource != null) {
+ if (resource.isDerived(IResource.CHECK_ANCESTORS)) {
+ String value = projectRegularPrefs.get(path, null);
+ projectRegularPrefs.remove(path);
+ // lazy creation of derived prefs
+ if (projectDerivedPrefs == null)
+ projectDerivedPrefs = getPreferences(project, true, true, true);
+ projectDerivedPrefs.put(path, value);
+ prefsChanged = true;
+ }
+ }
+ }
+ if (prefsChanged) {
+ Map/*<IProject, Boolean>*/ projectsToSave = new HashMap/*<IProject, Boolean>*/();
+ // this is internal change so do not notify charset delta job
+ projectsToSave.put(project, Boolean.TRUE);
+ job.addChanges(projectsToSave);
+ }
+ } catch (BackingStoreException e) {
+ // problems with the project scope... we gonna miss the changes (but will log)
+ String message = Messages.resources_readingEncoding;
+ Policy.log(new ResourceStatus(IResourceStatus.FAILED_GETTING_CHARSET, project.getFullPath(), message, e));
+ }
+ }
+
public void startup(IProgressMonitor monitor) {
job = new CharsetManagerJob();
- listener = new Listener();
- workspace.addResourceChangeListener(listener, IResourceChangeEvent.POST_CHANGE);
+ resourceChangeListener = new ResourceChangeListener();
+ workspace.addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);
charsetListener = new CharsetDeltaJob(workspace);
charsetListener.startup();
}
diff --git a/eclipse/plugins/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/NatureManager.java b/eclipse/plugins/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/NatureManager.java
index 3d0e9f7..3795989 100644
--- a/eclipse/plugins/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/NatureManager.java
+++ b/eclipse/plugins/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/NatureManager.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
@@ -25,13 +25,13 @@ import org.eclipse.osgi.util.NLS;
*/
public class NatureManager implements ILifecycleListener, IManager {
//maps String (nature ID) -> descriptor objects
- protected Map descriptors;
+ private Map descriptors;
//maps IProject -> String[] of enabled natures for that project
- protected Map natureEnablements;
+ private final Map natureEnablements = Collections.synchronizedMap(new HashMap(20));
//maps String (builder ID) -> String (nature ID)
- protected Map buildersToNatures = null;
+ private Map buildersToNatures;
//colour constants used in cycle detection algorithm
private static final byte WHITE = 0;
private static final byte GREY = 1;
@@ -43,7 +43,7 @@ public class NatureManager implements ILifecycleListener, IManager {
/**
* Computes the list of natures that are enabled for the given project.
- * Enablement computation is subtlely different from nature set
+ * Enablement computation is subtly different from nature set
* validation, because it must find and remove all inconsistencies.
*/
protected String[] computeNatureEnablements(Project project) {
@@ -108,7 +108,7 @@ public class NatureManager implements ILifecycleListener, IManager {
/* (non-Javadoc)
* @see IWorkspace#getNatureDescriptor(String)
*/
- public IProjectNatureDescriptor getNatureDescriptor(String natureId) {
+ public synchronized IProjectNatureDescriptor getNatureDescriptor(String natureId) {
lazyInitialize();
return (IProjectNatureDescriptor) descriptors.get(natureId);
}
@@ -116,7 +116,7 @@ public class NatureManager implements ILifecycleListener, IManager {
/* (non-Javadoc)
* @see IWorkspace#getNatureDescriptors()
*/
- public IProjectNatureDescriptor[] getNatureDescriptors() {
+ public synchronized IProjectNatureDescriptor[] getNatureDescriptors() {
lazyInitialize();
Collection values = descriptors.values();
return (IProjectNatureDescriptor[]) values.toArray(new IProjectNatureDescriptor[values.size()]);
@@ -275,7 +275,7 @@ public class NatureManager implements ILifecycleListener, IManager {
/**
* Marks all nature descriptors that are involved in cycles
*/
- protected void detectCycles() {
+ private void detectCycles() {
Collection values = descriptors.values();
ProjectNatureDescriptor[] natures = (ProjectNatureDescriptor[]) values.toArray(new ProjectNatureDescriptor[values.size()]);
for (int i = 0; i < natures.length; i++)
@@ -294,7 +294,7 @@ public class NatureManager implements ILifecycleListener, IManager {
* Returns the ID of the project nature that claims ownership of the
* builder with the given ID. Returns null if no nature owns that builder.
*/
- public String findNatureForBuilder(String builderID) {
+ public synchronized String findNatureForBuilder(String builderID) {
if (buildersToNatures == null) {
buildersToNatures = new HashMap(10);
IProjectNatureDescriptor[] descs = getNatureDescriptors();
@@ -310,28 +310,20 @@ public class NatureManager implements ILifecycleListener, IManager {
return (String) buildersToNatures.get(builderID);
}
- protected void flushEnablements(IProject project) {
- if (natureEnablements != null) {
- natureEnablements.remove(project);
- if (natureEnablements.size() == 0) {
- natureEnablements = null;
- }
- }
+ private synchronized void flushEnablements(IProject project) {
+ natureEnablements.remove(project);
}
/**
* Returns the cached array of enabled natures for this project,
* or null if there is nothing in the cache.
*/
- protected String[] getEnabledNatures(Project project) {
- String[] enabled;
- if (natureEnablements != null) {
- enabled = (String[]) natureEnablements.get(project);
- if (enabled != null)
- return enabled;
- }
+ protected synchronized String[] getEnabledNatures(Project project) {
+ String[] enabled = (String[]) natureEnablements.get(project);
+ if (enabled != null)
+ return enabled;
enabled = computeNatureEnablements(project);
- setEnabledNatures(project, enabled);
+ natureEnablements.put(project, enabled);
return enabled;
}
@@ -443,7 +435,7 @@ public class NatureManager implements ILifecycleListener, IManager {
* Only initialize the descriptor cache when we know it is actually needed.
* Running programs may never need to refer to this cache.
*/
- protected void lazyInitialize() {
+ private void lazyInitialize() {
if (descriptors != null)
return;
IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint(ResourcesPlugin.PI_RESOURCES, ResourcesPlugin.PT_NATURES);
@@ -464,15 +456,6 @@ public class NatureManager implements ILifecycleListener, IManager {
detectCycles();
}
- /**
- * Sets the cached array of enabled natures for this project.
- */
- protected void setEnabledNatures(IProject project, String[] enablements) {
- if (natureEnablements == null)
- natureEnablements = Collections.synchronizedMap(new HashMap(20));
- natureEnablements.put(project, enablements);
- }
-
public void shutdown(IProgressMonitor monitor) {
// do nothing
}
diff --git a/eclipse/plugins/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/Project.java b/eclipse/plugins/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/Project.java
index d6392b1..9561e20 100644
--- a/eclipse/plugins/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/Project.java
+++ b/eclipse/plugins/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/Project.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 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
@@ -630,7 +630,7 @@ public class Project extends Container implements IProject {
copyMetaArea(this, destination, Policy.subMonitorFor(monitor, Policy.opWork * 5 / 100));
// copy just the project and not its children yet (tree node, properties)
- internalCopyProjectOnly(destination, Policy.subMonitorFor(monitor, Policy.opWork * 5 / 100));
+ internalCopyProjectOnly(destination, destDesc, Policy.subMonitorFor(monitor, Policy.opWork * 5 / 100));
// set the description
destination.internalSetDescription(destDesc, false);
@@ -689,7 +689,7 @@ public class Project extends Container implements IProject {
/*
* Copies just the project and no children. Does NOT copy the meta area.
*/
- protected void internalCopyProjectOnly(IResource destination, IProgressMonitor monitor) throws CoreException {
+ protected void internalCopyProjectOnly(IResource destination, IProjectDescription destDesc, IProgressMonitor monitor) throws CoreException {
// close the property store so bogus values aren't copied to the destination
getPropertyManager().closePropertyStore(this);
getLocalManager().getHistoryStore().closeHistoryStore(this);
@@ -699,6 +699,13 @@ public class Project extends Container implements IProject {
ProjectInfo info = (ProjectInfo) ((Resource) destination).getResourceInfo(false, true);
+ //copy the hidden metadata that we store in the project description
+ ProjectDescription projectDesc = (ProjectDescription) destDesc;
+ ProjectDescription internalDesc = ((Project)destination.getProject()).internalGetDescription();
+ projectDesc.setLinkDescriptions(internalDesc.getLinks());
+ projectDesc.setFilterDescriptions(internalDesc.getFilters());
+ projectDesc.setVariableDescriptions(internalDesc.getVariables());
+
//clear properties, markers, and description for the new project, because they shouldn't be copied.
info.description = null;
info.natures = null;
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 a312d4d..10686d2 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
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2010 IBM Corporation and others.
+ * Copyright (c) 2004, 2011 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,15 @@ public class ProjectPreferences extends EclipsePreferences {
return new IteratorWrapper(set.iterator());
}
}
+
+ /**
+ * Name of a preference for configuring whether encodings for derived resources
+ * within the project should be stored in a separate derived preference file.
+ */
+ public static final String PREF_SEPARATE_DERIVED_ENCODINGS = "separateDerivedEncodings"; //$NON-NLS-1$
+ static final String PREFS_REGULAR_QUALIFIER = ResourcesPlugin.PI_RESOURCES;
+ static final String PREFS_DERIVED_QUALIFIER = PREFS_REGULAR_QUALIFIER + ".derived"; //$NON-NLS-1$
/**
* Cache which nodes have been loaded from disk
*/
@@ -112,7 +120,7 @@ public class ProjectPreferences extends EclipsePreferences {
clearNode(projectNode.node(qualifier));
// notifies the CharsetManager if needed
- if (qualifier.equals(ResourcesPlugin.PI_RESOURCES))
+ if (qualifier.equals(PREFS_REGULAR_QUALIFIER) || qualifier.equals(PREFS_DERIVED_QUALIFIER))
preferencesChanged(file.getProject());
}
@@ -130,7 +138,7 @@ public class ProjectPreferences extends EclipsePreferences {
String project = path.segment(0);
Preferences projectNode = root.node(ProjectScope.SCOPE).node(project);
// check if we need to notify the charset manager
- boolean hasResourcesSettings = getFile(folder, ResourcesPlugin.PI_RESOURCES).exists();
+ boolean hasResourcesSettings = getFile(folder, PREFS_REGULAR_QUALIFIER).exists() || getFile(folder, PREFS_DERIVED_QUALIFIER).exists();
// remove the preferences
removeNode(projectNode);
// notifies the CharsetManager
@@ -149,7 +157,7 @@ public class ProjectPreferences extends EclipsePreferences {
Preferences root = Platform.getPreferencesService().getRootNode();
Preferences projectNode = root.node(ProjectScope.SCOPE).node(project.getName());
// check if we need to notify the charset manager
- boolean hasResourcesSettings = getFile(project, ResourcesPlugin.PI_RESOURCES).exists();
+ boolean hasResourcesSettings = getFile(project, PREFS_REGULAR_QUALIFIER).exists() || getFile(project, PREFS_DERIVED_QUALIFIER).exists();
// remove the preferences
removeNode(projectNode);
// notifies the CharsetManager
@@ -303,11 +311,11 @@ public class ProjectPreferences extends EclipsePreferences {
// Bug 108066: In case the node had existed before it was updated from
// file, the read() operation marks it dirty. Override the dirty flag
// since we know that the node is expected to be in sync with the file.
- projectPrefs.dirty= false;
+ projectPrefs.dirty = false;
// make sure that we generate the appropriate resource change events
// if encoding settings have changed
- if (ResourcesPlugin.PI_RESOURCES.equals(qualifier))
+ if (PREFS_REGULAR_QUALIFIER.equals(qualifier) || PREFS_DERIVED_QUALIFIER.equals(qualifier))
preferencesChanged(file.getProject());
} catch (BackingStoreException e) {
IStatus status = new Status(IStatus.ERROR, ResourcesPlugin.PI_RESOURCES, IStatus.ERROR, message, e);
@@ -391,6 +399,30 @@ public class ProjectPreferences extends EclipsePreferences {
super.flush();
} finally {
isWriting = false;
+ if ((segmentCount == 3) && (PREFS_DERIVED_QUALIFIER.equals(qualifier))) {
+ final IFile fileInWorkspace = getFile();
+ if (fileInWorkspace != null) {
+ IWorkspaceRunnable operation = new IWorkspaceRunnable() {
+ public void run(IProgressMonitor monitor) throws CoreException {
+ if (fileInWorkspace.exists())
+ fileInWorkspace.setDerived(true, monitor);
+ }
+ };
+ Workspace workspace = ((Workspace) ResourcesPlugin.getWorkspace());
+ try {
+ if (workspace.getWorkManager().isLockAlreadyAcquired())
+ operation.run(null);
+ else
+ workspace.run(operation, workspace.getRuleFactory().derivedRule(fileInWorkspace), IResource.NONE, null);
+ } catch (OperationCanceledException e) {
+ throw new BackingStoreException(Messages.preferences_operationCanceled);
+ } catch (CoreException e) {
+ String message = NLS.bind(Messages.preferences_setDerivedException, fileInWorkspace.getFullPath());
+ log(new Status(IStatus.ERROR, ResourcesPlugin.PI_RESOURCES, IStatus.ERROR, message, e));
+ throw new BackingStoreException(message);
+ }
+ }
+ }
}
}
@@ -440,6 +472,19 @@ public class ProjectPreferences extends EclipsePreferences {
return new ProjectPreferences(nodeParent, nodeName);
}
+ protected String internalPut(String key, String newValue) {
+ if ((segmentCount == 3) && PREFS_REGULAR_QUALIFIER.equals(qualifier) && (project != null)) {
+ if (ProjectPreferences.PREF_SEPARATE_DERIVED_ENCODINGS.equals(key)) {
+ Workspace workspace = ((Workspace) ResourcesPlugin.getWorkspace());
+ if (Boolean.valueOf(newValue).booleanValue())
+ workspace.getCharsetManager().splitEncodingPreferences(project);
+ else
+ workspace.getCharsetManager().mergeEncodingPreferences(project);
+ }
+ }
+ return super.internalPut(key, newValue);
+ }
+
protected boolean isAlreadyLoaded(IEclipsePreferences node) {
return loadedNodes.contains(node.absolutePath());
}
@@ -501,6 +546,16 @@ public class ProjectPreferences extends EclipsePreferences {
return ResourcesPlugin.getWorkspace().getRoot().getProject(path).exists() || super.nodeExists(path);
}
+ public void remove(String key) {
+ super.remove(key);
+ if ((segmentCount == 3) && PREFS_REGULAR_QUALIFIER.equals(qualifier) && (project != null)) {
+ if (ProjectPreferences.PREF_SEPARATE_DERIVED_ENCODINGS.equals(key)) {
+ Workspace workspace = ((Workspace) ResourcesPlugin.getWorkspace());
+ workspace.getCharsetManager().mergeEncodingPreferences(project);
+ }
+ }
+ }
+
protected void save() throws BackingStoreException {
final IFile fileInWorkspace = getFile();
if (fileInWorkspace == null) {
diff --git a/eclipse/plugins/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/Workspace.java b/eclipse/plugins/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/Workspace.java
index c10af46..8da4f86 100644
--- a/eclipse/plugins/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/Workspace.java
+++ b/eclipse/plugins/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/Workspace.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 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
@@ -742,7 +742,7 @@ public class Workspace extends PlatformObject implements IWorkspace, ICoreConsta
sourceInfo = (ResourceInfo) sourceInfo.clone();
sourceInfo.setType(destinationType);
}
- ResourceInfo newInfo = createResource(destinationResource, sourceInfo, false, false, keepSyncInfo);
+ ResourceInfo newInfo = createResource(destinationResource, sourceInfo, false, true, keepSyncInfo);
// get/set the node id from the source's resource info so we can later put it in the
// info for the destination resource. This will help us generate the proper deltas,
// indicating a move rather than a add/delete
diff --git a/eclipse/plugins/org.eclipse.core.resources/src/org/eclipse/core/internal/utils/Messages.java b/eclipse/plugins/org.eclipse.core.resources/src/org/eclipse/core/internal/utils/Messages.java
index f3200d3..bebaf65 100644
--- a/eclipse/plugins/org.eclipse.core.resources/src/org/eclipse/core/internal/utils/Messages.java
+++ b/eclipse/plugins/org.eclipse.core.resources/src/org/eclipse/core/internal/utils/Messages.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2010 IBM Corporation and others.
+ * Copyright (c) 2005, 2011 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
@@ -118,6 +118,7 @@ public class Messages extends NLS {
public static String preferences_removeNodeException;
public static String preferences_clearNodeException;
public static String preferences_saveProblems;
+ public static String preferences_setDerivedException;
public static String preferences_syncException;
public static String projRead_badArguments;
diff --git a/eclipse/plugins/org.eclipse.core.resources/src/org/eclipse/core/internal/utils/messages.properties b/eclipse/plugins/org.eclipse.core.resources/src/org/eclipse/core/internal/utils/messages.properties
index 734015d..dfd539f 100644
--- a/eclipse/plugins/org.eclipse.core.resources/src/org/eclipse/core/internal/utils/messages.properties
+++ b/eclipse/plugins/org.eclipse.core.resources/src/org/eclipse/core/internal/utils/messages.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2000, 2010 IBM Corporation and others.
+# Copyright (c) 2000, 2011 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
@@ -115,6 +115,7 @@ preferences_operationCanceled=Operation canceled.
preferences_removeNodeException=Exception while removing preference node: {0}.
preferences_clearNodeException=Exception while clearing preference node: {0}.
preferences_saveProblems=Exception occurred while saving project preferences: {0}.
+preferences_setDerivedException=Exception occurred while setting derived flag for project derived preferences: {0}.
preferences_syncException=Exception occurred while synchronizing node: {0}.
projRead_badLinkName = Names ''{0}'' and ''{1}'' detected for a single link. Using ''{0}''.
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 a038a05..8281b20 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.6.1.qualifier
+Bundle-Version: 3.6.3.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/DebugUIPlugin.java b/eclipse/plugins/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPlugin.java
index a0a6b08..d6ac5b6 100644
--- a/eclipse/plugins/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPlugin.java
+++ b/eclipse/plugins/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPlugin.java
@@ -8,6 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
* Sascha Radike - bug 56642
+ * Martin Oberhuber (Wind River) - [327446] Avoid unnecessary wait-for-build dialog.
*******************************************************************************/
package org.eclipse.debug.internal.ui;
@@ -1062,7 +1063,8 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener {
public static void launchInBackground(final ILaunchConfiguration configuration, final String mode) {
final IJobManager jobManager = Job.getJobManager();
IPreferenceStore store = DebugUIPlugin.getDefault().getPreferenceStore();
- boolean wait = (jobManager.find(ResourcesPlugin.FAMILY_AUTO_BUILD).length > 0) || (jobManager.find(ResourcesPlugin.FAMILY_MANUAL_BUILD).length > 0);
+ boolean wait = (jobManager.find(ResourcesPlugin.FAMILY_AUTO_BUILD).length > 0 && ResourcesPlugin.getWorkspace().isAutoBuilding())
+ || (jobManager.find(ResourcesPlugin.FAMILY_MANUAL_BUILD).length > 0);
String waitPref = store.getString(IInternalDebugUIConstants.PREF_WAIT_FOR_BUILD);
if (wait) { // if there are build jobs running, do we wait or not??
if (waitPref.equals(MessageDialogWithToggle.PROMPT)) {
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 914603f..e779dd5 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
@@ -944,6 +944,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun
}
} finally {
fSettingInput = false;
+ updateButtons();
}
if(getShell() != null && getShell().isVisible()) {
resize();
diff --git a/eclipse/plugins/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/PerspectiveManager.java b/eclipse/plugins/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/PerspectiveManager.java
index ded997b..259883a 100644
--- a/eclipse/plugins/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/PerspectiveManager.java
+++ b/eclipse/plugins/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/PerspectiveManager.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
@@ -7,6 +7,7 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
+ * Martin Oberhuber (Wind River) - [325557] Perspective "none" is not persisted
*******************************************************************************/
package org.eclipse.debug.internal.ui.launchConfigurations;
@@ -877,21 +878,28 @@ public class PerspectiveManager implements ILaunchListener, ISuspendTriggerListe
Element element = null;
Set modes = null;
String id = null;
+ ILaunchConfigurationType type = null;
ILaunchDelegate delegate = null;
for(Iterator iter = fPerspectiveContexts.iterator(); iter.hasNext();) {
context = (PerspectiveContext) iter.next();
modesets = context.getPersepctiveMap();
+ type = context.getLaunchConfigurationType();
+ delegate = context.getLaunchDelegate();
for(Iterator iter2 = modesets.keySet().iterator(); iter2.hasNext();) {
modes = (Set) iter2.next();
id = context.getPerspective(modes);
- if(id != null) {
+ String defaultId = getDefaultLaunchPerspective(type, delegate, modes);
+ if(id == null && defaultId != null) {
+ //bug 325557: Override of a default perspective
+ id = IDebugUIConstants.PERSPECTIVE_NONE;
+ }
+ if(id != null && !id.equals(defaultId)) {
element = doc.createElement(IConfigurationElementConstants.LAUNCH_PERSPECTIVE);
element.setAttribute(IConfigurationElementConstants.MODE, createModesetString(modes));
- delegate = context.getLaunchDelegate();
if(delegate != null) {
element.setAttribute(ATTR_DELEGATE_ID, delegate.getId());
}
- element.setAttribute(IConfigurationElementConstants.CONFIGURATION_TYPES, context.getLaunchConfigurationType().getIdentifier());
+ element.setAttribute(IConfigurationElementConstants.CONFIGURATION_TYPES, type.getIdentifier());
element.setAttribute(IConfigurationElementConstants.PERSPECTIVE, id);
root.appendChild(element);
}
diff --git a/eclipse/plugins/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/TreeModelLabelProvider.java b/eclipse/plugins/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/TreeModelLabelProvider.java
index b811972..aac13da 100644
--- a/eclipse/plugins/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/TreeModelLabelProvider.java
+++ b/eclipse/plugins/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/TreeModelLabelProvider.java
@@ -220,6 +220,8 @@ public class TreeModelLabelProvider extends ColumnLabelProvider implements ITree
}
public synchronized boolean update(TreePath elementPath) {
+ cancelPathUpdates(elementPath);
+
String[] visibleColumns = fViewer.getVisibleColumns();
Object element = elementPath.getLastSegment();
IElementLabelProvider presentation = ViewerAdapterService.getLabelProvider(element);
@@ -247,6 +249,21 @@ public class TreeModelLabelProvider extends ColumnLabelProvider implements ITree
}
}
+ /**
+ * Cancel any outstanding updates that are running for this element.
+ */
+ protected void cancelPathUpdates(TreePath elementPath) {
+ synchronized (fUpdatesInProgress) {
+ Iterator updatesInProgress = fUpdatesInProgress.iterator();
+ while (updatesInProgress.hasNext()) {
+ ILabelUpdate currentUpdate = (ILabelUpdate) updatesInProgress.next();
+ if (elementPath.equals(currentUpdate.getElementPath())) {
+ currentUpdate.cancel();
+ }
+ }
+ }
+ }
+
private void startRequests(UIJob updateJob) {
// Avoid calling providers inside a synchronized section. Instead
// copy the updates map into a new variable.
diff --git a/eclipse/plugins/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ViewContextService.java b/eclipse/plugins/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ViewContextService.java
index 74ba6ef..8a62fa8 100644
--- a/eclipse/plugins/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ViewContextService.java
+++ b/eclipse/plugins/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ViewContextService.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
@@ -16,9 +16,9 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
import java.util.StringTokenizer;
-import java.util.Map.Entry;
import org.eclipse.core.commands.common.NotDefinedException;
import org.eclipse.core.commands.contexts.Context;
@@ -103,6 +103,12 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi
private IDebugContextService fDebugContextService;
+ /**
+ * Perspective that is currently being de-activated. Used to determine
+ * when to ignore active context changes.
+ */
+ private IPerspectiveDescriptor fActivePerspective;
+
// base debug context
public static final String DEBUG_CONTEXT= "org.eclipse.debug.ui.debugging"; //$NON-NLS-1$
@@ -219,9 +225,9 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi
* Activates the views in this context hierarchy. Views are activated top down, allowing
* sub-contexts to override settings in a parent context.
*/
- public void activateChain(IWorkbenchPage page) {
+ public void activateChain(IWorkbenchPage page, IPerspectiveDescriptor perspective) {
initializeChain();
- doActivation(page, fAllViewBindingIds, fAllConetxtIds);
+ doActivation(page, perspective, fAllViewBindingIds, fAllConetxtIds);
}
/**
@@ -232,18 +238,18 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi
* @param viewIds id's of views to activate
* @param contextIds associated contexts that are activated
*/
- private void doActivation(IWorkbenchPage page, String[] viewIds, String[] contextIds) {
+ private void doActivation(IWorkbenchPage page, IPerspectiveDescriptor perspective, String[] viewIds, String[] contextIds) {
// note activation of all the relevant contexts
for (int i = 0; i < contextIds.length; i++) {
addActivated(contextIds[i]);
}
// set the active context to be this
- setActive(page.getPerspective(), getId());
+ setActive(perspective, getId());
// activate the view bindings
for (int i = 0; i < viewIds.length; i++) {
String viewId = viewIds[i];
ViewBinding binding = (ViewBinding) fAllViewIdToBindings.get(viewId);
- binding.activated(page);
+ binding.activated(page, perspective);
}
// bring most relevant views to top
for (int i = 0; i < viewIds.length; i++) {
@@ -293,7 +299,7 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi
*
* @param page workbench page
*/
- public void deactivate(IWorkbenchPage page) {
+ public void deactivate(IWorkbenchPage page, IPerspectiveDescriptor perspective) {
removeActivated(getId());
if (isActiveContext(getId())) {
setActive(page.getPerspective(), null);
@@ -301,7 +307,7 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi
for (int i = 0; i < fViewBindingIds.length; i++) {
String viewId = fViewBindingIds[i];
ViewBinding binding = (ViewBinding) fAllViewIdToBindings.get(viewId);
- binding.deactivated(page);
+ binding.deactivated(page, perspective);
}
}
@@ -401,15 +407,15 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi
* Returns whether this view was opened by the user in the active perspective.
* @return
*/
- public boolean isUserOpened() {
- return fUserOpened.contains(getActivePerspective().getId());
+ public boolean isUserOpened(IPerspectiveDescriptor perspective) {
+ return fUserOpened.contains(perspective.getId());
}
/**
* Returns whether this view was closed by the user in the active perspective
* @return
*/
- public boolean isUserClosed() {
+ public boolean isUserClosed(IPerspectiveDescriptor perspective) {
return fUserClosed.contains(getActivePerspective().getId());
}
@@ -421,8 +427,8 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi
*
* @return
*/
- public boolean isDefault() {
- String id = getActivePerspective().getId();
+ public boolean isDefault(IPerspectiveDescriptor perspective) {
+ String id = perspective.getId();
if (IDebugUIConstants.ID_DEBUG_PERSPECTIVE.equals(id)) {
return fgBaseDebugViewIds.contains(getViewId());
}
@@ -461,8 +467,8 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi
*
* @param page
*/
- public void activated(IWorkbenchPage page) {
- if (!isUserClosed()) {
+ public void activated(IWorkbenchPage page, IPerspectiveDescriptor perspective) {
+ if (!isUserClosed(perspective)) {
if (isAutoOpen()) {
try {
fIgnoreChanges = true;
@@ -511,9 +517,9 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi
*
* @param page
*/
- public void deactivated(IWorkbenchPage page) {
- if (!isUserOpened()) {
- if (isAutoClose() && !isDefault()) {
+ public void deactivated(IWorkbenchPage page, IPerspectiveDescriptor perspective) {
+ if (!isUserOpened(perspective)) {
+ if (isAutoClose() && !isDefault(perspective)) {
IViewReference reference = page.findViewReference(getViewId());
if (reference != null) {
try {
@@ -598,6 +604,10 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi
getDebugContextService().addDebugContextListener(this);
DebugUIPlugin.getDefault().getPluginPreferences().addPropertyChangeListener(this);
fContextService.addContextManagerListener(this);
+ IWorkbenchPage page = fWindow.getActivePage();
+ if (page != null) {
+ fActivePerspective = page.getPerspective();
+ }
}
public void dispose() {
@@ -605,6 +615,7 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi
getDebugContextService().removeDebugContextListener(this);
DebugUIPlugin.getDefault().getPluginPreferences().removePropertyChangeListener(this);
fContextService.removeContextManagerListener(this);
+ fActivePerspective = null;
}
/**
@@ -715,11 +726,7 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi
* @return active perspective or <code>null</code>
*/
private IPerspectiveDescriptor getActivePerspective() {
- IWorkbenchPage activePage = fWindow.getActivePage();
- if (activePage != null) {
- return activePage.getPerspective();
- }
- return null;
+ return fActivePerspective;
}
/**
@@ -788,12 +795,12 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi
while (contexts.hasNext()) {
String contextId = (String)contexts.next();
if (!isActivated(contextId)) {
- activateChain(contextId);
+ activateChain(contextId, getActivePerspective());
}
// ensure last context gets top priority
if (!contexts.hasNext()) {
if (!isActiveContext(contextId)) {
- activateChain(contextId);
+ activateChain(contextId, getActivePerspective());
}
}
}
@@ -901,7 +908,7 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi
Iterator iterator = contexts.iterator();
while (iterator.hasNext()) {
String id = (String) iterator.next();
- deactivate(id);
+ deactivate(id, perspective);
}
}
}
@@ -934,6 +941,7 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi
*/
public void perspectiveActivated(IWorkbenchPage page, IPerspectiveDescriptor perspective) {
if (page.getWorkbenchWindow().equals(fWindow)) {
+ fActivePerspective = perspective;
ISelection activeContext = getDebugContextService().getActiveContext();
if (activeContext != null) {
contextActivated(activeContext);
@@ -952,12 +960,12 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi
*
* @param contextId
*/
- private void activateChain(String contextId) {
+ private void activateChain(String contextId, IPerspectiveDescriptor perspective) {
IWorkbenchPage page = fWindow.getActivePage();
if (page != null) {
DebugContextViewBindings bindings= (DebugContextViewBindings) fContextIdsToBindings.get(contextId);
if (bindings != null) {
- bindings.activateChain(page);
+ bindings.activateChain(page, perspective);
}
}
}
@@ -1001,7 +1009,7 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi
* @see org.eclipse.core.commands.contexts.IContextManagerListener#contextManagerChanged(org.eclipse.core.commands.contexts.ContextManagerEvent)
*/
public void contextManagerChanged(ContextManagerEvent event) {
- if (event.isActiveContextsChanged()) {
+ if (event.isActiveContextsChanged() && getActivePerspective() != null) {
Set disabledContexts = getDisabledContexts(event);
if (!disabledContexts.isEmpty()) {
Iterator contexts = disabledContexts.iterator();
@@ -1009,7 +1017,7 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi
String contextId = (String)contexts.next();
if (isViewConetxt(contextId)) {
if (isActivated(contextId)) {
- deactivate(contextId);
+ deactivate(contextId, getActivePerspective());
}
}
}
@@ -1019,12 +1027,12 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi
}
}
- private void deactivate(String contextId) {
+ private void deactivate(String contextId, IPerspectiveDescriptor perspective) {
IWorkbenchPage page = fWindow.getActivePage();
if (page != null) {
DebugContextViewBindings bindings = (DebugContextViewBindings) fContextIdsToBindings.get(contextId);
if (bindings != null) {
- bindings.deactivate(page);
+ bindings.deactivate(page, perspective);
}
}
}
@@ -1118,6 +1126,7 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi
*/
public void perspectivePreDeactivate(IWorkbenchPage page, IPerspectiveDescriptor perspective) {
if (page.getWorkbenchWindow().equals(fWindow)) {
+ fActivePerspective = null;
clean(perspective);
}
}
diff --git a/eclipse/plugins/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewTreeModelContentProvider.java b/eclipse/plugins/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewTreeModelContentProvider.java
index 85824dd..18856e1 100644
--- a/eclipse/plugins/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewTreeModelContentProvider.java
+++ b/eclipse/plugins/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewTreeModelContentProvider.java
@@ -21,13 +21,13 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.TreeModelViewer;
public class MemoryViewTreeModelContentProvider extends
TreeModelContentProvider {
- protected void updateNodes(IModelDelta[] nodes) {
+ protected void updateNodes(IModelDelta[] nodes, int mask) {
if (getViewer() instanceof TreeModelViewer)
{
for (int i = 0; i < nodes.length; i++) {
IModelDelta node = nodes[i];
- int flags = node.getFlags();
+ int flags = node.getFlags() & mask;
if ((flags & IModelDelta.ADDED) != 0) {
if (node.getElement() instanceof IMemoryBlock) {
@@ -79,7 +79,7 @@ public class MemoryViewTreeModelContentProvider extends
if ((flags & IModelDelta.UNINSTALL) != 0) {
handleUninstall(node);
}
- updateNodes(node.getChildDeltas());
+ updateNodes(node.getChildDeltas(), mask);
}
}
}
diff --git a/eclipse/plugins/org.eclipse.ecf.filetransfer/.classpath b/eclipse/plugins/org.eclipse.ecf.filetransfer/.classpath
index c2ce266..6f3b481 100644
--- a/eclipse/plugins/org.eclipse.ecf.filetransfer/.classpath
+++ b/eclipse/plugins/org.eclipse.ecf.filetransfer/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/CDC-1.0%Foundation-1.0"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/CDC-1.1%Foundation-1.1"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/eclipse/plugins/org.eclipse.ecf.filetransfer/.gitignore b/eclipse/plugins/org.eclipse.ecf.filetransfer/.gitignore
new file mode 100644
index 0000000..e660fd9
--- /dev/null
+++ b/eclipse/plugins/org.eclipse.ecf.filetransfer/.gitignore
@@ -0,0 +1 @@
+bin/
diff --git a/eclipse/plugins/org.eclipse.ecf.filetransfer/.settings/org.eclipse.jdt.core.prefs b/eclipse/plugins/org.eclipse.ecf.filetransfer/.settings/org.eclipse.jdt.core.prefs
index 6619e08..038ed2d 100644
--- a/eclipse/plugins/org.eclipse.ecf.filetransfer/.settings/org.eclipse.jdt.core.prefs
+++ b/eclipse/plugins/org.eclipse.ecf.filetransfer/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Mon May 04 17:44:34 PDT 2009
+#Wed Sep 01 15:10:47 PDT 2010
eclipse.preferences.version=1
org.eclipse.jdt.core.builder.cleanOutputFolder=clean
org.eclipse.jdt.core.builder.duplicateResourceTask=warning
@@ -8,9 +8,9 @@ org.eclipse.jdt.core.circularClasspath=error
org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.3
+org.eclipse.jdt.core.compiler.compliance=1.4
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
diff --git a/eclipse/plugins/org.eclipse.ecf.filetransfer/.settings/org.eclipse.pde.api.tools.prefs b/eclipse/plugins/org.eclipse.ecf.filetransfer/.settings/org.eclipse.pde.api.tools.prefs
new file mode 100644
index 0000000..16aea9f
--- /dev/null
+++ b/eclipse/plugins/org.eclipse.ecf.filetransfer/.settings/org.eclipse.pde.api.tools.prefs
@@ -0,0 +1,94 @@
+#Wed Sep 01 14:55:34 PDT 2010
+ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
+ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
+CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
+CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
+CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
+CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
+CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
+ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
+ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
+ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
+FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
+FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
+FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
+FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
+ILLEGAL_EXTEND=Warning
+ILLEGAL_IMPLEMENT=Warning
+ILLEGAL_INSTANTIATE=Warning
+ILLEGAL_OVERRIDE=Warning
+ILLEGAL_REFERENCE=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+INVALID_JAVADOC_TAG=Ignore
+INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error
+LEAK_EXTEND=Warning
+LEAK_FIELD_DECL=Warning
+LEAK_IMPLEMENT=Warning
+LEAK_METHOD_PARAM=Warning
+LEAK_METHOD_RETURN_TYPE=Warning
+METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
+METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
+UNUSED_PROBLEM_FILTERS=Warning
+automatically_removed_unused_problem_filters=false
+eclipse.preferences.version=1
+incompatible_api_component_version=Error
+incompatible_api_component_version_include_major_without_breaking_change=Disabled
+incompatible_api_component_version_include_minor_without_api_change=Disabled
+invalid_since_tag_version=Error
+malformed_since_tag=Error
+missing_since_tag=Error
+report_api_breakage_when_major_version_incremented=Disabled
+report_resolution_errors_api_component=Warning
diff --git a/eclipse/plugins/org.eclipse.ecf.filetransfer/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.ecf.filetransfer/META-INF/MANIFEST.MF
index ea0d6cf..b36d944 100644
--- a/eclipse/plugins/org.eclipse.ecf.filetransfer/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.ecf.filetransfer/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin.name
Bundle-SymbolicName: org.eclipse.ecf.filetransfer;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 5.0.0.qualifier
Bundle-Activator: org.eclipse.ecf.internal.filetransfer.Activator
Bundle-Vendor: %plugin.provider
Eclipse-LazyStart: true
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,
- J2SE-1.3
+Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,
+ J2SE-1.4
Export-Package: org.eclipse.ecf.filetransfer,
org.eclipse.ecf.filetransfer.events,
org.eclipse.ecf.filetransfer.events.socket;version:="1.0";x-internal:="true",
@@ -20,7 +20,6 @@ Require-Bundle: org.eclipse.equinox.common,
org.eclipse.equinox.registry,
org.eclipse.ecf
Import-Package: org.eclipse.core.runtime.jobs,
- org.eclipse.osgi.util;version="1.0.0",
org.osgi.framework;version="1.3.0",
org.osgi.service.log;version="1.3.0",
org.osgi.service.url;version="1.0.0",
diff --git a/eclipse/plugins/org.eclipse.ecf.filetransfer/build.properties b/eclipse/plugins/org.eclipse.ecf.filetransfer/build.properties
index 4f1727d..dd45fdd 100644
--- a/eclipse/plugins/org.eclipse.ecf.filetransfer/build.properties
+++ b/eclipse/plugins/org.eclipse.ecf.filetransfer/build.properties
@@ -9,5 +9,5 @@ src.includes = about.html,\
schema/
jars.compile.order = .
source.. = src/
-jre.compilation.profile = J2SE-1.3
+jre.compilation.profile = J2SE-1.4
javacWarnings.. = -assertIdentifier,-enumIdentifier
diff --git a/eclipse/plugins/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/FileTransferJob.java b/eclipse/plugins/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/FileTransferJob.java
index d0b7dbe..374eaf2 100644
--- a/eclipse/plugins/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/FileTransferJob.java
+++ b/eclipse/plugins/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/FileTransferJob.java
@@ -13,7 +13,6 @@ package org.eclipse.ecf.filetransfer;
import org.eclipse.core.runtime.*;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.ecf.filetransfer.events.IIncomingFileTransferReceiveStartEvent;
-import org.eclipse.ecf.internal.filetransfer.Messages;
/**
* {@link Job} subclass for executing file transfers. This class should
@@ -68,9 +67,9 @@ public class FileTransferJob extends Job {
*/
protected final IStatus run(IProgressMonitor mntr) {
if (this.fileTransferRunnable == null)
- return new Status(IStatus.ERROR, org.eclipse.ecf.internal.filetransfer.Activator.PLUGIN_ID, IStatus.ERROR, Messages.FileTransferJob_STATUSERROR_NO_RUNNABLE, null);
+ return new Status(IStatus.ERROR, org.eclipse.ecf.internal.filetransfer.Activator.PLUGIN_ID, IStatus.ERROR, "Runnable cannot be null", null); //$NON-NLS-1$
if (this.fileTransfer == null)
- return new Status(IStatus.ERROR, org.eclipse.ecf.internal.filetransfer.Activator.PLUGIN_ID, IStatus.ERROR, Messages.FileTransferJob_STATUSERROR_NO_TRANSFER, null);
+ return new Status(IStatus.ERROR, org.eclipse.ecf.internal.filetransfer.Activator.PLUGIN_ID, IStatus.ERROR, "File transfer member cannot be null", null); //$NON-NLS-1$
return this.fileTransferRunnable.performFileTransfer(mntr);
}
diff --git a/eclipse/plugins/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/identity/FileIDFactory.java b/eclipse/plugins/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/identity/FileIDFactory.java
index 35efabb..107c517 100644
--- a/eclipse/plugins/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/identity/FileIDFactory.java
+++ b/eclipse/plugins/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/identity/FileIDFactory.java
@@ -8,6 +8,7 @@
******************************************************************************/
package org.eclipse.ecf.filetransfer.identity;
+import java.net.URI;
import java.net.URL;
import org.eclipse.ecf.core.identity.IDFactory;
import org.eclipse.ecf.core.identity.Namespace;
@@ -20,7 +21,7 @@ import org.eclipse.ecf.internal.filetransfer.FileTransferDebugOptions;
* Factory class entry point for creating IFileID instances.
*
*/
-public class FileIDFactory {
+public class FileIDFactory implements IFileIDFactory {
protected static FileIDFactory instance = null;
@@ -32,6 +33,7 @@ public class FileIDFactory {
* Get singleton instance
*
* @return FileIDFactory singleton instance. Will not be <code>null</code>.
+ * @since 5.0
*/
public static FileIDFactory getDefault() {
return instance;
@@ -79,6 +81,25 @@ public class FileIDFactory {
* @param namespace
* the namespace to use to create the IFileID. Can use
* {@link IRetrieveFileTransferContainerAdapter#getRetrieveNamespace()}.
+ * Must not be null.
+ * @param remoteFile
+ * the remote resource identifier to use. Must not be <code>null</code>.
+ * @return IFileID instance. Will not return <code>null</code>.
+ * @throws FileCreateException
+ * thrown if some problem creating IFileID from given namespace
+ * and filename
+ * @since 5.0
+ */
+ public IFileID createFileID(Namespace namespace, URI remoteFile) throws FileCreateException {
+ return createFileID(namespace, new Object[] {remoteFile});
+ }
+
+ /**
+ * Create an IFileID from a Namespace and a String.
+ *
+ * @param namespace
+ * the namespace to use to create the IFileID. Can use
+ * {@link IRetrieveFileTransferContainerAdapter#getRetrieveNamespace()}.
* Must not be <code>null</code>.
* @param arguments
* Object [] of arguments to use to create file ID. These
diff --git a/eclipse/plugins/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/identity/IFileID.java b/eclipse/plugins/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/identity/IFileID.java
index cbd2e60..b70aa8d 100644
--- a/eclipse/plugins/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/identity/IFileID.java
+++ b/eclipse/plugins/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/identity/IFileID.java
@@ -8,9 +8,7 @@
******************************************************************************/
package org.eclipse.ecf.filetransfer.identity;
-import java.net.MalformedURLException;
-import java.net.URL;
-
+import java.net.*;
import org.eclipse.ecf.core.identity.ID;
/**
@@ -36,4 +34,13 @@ public interface IFileID extends ID {
* @exception MalformedURLException thrown if URL cannot be created for this IFileID
*/
public URL getURL() throws MalformedURLException;
+
+ /**
+ * Get the URI associated with the file identified by this IFileID.
+ *
+ * @return URI associated with this IFileID. Will not be <code>null</code>.
+ * @throws URISyntaxException thrown if URI cannot be created for this IFileID.
+ * @since 5.0
+ */
+ public URI getURI() throws URISyntaxException;
}
diff --git a/eclipse/plugins/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/identity/IFileIDFactory.java b/eclipse/plugins/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/identity/IFileIDFactory.java
new file mode 100644
index 0000000..917c7d8
--- /dev/null
+++ b/eclipse/plugins/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/identity/IFileIDFactory.java
@@ -0,0 +1,89 @@
+/*******************************************************************************
+* Copyright (c) 2010 Composent, 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 http://www.eclipse.org/legal/epl-v10.html
+*
+* Contributors:
+* Composent, Inc. - initial API and implementation
+******************************************************************************/
+package org.eclipse.ecf.filetransfer.identity;
+
+import java.net.URI;
+import java.net.URL;
+import org.eclipse.ecf.core.identity.Namespace;
+import org.eclipse.ecf.filetransfer.IRetrieveFileTransferContainerAdapter;
+
+/**
+ * @since 5.0
+ */
+public interface IFileIDFactory {
+
+ /**
+ * Create an IFileID from a Namespace and a String.
+ *
+ * @param namespace
+ * the namespace to use to create the IFileID. Can use
+ * {@link IRetrieveFileTransferContainerAdapter#getRetrieveNamespace()}.
+ * Must not be <code>null</code>.
+ * @param remoteFile
+ * the remote filename to use. Must not be <code>null</code>.
+ * @return IFileID instance. Will not return <code>null</code>.
+ * @throws FileCreateException
+ * thrown if some problem creating IFileID from given namespace
+ * and filename
+ */
+ public IFileID createFileID(Namespace namespace, URL remoteFile) throws FileCreateException;
+
+ /**
+ * Create an IFileID from a Namespace and a String.
+ *
+ * @param namespace
+ * the namespace to use to create the IFileID. Can use
+ * {@link IRetrieveFileTransferContainerAdapter#getRetrieveNamespace()}.
+ * Must not be null.
+ * @param remoteFile
+ * the remote filename to use. Must not be <code>null</code>.
+ * @return IFileID instance. Will not return <code>null</code>.
+ * @throws FileCreateException
+ * thrown if some problem creating IFileID from given namespace
+ * and filename
+ */
+ public IFileID createFileID(Namespace namespace, String remoteFile) throws FileCreateException;
+
+ /**
+ * Create an IFileID from a Namespace and a String.
+ *
+ * @param namespace
+ * the namespace to use to create the IFileID. Can use
+ * {@link IRetrieveFileTransferContainerAdapter#getRetrieveNamespace()}.
+ * Must not be null.
+ * @param remoteFile
+ * the remote resource identifier to use. Must not be <code>null</code>.
+ * @return IFileID instance. Will not return <code>null</code>.
+ * @throws FileCreateException
+ * thrown if some problem creating IFileID from given namespace
+ * and filename
+ * @since 5.0
+ */
+ public IFileID createFileID(Namespace namespace, URI remoteFile) throws FileCreateException;
+
+ /**
+ * Create an IFileID from a Namespace and a String.
+ *
+ * @param namespace
+ * the namespace to use to create the IFileID. Can use
+ * {@link IRetrieveFileTransferContainerAdapter#getRetrieveNamespace()}.
+ * Must not be <code>null</code>.
+ * @param arguments
+ * Object [] of arguments to use to create file ID. These
+ * arguments will be passed to the
+ * {@link Namespace#createInstance(Object[])} method of the
+ * appropriate Namespace setup by the provider
+ * @return IFileID instance. Will not return <code>null</code>.
+ * @throws FileCreateException
+ * thrown if some problem creating IFileID from given namespace
+ * and filename
+ */
+ public IFileID createFileID(Namespace namespace, Object[] arguments) throws FileCreateException;
+}
diff --git a/eclipse/plugins/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/internal/filetransfer/Messages.java b/eclipse/plugins/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/internal/filetransfer/Messages.java
deleted file mode 100644
index 9614e49..0000000
--- a/eclipse/plugins/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/internal/filetransfer/Messages.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2004 Composent, 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Composent, Inc. - initial API and implementation
- *****************************************************************************/
-
-package org.eclipse.ecf.internal.filetransfer;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- *
- */
-public class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.ecf.internal.filetransfer.messages"; //$NON-NLS-1$
- public static String FileTransferJob_STATUSERROR_NO_RUNNABLE;
- public static String FileTransferJob_STATUSERROR_NO_TRANSFER;
- static {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-
- private Messages() {
- // private null constructor
- }
-}
diff --git a/eclipse/plugins/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/internal/filetransfer/messages.properties b/eclipse/plugins/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/internal/filetransfer/messages.properties
deleted file mode 100644
index ffecf8e..0000000
--- a/eclipse/plugins/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/internal/filetransfer/messages.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-FileTransferJob_STATUSERROR_NO_RUNNABLE=No runnable for file transfer
-FileTransferJob_STATUSERROR_NO_TRANSFER=No file transfer
diff --git a/eclipse/plugins/org.eclipse.ecf.identity/.gitignore b/eclipse/plugins/org.eclipse.ecf.identity/.gitignore
new file mode 100644
index 0000000..e660fd9
--- /dev/null
+++ b/eclipse/plugins/org.eclipse.ecf.identity/.gitignore
@@ -0,0 +1 @@
+bin/
diff --git a/eclipse/plugins/org.eclipse.ecf.identity/.options b/eclipse/plugins/org.eclipse.ecf.identity/.options
deleted file mode 100644
index a82aa7c..0000000
--- a/eclipse/plugins/org.eclipse.ecf.identity/.options
+++ /dev/null
@@ -1,15 +0,0 @@
-# Debugging options for the org.eclipse.ecf.identity plug-in
-
-# Turn on general debugging for the org.eclipse.ecf.identity plug-in
-org.eclipse.ecf.identity/debug=true
-
-# Trace when exceptions are caught
-org.eclipse.ecf.identity/debug/exceptions/catching=false
-# Trace when exceptions are thrown
-org.eclipse.ecf.identity/debug/exceptions/throwing=false
-
-# Trace when methods are entered
-org.eclipse.ecf.identity/debug/methods/entering=false
-# Trace when methods are exited
-org.eclipse.ecf.identity/debug/methods/exiting=false
-
diff --git a/eclipse/plugins/org.eclipse.ecf.identity/.settings/org.eclipse.pde.api.tools.prefs b/eclipse/plugins/org.eclipse.ecf.identity/.settings/org.eclipse.pde.api.tools.prefs
new file mode 100644
index 0000000..add1632
--- /dev/null
+++ b/eclipse/plugins/org.eclipse.ecf.identity/.settings/org.eclipse.pde.api.tools.prefs
@@ -0,0 +1,94 @@
+#Wed Sep 01 15:13:28 PDT 2010
+ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
+ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
+CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
+CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
+CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
+CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
+CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
+ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
+ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
+ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
+FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
+FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
+FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
+FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
+ILLEGAL_EXTEND=Warning
+ILLEGAL_IMPLEMENT=Warning
+ILLEGAL_INSTANTIATE=Warning
+ILLEGAL_OVERRIDE=Warning
+ILLEGAL_REFERENCE=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+INVALID_JAVADOC_TAG=Ignore
+INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error
+LEAK_EXTEND=Warning
+LEAK_FIELD_DECL=Warning
+LEAK_IMPLEMENT=Warning
+LEAK_METHOD_PARAM=Warning
+LEAK_METHOD_RETURN_TYPE=Warning
+METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
+METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
+UNUSED_PROBLEM_FILTERS=Warning
+automatically_removed_unused_problem_filters=false
+eclipse.preferences.version=1
+incompatible_api_component_version=Error
+incompatible_api_component_version_include_major_without_breaking_change=Disabled
+incompatible_api_component_version_include_minor_without_api_change=Disabled
+invalid_since_tag_version=Error
+malformed_since_tag=Error
+missing_since_tag=Error
+report_api_breakage_when_major_version_incremented=Disabled
+report_resolution_errors_api_component=Warning
diff --git a/eclipse/plugins/org.eclipse.ecf.identity/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.ecf.identity/META-INF/MANIFEST.MF
index 57357e8..331f2bb 100644
--- a/eclipse/plugins/org.eclipse.ecf.identity/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.ecf.identity/META-INF/MANIFEST.MF
@@ -2,18 +2,17 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin.name
Bundle-SymbolicName: org.eclipse.ecf.identity;singleton:=true
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 3.1.100.qualifier
Bundle-Activator: org.eclipse.ecf.internal.core.identity.Activator
Bundle-Localization: plugin
Bundle-Vendor: %plugin.provider
Eclipse-LazyStart: true
-Export-Package: org.eclipse.ecf.core.identity;version="3.0.0",
- org.eclipse.ecf.core.util;version="3.0.0",
- org.eclipse.ecf.internal.core.identity;version="3.0.0";x-internal:=true
+Export-Package: org.eclipse.ecf.core.identity;version="3.2.0",
+ org.eclipse.ecf.core.util;version="3.2.0",
+ org.eclipse.ecf.internal.core.identity;version="3.2.0";x-internal:=true
Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,
J2SE-1.4
Import-Package: org.eclipse.osgi.service.debug;version="1.0.0",
- org.eclipse.osgi.util;version="1.0.0",
org.osgi.framework;version="1.3.0",
org.osgi.service.log;version="1.3.0",
org.osgi.util.tracker;version="1.3.2"
diff --git a/eclipse/plugins/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/GUID.java b/eclipse/plugins/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/GUID.java
index 53528ea..1155ff4 100644
--- a/eclipse/plugins/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/GUID.java
+++ b/eclipse/plugins/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/GUID.java
@@ -10,8 +10,6 @@ package org.eclipse.ecf.core.identity;
import java.security.SecureRandom;
import org.eclipse.ecf.core.util.Base64;
-import org.eclipse.ecf.internal.core.identity.Messages;
-import org.eclipse.osgi.util.NLS;
/**
* Globally unique ID implementation class. Uses
@@ -26,8 +24,7 @@ public class GUID extends StringID {
private static final long serialVersionUID = -8546568877571886386L;
public GUIDNamespace() {
- super(GUID.class.getName(),
- Messages.GUID_GUID_Namespace_Description_Default);
+ super(GUID.class.getName(), "GUID Namespace"); //$NON-NLS-1$
}
public ID createInstance(Object[] args) throws IDCreateException {
@@ -44,8 +41,7 @@ public class GUID extends StringID {
else
return new GUID(this);
} catch (Exception e) {
- throw new IDCreateException(NLS.bind(
- "{0} createInstance()", getName()), e); //$NON-NLS-1$
+ throw new IDCreateException(getName() + " createInstance()", e); //$NON-NLS-1$
}
}
@@ -91,8 +87,8 @@ public class GUID extends StringID {
try {
getRandom(algo, provider);
} catch (Exception e) {
- throw new IDCreateException(Messages.GUID_GUID_Creation_Failure
- + e.getMessage());
+ throw new IDCreateException(
+ "GUID creation failure: " + e.getMessage()); //$NON-NLS-1$
}
// make sure we have reasonable byteLength
if (byteLength <= 0)
@@ -143,10 +139,9 @@ public class GUID extends StringID {
if (provider == null) {
if (algo == null) {
try {
- random = SecureRandom
- .getInstance(Messages.GUID_IBM_SECURE_RANDOM);
+ random = SecureRandom.getInstance("IBMSECURERANDOM"); //$NON-NLS-1$
} catch (Exception e) {
- random = SecureRandom.getInstance(Messages.GUID_SHA1);
+ random = SecureRandom.getInstance("SHA1PRNG"); //$NON-NLS-1$
}
} else
random = SecureRandom.getInstance(algo);
diff --git a/eclipse/plugins/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/IDFactory.java b/eclipse/plugins/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/IDFactory.java
index 68e67ec..c040aed 100644
--- a/eclipse/plugins/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/IDFactory.java
+++ b/eclipse/plugins/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/IDFactory.java
@@ -12,10 +12,7 @@ import java.security.AccessController;
import java.util.*;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-import org.eclipse.ecf.core.util.Trace;
import org.eclipse.ecf.internal.core.identity.Activator;
-import org.eclipse.ecf.internal.core.identity.IdentityDebugOptions;
-import org.eclipse.osgi.util.NLS;
/**
* A factory class for creating ID instances. This is the factory for plugins to
@@ -43,16 +40,10 @@ public class IDFactory implements IIDFactory {
private synchronized static void initialize() {
if (!initialized) {
- Trace.entering(Activator.PLUGIN_ID,
- IdentityDebugOptions.METHODS_ENTERING, IDFactory.class,
- "initialize");
Activator a = Activator.getDefault();
if (a != null)
a.setupNamespaceExtensionPoint();
initialized = true;
- Trace.exiting(Activator.PLUGIN_ID,
- IdentityDebugOptions.METHODS_ENTERING, IDFactory.class,
- "initialize");
}
}
@@ -75,17 +66,10 @@ public class IDFactory implements IIDFactory {
public Namespace addNamespace(Namespace namespace) throws SecurityException {
if (namespace == null)
return null;
- Trace.entering(Activator.PLUGIN_ID,
- IdentityDebugOptions.METHODS_ENTERING, IDFactory.class,
- "addNamespace", namespace); //$NON-NLS-1$
checkPermission(new NamespacePermission(namespace.toString(),
NamespacePermission.ADD_NAMESPACE));
initialize();
- Namespace result = addNamespace0(namespace);
- Trace.exiting(Activator.PLUGIN_ID,
- IdentityDebugOptions.METHODS_EXITING, IDFactory.class,
- "addNamespace", result); //$NON-NLS-1$
- return result;
+ return addNamespace0(namespace);
}
public final static Namespace addNamespace0(Namespace namespace) {
@@ -111,17 +95,10 @@ public class IDFactory implements IIDFactory {
throws SecurityException {
if (namespace == null)
return false;
- Trace.entering(Activator.PLUGIN_ID,
- IdentityDebugOptions.METHODS_ENTERING, IDFactory.class,
- "containsNamespace", namespace); //$NON-NLS-1$
checkPermission(new NamespacePermission(namespace.toString(),
NamespacePermission.CONTAINS_NAMESPACE));
initialize();
- boolean result = containsNamespace0(namespace);
- Trace.exiting(Activator.PLUGIN_ID,
- IdentityDebugOptions.METHODS_EXITING, IDFactory.class,
- "containsNamespace", new Boolean(result)); //$NON-NLS-1$
- return result;
+ return containsNamespace0(namespace);
}
/*
@@ -130,9 +107,6 @@ public class IDFactory implements IIDFactory {
* @see org.eclipse.ecf.core.identity.IIDFactory#getNamespaces()
*/
public List getNamespaces() {
- Trace.entering(Activator.PLUGIN_ID,
- IdentityDebugOptions.METHODS_ENTERING, IDFactory.class,
- "getNamespaces"); //$NON-NLS-1$
initialize();
return new ArrayList(namespaces.values());
}
@@ -153,17 +127,10 @@ public class IDFactory implements IIDFactory {
public Namespace getNamespace(Namespace namespace) throws SecurityException {
if (namespace == null)
return null;
- Trace.entering(Activator.PLUGIN_ID,
- IdentityDebugOptions.METHODS_ENTERING, IDFactory.class,
- "getNamespace", namespace); //$NON-NLS-1$
checkPermission(new NamespacePermission(namespace.toString(),
NamespacePermission.GET_NAMESPACE));
initialize();
- Namespace result = getNamespace0(namespace);
- Trace.exiting(Activator.PLUGIN_ID,
- IdentityDebugOptions.METHODS_EXITING, IDFactory.class,
- "getNamespace", result); //$NON-NLS-1$
- return result;
+ return getNamespace0(namespace);
}
/*
@@ -174,15 +141,8 @@ public class IDFactory implements IIDFactory {
* .String)
*/
public Namespace getNamespaceByName(String name) throws SecurityException {
- Trace.entering(Activator.PLUGIN_ID,
- IdentityDebugOptions.METHODS_ENTERING, IDFactory.class,
- "getNamespaceByName", name); //$NON-NLS-1$
initialize();
- Namespace result = getNamespace0(name);
- Trace.exiting(Activator.PLUGIN_ID,
- IdentityDebugOptions.METHODS_EXITING, IDFactory.class,
- "getNamespaceByName", result); //$NON-NLS-1$
- return result;
+ return getNamespace0(name);
}
protected final static Namespace getNamespace0(Namespace n) {
@@ -212,15 +172,8 @@ public class IDFactory implements IIDFactory {
* @see org.eclipse.ecf.core.identity.IIDFactory#createGUID(int)
*/
public ID createGUID(int length) throws IDCreateException {
- Trace.entering(Activator.PLUGIN_ID,
- IdentityDebugOptions.METHODS_ENTERING, IDFactory.class,
- "createGUID", new Integer(length)); //$NON-NLS-1$
- Namespace namespace = new GUID.GUIDNamespace();
- ID result = createID(namespace, new Integer[] { new Integer(length) });
- Trace.exiting(Activator.PLUGIN_ID,
- IdentityDebugOptions.METHODS_EXITING, IDFactory.class,
- "createGUID", result); //$NON-NLS-1$
- return result;
+ return createID(new GUID.GUIDNamespace(), new Integer[] { new Integer(
+ length) });
}
protected static void logAndThrow(String s, Throwable t)
@@ -232,9 +185,6 @@ public class IDFactory implements IIDFactory {
} else {
e = new IDCreateException(s);
}
- Trace.throwing(Activator.PLUGIN_ID,
- IdentityDebugOptions.EXCEPTIONS_THROWING, IDFactory.class,
- "logAndThrow", e); //$NON-NLS-1$
Activator.getDefault().log(
new Status(IStatus.ERROR, Activator.PLUGIN_ID,
IDENTITY_CREATION_ERRORCODE, s, e));
@@ -249,9 +199,6 @@ public class IDFactory implements IIDFactory {
* .identity.Namespace, java.lang.Object[])
*/
public ID createID(Namespace n, Object[] args) throws IDCreateException {
- Trace.entering(Activator.PLUGIN_ID,
- IdentityDebugOptions.METHODS_ENTERING, IDFactory.class,
- "createID", new Object[] { n, Trace.getArgumentsString(args) }); //$NON-NLS-1$
// Verify namespace is non-null
if (n == null)
logAndThrow("Namespace cannot be null", null); //$NON-NLS-1$
@@ -260,15 +207,8 @@ public class IDFactory implements IIDFactory {
// throw...we don't create any instances that we don't know about!
Namespace ns = getNamespace0(n);
if (ns == null)
- logAndThrow(NLS.bind("Namespace {0} not found", n.getName()), null); //$NON-NLS-1$
- // We're OK, go ahead and setup array of classes for call to
- // instantiator
- // Ask instantiator to actually create instance
- ID result = ns.createInstance(args);
- Trace.exiting(Activator.PLUGIN_ID,
- IdentityDebugOptions.METHODS_EXITING, IDFactory.class,
- "createID", result); //$NON-NLS-1$
- return result;
+ logAndThrow("Namespace " + n.getName() + " not found", null); //$NON-NLS-1$
+ return ns.createInstance(args);
}
/*
@@ -281,8 +221,8 @@ public class IDFactory implements IIDFactory {
throws IDCreateException {
Namespace n = getNamespaceByName(namespaceName);
if (n == null)
- throw new IDCreateException(NLS.bind(
- "Namespace {0} not found", namespaceName)); //$NON-NLS-1$
+ throw new IDCreateException(
+ "Namespace " + namespaceName + " not found"); //$NON-NLS-1$
return createID(n, args);
}
@@ -304,8 +244,8 @@ public class IDFactory implements IIDFactory {
public ID createStringID(String idstring) throws IDCreateException {
if (idstring == null)
throw new IDCreateException("StringID cannot be null"); //$NON-NLS-1$
- Namespace n = new StringID.StringIDNamespace();
- return createID(n, new String[] { idstring });
+ return createID(new StringID.StringIDNamespace(),
+ new String[] { idstring });
}
/*
@@ -314,8 +254,7 @@ public class IDFactory implements IIDFactory {
* @see org.eclipse.ecf.core.identity.IIDFactory#createLongID(long)
*/
public ID createLongID(long l) throws IDCreateException {
- Namespace n = new LongID.LongNamespace();
- return createID(n, new Long[] { new Long(l) });
+ return createID(new LongID.LongNamespace(), new Long[] { new Long(l) });
}
/*
@@ -328,17 +267,10 @@ public class IDFactory implements IIDFactory {
public Namespace removeNamespace(Namespace n) throws SecurityException {
if (n == null)
return null;
- Trace.entering(Activator.PLUGIN_ID,
- IdentityDebugOptions.METHODS_ENTERING, IDFactory.class,
- "removeNamespace", n); //$NON-NLS-1$
checkPermission(new NamespacePermission(n.toString(),
NamespacePermission.REMOVE_NAMESPACE));
initialize();
- Namespace result = removeNamespace0(n);
- Trace.exiting(Activator.PLUGIN_ID,
- IdentityDebugOptions.METHODS_EXITING, IDFactory.class,
- "removeNamespace", result); //$NON-NLS-1$
- return result;
+ return removeNamespace0(n);
}
protected final static Namespace removeNamespace0(Namespace n) {
diff --git a/eclipse/plugins/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/LongID.java b/eclipse/plugins/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/LongID.java
index fdd13ce..fabb7b4 100644
--- a/eclipse/plugins/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/LongID.java
+++ b/eclipse/plugins/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/LongID.java
@@ -8,8 +8,6 @@
******************************************************************************/
package org.eclipse.ecf.core.identity;
-import org.eclipse.osgi.util.NLS;
-
/**
* A unique ID class based upon Long/long
*
@@ -40,8 +38,7 @@ public class LongID extends BaseID {
return new LongID(this, Long.decode(init));
return new LongID(this, (Long) args[0]);
} catch (Exception e) {
- throw new IDCreateException(NLS.bind(
- "{0} createInstance()", getName()), e); //$NON-NLS-1$
+ throw new IDCreateException(getName() + " createInstance()", e); //$NON-NLS-1$
}
}
diff --git a/eclipse/plugins/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/StringID.java b/eclipse/plugins/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/StringID.java
index 2b00e87..eb508dd 100644
--- a/eclipse/plugins/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/StringID.java
+++ b/eclipse/plugins/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/StringID.java
@@ -8,8 +8,6 @@
******************************************************************************/
package org.eclipse.ecf.core.identity;
-import org.eclipse.osgi.util.NLS;
-
/**
* A string-based identity
*
@@ -35,10 +33,8 @@ public class StringID extends BaseID {
return new StringID(this, init);
return new StringID(this, (String) parameters[0]);
} catch (Exception e) {
- throw new IDCreateException(
- NLS
- .bind(
- "{0} createInstance()", StringIDNamespace.this.getName()), e); //$NON-NLS-1$
+ throw new IDCreateException(StringIDNamespace.this.getName()
+ + " createInstance()", e); //$NON-NLS-1$
}
}
diff --git a/eclipse/plugins/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/Trace.java b/eclipse/plugins/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/Trace.java
index d71635e..2692b72 100644
--- a/eclipse/plugins/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/Trace.java
+++ b/eclipse/plugins/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/Trace.java
@@ -11,7 +11,6 @@ package org.eclipse.ecf.core.util;
import java.text.SimpleDateFormat;
import java.util.*;
import org.eclipse.ecf.internal.core.identity.Activator;
-import org.eclipse.ecf.internal.core.identity.Messages;
import org.eclipse.osgi.service.debug.DebugOptions;
/**
@@ -129,7 +128,8 @@ public class Trace {
*
* @return Whether tracing is enabled for the plug-in.
* @param pluginId
- * The symbolic plugin id for which to determine trace enablement.
+ * The symbolic plugin id for which to determine trace
+ * enablement.
*
*/
protected static boolean shouldTrace(String pluginId) {
@@ -242,7 +242,8 @@ public class Trace {
*/
protected static void trace(String message) {
StringBuffer buf = new StringBuffer(PARENTHESIS_OPEN);
- buf.append(TRACE_STR).append(PARENTHESIS_CLOSE).append(getTimeString()).append(message).append(SEPARATOR_SPACE);
+ buf.append(TRACE_STR).append(PARENTHESIS_CLOSE).append(getTimeString())
+ .append(message).append(SEPARATOR_SPACE);
System.out.println(buf.toString());
}
@@ -253,7 +254,7 @@ public class Trace {
*/
protected static String getTimeString() {
Date d = new Date();
- SimpleDateFormat df = new SimpleDateFormat(Messages.Trace_Date_Time_Format);
+ SimpleDateFormat df = new SimpleDateFormat("[MM/dd/yy;HH:mm:ss:SSS]"); //$NON-NLS-1$
return df.format(d);
}
@@ -304,11 +305,14 @@ public class Trace {
* The message to be traced.
*
*/
- public static void trace(String pluginId, String option, Class clazz, String methodName, String message) {
+ public static void trace(String pluginId, String option, Class clazz,
+ String methodName, String message) {
if (shouldTrace(pluginId, option)) {
- StringBuffer buf = new StringBuffer(PREFIX_TRACING).append(clazz.getName());
+ StringBuffer buf = new StringBuffer(PREFIX_TRACING).append(clazz
+ .getName());
buf.append(SEPARATOR_METHOD).append(methodName);
- buf.append(PARENTHESIS_OPEN).append(message).append(PARENTHESIS_CLOSE);
+ buf.append(PARENTHESIS_OPEN).append(message)
+ .append(PARENTHESIS_CLOSE);
trace(buf.toString());
}
}
@@ -327,12 +331,16 @@ public class Trace {
* @param newValue
* The new value.
*/
- public static void changing(String pluginId, String option, String valueDescription, Object oldValue, Object newValue) {
+ public static void changing(String pluginId, String option,
+ String valueDescription, Object oldValue, Object newValue) {
if (shouldTrace(pluginId, option)) {
StringBuffer buf = new StringBuffer(PREFIX_CHANGING);
- buf.append(valueDescription).append(SEPARATOR_SPACE).append(LABEL_OLD_VALUE).append(getArgumentString(oldValue));
- buf.append(SEPARATOR_PARAMETER).append(LABEL_NEW_VALUE).append(getArgumentString(newValue));
+ buf.append(valueDescription).append(SEPARATOR_SPACE)
+ .append(LABEL_OLD_VALUE)
+ .append(getArgumentString(oldValue));
+ buf.append(SEPARATOR_PARAMETER).append(LABEL_NEW_VALUE)
+ .append(getArgumentString(newValue));
trace(buf.toString());
}
}
@@ -354,12 +362,18 @@ public class Trace {
* @param newValue
* The new value.
*/
- public static void changing(String pluginId, String option, Class clazz, String methodName, String valueDescription, Object oldValue, Object newValue) {
+ public static void changing(String pluginId, String option, Class clazz,
+ String methodName, String valueDescription, Object oldValue,
+ Object newValue) {
if (shouldTrace(pluginId, option)) {
StringBuffer buf = new StringBuffer(PREFIX_CHANGING);
- buf.append(valueDescription).append(SEPARATOR_SPACE).append(LABEL_OLD_VALUE).append(getArgumentString(oldValue));
- buf.append(SEPARATOR_PARAMETER).append(LABEL_NEW_VALUE).append(getArgumentString(newValue));
- buf.append(SEPARATOR_SPACE).append(PARENTHESIS_OPEN).append(clazz.getName()).append(SEPARATOR_METHOD);
+ buf.append(valueDescription).append(SEPARATOR_SPACE)
+ .append(LABEL_OLD_VALUE)
+ .append(getArgumentString(oldValue));
+ buf.append(SEPARATOR_PARAMETER).append(LABEL_NEW_VALUE)
+ .append(getArgumentString(newValue));
+ buf.append(SEPARATOR_SPACE).append(PARENTHESIS_OPEN)
+ .append(clazz.getName()).append(SEPARATOR_METHOD);
buf.append(methodName).append(PARENTHESIS_CLOSE);
trace(buf.toString());
}
@@ -381,12 +395,14 @@ public class Trace {
* The throwable that is being caught.
*
*/
- public static void catching(String pluginId, String option, Class clazz, String methodName, Throwable throwable) {
+ public static void catching(String pluginId, String option, Class clazz,
+ String methodName, Throwable throwable) {
if (shouldTrace(pluginId, option)) {
StringBuffer buf = new StringBuffer(PREFIX_CATCHING);
buf.append(throwable.getMessage()).append(SEPARATOR_SPACE);
- buf.append(PARENTHESIS_OPEN).append(clazz.getName()).append(SEPARATOR_METHOD);
+ buf.append(PARENTHESIS_OPEN).append(clazz.getName())
+ .append(SEPARATOR_METHOD);
buf.append(methodName).append(PARENTHESIS_CLOSE);
trace(buf.toString());
throwable.printStackTrace(System.err);
@@ -410,12 +426,14 @@ public class Trace {
* The throwable that is being thrown.
*
*/
- public static void throwing(String pluginId, String option, Class clazz, String methodName, Throwable throwable) {
+ public static void throwing(String pluginId, String option, Class clazz,
+ String methodName, Throwable throwable) {
if (shouldTrace(pluginId, option)) {
StringBuffer buf = new StringBuffer(PREFIX_THROWING);
buf.append(throwable.getMessage()).append(SEPARATOR_SPACE);
- buf.append(PARENTHESIS_OPEN).append(clazz.getName()).append(SEPARATOR_METHOD);
+ buf.append(PARENTHESIS_OPEN).append(clazz.getName())
+ .append(SEPARATOR_METHOD);
buf.append(methodName).append(PARENTHESIS_CLOSE);
trace(buf.toString());
throwable.printStackTrace(System.err);
@@ -435,11 +453,14 @@ public class Trace {
* The name of method that is being entered.
*
*/
- public static void entering(String pluginId, String option, Class clazz, String methodName) {
+ public static void entering(String pluginId, String option, Class clazz,
+ String methodName) {
if (shouldTrace(pluginId, option)) {
- StringBuffer buf = new StringBuffer(PREFIX_ENTERING).append(clazz.getName());
- buf.append(SEPARATOR_METHOD).append(methodName).append(PARENTHESIS_OPEN).append(PARENTHESIS_CLOSE);
+ StringBuffer buf = new StringBuffer(PREFIX_ENTERING).append(clazz
+ .getName());
+ buf.append(SEPARATOR_METHOD).append(methodName)
+ .append(PARENTHESIS_OPEN).append(PARENTHESIS_CLOSE);
trace(buf.toString());
}
}
@@ -460,12 +481,15 @@ public class Trace {
* The parameter to the method being entered.
*
*/
- public static void entering(String pluginId, String option, Class clazz, String methodName, Object parameter) {
+ public static void entering(String pluginId, String option, Class clazz,
+ String methodName, Object parameter) {
if (shouldTrace(pluginId, option)) {
- StringBuffer buf = new StringBuffer(PREFIX_ENTERING).append(clazz.getName());
+ StringBuffer buf = new StringBuffer(PREFIX_ENTERING).append(clazz
+ .getName());
buf.append(SEPARATOR_METHOD).append(methodName);
- buf.append(PARENTHESIS_OPEN).append(getArgumentString(parameter)).append(PARENTHESIS_CLOSE);
+ buf.append(PARENTHESIS_OPEN).append(getArgumentString(parameter))
+ .append(PARENTHESIS_CLOSE);
trace(buf.toString());
}
@@ -487,12 +511,15 @@ public class Trace {
* The parameters to the method being entered.
*
*/
- public static void entering(String pluginId, String option, Class clazz, String methodName, Object[] parameters) {
+ public static void entering(String pluginId, String option, Class clazz,
+ String methodName, Object[] parameters) {
if (shouldTrace(pluginId, option)) {
- StringBuffer buf = new StringBuffer(PREFIX_ENTERING).append(clazz.getName());
+ StringBuffer buf = new StringBuffer(PREFIX_ENTERING).append(clazz
+ .getName());
buf.append(SEPARATOR_METHOD).append(methodName);
- buf.append(PARENTHESIS_OPEN).append(getArgumentString(parameters)).append(PARENTHESIS_CLOSE);
+ buf.append(PARENTHESIS_OPEN).append(getArgumentString(parameters))
+ .append(PARENTHESIS_CLOSE);
trace(buf.toString());
}
@@ -511,10 +538,12 @@ public class Trace {
* The name of method that is being exited.
*
*/
- public static void exiting(String pluginId, String option, Class clazz, String methodName) {
+ public static void exiting(String pluginId, String option, Class clazz,
+ String methodName) {
if (shouldTrace(pluginId, option)) {
- StringBuffer buf = new StringBuffer(PREFIX_EXITING).append(clazz.getName());
+ StringBuffer buf = new StringBuffer(PREFIX_EXITING).append(clazz
+ .getName());
buf.append(SEPARATOR_METHOD).append(methodName);
trace(buf.toString());
}
@@ -536,12 +565,15 @@ public class Trace {
* The return value of the method being exited.
*
*/
- public static void exiting(String pluginId, String option, Class clazz, String methodName, Object returnValue) {
+ public static void exiting(String pluginId, String option, Class clazz,
+ String methodName, Object returnValue) {
if (shouldTrace(pluginId, option)) {
- StringBuffer buf = new StringBuffer(PREFIX_EXITING).append(clazz.getName());
+ StringBuffer buf = new StringBuffer(PREFIX_EXITING).append(clazz
+ .getName());
buf.append(SEPARATOR_METHOD).append(methodName);
- buf.append(PARENTHESIS_OPEN).append(getArgumentString(returnValue)).append(PARENTHESIS_CLOSE);
+ buf.append(PARENTHESIS_OPEN).append(getArgumentString(returnValue))
+ .append(PARENTHESIS_CLOSE);
trace(buf.toString());
}
diff --git a/eclipse/plugins/org.eclipse.ecf.identity/src/org/eclipse/ecf/internal/core/identity/Activator.java b/eclipse/plugins/org.eclipse.ecf.identity/src/org/eclipse/ecf/internal/core/identity/Activator.java
index 344a29f..0b186c0 100644
--- a/eclipse/plugins/org.eclipse.ecf.identity/src/org/eclipse/ecf/internal/core/identity/Activator.java
+++ b/eclipse/plugins/org.eclipse.ecf.identity/src/org/eclipse/ecf/internal/core/identity/Activator.java
@@ -159,9 +159,6 @@ public class Activator implements BundleActivator {
* the members to remove
*/
protected void removeNamespaceExtensions(IConfigurationElement[] members) {
- org.eclipse.ecf.core.util.Trace.entering(Activator.PLUGIN_ID,
- IdentityDebugOptions.METHODS_ENTERING, Activator.class,
- "removeNamespaceExtensions", members); //$NON-NLS-1$
for (int m = 0; m < members.length; m++) {
final IConfigurationElement member = members[m];
String name = null;
@@ -179,23 +176,13 @@ public class Activator implements BundleActivator {
}
// remove
factory.removeNamespace(n);
- org.eclipse.ecf.core.util.Trace.trace(Activator.PLUGIN_ID,
- IdentityDebugOptions.DEBUG,
- "removeNamespaceExtensions.removedNamespace(" //$NON-NLS-1$
- + n + ")"); //$NON-NLS-1$
} catch (final Exception e) {
- org.eclipse.ecf.core.util.Trace.catching(Activator.PLUGIN_ID,
- IdentityDebugOptions.EXCEPTIONS_CATCHING,
- Activator.class, "removeNamespaceExtensions", e); //$NON-NLS-1$
getDefault().log(
new Status(IStatus.ERROR, Activator.PLUGIN_ID,
REMOVE_NAMESPACE_ERRORCODE,
"Exception removing namespace", e)); //$NON-NLS-1$
}
}
- org.eclipse.ecf.core.util.Trace.exiting(Activator.PLUGIN_ID,
- IdentityDebugOptions.METHODS_EXITING, Activator.class,
- "removeNamespaceExtensions", members); //$NON-NLS-1$
}
public Bundle getBundle() {
@@ -205,8 +192,11 @@ public class Activator implements BundleActivator {
}
protected synchronized LogService getLogService() {
- if (this.context == null)
- return null;
+ if (context == null) {
+ if (logService == null)
+ logService = new SystemLogService(PLUGIN_ID);
+ return logService;
+ }
if (logServiceTracker == null) {
logServiceTracker = new ServiceTracker(this.context,
LogService.class.getName(), null);
@@ -234,9 +224,6 @@ public class Activator implements BundleActivator {
* the members to add
*/
protected void addNamespaceExtensions(IConfigurationElement[] members) {
- org.eclipse.ecf.core.util.Trace.entering(Activator.PLUGIN_ID,
- IdentityDebugOptions.METHODS_ENTERING, Activator.class,
- "addNamespaceExtensions", members); //$NON-NLS-1$
final String bundleName = getDefault().getBundle().getSymbolicName();
for (int m = 0; m < members.length; m++) {
final IConfigurationElement member = members[m];
@@ -255,24 +242,13 @@ public class Activator implements BundleActivator {
final String nsDescription = member
.getAttribute(DESCRIPTION_ATTRIBUTE);
ns.initialize(nsName, nsDescription);
- org.eclipse.ecf.core.util.Trace.trace(Activator.PLUGIN_ID,
- IdentityDebugOptions.DEBUG,
- "addNamespaceExtensions.createdNamespace(" + ns + ")"); //$NON-NLS-1$ //$NON-NLS-2$
// Check to see if we have a namespace name collision
if (!IDFactory.containsNamespace0(ns)) {
// Now add to known namespaces
IDFactory.addNamespace0(ns);
- org.eclipse.ecf.core.util.Trace
- .trace(Activator.PLUGIN_ID,
- IdentityDebugOptions.DEBUG,
- "addNamespaceExtensions.addedNamespaceToFactory(" + ns //$NON-NLS-1$
- + ")"); //$NON-NLS-1$
}
} catch (final CoreException e) {
getDefault().log(e.getStatus());
- org.eclipse.ecf.core.util.Trace.catching(Activator.PLUGIN_ID,
- IdentityDebugOptions.EXCEPTIONS_CATCHING,
- Activator.class, "addNamespaceExtensions", e); //$NON-NLS-1$
} catch (final Exception e) {
getDefault()
.log(new Status(
@@ -285,14 +261,8 @@ public class Activator implements BundleActivator {
+ extension
.getExtensionPointUniqueIdentifier(),
null));
- org.eclipse.ecf.core.util.Trace.catching(Activator.PLUGIN_ID,
- IdentityDebugOptions.EXCEPTIONS_CATCHING,
- Activator.class, "addNamespaceExtensions", e); //$NON-NLS-1$
}
}
- org.eclipse.ecf.core.util.Trace.exiting(Activator.PLUGIN_ID,
- IdentityDebugOptions.METHODS_EXITING, Activator.class,
- "addNamespaceExtensions"); //$NON-NLS-1$
}
/**
@@ -319,8 +289,6 @@ public class Activator implements BundleActivator {
* org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
*/
public void stop(BundleContext ctxt) throws Exception {
- Trace.entering(Activator.PLUGIN_ID,
- IdentityDebugOptions.METHODS_EXITING, Activator.class, "stop"); //$NON-NLS-1$
final IExtensionRegistry reg = getExtensionRegistry();
if (reg != null)
reg.removeRegistryChangeListener(registryManager);
diff --git a/eclipse/plugins/org.eclipse.ecf.identity/src/org/eclipse/ecf/internal/core/identity/IdentityDebugOptions.java b/eclipse/plugins/org.eclipse.ecf.identity/src/org/eclipse/ecf/internal/core/identity/IdentityDebugOptions.java
deleted file mode 100644
index 4480e48..0000000
--- a/eclipse/plugins/org.eclipse.ecf.identity/src/org/eclipse/ecf/internal/core/identity/IdentityDebugOptions.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 Composent, 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 http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Composent, Inc. - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ecf.internal.core.identity;
-
-public interface IdentityDebugOptions {
-
- public static final String DEBUG = Activator.PLUGIN_ID + "/debug"; //$NON-NLS-1$
-
- public static final String EXCEPTIONS_CATCHING = DEBUG + "/exceptions/catching"; //$NON-NLS-1$
-
- public static final String EXCEPTIONS_THROWING = DEBUG + "/exceptions/throwing"; //$NON-NLS-1$
-
- public static final String METHODS_ENTERING = DEBUG + "/methods/entering"; //$NON-NLS-1$
-
- public static final String METHODS_EXITING = DEBUG + "/methods/exiting"; //$NON-NLS-1$
-
-}
diff --git a/eclipse/plugins/org.eclipse.ecf.identity/src/org/eclipse/ecf/internal/core/identity/Messages.java b/eclipse/plugins/org.eclipse.ecf.identity/src/org/eclipse/ecf/internal/core/identity/Messages.java
deleted file mode 100644
index bf3a8b2..0000000
--- a/eclipse/plugins/org.eclipse.ecf.identity/src/org/eclipse/ecf/internal/core/identity/Messages.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2004 Composent, 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Composent, Inc. - initial API and implementation
- *****************************************************************************/
-
-package org.eclipse.ecf.internal.core.identity;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- *
- */
-public class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.ecf.internal.core.identity.messages"; //$NON-NLS-1$
- public static String GUID_GUID_Creation_Failure;
- public static String GUID_GUID_Namespace_Description_Default;
- public static String GUID_IBM_SECURE_RANDOM;
- public static String GUID_SHA1;
- public static String Trace_Date_Time_Format;
- static {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-
- private Messages() {
- // private null constructor
- }
-}
diff --git a/eclipse/plugins/org.eclipse.ecf.identity/src/org/eclipse/ecf/internal/core/identity/messages.properties b/eclipse/plugins/org.eclipse.ecf.identity/src/org/eclipse/ecf/internal/core/identity/messages.properties
deleted file mode 100644
index aed6ada..0000000
--- a/eclipse/plugins/org.eclipse.ecf.identity/src/org/eclipse/ecf/internal/core/identity/messages.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-GUID_GUID_Namespace_Description_Default=GUID Namespace
-GUID_IBM_SECURE_RANDOM=IBMSECURERANDOM
-GUID_SHA1=SHA1PRNG
-Trace_Date_Time_Format=[MM/dd/yy;HH:mm:ss:SSS]
-GUID_GUID_Creation_Failure=GUID creation failure:
diff --git a/eclipse/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl/.gitignore b/eclipse/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl/.gitignore
new file mode 100644
index 0000000..e660fd9
--- /dev/null
+++ b/eclipse/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl/.gitignore
@@ -0,0 +1 @@
+bin/
diff --git a/eclipse/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl/.settings/org.eclipse.pde.api.tools.prefs b/eclipse/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl/.settings/org.eclipse.pde.api.tools.prefs
new file mode 100644
index 0000000..dba04af
--- /dev/null
+++ b/eclipse/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl/.settings/org.eclipse.pde.api.tools.prefs
@@ -0,0 +1,94 @@
+#Wed Sep 01 15:16:56 PDT 2010
+ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
+ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
+CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
+CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
+CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
+CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
+CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
+ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
+ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
+ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
+FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
+FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
+FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
+FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
+ILLEGAL_EXTEND=Warning
+ILLEGAL_IMPLEMENT=Warning
+ILLEGAL_INSTANTIATE=Warning
+ILLEGAL_OVERRIDE=Warning
+ILLEGAL_REFERENCE=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+INVALID_JAVADOC_TAG=Ignore
+INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error
+LEAK_EXTEND=Warning
+LEAK_FIELD_DECL=Warning
+LEAK_IMPLEMENT=Warning
+LEAK_METHOD_PARAM=Warning
+LEAK_METHOD_RETURN_TYPE=Warning
+METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
+METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
+UNUSED_PROBLEM_FILTERS=Warning
+automatically_removed_unused_problem_filters=false
+eclipse.preferences.version=1
+incompatible_api_component_version=Error
+incompatible_api_component_version_include_major_without_breaking_change=Disabled
+incompatible_api_component_version_include_minor_without_api_change=Disabled
+invalid_since_tag_version=Error
+malformed_since_tag=Error
+missing_since_tag=Error
+report_api_breakage_when_major_version_incremented=Disabled
+report_resolution_errors_api_component=Warning
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.discovery.compatibility/.gitignore b/eclipse/plugins/org.eclipse.ecf.provider.filetransfer.httpclient/.gitignore
similarity index 100%
copy from eclipse/plugins/org.eclipse.equinox.p2.discovery.compatibility/.gitignore
copy to eclipse/plugins/org.eclipse.ecf.provider.filetransfer.httpclient/.gitignore
diff --git a/eclipse/plugins/org.eclipse.ecf.provider.filetransfer.httpclient/.settings/org.eclipse.pde.api.tools.prefs b/eclipse/plugins/org.eclipse.ecf.provider.filetransfer.httpclient/.settings/org.eclipse.pde.api.tools.prefs
index 92c8333..e0cf154 100644
--- a/eclipse/plugins/org.eclipse.ecf.provider.filetransfer.httpclient/.settings/org.eclipse.pde.api.tools.prefs
+++ b/eclipse/plugins/org.eclipse.ecf.provider.filetransfer.httpclient/.settings/org.eclipse.pde.api.tools.prefs
@@ -1,10 +1,12 @@
-#Fri Jan 29 14:31:15 PST 2010
+#Wed Sep 01 15:16:36 PDT 2010
ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
@@ -57,7 +59,7 @@ INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
INVALID_JAVADOC_TAG=Ignore
-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore
+INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error
LEAK_EXTEND=Warning
LEAK_FIELD_DECL=Warning
LEAK_IMPLEMENT=Ignore
@@ -80,6 +82,7 @@ TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
UNUSED_PROBLEM_FILTERS=Warning
+automatically_removed_unused_problem_filters=false
eclipse.preferences.version=1
incompatible_api_component_version=Error
incompatible_api_component_version_include_major_without_breaking_change=Disabled
diff --git a/eclipse/plugins/org.eclipse.ecf.provider.filetransfer.ssl/.gitignore b/eclipse/plugins/org.eclipse.ecf.provider.filetransfer.ssl/.gitignore
new file mode 100644
index 0000000..e660fd9
--- /dev/null
+++ b/eclipse/plugins/org.eclipse.ecf.provider.filetransfer.ssl/.gitignore
@@ -0,0 +1 @@
+bin/
diff --git a/eclipse/plugins/org.eclipse.ecf.provider.filetransfer.ssl/.settings/org.eclipse.pde.api.tools.prefs b/eclipse/plugins/org.eclipse.ecf.provider.filetransfer.ssl/.settings/org.eclipse.pde.api.tools.prefs
new file mode 100644
index 0000000..80b183d
--- /dev/null
+++ b/eclipse/plugins/org.eclipse.ecf.provider.filetransfer.ssl/.settings/org.eclipse.pde.api.tools.prefs
@@ -0,0 +1,94 @@
+#Wed Sep 01 15:17:23 PDT 2010
+ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
+ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
+CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
+CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
+CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
+CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
+CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
+ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
+ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
+ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
+FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
+FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
+FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
+FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
+ILLEGAL_EXTEND=Warning
+ILLEGAL_IMPLEMENT=Warning
+ILLEGAL_INSTANTIATE=Warning
+ILLEGAL_OVERRIDE=Warning
+ILLEGAL_REFERENCE=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+INVALID_JAVADOC_TAG=Ignore
+INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error
+LEAK_EXTEND=Warning
+LEAK_FIELD_DECL=Warning
+LEAK_IMPLEMENT=Warning
+LEAK_METHOD_PARAM=Warning
+LEAK_METHOD_RETURN_TYPE=Warning
+METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
+METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
+UNUSED_PROBLEM_FILTERS=Warning
+automatically_removed_unused_problem_filters=false
+eclipse.preferences.version=1
+incompatible_api_component_version=Error
+incompatible_api_component_version_include_major_without_breaking_change=Disabled
+incompatible_api_component_version_include_minor_without_api_change=Disabled
+invalid_since_tag_version=Error
+malformed_since_tag=Error
+missing_since_tag=Error
+report_api_breakage_when_major_version_incremented=Disabled
+report_resolution_errors_api_component=Warning
diff --git a/eclipse/plugins/org.eclipse.ecf.provider.filetransfer/.gitignore b/eclipse/plugins/org.eclipse.ecf.provider.filetransfer/.gitignore
new file mode 100644
index 0000000..e660fd9
--- /dev/null
+++ b/eclipse/plugins/org.eclipse.ecf.provider.filetransfer/.gitignore
@@ -0,0 +1 @@
+bin/
diff --git a/eclipse/plugins/org.eclipse.ecf.provider.filetransfer/.settings/org.eclipse.pde.api.tools.prefs b/eclipse/plugins/org.eclipse.ecf.provider.filetransfer/.settings/org.eclipse.pde.api.tools.prefs
new file mode 100644
index 0000000..b074f16
--- /dev/null
+++ b/eclipse/plugins/org.eclipse.ecf.provider.filetransfer/.settings/org.eclipse.pde.api.tools.prefs
@@ -0,0 +1,94 @@
+#Wed Sep 01 15:15:43 PDT 2010
+ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
+ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
+CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
+CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
+CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
+CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
+CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
+ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
+ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
+ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
+FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
+FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
+FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
+FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
+ILLEGAL_EXTEND=Warning
+ILLEGAL_IMPLEMENT=Warning
+ILLEGAL_INSTANTIATE=Warning
+ILLEGAL_OVERRIDE=Warning
+ILLEGAL_REFERENCE=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+INVALID_JAVADOC_TAG=Ignore
+INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error
+LEAK_EXTEND=Warning
+LEAK_FIELD_DECL=Warning
+LEAK_IMPLEMENT=Warning
+LEAK_METHOD_PARAM=Warning
+LEAK_METHOD_RETURN_TYPE=Warning
+METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
+METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
+UNUSED_PROBLEM_FILTERS=Warning
+automatically_removed_unused_problem_filters=false
+eclipse.preferences.version=1
+incompatible_api_component_version=Error
+incompatible_api_component_version_include_major_without_breaking_change=Disabled
+incompatible_api_component_version_include_minor_without_api_change=Disabled
+invalid_since_tag_version=Error
+malformed_since_tag=Error
+missing_since_tag=Error
+report_api_breakage_when_major_version_incremented=Disabled
+report_resolution_errors_api_component=Warning
diff --git a/eclipse/plugins/org.eclipse.ecf.provider.filetransfer/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.ecf.provider.filetransfer/META-INF/MANIFEST.MF
index 477c9ac..cbf6a1c 100644
--- a/eclipse/plugins/org.eclipse.ecf.provider.filetransfer/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.ecf.provider.filetransfer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin.name
Bundle-SymbolicName: org.eclipse.ecf.provider.filetransfer;singleton:=true
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 3.2.0.qualifier
Bundle-Activator: org.eclipse.ecf.internal.provider.filetransfer.Activator
Bundle-Vendor: %plugin.provider
Bundle-Localization: plugin
diff --git a/eclipse/plugins/org.eclipse.ecf.provider.filetransfer/schema/browseFileTransferProtocolFactory.exsd b/eclipse/plugins/org.eclipse.ecf.provider.filetransfer/schema/browseFileTransferProtocolFactory.exsd
index 2a0a9b3..c00183c 100644
--- a/eclipse/plugins/org.eclipse.ecf.provider.filetransfer/schema/browseFileTransferProtocolFactory.exsd
+++ b/eclipse/plugins/org.eclipse.ecf.provider.filetransfer/schema/browseFileTransferProtocolFactory.exsd
@@ -2,15 +2,20 @@
<!-- Schema file written by PDE -->
<schema targetNamespace="org.eclipse.ecf.provider.filetransfer" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
- <appinfo>
+ <appInfo>
<meta.schema plugin="org.eclipse.ecf.provider.filetransfer" id="browseFileTransferProtocolFactory" name="browseFileTransferProtocolFactory"/>
- </appinfo>
+ </appInfo>
<documentation>
This extension point allows IRemoteFileSystemBrowserFactorys to be defined for given file transfer protocols.
</documentation>
</annotation>
<element name="extension">
+ <annotation>
+ <appInfo>
+ <meta.element />
+ </appInfo>
+ </annotation>
<complexType>
<sequence>
<element ref="browseFileTransferProtocolFactory" minOccurs="0" maxOccurs="unbounded"/>
@@ -34,9 +39,9 @@
<documentation>
</documentation>
- <appinfo>
+ <appInfo>
<meta.attribute translatable="true"/>
- </appinfo>
+ </appInfo>
</annotation>
</attribute>
</complexType>
@@ -61,9 +66,9 @@
<documentation>
The factory class to use for given protocol. Must implement <b>org.eclipse.ecf.filetransfer.service.IRemoteFileSystemBrowserFactory</b>
</documentation>
- <appinfo>
+ <appInfo>
<meta.attribute kind="java" basedOn=":org.eclipse.ecf.filetransfer.service.IRemoteFileSystemBrowserFactory"/>
- </appinfo>
+ </appInfo>
</annotation>
</attribute>
<attribute name="priority" type="string">
@@ -73,22 +78,29 @@
</documentation>
</annotation>
</attribute>
+ <attribute name="uri" type="boolean">
+ <annotation>
+ <documentation>
+ Flag to indicate that the protocol factory will use URIs (rather than URLs...which is the default). True indicates that URIs will be used, and *no* URLStreamHandler will be registered for the associated protocol. If false, URLs will be used and an URLStreamHandler will be registered for the given protocol factory. NOTE: If this flag is true, providers that attempt to access IFileID.getURL() may be unable to do so, since the URI may not be successfully parsed as a URL.
+ </documentation>
+ </annotation>
+ </attribute>
</complexType>
</element>
<annotation>
- <appinfo>
+ <appInfo>
<meta.section type="since"/>
- </appinfo>
+ </appInfo>
<documentation>
1.0.0
</documentation>
</annotation>
<annotation>
- <appinfo>
+ <appInfo>
<meta.section type="examples"/>
- </appinfo>
+ </appInfo>
<documentation>
<pre>
<extension
@@ -105,9 +117,9 @@
</annotation>
<annotation>
- <appinfo>
+ <appInfo>
<meta.section type="apiInfo"/>
- </appinfo>
+ </appInfo>
<documentation>
Here is the <b>org.eclipse.ecf.filetransfer.service.IRemoteFileSystemBrowserFactory</b>
@@ -130,20 +142,19 @@ public interface IRemoteFileSystemBrowserFactory {
</documentation>
</annotation>
-
<annotation>
- <appinfo>
+ <appInfo>
<meta.section type="implementation"/>
- </appinfo>
+ </appInfo>
<documentation>
None
</documentation>
</annotation>
<annotation>
- <appinfo>
+ <appInfo>
<meta.section type="copyright"/>
- </appinfo>
+ </appInfo>
<documentation>
Copyright (c) 2004 Composent, Inc., IBM 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: Composent, Inc. - initial API and implementation, IBM, Inc. - Initial API and implementation
diff --git a/eclipse/plugins/org.eclipse.ecf.provider.filetransfer/schema/retrieveFileTransferProtocolFactory.exsd b/eclipse/plugins/org.eclipse.ecf.provider.filetransfer/schema/retrieveFileTransferProtocolFactory.exsd
index 91f9ddb..b48263e 100644
--- a/eclipse/plugins/org.eclipse.ecf.provider.filetransfer/schema/retrieveFileTransferProtocolFactory.exsd
+++ b/eclipse/plugins/org.eclipse.ecf.provider.filetransfer/schema/retrieveFileTransferProtocolFactory.exsd
@@ -2,15 +2,20 @@
<!-- Schema file written by PDE -->
<schema targetNamespace="org.eclipse.ecf.provider.filetransfer" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
- <appinfo>
+ <appInfo>
<meta.schema plugin="org.eclipse.ecf.provider.filetransfer" id="retrieveFileTransferProtocolFactory" name="retrieveFileTransferProtocolFactory"/>
- </appinfo>
+ </appInfo>
<documentation>
This extension point allows IRetrieveFileTransferFactorys to be defined for given file transfer protocols.
</documentation>
</annotation>
<element name="extension">
+ <annotation>
+ <appInfo>
+ <meta.element />
+ </appInfo>
+ </annotation>
<complexType>
<sequence>
<element ref="retrieveFileTransferProtocolFactory" minOccurs="0" maxOccurs="unbounded"/>
@@ -34,9 +39,9 @@
<documentation>
</documentation>
- <appinfo>
+ <appInfo>
<meta.attribute translatable="true"/>
- </appinfo>
+ </appInfo>
</annotation>
</attribute>
</complexType>
@@ -61,9 +66,9 @@
<documentation>
The factory class to use for given protocol. Must implement <b>org.eclipse.ecf.filetransfer.service.IRetrieveFileTransferFactory</b>
</documentation>
- <appinfo>
+ <appInfo>
<meta.attribute kind="java" basedOn="org.eclipse.ecf.filetransfer.service.IRetrieveFileTransferFactory"/>
- </appinfo>
+ </appInfo>
</annotation>
</attribute>
<attribute name="priority" type="string">
@@ -73,22 +78,29 @@
</documentation>
</annotation>
</attribute>
+ <attribute name="uri" type="boolean">
+ <annotation>
+ <documentation>
+ Flag to indicate that the protocol factory will use URIs (rather than URLs...which is the default). True indicates that URIs will be used, and *no* URLStreamHandler will be registered for the associated protocol. If false, URLs will be used and an URLStreamHandler will be registered for the given protocol factory. NOTE: If this flag is true, providers that attempt to access IFileID.getURL() may be unable to do so, since the URI may not be successfully parsed as a URL.
+ </documentation>
+ </annotation>
+ </attribute>
</complexType>
</element>
<annotation>
- <appinfo>
+ <appInfo>
<meta.section type="since"/>
- </appinfo>
+ </appInfo>
<documentation>
1.0.0
</documentation>
</annotation>
<annotation>
- <appinfo>
+ <appInfo>
<meta.section type="examples"/>
- </appinfo>
+ </appInfo>
<documentation>
<pre>
<extension
@@ -109,9 +121,9 @@
</annotation>
<annotation>
- <appinfo>
+ <appInfo>
<meta.section type="apiInfo"/>
- </appinfo>
+ </appInfo>
<documentation>
Here is the <b>org.eclipse.ecf.filetransfer.service.IRetrieveFileTransferFactory</b>
@@ -134,20 +146,19 @@ public interface IRetrieveFileTransferFactory {
</documentation>
</annotation>
-
<annotation>
- <appinfo>
+ <appInfo>
<meta.section type="implementation"/>
- </appinfo>
+ </appInfo>
<documentation>
None
</documentation>
</annotation>
<annotation>
- <appinfo>
+ <appInfo>
<meta.section type="copyright"/>
- </appinfo>
+ </appInfo>
<documentation>
Copyright (c) 2004 Composent, Inc., IBM 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: Composent, Inc. - initial API and implementation, IBM, Inc. - Initial API and implementation
diff --git a/eclipse/plugins/org.eclipse.ecf.provider.filetransfer/schema/sendFileTransferProtocolFactory.exsd b/eclipse/plugins/org.eclipse.ecf.provider.filetransfer/schema/sendFileTransferProtocolFactory.exsd
index c6e22d7..376604f 100644
--- a/eclipse/plugins/org.eclipse.ecf.provider.filetransfer/schema/sendFileTransferProtocolFactory.exsd
+++ b/eclipse/plugins/org.eclipse.ecf.provider.filetransfer/schema/sendFileTransferProtocolFactory.exsd
@@ -2,15 +2,20 @@
<!-- Schema file written by PDE -->
<schema targetNamespace="org.eclipse.ecf.provider.filetransfer" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
- <appinfo>
+ <appInfo>
<meta.schema plugin="org.eclipse.ecf.provider.filetransfer" id="sendFileTransferProtocolFactory" name="sendFileTransferProtocolFactory"/>
- </appinfo>
+ </appInfo>
<documentation>
This extension point allows IRetrieveFileTransferFactorys to be defined for given file transfer protocols.
</documentation>
</annotation>
<element name="extension">
+ <annotation>
+ <appInfo>
+ <meta.element />
+ </appInfo>
+ </annotation>
<complexType>
<sequence>
<element ref="sendFileTransferProtocolFactory" minOccurs="0" maxOccurs="unbounded"/>
@@ -34,9 +39,9 @@
<documentation>
</documentation>
- <appinfo>
+ <appInfo>
<meta.attribute translatable="true"/>
- </appinfo>
+ </appInfo>
</annotation>
</attribute>
</complexType>
@@ -61,9 +66,9 @@
<documentation>
The factory class to use for given protocol. Must implement <b>org.eclipse.ecf.filetransfer.service.ISendFileTransferFactory</b>
</documentation>
- <appinfo>
+ <appInfo>
<meta.attribute kind="java" basedOn=":org.eclipse.ecf.filetransfer.service.ISendFileTransferFactory"/>
- </appinfo>
+ </appInfo>
</annotation>
</attribute>
<attribute name="priority" type="string">
@@ -73,22 +78,29 @@
</documentation>
</annotation>
</attribute>
+ <attribute name="uri" type="boolean">
+ <annotation>
+ <documentation>
+ Flag to indicate that the protocol factory will use URIs (rather than URLs...which is the default). True indicates that URIs will be used, and *no* URLStreamHandler will be registered for the associated protocol. If false, URLs will be used and an URLStreamHandler will be registered for the given protocol factory. NOTE: If this flag is true, providers that attempt to access IFileID.getURL() may be unable to do so, since the URI may not be successfully parsed as a URL.
+ </documentation>
+ </annotation>
+ </attribute>
</complexType>
</element>
<annotation>
- <appinfo>
+ <appInfo>
<meta.section type="since"/>
- </appinfo>
+ </appInfo>
<documentation>
1.0.0
</documentation>
</annotation>
<annotation>
- <appinfo>
+ <appInfo>
<meta.section type="examples"/>
- </appinfo>
+ </appInfo>
<documentation>
<pre>
<extension
@@ -105,9 +117,9 @@
</annotation>
<annotation>
- <appinfo>
+ <appInfo>
<meta.section type="apiInfo"/>
- </appinfo>
+ </appInfo>
<documentation>
Here is the <b>org.eclipse.ecf.filetransfer.service.IRetrieveFileTransferFactory</b>
@@ -130,20 +142,19 @@ public interface IRetrieveFileTransferFactory {
</documentation>
</annotation>
-
<annotation>
- <appinfo>
+ <appInfo>
<meta.section type="implementation"/>
- </appinfo>
+ </appInfo>
<documentation>
None
</documentation>
</annotation>
<annotation>
- <appinfo>
+ <appInfo>
<meta.section type="copyright"/>
- </appinfo>
+ </appInfo>
<documentation>
Copyright (c) 2004 Composent, Inc., IBM 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: Composent, Inc. - initial API and implementation, IBM, Inc. - Initial API and implementation
diff --git a/eclipse/plugins/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/internal/provider/filetransfer/Activator.java b/eclipse/plugins/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/internal/provider/filetransfer/Activator.java
index b254937..9a20381 100644
--- a/eclipse/plugins/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/internal/provider/filetransfer/Activator.java
+++ b/eclipse/plugins/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/internal/provider/filetransfer/Activator.java
@@ -70,6 +70,7 @@ public class Activator implements BundleActivator, IFileTransferProtocolToFactor
private static final String PRIORITY_ATTR = "priority"; //$NON-NLS-1$
private static final int DEFAULT_PRIORITY = 100;
private static final String PROTOCOL_ATTR = "protocol"; //$NON-NLS-1$
+ private static final String URI_ATTR = "uri"; //$NON-NLS-1$
private static final String[] jvmSchemes = new String[] {Messages.FileTransferNamespace_Http_Protocol, Messages.FileTransferNamespace_Ftp_Protocol, Messages.FileTransferNamespace_File_Protocol, Messages.FileTransferNamespace_Jar_Protocol, Messages.FileTransferNamespace_Https_Protocol, Messages.FileTransferNamespace_Mailto_Protocol, Messages.FileTransferNamespace_Gopher_Protocol};
private static final String URL_HANDLER_PROTOCOL_NAME = "url.handler.protocol"; //$NON-NLS-1$
@@ -441,6 +442,8 @@ public class Activator implements BundleActivator, IFileTransferProtocolToFactor
final String protocol = configElements[i].getAttribute(PROTOCOL_ATTR);
if (protocol == null || "".equals(protocol)) //$NON-NLS-1$
return;
+ String uriStr = configElements[i].getAttribute(URI_ATTR);
+ boolean uri = (uriStr == null) ? false : Boolean.valueOf(uriStr).booleanValue();
String CONTRIBUTION_WARNING = "File retrieve contribution"; //$NON-NLS-1$
try {
String pluginId = configElements[i].getDeclaringExtension().getContributor().getName();
@@ -452,7 +455,7 @@ public class Activator implements BundleActivator, IFileTransferProtocolToFactor
int priority = getPriority(configElements[i], CONTRIBUTION_WARNING, protocol);
String contributorName = configElements[i].getDeclaringExtension().getContributor().getName();
// Now add new ProtocolFactory
- setRetrieveFileTransferFactory(protocol, contributorName, retrieveFactory, priority);
+ setRetrieveFileTransferFactory(protocol, contributorName, retrieveFactory, priority, uri);
} else {
Activator.getDefault().log(new Status(IStatus.WARNING, PLUGIN_ID, IStatus.WARNING, "Plugin " + pluginId + " excluded from contributing retrieve factory", null)); //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -478,6 +481,8 @@ public class Activator implements BundleActivator, IFileTransferProtocolToFactor
final String protocol = configElements[i].getAttribute(PROTOCOL_ATTR);
if (protocol == null || "".equals(protocol)) //$NON-NLS-1$
return;
+ String uriStr = configElements[i].getAttribute(URI_ATTR);
+ boolean uri = (uriStr == null) ? false : Boolean.valueOf(uriStr).booleanValue();
String CONTRIBUTION_WARNING = "File send contribution"; //$NON-NLS-1$
try {
String pluginId = configElements[i].getDeclaringExtension().getContributor().getName();
@@ -487,7 +492,7 @@ public class Activator implements BundleActivator, IFileTransferProtocolToFactor
final ISendFileTransferFactory clazz = (ISendFileTransferFactory) configElements[i].createExecutableExtension(CLASS_ATTR);
// Get priority for new entry, if optional priority attribute specified
int priority = getPriority(configElements[i], CONTRIBUTION_WARNING, protocol);
- setSendFileTransferFactory(protocol, pluginId, clazz, priority);
+ setSendFileTransferFactory(protocol, pluginId, clazz, priority, uri);
} else {
Activator.getDefault().log(new Status(IStatus.WARNING, PLUGIN_ID, IStatus.WARNING, "Plugin " + pluginId + " excluded from contributing send factory", null)); //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -513,6 +518,8 @@ public class Activator implements BundleActivator, IFileTransferProtocolToFactor
final String protocol = configElements[i].getAttribute(PROTOCOL_ATTR);
if (protocol == null || "".equals(protocol)) //$NON-NLS-1$
return;
+ String uriStr = configElements[i].getAttribute(URI_ATTR);
+ boolean uri = (uriStr == null) ? false : Boolean.valueOf(uriStr).booleanValue();
String CONTRIBUTION_WARNING = "File browse contribution"; //$NON-NLS-1$
try {
String pluginId = configElements[i].getDeclaringExtension().getContributor().getName();
@@ -522,7 +529,7 @@ public class Activator implements BundleActivator, IFileTransferProtocolToFactor
final IRemoteFileSystemBrowserFactory clazz = (IRemoteFileSystemBrowserFactory) configElements[i].createExecutableExtension(CLASS_ATTR);
// Get priority for new entry, if optional priority attribute specified
int priority = getPriority(configElements[i], CONTRIBUTION_WARNING, protocol);
- setBrowseFileTransferFactory(protocol, pluginId, clazz, priority);
+ setBrowseFileTransferFactory(protocol, pluginId, clazz, priority, uri);
} else {
Activator.getDefault().log(new Status(IStatus.WARNING, PLUGIN_ID, IStatus.WARNING, "Plugin " + pluginId + " excluded from contributing browse factory", null)); //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -647,6 +654,10 @@ public class Activator implements BundleActivator, IFileTransferProtocolToFactor
}
public boolean setRetrieveFileTransferFactory(String protocol, String id, IRetrieveFileTransferFactory factory, int priority) {
+ return setRetrieveFileTransferFactory(protocol, id, factory, priority, false);
+ }
+
+ public boolean setRetrieveFileTransferFactory(String protocol, String id, IRetrieveFileTransferFactory factory, int priority, boolean uri) {
if (protocol == null || "".equals(protocol)) //$NON-NLS-1$
return false;
if (id == null)
@@ -675,10 +686,13 @@ public class Activator implements BundleActivator, IFileTransferProtocolToFactor
Activator.getDefault().log(new Status(IStatus.WARNING, PLUGIN_ID, IStatus.WARNING, NLS.bind("{0} for protocol {1} from {2} will be used in preference to existing handler. New handler has higher priority={3}<{4}.", new Object[] {CONTRIBUTION_WARNING, protocol, id, new Integer(priority), new Integer(oldProtocolFactory.priority)}), null)); //$NON-NLS-1$
}
}
- String[] existingSchemes = getPlatformSupportedSchemes();
- if (!isSchemeRegistered(protocol, existingSchemes))
- registerScheme(protocol);
- // Finally, put clazz in map with protocol as key
+ // If !uri, then check/register protocol as URLStreamHandlerService
+ if (!uri) {
+ String[] existingSchemes = getPlatformSupportedSchemes();
+ if (!isSchemeRegistered(protocol, existingSchemes))
+ registerScheme(protocol);
+ }
+ // Finally, put protocol factory in map with protocol as key
retrieveFileTransferProtocolMap.put(protocol, newProtocolFactory);
return true;
}
@@ -727,6 +741,10 @@ public class Activator implements BundleActivator, IFileTransferProtocolToFactor
}
public boolean setBrowseFileTransferFactory(String protocol, String id, IRemoteFileSystemBrowserFactory factory, int priority) {
+ return setBrowseFileTransferFactory(protocol, id, factory, priority, false);
+ }
+
+ public boolean setBrowseFileTransferFactory(String protocol, String id, IRemoteFileSystemBrowserFactory factory, int priority, boolean uri) {
if (protocol == null || "".equals(protocol)) //$NON-NLS-1$
return false;
if (id == null)
@@ -755,10 +773,13 @@ public class Activator implements BundleActivator, IFileTransferProtocolToFactor
Activator.getDefault().log(new Status(IStatus.WARNING, PLUGIN_ID, IStatus.WARNING, NLS.bind("{0} for protocol {1} from {2} will be used in preference to existing handler. New handler has higher priority={3}<{4}.", new Object[] {CONTRIBUTION_WARNING, protocol, id, new Integer(priority), new Integer(oldProtocolFactory.priority)}), null)); //$NON-NLS-1$
}
}
- String[] existingSchemes = getPlatformSupportedSchemes();
- if (!isSchemeRegistered(protocol, existingSchemes))
- registerScheme(protocol);
- // Finally, put clazz in map with protocol as key
+ // If !uri, then check/register protocol as URLStreamHandlerService
+ if (!uri) {
+ String[] existingSchemes = getPlatformSupportedSchemes();
+ if (!isSchemeRegistered(protocol, existingSchemes))
+ registerScheme(protocol);
+ }
+ // Finally, put protocol factory in map with protocol as key
browseFileTransferProtocolMap.put(protocol, newProtocolFactory);
return true;
}
@@ -807,6 +828,10 @@ public class Activator implements BundleActivator, IFileTransferProtocolToFactor
}
public boolean setSendFileTransferFactory(String protocol, String id, ISendFileTransferFactory factory, int priority) {
+ return setSendFileTransferFactory(protocol, id, factory, priority, false);
+ }
+
+ public boolean setSendFileTransferFactory(String protocol, String id, ISendFileTransferFactory factory, int priority, boolean uri) {
if (protocol == null || "".equals(protocol)) //$NON-NLS-1$
return false;
if (id == null)
@@ -835,10 +860,13 @@ public class Activator implements BundleActivator, IFileTransferProtocolToFactor
Activator.getDefault().log(new Status(IStatus.WARNING, PLUGIN_ID, IStatus.WARNING, NLS.bind("{0} for protocol {1} from {2} will be used in preference to existing handler. New handler has higher priority={3}<{4}.", new Object[] {CONTRIBUTION_WARNING, protocol, id, new Integer(priority), new Integer(oldProtocolFactory.priority)}), null)); //$NON-NLS-1$
}
}
- String[] existingSchemes = getPlatformSupportedSchemes();
- if (!isSchemeRegistered(protocol, existingSchemes))
- registerScheme(protocol);
- // Finally, put clazz in map with protocol as key
+ // If !uri, then check/register protocol as URLStreamHandlerService
+ if (!uri) {
+ String[] existingSchemes = getPlatformSupportedSchemes();
+ if (!isSchemeRegistered(protocol, existingSchemes))
+ registerScheme(protocol);
+ }
+ // Finally, put protocol factory in map with protocol as key
sendFileTransferProtocolMap.put(protocol, newProtocolFactory);
return true;
}
diff --git a/eclipse/plugins/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/IFileTransferProtocolToFactoryMapper.java b/eclipse/plugins/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/IFileTransferProtocolToFactoryMapper.java
index 42bdf82..8f6f7ec 100644
--- a/eclipse/plugins/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/IFileTransferProtocolToFactoryMapper.java
+++ b/eclipse/plugins/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/IFileTransferProtocolToFactoryMapper.java
@@ -38,6 +38,29 @@ public interface IFileTransferProtocolToFactoryMapper {
public boolean setRetrieveFileTransferFactory(String protocol, String id, IRetrieveFileTransferFactory factory, int priority);
/**
+ * <p>
+ * For the given protocol, set the given factory to be used for retrieve file transfer. If successful, subsequent retrieve
+ * requests for the given protocol will use the given factory. </p>
+ * <p>For this method to be successful the protocol has to be
+ * non-null, the id has to be non-null and unique (should probably be set to the bundle symbolic name of the bundle calling this
+ * method), the factory must be non-null, and the priority must be higher (a *smaller number*) than any existing factory for the
+ * given protocol. The default priority is 100, and the highest priority is 0.
+ * </p>
+ * @param protocol the protocol (e.g. http/https) to map the factory to.
+ * @param id a unique id for the factory (should be bundle symbolic name of bundle calling method)
+ * @param factory the factory to associate with the given protocol
+ * @param priority priority (highest = 0) to use for this factory relative to any existing factories.
+ * @param uri if <code>true</code> the factory is added as a URI rather than a URL, meaning that <b>no</b> URLStreamHandler is
+ * registered for the given protocol. This is in contrast to the {@link #setRetrieveFileTransferFactory(String, String, IRetrieveFileTransferFactory, int)},
+ * which automatically registers an URLStreamHandler for the given protocol. If false, URLs will be used and an URLStreamHandler will be registered for the
+ * given protocol factory. NOTE: If this flag is true, providers that attempt to access IFileID.getURL() may be unable to do so, since the
+ * URI may not be successfully parsed as a URL.
+ *
+ * @return <code>true</code> if the given factory was set for this protocol, <code>false</code> if not
+ */
+ public boolean setRetrieveFileTransferFactory(String protocol, String id, IRetrieveFileTransferFactory factory, int priority, boolean uri);
+
+ /**
* Get the factory id of the active factory for the given protocol. If the given protocol does not have an
* active factory, returns <code>null</code>.
*
@@ -81,6 +104,29 @@ public interface IFileTransferProtocolToFactoryMapper {
public boolean setBrowseFileTransferFactory(String protocol, String id, IRemoteFileSystemBrowserFactory factory, int priority);
/**
+ * <p>
+ * For the given protocol, set the given factory to be used for retrieve file transfer. If successful, subsequent retrieve
+ * requests for the given protocol will use the given factory. </p>
+ * <p>For this method to be successful the protocol has to be
+ * non-null, the id has to be non-null and unique (should probably be set to the bundle symbolic name of the bundle calling this
+ * method), the factory must be non-null, and the priority must be higher (a *smaller number*) than any existing factory for the
+ * given protocol. The default priority is 100, and the highest priority is 0.
+ * </p>
+ * @param protocol the protocol (e.g. http/https) to map the factory to.
+ * @param id a unique id for the factory (should be bundle symbolic name of bundle calling method)
+ * @param factory the factory to associate with the given protocol
+ * @param priority priority (highest = 0) to use for this factory relative to any existing factories.
+ * @param uri if <code>true</code> the factory is added as a URI rather than a URL, meaning that <b>no</b> URLStreamHandler is
+ * registered for the given protocol. This is in contrast to the {@link #setRetrieveFileTransferFactory(String, String, IRetrieveFileTransferFactory, int)},
+ * which automatically registers an URLStreamHandler for the given protocol. If false, URLs will be used and an URLStreamHandler will be registered for the
+ * given protocol factory. NOTE: If this flag is true, providers that attempt to access IFileID.getURL() may be unable to do so, since the
+ * URI may not be successfully parsed as a URL.
+ *
+ * @return <code>true</code> if the given factory was set for this protocol, <code>false</code> if not
+ */
+ public boolean setBrowseFileTransferFactory(String protocol, String id, IRemoteFileSystemBrowserFactory factory, int priority, boolean uri);
+
+ /**
* Get the factory id of the active factory for the given protocol. If the given protocol does not have an
* active factory, returns <code>null</code>.
*
@@ -124,6 +170,29 @@ public interface IFileTransferProtocolToFactoryMapper {
public boolean setSendFileTransferFactory(String protocol, String id, ISendFileTransferFactory factory, int priority);
/**
+ * <p>
+ * For the given protocol, set the given factory to be used for retrieve file transfer. If successful, subsequent retrieve
+ * requests for the given protocol will use the given factory. </p>
+ * <p>For this method to be successful the protocol has to be
+ * non-null, the id has to be non-null and unique (should probably be set to the bundle symbolic name of the bundle calling this
+ * method), the factory must be non-null, and the priority must be higher (a *smaller number*) than any existing factory for the
+ * given protocol. The default priority is 100, and the highest priority is 0.
+ * </p>
+ * @param protocol the protocol (e.g. http/https) to map the factory to.
+ * @param id a unique id for the factory (should be bundle symbolic name of bundle calling method)
+ * @param factory the factory to associate with the given protocol
+ * @param priority priority (highest = 0) to use for this factory relative to any existing factories.
+ * @param uri if <code>true</code> the factory is added as a URI rather than a URL, meaning that <b>no</b> URLStreamHandler is
+ * registered for the given protocol. This is in contrast to the {@link #setRetrieveFileTransferFactory(String, String, IRetrieveFileTransferFactory, int)},
+ * which automatically registers an URLStreamHandler for the given protocol. If false, URLs will be used and an URLStreamHandler will be registered for the
+ * given protocol factory. NOTE: If this flag is true, providers that attempt to access IFileID.getURL() may be unable to do so, since the
+ * URI may not be successfully parsed as a URL.
+ *
+ * @return <code>true</code> if the given factory was set for this protocol, <code>false</code> if not
+ */
+ public boolean setSendFileTransferFactory(String protocol, String id, ISendFileTransferFactory factory, int priority, boolean uri);
+
+ /**
* Get the factory id of the active factory for the given protocol. If the given protocol does not have an
* active factory, returns <code>null</code>.
*
diff --git a/eclipse/plugins/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/identity/FileTransferID.java b/eclipse/plugins/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/identity/FileTransferID.java
index 378c1f3..3b3edb2 100644
--- a/eclipse/plugins/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/identity/FileTransferID.java
+++ b/eclipse/plugins/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/identity/FileTransferID.java
@@ -10,6 +10,9 @@
*****************************************************************************/
package org.eclipse.ecf.provider.filetransfer.identity;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
import java.net.URL;
import org.eclipse.core.runtime.Assert;
import org.eclipse.ecf.core.identity.BaseID;
@@ -22,6 +25,7 @@ public class FileTransferID extends BaseID implements IFileID {
private static final long serialVersionUID = 1274308869502156992L;
URL fileURL;
+ URI fileURI;
public FileTransferID(Namespace namespace, URL url) {
super(namespace);
@@ -29,28 +33,47 @@ public class FileTransferID extends BaseID implements IFileID {
this.fileURL = url;
}
+ /**
+ * @since 3.2
+ */
+ public FileTransferID(Namespace namespace, URI uri) {
+ super(namespace);
+ Assert.isNotNull(uri, "FileTransferID URI cannot be null"); //$NON-NLS-1$
+ this.fileURI = uri;
+ }
+
protected int namespaceCompareTo(BaseID o) {
- return this.fileURL.toExternalForm().compareTo(((FileTransferID) o).toExternalForm());
+ if (o == null)
+ return 1;
+ if (!(o instanceof FileTransferID))
+ return 1;
+
+ return (fileURI != null) ? fileURI.compareTo(((FileTransferID) o).fileURI) : fileURL.toExternalForm().compareTo(((FileTransferID) o).toExternalForm());
}
protected boolean namespaceEquals(BaseID o) {
- return this.fileURL.equals(((FileTransferID) o).fileURL);
+ if (o == null)
+ return false;
+ if (!(o instanceof FileTransferID))
+ return false;
+
+ return (fileURI != null) ? fileURI.equals(((FileTransferID) o).fileURI) : fileURL.equals(((FileTransferID) o).fileURL);
}
protected String namespaceGetName() {
- return this.fileURL.toExternalForm();
+ return (fileURI != null) ? fileURI.toASCIIString() : fileURL.toExternalForm();
}
protected int namespaceHashCode() {
- return this.fileURL.hashCode();
+ return (fileURI != null) ? fileURI.hashCode() : this.fileURL.hashCode();
}
public String getFilename() {
return getFileNameOnly();
}
- public URL getURL() {
- return this.fileURL;
+ public URL getURL() throws MalformedURLException {
+ return (fileURI != null) ? fileURI.toURL() : fileURL;
}
protected String getFileNameOnly() {
@@ -64,4 +87,11 @@ public class FileTransferID extends BaseID implements IFileID {
b.append("]"); //$NON-NLS-1$
return b.toString();
}
+
+ /**
+ * @since 3.2
+ */
+ public URI getURI() throws URISyntaxException {
+ return (fileURI != null) ? fileURI : new URI(fileURL.toExternalForm());
+ }
}
diff --git a/eclipse/plugins/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/identity/FileTransferNamespace.java b/eclipse/plugins/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/identity/FileTransferNamespace.java
index cc1cede..5252af1 100644
--- a/eclipse/plugins/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/identity/FileTransferNamespace.java
+++ b/eclipse/plugins/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/identity/FileTransferNamespace.java
@@ -8,6 +8,7 @@
******************************************************************************/
package org.eclipse.ecf.provider.filetransfer.identity;
+import java.net.URI;
import java.net.URL;
import java.util.HashSet;
import java.util.Set;
@@ -51,11 +52,13 @@ public class FileTransferNamespace extends Namespace {
try {
String init = getInitFromExternalForm(args);
if (init != null)
- return new FileTransferID(this, new URL(init));
+ return new FileTransferID(this, new URI(init));
if (args[0] instanceof URL)
return new FileTransferID(this, (URL) args[0]);
if (args[0] instanceof String)
- return new FileTransferID(this, new URL((String) args[0]));
+ return new FileTransferID(this, new URI((String) args[0]));
+ if (args[0] instanceof URI)
+ return new FileTransferID(this, (URI) args[0]);
} catch (Exception e) {
throw new IDCreateException(Messages.FileTransferNamespace_Exception_Create_Instance, e);
}
diff --git a/eclipse/plugins/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/outgoing/MultiProtocolOutgoingAdapter.java b/eclipse/plugins/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/outgoing/MultiProtocolOutgoingAdapter.java
index 466038c..38b0b24 100644
--- a/eclipse/plugins/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/outgoing/MultiProtocolOutgoingAdapter.java
+++ b/eclipse/plugins/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/outgoing/MultiProtocolOutgoingAdapter.java
@@ -13,7 +13,9 @@ package org.eclipse.ecf.provider.filetransfer.outgoing;
import java.io.File;
import java.net.MalformedURLException;
+import java.net.URISyntaxException;
import java.util.Map;
+import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.IAdapterManager;
import org.eclipse.ecf.core.identity.IDFactory;
import org.eclipse.ecf.core.identity.Namespace;
@@ -67,15 +69,23 @@ public class MultiProtocolOutgoingAdapter implements ISendFileTransfer {
}
public void sendOutgoingRequest(IFileID targetID, File outgoingFile, IFileTransferListener transferListener, Map options) throws SendFileTransferException {
+
+ Assert.isNotNull(targetID);
+ Assert.isNotNull(outgoingFile);
+ Assert.isNotNull(transferListener);
+
String protocol = null;
try {
- protocol = targetID.getURL().getProtocol();
- } catch (final MalformedURLException e) {
- throw new SendFileTransferException(Messages.AbstractRetrieveFileTransfer_MalformedURLException);
+ protocol = targetID.getURI().getScheme();
+ } catch (URISyntaxException e) {
+ try {
+ protocol = targetID.getURL().getProtocol();
+ } catch (final MalformedURLException e1) {
+ throw new SendFileTransferException(Messages.AbstractRetrieveFileTransfer_MalformedURLException);
+ }
}
- ISendFileTransferContainerAdapter fileTransfer = null;
- fileTransfer = Activator.getDefault().getSendFileTransfer(protocol);
+ ISendFileTransferContainerAdapter fileTransfer = Activator.getDefault().getSendFileTransfer(protocol);
// If no handler setup for this protocol then throw
if (fileTransfer == null) {
@@ -111,15 +121,22 @@ public class MultiProtocolOutgoingAdapter implements ISendFileTransfer {
* @see org.eclipse.ecf.filetransfer.ISendFileTransferContainerAdapter#sendOutgoingRequest(org.eclipse.ecf.filetransfer.identity.IFileID, org.eclipse.ecf.filetransfer.IFileTransferInfo, org.eclipse.ecf.filetransfer.IFileTransferListener, java.util.Map)
*/
public void sendOutgoingRequest(IFileID targetID, IFileTransferInfo localFileToSend, IFileTransferListener transferListener, Map options) throws SendFileTransferException {
+ Assert.isNotNull(targetID);
+ Assert.isNotNull(localFileToSend);
+ Assert.isNotNull(transferListener);
+
String protocol = null;
try {
- protocol = targetID.getURL().getProtocol();
- } catch (final MalformedURLException e) {
- throw new SendFileTransferException(Messages.AbstractRetrieveFileTransfer_MalformedURLException);
+ protocol = targetID.getURI().getScheme();
+ } catch (URISyntaxException e) {
+ try {
+ protocol = targetID.getURL().getProtocol();
+ } catch (final MalformedURLException e1) {
+ throw new SendFileTransferException(Messages.AbstractRetrieveFileTransfer_MalformedURLException);
+ }
}
- ISendFileTransferContainerAdapter fileTransfer = null;
- fileTransfer = Activator.getDefault().getSendFileTransfer(protocol);
+ ISendFileTransferContainerAdapter fileTransfer = Activator.getDefault().getSendFileTransfer(protocol);
// If no handler setup for this protocol then throw
if (fileTransfer == null) {
diff --git a/eclipse/plugins/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/retrieve/MultiProtocolRetrieveAdapter.java b/eclipse/plugins/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/retrieve/MultiProtocolRetrieveAdapter.java
index b3f1cd3..1fcf76c 100644
--- a/eclipse/plugins/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/retrieve/MultiProtocolRetrieveAdapter.java
+++ b/eclipse/plugins/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/retrieve/MultiProtocolRetrieveAdapter.java
@@ -12,7 +12,9 @@
package org.eclipse.ecf.provider.filetransfer.retrieve;
import java.net.MalformedURLException;
+import java.net.URISyntaxException;
import java.util.Map;
+import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.IAdapterManager;
import org.eclipse.ecf.core.identity.IDFactory;
import org.eclipse.ecf.core.identity.Namespace;
@@ -73,15 +75,21 @@ public class MultiProtocolRetrieveAdapter implements IRetrieveFileTransfer {
*/
public void sendRetrieveRequest(IFileID remoteFileID, IFileTransferListener transferListener, Map options) throws IncomingFileTransferException {
+ Assert.isNotNull(remoteFileID);
+ Assert.isNotNull(transferListener);
+
String protocol = null;
try {
- protocol = remoteFileID.getURL().getProtocol();
- } catch (final MalformedURLException e) {
- throw new IncomingFileTransferException(Messages.AbstractRetrieveFileTransfer_MalformedURLException);
+ protocol = remoteFileID.getURI().getScheme();
+ } catch (URISyntaxException e) {
+ try {
+ protocol = remoteFileID.getURL().getProtocol();
+ } catch (final MalformedURLException e1) {
+ throw new IncomingFileTransferException(Messages.AbstractRetrieveFileTransfer_MalformedURLException);
+ }
}
- IRetrieveFileTransferContainerAdapter fileTransfer = null;
- fileTransfer = Activator.getDefault().getFileTransfer(protocol);
+ IRetrieveFileTransferContainerAdapter fileTransfer = Activator.getDefault().getFileTransfer(protocol);
// We will default to JRE-provided file transfer if nothing else
// available
@@ -107,15 +115,21 @@ public class MultiProtocolRetrieveAdapter implements IRetrieveFileTransfer {
* org.eclipse.ecf.filetransfer.IFileTransferListener, java.util.Map)
*/
public void sendRetrieveRequest(IFileID remoteFileID, IFileRangeSpecification rangeSpecification, IFileTransferListener transferListener, Map options) throws IncomingFileTransferException {
+ Assert.isNotNull(remoteFileID);
+ Assert.isNotNull(transferListener);
+
String protocol = null;
try {
- protocol = remoteFileID.getURL().getProtocol();
- } catch (final MalformedURLException e) {
- throw new IncomingFileTransferException(Messages.AbstractRetrieveFileTransfer_MalformedURLException);
+ protocol = remoteFileID.getURI().getScheme();
+ } catch (URISyntaxException e) {
+ try {
+ protocol = remoteFileID.getURL().getProtocol();
+ } catch (final MalformedURLException e1) {
+ throw new IncomingFileTransferException(Messages.AbstractRetrieveFileTransfer_MalformedURLException);
+ }
}
- IRetrieveFileTransferContainerAdapter fileTransfer = null;
- fileTransfer = Activator.getDefault().getFileTransfer(protocol);
+ IRetrieveFileTransferContainerAdapter fileTransfer = Activator.getDefault().getFileTransfer(protocol);
// We will default to JRE-provided file transfer if nothing else
// available
diff --git a/eclipse/plugins/org.eclipse.ecf.ssl/.gitignore b/eclipse/plugins/org.eclipse.ecf.ssl/.gitignore
new file mode 100644
index 0000000..e660fd9
--- /dev/null
+++ b/eclipse/plugins/org.eclipse.ecf.ssl/.gitignore
@@ -0,0 +1 @@
+bin/
diff --git a/eclipse/plugins/org.eclipse.ecf.ssl/.settings/org.eclipse.pde.api.tools.prefs b/eclipse/plugins/org.eclipse.ecf.ssl/.settings/org.eclipse.pde.api.tools.prefs
new file mode 100644
index 0000000..d9e7782
--- /dev/null
+++ b/eclipse/plugins/org.eclipse.ecf.ssl/.settings/org.eclipse.pde.api.tools.prefs
@@ -0,0 +1,94 @@
+#Wed Sep 01 15:17:51 PDT 2010
+ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
+ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
+CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
+CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
+CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
+CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
+CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
+ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
+ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
+ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
+FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
+FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
+FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
+FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
+ILLEGAL_EXTEND=Warning
+ILLEGAL_IMPLEMENT=Warning
+ILLEGAL_INSTANTIATE=Warning
+ILLEGAL_OVERRIDE=Warning
+ILLEGAL_REFERENCE=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+INVALID_JAVADOC_TAG=Ignore
+INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error
+LEAK_EXTEND=Warning
+LEAK_FIELD_DECL=Warning
+LEAK_IMPLEMENT=Warning
+LEAK_METHOD_PARAM=Warning
+LEAK_METHOD_RETURN_TYPE=Warning
+METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
+METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
+UNUSED_PROBLEM_FILTERS=Warning
+automatically_removed_unused_problem_filters=false
+eclipse.preferences.version=1
+incompatible_api_component_version=Error
+incompatible_api_component_version_include_major_without_breaking_change=Disabled
+incompatible_api_component_version_include_minor_without_api_change=Disabled
+invalid_since_tag_version=Error
+malformed_since_tag=Error
+missing_since_tag=Error
+report_api_breakage_when_major_version_incremented=Disabled
+report_resolution_errors_api_component=Warning
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.discovery.compatibility/.gitignore b/eclipse/plugins/org.eclipse.ecf/.gitignore
similarity index 100%
copy from eclipse/plugins/org.eclipse.equinox.p2.discovery.compatibility/.gitignore
copy to eclipse/plugins/org.eclipse.ecf/.gitignore
diff --git a/eclipse/plugins/org.eclipse.ecf/.settings/org.eclipse.pde.api.tools.prefs b/eclipse/plugins/org.eclipse.ecf/.settings/org.eclipse.pde.api.tools.prefs
new file mode 100644
index 0000000..4124dae
--- /dev/null
+++ b/eclipse/plugins/org.eclipse.ecf/.settings/org.eclipse.pde.api.tools.prefs
@@ -0,0 +1,94 @@
+#Wed Sep 01 15:13:41 PDT 2010
+ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
+ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
+CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
+CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
+CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
+CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
+CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
+ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
+ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
+ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
+FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
+FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
+FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
+FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
+ILLEGAL_EXTEND=Warning
+ILLEGAL_IMPLEMENT=Warning
+ILLEGAL_INSTANTIATE=Warning
+ILLEGAL_OVERRIDE=Warning
+ILLEGAL_REFERENCE=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+INVALID_JAVADOC_TAG=Ignore
+INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error
+LEAK_EXTEND=Warning
+LEAK_FIELD_DECL=Warning
+LEAK_IMPLEMENT=Warning
+LEAK_METHOD_PARAM=Warning
+LEAK_METHOD_RETURN_TYPE=Warning
+METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
+METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
+UNUSED_PROBLEM_FILTERS=Warning
+automatically_removed_unused_problem_filters=false
+eclipse.preferences.version=1
+incompatible_api_component_version=Error
+incompatible_api_component_version_include_major_without_breaking_change=Disabled
+incompatible_api_component_version_include_minor_without_api_change=Disabled
+invalid_since_tag_version=Error
+malformed_since_tag=Error
+missing_since_tag=Error
+report_api_breakage_when_major_version_incremented=Disabled
+report_resolution_errors_api_component=Warning
diff --git a/eclipse/plugins/org.eclipse.ecf/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.ecf/META-INF/MANIFEST.MF
index 83c8123..3864e4d 100644
--- a/eclipse/plugins/org.eclipse.ecf/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.ecf/META-INF/MANIFEST.MF
@@ -1,14 +1,14 @@
Manifest-Version: 1.0
Bundle-Name: %plugin.name
Bundle-SymbolicName: org.eclipse.ecf;singleton:=true
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 3.1.200.qualifier
Bundle-Activator: org.eclipse.ecf.internal.core.ECFPlugin
Bundle-Vendor: %plugin.provider
Bundle-Localization: plugin
Eclipse-LazyStart: true
Bundle-ManifestVersion: 2
Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,
- J2SE-1.3
+ J2SE-1.4
Export-Package: org.eclipse.ecf.core;version="3.0.0",
org.eclipse.ecf.core.events,
org.eclipse.ecf.core.jobs;version="1.0";x-internal:=true,
@@ -21,7 +21,6 @@ Export-Package: org.eclipse.ecf.core;version="3.0.0",
org.eclipse.ecf.internal.core;x-internal:=true
Import-Package: org.eclipse.core.runtime.jobs,
org.eclipse.equinox.concurrent.future;version="1.0.0";resolution:=optional,
- org.eclipse.osgi.util;version="1.0.0",
org.osgi.framework;version="1.3.0",
org.osgi.service.log;version="1.3.0",
org.osgi.util.tracker;version="1.3.2"
diff --git a/eclipse/plugins/org.eclipse.ecf/buckminster.cspex b/eclipse/plugins/org.eclipse.ecf/buckminster.cspex
new file mode 100644
index 0000000..b5ff4ae
--- /dev/null
+++ b/eclipse/plugins/org.eclipse.ecf/buckminster.cspex
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<cspecExtension
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0"
+ xmlns="http://www.eclipse.org/buckminster/CSpec-1.0">
+ <dependencies>
+ </dependencies>
+ <generators>
+ <!-- Place your Generators here -->
+ </generators>
+ <artifacts>
+ <!-- Place your Artifacts here -->
+ </artifacts>
+ <actions>
+ <public name="create.javadoc" actor="ant">
+ <actorProperties>
+ <property key="buildFile" value="javadoc.xml" />
+ <property key="targets" value="javadoc" />
+ </actorProperties>
+ <properties>
+ <property key="source" value="${projectsPath}" />
+ <property key="output" value="${javadoc.output}" />
+ <property key="target" value="${targetPlatformPath}" />
+ </properties>
+ </public>
+ </actions>
+ <groups>
+ <!-- Place your Groups here -->
+ </groups>
+ <alterDependencies>
+ <!-- Place your Dependencies alterations here -->
+ </alterDependencies>
+ <alterArtifacts>
+ <!-- Place your Artifact alterations here -->
+ </alterArtifacts>
+ <alterActions>
+ <!-- Place your Action alterations here -->
+ </alterActions>
+ <alterGroups>
+ <!-- Place your Group alterations here -->
+ </alterGroups>
+</cspecExtension>
diff --git a/eclipse/plugins/org.eclipse.ecf/javadoc.xml b/eclipse/plugins/org.eclipse.ecf/javadoc.xml
index 74944ac..fed9d0c 100644
--- a/eclipse/plugins/org.eclipse.ecf/javadoc.xml
+++ b/eclipse/plugins/org.eclipse.ecf/javadoc.xml
@@ -1,6 +1,43 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project default="javadoc">
- <target name="javadoc">
- <javadoc access="protected" additionalparam="-J-Xmx256m -tag model:a:Model -tag generated:a:Generated -tag noreference:tcmf:DoNotReference -tag ordered:a:Ordered -tag noimplement:a:NoImplement -tag noextend:a:NoExtend " author="false" classpath="C:\eclipse3.6rc3\eclipse\plugins\org.eclipse.ui.console_3.5.0.v20100526.jar;../org.apache.log4j;../org.eclipse.ecf.remoteservice/bin;../org.eclipse.ecf.presence.ui/bin;C:\eclipse3.6rc3\eclipse\plugins\org.eclipse.swt_3.6.0.v3650.jar;C:\eclipse3.6rc3\eclipse\plugins\org.eclipse.core.jobs_3.5.0.v20100515.jar;C:\eclipse3.6rc3\eclipse\plugins\org.eclipse.ui_3.6.0.I20100527-0800.jar;C:\eclipse3.6rc3\eclipse\plugins\org.eclipse.core.resources_3.6.0.v20100526-0737.jar;C:\eclipse3.6rc3\eclipse\plugins\org.eclipse.text_3.5.0.v20100520-0800.jar;C:\eclipse3.6rc3\eclipse\plugins\org.eclipse.equinox.concurrent_1.0.100.v20100503.jar;../org.eclipse.emf.ecore.change/bin;../org.eclipse.ecf.provider.remoteservice/bin;C:\eclipse3.6rc3\eclipse\plugins\org.eclipse.jface_3.6.0.I20100526-1400.jar;C:\eclipse3.6rc3\eclipse\plugins\org.eclipse.ui.ide_3.6.0.I20100526-1400.jar;../org.eclipse.ecf.presence/bin;../org.eclipse.ecf.provider.xmpp/bin;bin;C:\eclipse3.6rc3\eclipse\plugins\org.eclipse.ui.forms_3.5.0.v20100427.jar;../org.eclipse.ecf.provider.datashare/bin;../org.eclipse.ecf.discovery.ui.edit/bin;../org.jivesoftware.smack/bin;../org.eclipse.ecf.sync/bin;C:\eclipse3.6rc3\eclipse\plugins\org.eclipse.ui.editors_3.6.0.v20100520-0800.jar;../org.eclipse.ecf.provider.filetransfer/bin;../org.eclipse.ecf.identity/bin;../org.eclipse.emf.ecore/bin;C:\eclipse3.6rc3\eclipse\plugins\org.eclipse.swt.win32.win32.x86_3.6.0.v3650.jar;C:\eclipse3.6rc3\eclipse\plugins\org.eclipse.equinox.preferences_3.3.0.v20100503.jar;../org.eclipse.ecf.ui/bin;C:\eclipse3.6rc3\eclipse\plugins\org.eclipse.core.commands_3.6.0.I20100512-1500.jar;C:\eclipse3.6rc3\eclipse\plugins\org.objectweb.asm_3.2.0.v200909071300.jar;../org.jivesoftware.smack/jars/xpp.jar;../org.eclipse.emf.edit/bin;C:\eclipse3.6rc3\eclipse\plugins\org.eclipse.equinox.registry_3.5.0.v20100503.jar;../org.eclipse.ecf.telephony.call/bin;C:\eclipse3.6rc3\eclipse\plugins\org.eclipse.core.runtime_3.6.0.v20100505.jar;C:\eclipse3.6rc3\eclipse\plugins\org.eclipse.ui.views_3.5.0.I20100527-0800.jar;../org.eclipse.ecf.sharedobject/bin;C:\eclipse3.6rc3\eclipse\plugins\org.eclipse.core.contenttype_3.4.100.v20100505-1235.jar;C:\eclipse3.6rc3\eclipse\plugins\org.eclipse.ui.workbench.texteditor_3.6.0.v20100520-0800.jar;C:\eclipse3.6rc3\eclipse\plugins\org.apache.commons.httpclient_3.1.0.v201005080502.jar;C:\eclipse3.6rc3\eclipse\plugins\org.eclipse.core.filesystem_1.3.0.v20100526-0737.jar;../org.apache.zookeeper/zookeeper-3.3.0.jar;C:\eclipse3.6rc3\eclipse\plugins\org.eclipse.ui.workbench_3.6.0.I20100526-1400.jar;../org.eclipse.emf.edit.ui/bin;C:\eclipse3.6rc3\eclipse\plugins\org.eclipse.core.runtime.compatibility.registry_3.3.0.v20100520\runtime_registry_compatibility.jar;../org.eclipse.ecf.filetransfer/bin;../org.eclipse.ecf.provider/bin;../ch.ethz.iks.slp/bin;C:\eclipse3.6rc3\eclipse\plugins\org.eclipse.jface.text_3.6.0.v20100526-0800.jar;../org.eclipse.ecf.discovery/bin;../org.eclipse.ecf.datashare/bin;../ch.ethz.iks.r_osgi.remote/bin;C:\eclipse3.6rc3\eclipse\plugins\org.eclipse.core.filebuffers_3.5.100.v20100520-0800.jar;C:\eclipse3.6rc3\eclipse\plugins\org.eclipse.core.net_1.2.100.I20100511-0800.jar;../org.eclipse.emf.common.ui/bin;C:\eclipse3.6rc3\eclipse\plugins\org.eclipse.osgi.services_3.2.100.v20100503.jar;../org.eclipse.ecf.discovery.ui.model/bin;C:\eclipse3.6rc3\eclipse\plugins\org.eclipse.equinox.common_3.6.0.v20100503.jar;C:\eclipse3.6rc3\eclipse\plugins\org.eclipse.core.expressions_3.4.200.v20100505.jar;../org.eclipse.emf.common/bin;C:\eclipse3.6rc3\eclipse\plugins\org.eclipse.osgi_3.6.0.v20100517.jar;C:\eclipse3.6rc3\eclipse\plugins\org.eclipse.equinox.security_1.0.200.v20100503.jar;../org.eclipse.ecf.discovery.ui/bin;../org.eclipse.ecf.osgi.services.discovery/bin;C:\eclipse3.6rc3\eclipse\plugins\org.eclipse.equinox.app_1.3.0.v20100512.jar" destdir="../ecf documentation/org.eclipse.ecf.docs/api" doctitle="Eclipse Communication Framework (ECF) 3.3.0" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" packagenames="org.eclipse.ecf.ui.hyperlink,org.eclipse.ecf.core.sharedobject.util,org.eclipse.ecf.filetransfer.ui,org.eclipse.ecf.core.sharedobject.provider,org.eclipse.ecf.example.clients,org.eclipse.ecf.presence.im,org.eclipse.ecf.ui.actions,org.eclipse.ecf.telephony.call.ui.actions,org.eclipse.ecf.core.provider,org.eclipse.ecf.discovery.service,org.eclipse.ecf.presence.bot,org.eclipse.ecf.provider.zookeeper,org.eclipse.ecf.provider.remoteservice,org.eclipse.ecf.core.sharedobject.events,org.eclipse.ecf.remoteservice.soap.identity,org.eclipse.ecf.provider.jslp.identity,org.eclipse.ecf.telephony.call.events,org.eclipse.ecf.presence.collab.ui,org.eclipse.ecf.core.identity,org.eclipse.ecf.provider.remoteservice.generic,org.eclipse.ecf.remoteservice.soap.client,org.eclipse.ecf.docshare,org.eclipse.ecf.presence.collab.ui.url,org.eclipse.ecf.remoteservice.rest,org.eclipse.ecf.internal.docshare,org.eclipse.ecf.presence.roster,org.eclipse.ecf.core.events,org.eclipse.ecf.discovery.ui.model,org.eclipse.ecf.provider.discovery,org.eclipse.ecf.provider.filetransfer.events.socket,org.eclipse.ecf.provider.generic.gmm,org.eclipse.ecf.examples.remoteservices.hello,org.eclipse.ecf.presence.collab.ui.screencapture,org.eclipse.ecf.provider.zookeeper.core,org.eclipse.ecf.provider.filetransfer.outgoing,org.eclipse.ecf.filetransfer.events,org.eclipse.ecf.datashare.service,org.eclipse.ecf.filetransfer.ui.actions,org.eclipse.ecf.core.sharedobject,org.eclipse.ecf.filetransfer.events.socket,org.eclipse.ecf.sync.doc,org.eclipse.ecf.ui.util,org.eclipse.ecf.core.sharedobject.security,org.eclipse.ecf.remoteservice.client,org.eclipse.ecf.provider.filetransfer.retrieve,org.eclipse.ecf.core.user,org.eclipse.ecf.presence.chatroom,org.eclipse.ecf.provider.filetransfer.identity,org.eclipse.ecf.remoteservices.ui,org.eclipse.ecf.provider.generic,org.eclipse.ecf.presence.ui.dnd,org.eclipse.ecf.provider.comm,org.eclipse.ecf.ui.screencapture,org.eclipse.ecf.presence.bot.application,org.eclipse.ecf.presence.search.message,org.eclipse.ecf.provider.jslp.container,org.eclipse.ecf.provider.ui.wizards,org.eclipse.ecf.ui.dialogs,org.eclipse.ecf.ui.wizards,org.eclipse.ecf.presence.history,org.eclipse.ecf.presence.collab.ui.view,org.eclipse.ecf.core.start,org.eclipse.ecf.osgi.services.distribution,org.eclipse.ecf.docshare.messages,org.eclipse.ecf.provider.filetransfer.browse,org.eclipse.ecf.core.security,org.eclipse.ecf.remoteservice.rest.util,org.eclipse.ecf.provider.localdiscovery,org.eclipse.ecf.protocol.bittorrent,org.eclipse.ecf.discovery.ui.model.resource,org.eclipse.ecf.remoteservice.rest.client,org.eclipse.ecf.presence.ui.menu,org.eclipse.ecf.protocol.msn.events,org.eclipse.ecf.presence.search,org.eclipse.ecf.provider.zookeeper.util,org.eclipse.ecf.ui,org.eclipse.ecf.provider.comm.tcp,org.eclipse.ecf.protocol.msn,org.eclipse.ecf.remoteservice.util.tracker,org.eclipse.ecf.presence.bot.impl,org.eclipse.ecf.presence.ui,org.eclipse.ecf.storage,org.eclipse.ecf.filetransfer.events.socketfactory,org.eclipse.ecf.remoteservice.eventadmin,org.eclipse.ecf.presence.ui.chatroom,org.eclipse.ecf.server.generic,org.eclipse.ecf.provider.xmpp.identity,org.eclipse.ecf.docshare.menu,org.eclipse.ecf.datashare.events,org.eclipse.ecf.provider.datashare.nio,org.eclipse.ecf.example.clients.applications,org.eclipse.ecf.telephony.call.service,org.eclipse.ecf.provider.jmdns.identity,org.eclipse.ecf.examples.remoteservices.hello.impl,org.eclipse.ecf.filetransfer.identity,org.eclipse.ecf.telephony.call,org.eclipse.ecf.server.generic.app,org.eclipse.ecf.datashare,org.eclipse.ecf.provider.xmpp,org.eclipse.ecf.discovery.ui.model.provider,org.eclipse.ecf.provider.r_osgi.identity,org.eclipse.ecf.remoteservice.util,org.eclipse.ecf.sync,org.eclipse.ecf.discovery.ui.model.impl,org.eclipse.ecf.presence.collab.ui.console,org.eclipse.ecf.provider.jmdns.container,org.eclipse.ecf.datashare.mergeable,org.eclipse.ecf.provider.util,org.eclipse.ecf.discovery.identity,org.eclipse.ecf.presence.ui.roster,org.eclipse.ecf.remoteservice.rest.identity,org.eclipse.ecf.examples.provider.trivial,org.eclipse.ecf.filetransfer.service,org.eclipse.ecf.discovery.ui.model.util,org.eclipse.ecf.presence.service,org.eclipse.ecf.core.util,org.eclipse.ecf.provider.filetransfer.httpclient,org.eclipse.ecf.provider.filetransfer.util,org.eclipse.ecf.core.jobs,org.eclipse.ecf.osgi.services.discovery.local,org.eclipse.ecf.remoteservice.events,org.eclipse.ecf.core.status" source="1.5" sourcefiles="../org.eclipse.ecf.discovery.ui/src/org/eclipse/ecf/discovery/ui/DiscoveryPropertyTesterUtil.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRemoteFileSystemListener.java,../org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IPresenceContainerAdapter.java,../org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceRegistration.java,../org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteServiceHelper.java,src/org/eclipse/ecf/core/ContainerTypeDescription.java,src/org/eclipse/ecf/core/IContainerManager.java,../org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/ServiceProperties.java,src/org/eclipse/ecf/core/IContainerFactory.java,../org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IFQID.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRemoteFile.java,../org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/Constants.java,../org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceProperties.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/FileTransferJob.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileTransferPausable.java,../org.eclipse.ecf.server/src/org/eclipse/ecf/server/IServiceClientManager.java,../org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceReference.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/UserCancelledException.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/BrowseFileTransferException.java,../org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/AbstractDiscoveryContainerAdapter.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IIncomingFileTransferRequestListener.java,../org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IAsyncRemoteServiceProxy.java,src/org/eclipse/ecf/core/AbstractContainerAdapterFactory.java,../org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/SharedObjectDatashareContainerAdapter.java,../org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/BaseChannel.java,../org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/AbstractRemoteCallListener.java,../org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceProxy.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IIncomingFileTransfer.java,../org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/AbstractRemoteService.java,src/org/eclipse/ecf/core/ContainerCreateException.java,../org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceEvent.java,../org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceTypeListener.java,../org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteFilter.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileTransferRateControl.java,../org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/AsyncService.java,../org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/DatashareContainer.java,../org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteServiceID.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRemoteFileAttributes.java,src/org/eclipse/ecf/core/IContainerManagerListener.java,../org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceInfo.java,../org.eclipse.ecf.osgi.services.discovery/src/org/eclipse/ecf/osgi/services/discovery/IProxyDiscoveryListener.java,../org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteServiceContainer.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileRangeSpecification.java,../org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IIMMessageEvent.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileTransferInfo.java,../org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/Presence.java,../org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/AsyncMethod.java,../org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IPresenceSender.java,src/org/eclipse/ecf/core/IReliableContainer.java,../org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/CallbackRemoteCallListener.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRemoteFileInfo.java,../org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/ServiceContainerEvent.java,../org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceListener.java,../org.eclipse.ecf.osgi.services.discovery/src/org/eclipse/ecf/osgi/services/discovery/RemoteServiceEndpointDescription.java,src/org/eclipse/ecf/core/ContainerAuthenticationException.java,../org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/DiscoveryContainerConfig.java,../org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteCallListener.java,../org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IPresenceListener.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileTransferRunnable.java,../org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IAsyncCallback.java,../org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IMMessage.java,../org.eclipse.ecf.discovery.ui/src/org/eclipse/ecf/discovery/ui/DiscoveryHandlerUtil.java,../org.eclipse.ecf.osgi.services.discovery/src/org/eclipse/ecf/osgi/services/discovery/RemoteServicePublication.java,../org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteCall.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/InvalidFileRangeSpecificationException.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileTransferListener.java,src/org/eclipse/ecf/core/BaseContainer.java,../org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IAccountManager.java,../org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/DatashareContainerAdapterFactory.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/SendFileTransferException.java,src/org/eclipse/ecf/core/ContainerFactory.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRetrieveFileTransferContainerAdapter.java,../org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/ServiceTypeContainerEvent.java,../org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceID.java,../org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/DatashareContainerConfig.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IncomingFileTransferException.java,../org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceContainer.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/ISendFileTransferContainerAdapter.java,../org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IIMMessageListener.java,../org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceListener.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRemoteFileSystemRequest.java,../org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IPresence.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/RemoteFileSystemException.java,../org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceTypeEvent.java,../org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IDiscoveryContainerAdapter.java,../org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/AbstractPresenceContainer.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IOutgoingFileTransfer.java,src/org/eclipse/ecf/core/AbstractContainer.java,../org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/ServiceInfo.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileTransfer.java,../org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/DatashareContainerAdapter.java,../org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteService.java,../org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IIMMessage.java,src/org/eclipse/ecf/core/IContainerListener.java,../org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteCall.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/FileTransferInfo.java,../org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IContainerServiceInfoAdapter.java,../org.eclipse.ecf.server/src/org/eclipse/ecf/server/IServiceClient.java,../org.eclipse.ecf.server/src/org/eclipse/ecf/server/IServiceHost.java,../org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceContainerAdapter.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRemoteFileSystemBrowserContainerAdapter.java,src/org/eclipse/ecf/core/IContainer.java,../org.eclipse.ecf.osgi.services.discovery/src/org/eclipse/ecf/osgi/services/discovery/IRemoteServiceEndpointDescription.java,../org.eclipse.ecf.osgi.services.discovery/src/org/eclipse/ecf/osgi/services/discovery/IHostDiscoveryListener.java,src/org/eclipse/ecf/core/ContainerConnectException.java" sourcepath="../org.eclipse.ecf.provider.jslp/src;../org.eclipse.ecf.provider.ui/src;../org.eclipse.ecf.identity/src;../org.eclipse.ecf.ui/src;../org.eclipse.ecf.presence.collab.ui/src;../org.eclipse.ecf.osgi.services.discovery/src;../org.eclipse.ecf.examples.provider.trivial/src;../org.eclipse.ecf.storage/src;../org.eclipse.ecf.remoteservice.ui/src;../org.eclipse.ecf.server/src;../org.eclipse.ecf.osgi.services.discovery.local/src;../org.eclipse.ecf.provider.r_osgi/src;../org.eclipse.ecf.provider.zookeeper/src;../org.eclipse.ecf.remoteservice.eventadmin/src;../org.eclipse.ecf.protocol.bittorrent/src;../org.eclipse.ecf.provider.datashare.nio/src;../org.eclipse.ecf.osgi.services.distribution/src;../org.eclipse.ecf.provider.filetransfer/src;../org.eclipse.ecf.filetransfer.ui/src;../org.eclipse.ecf.remoteservice.rest/src;../org.eclipse.ecf.protocol.msn/src;../org.eclipse.ecf.provider.filetransfer.httpclient/src;../org.eclipse.ecf.discovery.ui/src;../org.eclipse.ecf.remoteservice/src;../org.eclipse.ecf.provider.localdiscovery/src;../org.eclipse.ecf.provider/src;../org.eclipse.ecf.datashare/src;../org.eclipse.ecf.presence.bot/src;src;../org.eclipse.ecf.discovery.ui.edit/src;../org.eclipse.ecf.presence.ui/src;../org.eclipse.ecf.telephony.call/src;../org.eclipse.ecf.sharedobject/src;../org.eclipse.ecf.sync/src;../org.eclipse.ecf.provider.discovery/src;../org.eclipse.ecf.provider.datashare/src;../org.eclipse.ecf.docshare/src;../org.eclipse.ecf.remoteservice.soap/src;../org.eclipse.ecf.discovery/src;../org.eclipse.ecf.provider.remoteservice/src;../org.eclipse.ecf.provider.jmdns/jmdns;../org.eclipse.ecf.presence/src;../org.eclipse.ecf.telephony.call.ui/src;../org.eclipse.ecf.examples.remoteservices.hello/src;../org.eclipse.ecf.provider.xmpp/src;../org.eclipse.ecf.discovery.ui.model/src;../org.eclipse.ecf.example.clients/src;../org.eclipse.ecf.server.generic/src;../org.eclipse.ecf.filetransfer/src;../org.eclipse.ecf.provider.jmdns/src" splitindex="true" use="true" version="true"/>
- </target>
-</project>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project default="javadoc">
+
+ <path id="files.classpath">
+ <fileset dir="${target}/">
+ <filename name="**/*.jar" />
+ </fileset>
+ </path>
+
+ <target name="javadoc">
+ <echo message="${target}"/>
+ <echo message="${source}"/>
+ <echo message="${output}"/>
+ <javadoc access="protected" additionalparam="-J-Xmx512m -tag model:a:Model -tag generated:a:Generated -tag noreference:tcmf:DoNotReference -tag ordered:a:Ordered -tag noimplement:a:NoImplement -tag noextend:a:NoExtend -tag ThreadSafe -tag Immutable "
+ author="false"
+ classpathref="files.classpath"
+ destdir="${output}"
+ doctitle="Eclipse Communication Framework (ECF) 3.4.0"
+ nodeprecated="false"
+ nodeprecatedlist="false"
+ noindex="false"
+ nonavbar="false"
+ notree="false"
+ source="1.5"
+ splitindex="true"
+ use="true"
+ version="true">
+
+ <fileset dir="${source}" defaultexcludes="true">
+ <include name="**/*.java"/>
+ <exclude name="**/util/**"/>
+ <exclude name="**/ui/**"/>
+ <exclude name="**/provider/**"/>
+ <exclude name="**/smack/**"/>
+ <exclude name="**/incubation/**"/>
+ <exclude name="**/internal/**"/>
+ <exclude name="**/ch/**"/>
+ <exclude name="**/jmdns/**"/>
+ <exclude name="**/tests/**"/>
+ </fileset>
+ </javadoc>
+ </target>
+</project>
diff --git a/eclipse/plugins/org.eclipse.ecf/src/org/eclipse/ecf/core/AbstractContainer.java b/eclipse/plugins/org.eclipse.ecf/src/org/eclipse/ecf/core/AbstractContainer.java
index 07d931e..d87399f 100644
--- a/eclipse/plugins/org.eclipse.ecf/src/org/eclipse/ecf/core/AbstractContainer.java
+++ b/eclipse/plugins/org.eclipse.ecf/src/org/eclipse/ecf/core/AbstractContainer.java
@@ -14,7 +14,6 @@ import org.eclipse.ecf.core.events.ContainerDisposeEvent;
import org.eclipse.ecf.core.events.IContainerEvent;
import org.eclipse.ecf.core.security.*;
import org.eclipse.ecf.internal.core.ECFPlugin;
-import org.eclipse.ecf.internal.core.Messages;
/**
* Abstract implementation of IContainer. Provides implementations of listener
@@ -90,7 +89,7 @@ public abstract class AbstractContainer implements IContainer {
ObjectCallback cb = (ObjectCallback) callbacks[0];
pw = (String) cb.getObject();
} catch (Exception e) {
- throw new ContainerConnectException(Messages.AbstractContainer_Exception_Callback_Handler, e);
+ throw new ContainerConnectException("Exception in CallbackHandler.handle(<callbacks>)", e); //$NON-NLS-1$
}
return pw;
}
diff --git a/eclipse/plugins/org.eclipse.ecf/src/org/eclipse/ecf/core/BaseContainer.java b/eclipse/plugins/org.eclipse.ecf/src/org/eclipse/ecf/core/BaseContainer.java
index 94e6215..bf004c7 100644
--- a/eclipse/plugins/org.eclipse.ecf/src/org/eclipse/ecf/core/BaseContainer.java
+++ b/eclipse/plugins/org.eclipse.ecf/src/org/eclipse/ecf/core/BaseContainer.java
@@ -14,7 +14,6 @@ import org.eclipse.core.runtime.Assert;
import org.eclipse.ecf.core.identity.*;
import org.eclipse.ecf.core.provider.BaseContainerInstantiator;
import org.eclipse.ecf.core.security.IConnectContext;
-import org.eclipse.ecf.internal.core.Messages;
/**
* Base implementation of IContainer. Subclasses may be created to fill out the
@@ -37,7 +36,7 @@ public class BaseContainer extends AbstractContainer {
return new BaseContainer(IDFactory.getDefault().createStringID((String) parameters[0]));
}
} catch (IDCreateException e) {
- throw new ContainerCreateException(Messages.BaseContainer_EXCEPTION_COULD_NOT_CREATE_ID);
+ throw new ContainerCreateException("Could not create ID for basecontainer"); //$NON-NLS-1$
}
return new BaseContainer(nextBaseContainerID++);
}
@@ -66,7 +65,7 @@ public class BaseContainer extends AbstractContainer {
try {
this.id = IDFactory.getDefault().createLongID(idl);
} catch (IDCreateException e) {
- throw new ContainerCreateException(Messages.BaseContainer_EXCEPTION_COULD_NOT_CREATE_ID, e);
+ throw new ContainerCreateException("Could not create ID for basecontainer", e); //$NON-NLS-1$
}
}
@@ -82,7 +81,7 @@ public class BaseContainer extends AbstractContainer {
* org.eclipse.ecf.core.security.IConnectContext)
*/
public void connect(ID targetID, IConnectContext connectContext) throws ContainerConnectException {
- throw new ContainerConnectException(Messages.BaseContainer_EXCEPTION_CONNECT_NOT_SUPPORT);
+ throw new ContainerConnectException("Connect not supported"); //$NON-NLS-1$
}
/*
diff --git a/eclipse/plugins/org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerFactory.java b/eclipse/plugins/org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerFactory.java
index 28ed6f6..100df70 100644
--- a/eclipse/plugins/org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerFactory.java
+++ b/eclipse/plugins/org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerFactory.java
@@ -39,7 +39,7 @@ import org.eclipse.ecf.internal.core.*;
*/
public class ContainerFactory implements IContainerFactory, IContainerManager {
- public static final String BASE_CONTAINER_NAME = Messages.ContainerFactory_Base_Container_Name;
+ public static final String BASE_CONTAINER_NAME = "ecf.base"; //$NON-NLS-1$
static final Map containerdescriptions = new HashMap();
@@ -49,6 +49,8 @@ public class ContainerFactory implements IContainerFactory, IContainerManager {
private static IContainerFactory instance = null;
+ private volatile static boolean init = false;
+
static {
instance = new ContainerFactory();
}
@@ -71,7 +73,13 @@ public class ContainerFactory implements IContainerFactory, IContainerManager {
}
}
- public static IContainerFactory getDefault() {
+ public synchronized static IContainerFactory getDefault() {
+ if (init == false) {
+ // first mark the extension initalized because it initializeExtensions()
+ // eventually calls this method again
+ init = true;
+ ECFPlugin.getDefault().initializeExtensions();
+ }
return instance;
}
@@ -199,7 +207,7 @@ public class ContainerFactory implements IContainerFactory, IContainerManager {
*/
public ContainerTypeDescription[] getDescriptionsForContainerAdapter(Class containerAdapter) {
if (containerAdapter == null)
- throw new NullPointerException(Messages.ContainerFactory_Exception_Adapter_Not_Null);
+ throw new NullPointerException("containerAdapter cannot be null"); //$NON-NLS-1$
List result = new ArrayList();
List descriptions = getDescriptions();
for (Iterator i = descriptions.iterator(); i.hasNext();) {
@@ -272,7 +280,7 @@ public class ContainerFactory implements IContainerFactory, IContainerManager {
String method = "createContainer"; //$NON-NLS-1$
Trace.entering(ECFPlugin.PLUGIN_ID, ECFDebugOptions.METHODS_ENTERING, ContainerFactory.class, method, new Object[] {containerTypeDescription, Trace.getArgumentsString(parameters)});
if (containerTypeDescription == null)
- throwContainerCreateException(Messages.ContainerFactory_Exception_Create_Container, null, method);
+ throwContainerCreateException("ContainerTypeDescription cannot be null", null, method); //$NON-NLS-1$
ContainerTypeDescription cd = getDescription0(containerTypeDescription);
if (cd == null)
throwContainerCreateException("ContainerTypeDescription '" //$NON-NLS-1$
@@ -448,7 +456,7 @@ public class ContainerFactory implements IContainerFactory, IContainerManager {
Assert.isNotNull(container);
Assert.isNotNull(typeDescription);
ID containerID = container.getID();
- Assert.isNotNull(containerID, Messages.ContainerFactory_EXCEPTION_CONTAINER_ID_NOT_NULL);
+ Assert.isNotNull(containerID, "Container ID cannot be null"); //$NON-NLS-1$
ContainerEntry result = null;
synchronized (containers) {
result = (ContainerEntry) containers.put(containerID, new ContainerEntry(container, typeDescription));
diff --git a/eclipse/plugins/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/BaseContainerInstantiator.java b/eclipse/plugins/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/BaseContainerInstantiator.java
index 0919097..7519cef 100644
--- a/eclipse/plugins/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/BaseContainerInstantiator.java
+++ b/eclipse/plugins/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/BaseContainerInstantiator.java
@@ -15,7 +15,6 @@ import java.util.*;
import org.eclipse.core.runtime.IAdapterManager;
import org.eclipse.ecf.core.*;
import org.eclipse.ecf.internal.core.ECFPlugin;
-import org.eclipse.ecf.internal.core.Messages;
/**
* Default implemenation of {@link IContainerInstantiator}. ECF provider implementers
@@ -59,7 +58,7 @@ public class BaseContainerInstantiator implements IContainerInstantiator {
}
public IContainer createInstance(ContainerTypeDescription description, Object[] parameters) throws ContainerCreateException {
- throw new ContainerCreateException(Messages.BaseContainerInstantiator_EXCEPTION_CREATEINSTANCE_NOT_SUPPORTED);
+ throw new ContainerCreateException("createInstance not supported"); //$NON-NLS-1$
}
public String[] getSupportedAdapterTypes(ContainerTypeDescription description) {
diff --git a/eclipse/plugins/org.eclipse.ecf/src/org/eclipse/ecf/core/security/BooleanCallback.java b/eclipse/plugins/org.eclipse.ecf/src/org/eclipse/ecf/core/security/BooleanCallback.java
index c2179a1..f7176aa 100644
--- a/eclipse/plugins/org.eclipse.ecf/src/org/eclipse/ecf/core/security/BooleanCallback.java
+++ b/eclipse/plugins/org.eclipse.ecf/src/org/eclipse/ecf/core/security/BooleanCallback.java
@@ -8,8 +8,6 @@
******************************************************************************/
package org.eclipse.ecf.core.security;
-import org.eclipse.ecf.internal.core.Messages;
-
/**
* Callback that handles Boolean types
*
@@ -38,7 +36,7 @@ public class BooleanCallback implements Callback, java.io.Serializable {
*/
public BooleanCallback(String prompt) {
if (prompt == null)
- throw new IllegalArgumentException(Messages.BooleanCallback_EXCEPTION_INVALID_BOOLEAN_ARGUMENT);
+ throw new IllegalArgumentException("Prompt cannot be null"); //$NON-NLS-1$
this.prompt = prompt;
}
@@ -60,7 +58,7 @@ public class BooleanCallback implements Callback, java.io.Serializable {
*/
public BooleanCallback(String prompt, boolean defaultValue) {
if (prompt == null)
- throw new IllegalArgumentException(Messages.BooleanCallback_EXCEPTION_INVALID_BOOLEAN_ARGUMENT);
+ throw new IllegalArgumentException("Prompt cannot be null"); //$NON-NLS-1$
this.prompt = prompt;
this.defaultValue = defaultValue;
diff --git a/eclipse/plugins/org.eclipse.ecf/src/org/eclipse/ecf/core/security/NameCallback.java b/eclipse/plugins/org.eclipse.ecf/src/org/eclipse/ecf/core/security/NameCallback.java
index b8bb4d5..0e0115c 100644
--- a/eclipse/plugins/org.eclipse.ecf/src/org/eclipse/ecf/core/security/NameCallback.java
+++ b/eclipse/plugins/org.eclipse.ecf/src/org/eclipse/ecf/core/security/NameCallback.java
@@ -8,8 +8,6 @@
******************************************************************************/
package org.eclipse.ecf.core.security;
-import org.eclipse.ecf.internal.core.Messages;
-
/**
* Callback that handles String types
*
@@ -35,7 +33,7 @@ public class NameCallback implements Callback, java.io.Serializable {
*/
public NameCallback(String prompt) {
if (prompt == null)
- throw new IllegalArgumentException(Messages.BooleanCallback_EXCEPTION_INVALID_BOOLEAN_ARGUMENT);
+ throw new IllegalArgumentException("Prompt cannot be null"); //$NON-NLS-1$
this.prompt = prompt;
}
@@ -57,7 +55,7 @@ public class NameCallback implements Callback, java.io.Serializable {
*/
public NameCallback(String prompt, String defaultName) {
if (prompt == null)
- throw new IllegalArgumentException(Messages.BooleanCallback_EXCEPTION_INVALID_BOOLEAN_ARGUMENT);
+ throw new IllegalArgumentException("Prompt cannot be null"); //$NON-NLS-1$
this.prompt = prompt;
this.defaultName = defaultName;
}
diff --git a/eclipse/plugins/org.eclipse.ecf/src/org/eclipse/ecf/core/security/PassphraseCallback.java b/eclipse/plugins/org.eclipse.ecf/src/org/eclipse/ecf/core/security/PassphraseCallback.java
index 8f14358..67d2c7a 100644
--- a/eclipse/plugins/org.eclipse.ecf/src/org/eclipse/ecf/core/security/PassphraseCallback.java
+++ b/eclipse/plugins/org.eclipse.ecf/src/org/eclipse/ecf/core/security/PassphraseCallback.java
@@ -8,8 +8,6 @@
******************************************************************************/
package org.eclipse.ecf.core.security;
-import org.eclipse.ecf.internal.core.Messages;
-
/**
* Callback that handles passphrases
*
@@ -35,7 +33,7 @@ public class PassphraseCallback implements Callback, java.io.Serializable {
*/
public PassphraseCallback(String prompt) {
if (prompt == null)
- throw new IllegalArgumentException(Messages.BooleanCallback_EXCEPTION_INVALID_BOOLEAN_ARGUMENT);
+ throw new IllegalArgumentException("Prompt cannot be null"); //$NON-NLS-1$
this.prompt = prompt;
}
@@ -57,7 +55,7 @@ public class PassphraseCallback implements Callback, java.io.Serializable {
*/
public PassphraseCallback(String prompt, String defaultPassphrase) {
if (prompt == null)
- throw new IllegalArgumentException(Messages.BooleanCallback_EXCEPTION_INVALID_BOOLEAN_ARGUMENT);
+ throw new IllegalArgumentException("Prompt cannot be null"); //$NON-NLS-1$
this.prompt = prompt;
this.defaultPassphrase = defaultPassphrase;
}
diff --git a/eclipse/plugins/org.eclipse.ecf/src/org/eclipse/ecf/core/security/PasswordCallback.java b/eclipse/plugins/org.eclipse.ecf/src/org/eclipse/ecf/core/security/PasswordCallback.java
index d8fb35f..92a1c81 100644
--- a/eclipse/plugins/org.eclipse.ecf/src/org/eclipse/ecf/core/security/PasswordCallback.java
+++ b/eclipse/plugins/org.eclipse.ecf/src/org/eclipse/ecf/core/security/PasswordCallback.java
@@ -8,8 +8,6 @@
******************************************************************************/
package org.eclipse.ecf.core.security;
-import org.eclipse.ecf.internal.core.Messages;
-
/**
* Callback that handles passwords
*
@@ -35,7 +33,7 @@ public class PasswordCallback implements Callback, java.io.Serializable {
*/
public PasswordCallback(String prompt) {
if (prompt == null)
- throw new IllegalArgumentException(Messages.BooleanCallback_EXCEPTION_INVALID_BOOLEAN_ARGUMENT);
+ throw new IllegalArgumentException("Prompt cannot be null"); //$NON-NLS-1$
this.prompt = prompt;
}
@@ -57,7 +55,7 @@ public class PasswordCallback implements Callback, java.io.Serializable {
*/
public PasswordCallback(String prompt, String defaultPassword) {
if (prompt == null)
- throw new IllegalArgumentException(Messages.BooleanCallback_EXCEPTION_INVALID_BOOLEAN_ARGUMENT);
+ throw new IllegalArgumentException("Prompt cannot be null"); //$NON-NLS-1$
this.prompt = prompt;
this.defaultPassword = defaultPassword;
}
diff --git a/eclipse/plugins/org.eclipse.ecf/src/org/eclipse/ecf/core/status/SerializableMultiStatus.java b/eclipse/plugins/org.eclipse.ecf/src/org/eclipse/ecf/core/status/SerializableMultiStatus.java
index a903a07..3cb453b 100644
--- a/eclipse/plugins/org.eclipse.ecf/src/org/eclipse/ecf/core/status/SerializableMultiStatus.java
+++ b/eclipse/plugins/org.eclipse.ecf/src/org/eclipse/ecf/core/status/SerializableMultiStatus.java
@@ -17,16 +17,32 @@ public class SerializableMultiStatus extends SerializableStatus {
/**
* List of child statuses.
*/
- private IStatus[] children;
+ private IStatus[] children = new IStatus[0];
+
+ public SerializableMultiStatus(IStatus status) {
+ this(status.getPlugin(), status.getCode(), status.getMessage(), status.getException());
+ IStatus[] childs = status.getChildren();
+ if (childs != null) {
+ for (int i = 0; i < childs.length; i++) {
+ if (childs[i].isMultiStatus()) {
+ add(new SerializableMultiStatus(childs[i]));
+ } else {
+ add(new SerializableStatus(childs[i]));
+ }
+ }
+ }
+ }
public SerializableMultiStatus(MultiStatus multiStatus) {
this(multiStatus.getPlugin(), multiStatus.getCode(), multiStatus.getMessage(), multiStatus.getException());
IStatus[] childs = multiStatus.getChildren();
- for (int i = 0; i < childs.length; i++) {
- if (childs[i].isMultiStatus()) {
- add(new SerializableMultiStatus((MultiStatus) childs[i]));
- } else {
- add(new SerializableStatus(childs[i]));
+ if (childs != null) {
+ for (int i = 0; i < childs.length; i++) {
+ if (childs[i].isMultiStatus()) {
+ add(new SerializableMultiStatus(childs[i]));
+ } else {
+ add(new SerializableStatus(childs[i]));
+ }
}
}
}
@@ -35,20 +51,21 @@ public class SerializableMultiStatus extends SerializableStatus {
this(pluginId, code, message, exception);
Assert.isLegal(newChildren != null);
int maxSeverity = getSeverity();
- for (int i = 0; i < newChildren.length; i++) {
- Assert.isLegal(newChildren[i] != null);
- int severity = newChildren[i].getSeverity();
- if (severity > maxSeverity)
- maxSeverity = severity;
+ if (newChildren != null) {
+ for (int i = 0; i < newChildren.length; i++) {
+ Assert.isLegal(newChildren[i] != null);
+ int severity = newChildren[i].getSeverity();
+ if (severity > maxSeverity)
+ maxSeverity = severity;
+ }
+ this.children = new IStatus[newChildren.length];
+ System.arraycopy(newChildren, 0, this.children, 0, newChildren.length);
}
- this.children = new IStatus[newChildren.length];
setSeverity(maxSeverity);
- System.arraycopy(newChildren, 0, this.children, 0, newChildren.length);
}
public SerializableMultiStatus(String pluginId, int code, String message, Throwable exception) {
super(OK, pluginId, code, message, exception);
- children = new IStatus[0];
}
/**
diff --git a/eclipse/plugins/org.eclipse.ecf/src/org/eclipse/ecf/core/status/SerializableStatus.java b/eclipse/plugins/org.eclipse.ecf/src/org/eclipse/ecf/core/status/SerializableStatus.java
index 367ef9e..583819d 100644
--- a/eclipse/plugins/org.eclipse.ecf/src/org/eclipse/ecf/core/status/SerializableStatus.java
+++ b/eclipse/plugins/org.eclipse.ecf/src/org/eclipse/ecf/core/status/SerializableStatus.java
@@ -12,7 +12,6 @@ package org.eclipse.ecf.core.status;
import java.io.*;
import org.eclipse.core.runtime.*;
import org.eclipse.ecf.internal.core.ECFPlugin;
-import org.eclipse.osgi.util.NLS;
public class SerializableStatus implements IStatus, Serializable {
@@ -179,7 +178,9 @@ public class SerializableStatus implements IStatus, Serializable {
* a low-level exception, or <code>null</code> if not applicable
*/
protected void setException(Throwable exception) {
- this.exception = checkForSerializable(exception);
+ // null is never serializable (https://bugs.eclipse.org/328772)
+ if (exception != null)
+ this.exception = checkForSerializable(exception);
}
private Throwable checkForSerializable(Throwable exception2) {
@@ -188,7 +189,7 @@ public class SerializableStatus implements IStatus, Serializable {
oos = new ObjectOutputStream(new ByteArrayOutputStream());
oos.writeObject(exception2);
} catch (IOException e) {
- ECFPlugin.getDefault().log(new Status(IStatus.WARNING, ECFPlugin.PLUGIN_ID, IStatus.WARNING, NLS.bind("Exception {0} could not be serialized for SerializableStatus", exception2), e)); //$NON-NLS-1$
+ ECFPlugin.getDefault().log(new Status(IStatus.WARNING, ECFPlugin.PLUGIN_ID, IStatus.WARNING, "Exception " + exception2 + " could not be serialized for SerializableStatus", e)); //$NON-NLS-1$ //$NON-NLS-2$
// In this case, we'll create a new exception that can be serialized
return createNewExceptionFor(exception2);
} finally {
diff --git a/eclipse/plugins/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/ECFPlugin.java b/eclipse/plugins/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/ECFPlugin.java
index 3f7422b..c36c030 100644
--- a/eclipse/plugins/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/ECFPlugin.java
+++ b/eclipse/plugins/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/ECFPlugin.java
@@ -15,7 +15,7 @@ import org.eclipse.ecf.core.provider.IContainerInstantiator;
import org.eclipse.ecf.core.start.ECFStartJob;
import org.eclipse.ecf.core.start.IECFStart;
import org.eclipse.ecf.core.util.*;
-import org.eclipse.osgi.util.NLS;
+import org.eclipse.ecf.internal.core.identity.Activator;
import org.osgi.framework.*;
import org.osgi.service.log.LogService;
import org.osgi.util.tracker.ServiceTracker;
@@ -124,11 +124,27 @@ public class ECFPlugin implements BundleActivator {
this.registryManager = new ECFRegistryManager();
registry.addRegistryChangeListener(registryManager);
}
- containerFactoryServiceRegistration = ctxt.registerService(IContainerFactory.class.getName(), ContainerFactory.getDefault(), null);
- containerManagerServiceRegistration = ctxt.registerService(IContainerManager.class.getName(), ContainerFactory.getDefault(), null);
- setupContainerFactoryExtensionPoint(ctxt);
- setupContainerExtensionPoint(ctxt);
- setupStartExtensionPoint(ctxt);
+
+ // defer extension execution until first consumer calls
+ final ServiceFactory sf = new ServiceFactory() {
+ public Object getService(Bundle bundle, ServiceRegistration registration) {
+ return ContainerFactory.getDefault();
+ }
+
+ public void ungetService(Bundle bundle, ServiceRegistration registration, Object service) {
+ // NOP
+ }
+ };
+ containerFactoryServiceRegistration = ctxt.registerService(IContainerFactory.class.getName(), sf, null);
+ containerManagerServiceRegistration = ctxt.registerService(IContainerManager.class.getName(), sf, null);
+
+ // but eagerly start ECF startup extension
+ setupStartExtensionPoint(context);
+ }
+
+ public void initializeExtensions() {
+ setupContainerFactoryExtensionPoint(context);
+ setupContainerExtensionPoint(context);
}
public void stop(BundleContext ctxt) throws Exception {
@@ -188,7 +204,14 @@ public class ECFPlugin implements BundleActivator {
return context.getBundle();
}
+ private LogService systemLogService;
+
protected LogService getLogService() {
+ if (context == null) {
+ if (systemLogService == null)
+ systemLogService = new SystemLogService(PLUGIN_ID);
+ return systemLogService;
+ }
if (logServiceTracker == null) {
logServiceTracker = new ServiceTracker(this.context, LogService.class.getName(), null);
logServiceTracker.open();
@@ -241,7 +264,7 @@ public class ECFPlugin implements BundleActivator {
factory.removeDescription(cd);
Trace.trace(ECFPlugin.PLUGIN_ID, ECFDebugOptions.DEBUG, method + ".removed " + cd + " from factory"); //$NON-NLS-1$ //$NON-NLS-2$
} catch (final Exception e) {
- logException(new Status(IStatus.ERROR, getDefault().getBundle().getSymbolicName(), IStatus.ERROR, NLS.bind(Messages.ECFPlugin_Container_Name_Collision_Prefix, name, extension.getExtensionPointUniqueIdentifier()), null), method, e);
+ logException(new Status(IStatus.ERROR, getDefault().getBundle().getSymbolicName(), IStatus.ERROR, "ECF container factory with name=" + name + " already found. Ignoring registration for containerFactory extension point=" + extension.getExtensionPointUniqueIdentifier(), null), method, e); //$NON-NLS-1$//$NON-NLS-2$
}
}
}
@@ -286,6 +309,7 @@ public class ECFPlugin implements BundleActivator {
protected void addContainerFactoryExtensions(IConfigurationElement[] members) {
final String method = "addContainerFactoryExtensions"; //$NON-NLS-1$
Trace.entering(ECFPlugin.PLUGIN_ID, ECFDebugOptions.METHODS_ENTERING, ECFPlugin.class, method, members);
+ final IContainerFactory factory = ContainerFactory.getDefault();
// For each configuration element
for (int m = 0; m < members.length; m++) {
final IConfigurationElement member = members[m];
@@ -294,14 +318,26 @@ public class ECFPlugin implements BundleActivator {
Object exten = null;
String name = null;
try {
+ // Get value of containerFactory name attribute
+ name = member.getAttribute(NAME_ATTRIBUTE);
+ if (name != null) {
+ ContainerTypeDescription ctd = factory.getDescriptionByName(name);
+ // If we've got one already by this name, then we skip this new one
+ if (ctd != null) {
+ // log with warning
+ log(new Status(IStatus.WARNING, Activator.PLUGIN_ID, "Factory already has container type description with name=" + name + ". Ignoring extension from " + member.getContributor().getName())); //$NON-NLS-1$ //$NON-NLS-2$
+ // and continue
+ continue;
+ }
+ }
// The only required attribute is "class"
exten = member.createExecutableExtension(CLASS_ATTRIBUTE);
final String clazz = exten.getClass().getName();
- // Get name and get version, if available
- name = member.getAttribute(NAME_ATTRIBUTE);
+
if (name == null) {
name = clazz;
}
+
// Get description, if present
String description = member.getAttribute(DESCRIPTION_ATTRIBUTE);
if (description == null) {
@@ -316,10 +352,9 @@ public class ECFPlugin implements BundleActivator {
// Now make description instance
final ContainerTypeDescription scd = new ContainerTypeDescription(name, (IContainerInstantiator) exten, description, server, hidden);
- final IContainerFactory factory = ContainerFactory.getDefault();
-
if (factory.containsDescription(scd)) {
- throw new CoreException(new Status(IStatus.ERROR, getDefault().getBundle().getSymbolicName(), IStatus.ERROR, NLS.bind(Messages.ECFPlugin_Container_Name_Collision_Prefix, name, extension.getExtensionPointUniqueIdentifier()), null));
+ log(new Status(IStatus.WARNING, Activator.PLUGIN_ID, "Factory already has container type description=" + scd + ". Ignoring extension from " + member.getContributor().getName())); //$NON-NLS-1$ //$NON-NLS-2$
+ continue;
}
// Now add the description and we're ready to go.
factory.addDescription(scd);
@@ -327,7 +362,7 @@ public class ECFPlugin implements BundleActivator {
} catch (final CoreException e) {
logException(e.getStatus(), method, e);
} catch (final Exception e) {
- logException(new Status(IStatus.ERROR, getDefault().getBundle().getSymbolicName(), IStatus.ERROR, NLS.bind(Messages.ECFPlugin_Container_Name_Collision_Prefix, name, extension.getExtensionPointUniqueIdentifier()), null), method, e);
+ logException(new Status(IStatus.ERROR, getDefault().getBundle().getSymbolicName(), IStatus.ERROR, "ECF container factory with name=" + name + " already found. Ignoring registration for containerFactory extension point=" + extension.getExtensionPointUniqueIdentifier(), null), method, e); //$NON-NLS-1$ //$NON-NLS-2$
}
}
}
@@ -405,6 +440,8 @@ public class ECFPlugin implements BundleActivator {
}
public IExtensionRegistry getExtensionRegistry() {
+ if (context == null)
+ return null;
return (IExtensionRegistry) extensionRegistryTracker.getService();
}
@@ -489,6 +526,8 @@ public class ECFPlugin implements BundleActivator {
}
public IAdapterManager getAdapterManager() {
+ if (context == null)
+ return null;
// First, try to get the adapter manager via
if (adapterManagerTracker == null) {
adapterManagerTracker = new ServiceTracker(this.context, IAdapterManager.class.getName(), null);
diff --git a/eclipse/plugins/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/Messages.java b/eclipse/plugins/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/Messages.java
deleted file mode 100644
index 4bf8c57..0000000
--- a/eclipse/plugins/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/Messages.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2004 Composent, 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Composent, Inc. - initial API and implementation
- *****************************************************************************/
-
-package org.eclipse.ecf.internal.core;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.ecf.internal.core.messages"; //$NON-NLS-1$
- public static String AbstractContainer_Exception_Callback_Handler;
- public static String BaseContainer_EXCEPTION_CONNECT_NOT_SUPPORT;
- public static String BaseContainer_EXCEPTION_COULD_NOT_CREATE_ID;
- public static String BaseContainerInstantiator_EXCEPTION_CREATEINSTANCE_NOT_SUPPORTED;
- public static String BooleanCallback_EXCEPTION_INVALID_BOOLEAN_ARGUMENT;
- public static String ContainerFactory_Base_Container_Name;
- public static String ContainerFactory_Exception_Adapter_Not_Null;
- public static String ContainerFactory_EXCEPTION_CONTAINER_ID_NOT_NULL;
- public static String ContainerFactory_EXCEPTION_CONTAINERID_NOT_NULL;
- public static String ContainerFactory_Exception_Create_Container;
- public static String ECFPlugin_Container_Name_Collision_Prefix;
- static {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-
- private Messages() {
- // private null constructor
- }
-}
diff --git a/eclipse/plugins/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/messages.properties b/eclipse/plugins/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/messages.properties
deleted file mode 100644
index 19d3464..0000000
--- a/eclipse/plugins/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/messages.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-################################################################################
-# Copyright (c) 2004, 2007 Composent, 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
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Composent, Inc. - initial API and implementation
-################################################################################
-
-ContainerFactory_Base_Container_Name = ecf.base
-ContainerFactory_Exception_Create_Container = ContainerTypeDescription cannot be null
-ContainerFactory_Exception_Adapter_Not_Null = containerAdapter cannot be null
-ContainerFactory_EXCEPTION_CONTAINER_ID_NOT_NULL=container ID cannot be null
-ContainerFactory_EXCEPTION_CONTAINERID_NOT_NULL=Container ID cannot be null
-AbstractContainer_Exception_Callback_Handler = Exception in CallbackHandler.handle(<callbacks>)
-ECFPlugin_Container_Name_Collision_Prefix = ECF container factory with name {0} already found. Ignoring registration for containerFactory extension point {1}.
-BaseContainer_EXCEPTION_CONNECT_NOT_SUPPORT=Connect not supported
-BaseContainer_EXCEPTION_COULD_NOT_CREATE_ID=Could not create ID for basecontainer
-BaseContainerInstantiator_EXCEPTION_CREATEINSTANCE_NOT_SUPPORTED=createInstance not supported
-BooleanCallback_EXCEPTION_INVALID_BOOLEAN_ARGUMENT=Prompt cannot be null.
diff --git a/eclipse/plugins/org.eclipse.equinox.http.registry/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.http.registry/META-INF/MANIFEST.MF
index 0979faa..1ee48fb 100644
--- a/eclipse/plugins/org.eclipse.equinox.http.registry/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.http.registry/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %bundleName
Bundle-SymbolicName: org.eclipse.equinox.http.registry;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
Bundle-Activator: org.eclipse.equinox.http.registry.internal.Activator
Bundle-Localization: plugin
Require-Bundle: org.eclipse.equinox.common,
diff --git a/eclipse/plugins/org.eclipse.equinox.http.registry/src/org/eclipse/equinox/http/registry/internal/DefaultRegistryHttpContext.java b/eclipse/plugins/org.eclipse.equinox.http.registry/src/org/eclipse/equinox/http/registry/internal/DefaultRegistryHttpContext.java
index a9e66d6..5a63923 100644
--- a/eclipse/plugins/org.eclipse.equinox.http.registry/src/org/eclipse/equinox/http/registry/internal/DefaultRegistryHttpContext.java
+++ b/eclipse/plugins/org.eclipse.equinox.http.registry/src/org/eclipse/equinox/http/registry/internal/DefaultRegistryHttpContext.java
@@ -115,7 +115,7 @@ public class DefaultRegistryHttpContext implements HttpContext {
String path = resourceName.substring(0, lastSlash);
if (path.length() == 0)
path = "/"; //$NON-NLS-1$
- String file = resourceName.substring(lastSlash + 1);
+ String file = sanitizeEntryName(resourceName.substring(lastSlash + 1));
Enumeration entryPaths = bundle.findEntries(path, file, false);
if (entryPaths != null && entryPaths.hasMoreElements())
@@ -124,6 +124,29 @@ public class DefaultRegistryHttpContext implements HttpContext {
return null;
}
+ private String sanitizeEntryName(String name) {
+ StringBuffer buffer = null;
+ for (int i = 0; i < name.length(); i++) {
+ char c = name.charAt(i);
+ switch (c) {
+ case '*' :
+ case '\\' :
+ // we need to escape '*' and '\'
+ if (buffer == null) {
+ buffer = new StringBuffer(name.length() + 16);
+ buffer.append(name.substring(0, i));
+ }
+ buffer.append('\\').append(c);
+ break;
+ default :
+ if (buffer != null)
+ buffer.append(c);
+ break;
+ }
+ }
+ return (buffer == null) ? name : buffer.toString();
+ }
+
public Set getResourcePaths(String path) {
if (bundlePath != null)
path = bundlePath + path;
diff --git a/eclipse/plugins/org.eclipse.equinox.jsp.jasper/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.jsp.jasper/META-INF/MANIFEST.MF
index d97a24b..05fb0e2 100644
--- a/eclipse/plugins/org.eclipse.equinox.jsp.jasper/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.jsp.jasper/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %bundleName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-SymbolicName: org.eclipse.equinox.jsp.jasper
-Bundle-Version: 1.0.200.qualifier
+Bundle-Version: 1.0.201.qualifier
Bundle-Activator: org.eclipse.equinox.internal.jsp.jasper.Activator
Import-Package: javax.servlet;version="[2.4, 3.0)",
javax.servlet.http;version="[2.4, 3.0)",
diff --git a/eclipse/plugins/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/jsp/jasper/JspServlet.java b/eclipse/plugins/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/jsp/jasper/JspServlet.java
index 14068b0..5792818 100644
--- a/eclipse/plugins/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/jsp/jasper/JspServlet.java
+++ b/eclipse/plugins/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/jsp/jasper/JspServlet.java
@@ -168,7 +168,7 @@ public class JspServlet extends HttpServlet {
String path = resourceName.substring(0, lastSlash);
if (path.length() == 0)
path = "/"; //$NON-NLS-1$
- String file = resourceName.substring(lastSlash + 1);
+ String file = sanitizeEntryName(resourceName.substring(lastSlash + 1));
Enumeration entryPaths = bundle.findEntries(path, file, false);
if (entryPaths != null && entryPaths.hasMoreElements())
return (URL) entryPaths.nextElement();
@@ -176,6 +176,29 @@ public class JspServlet extends HttpServlet {
return delegate.getResource(name);
}
+ private String sanitizeEntryName(String name) {
+ StringBuffer buffer = null;
+ for (int i = 0; i < name.length(); i++) {
+ char c = name.charAt(i);
+ switch (c) {
+ case '*' :
+ case '\\' :
+ // we need to escape '*' and '\'
+ if (buffer == null) {
+ buffer = new StringBuffer(name.length() + 16);
+ buffer.append(name.substring(0, i));
+ }
+ buffer.append('\\').append(c);
+ break;
+ default :
+ if (buffer != null)
+ buffer.append(c);
+ break;
+ }
+ }
+ return (buffer == null) ? name : buffer.toString();
+ }
+
public InputStream getResourceAsStream(String name) {
try {
URL resourceURL = getResource(name);
diff --git a/eclipse/plugins/org.eclipse.equinox.launcher.carbon.macosx/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.launcher.carbon.macosx/META-INF/MANIFEST.MF
index 0d21e54..069a235 100644
--- a/eclipse/plugins/org.eclipse.equinox.launcher.carbon.macosx/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.launcher.carbon.macosx/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.equinox.launcher.carbon.macosx;singleton:=true
-Bundle-Version: 1.1.1.qualifier
+Bundle-Version: 1.1.2.qualifier
Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.2.0)"
Eclipse-PlatformFilter: (& (osgi.ws=carbon) (osgi.os=macosx) (|(osgi.arch=x86)(osgi.arch=ppc)) )
Bundle-Localization: launcher.carbon.macosx
diff --git a/eclipse/plugins/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/META-INF/MANIFEST.MF
index 807ab25..c7df9b3 100644
--- a/eclipse/plugins/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.equinox.launcher.cocoa.macosx.x86_64;singleton:=true
-Bundle-Version: 1.1.1.qualifier
+Bundle-Version: 1.1.2.qualifier
Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.2.0)"
Eclipse-PlatformFilter: (& (osgi.ws=cocoa) (osgi.os=macosx) (osgi.arch=x86_64) )
Bundle-Localization: launcher.cocoa.macosx.x86_64
diff --git a/eclipse/plugins/org.eclipse.equinox.launcher.cocoa.macosx/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.launcher.cocoa.macosx/META-INF/MANIFEST.MF
index 534d132..a284c15 100644
--- a/eclipse/plugins/org.eclipse.equinox.launcher.cocoa.macosx/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.launcher.cocoa.macosx/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.equinox.launcher.cocoa.macosx;singleton:=true
-Bundle-Version: 1.1.1.qualifier
+Bundle-Version: 1.1.2.qualifier
Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.2.0)"
Eclipse-PlatformFilter: (& (osgi.ws=cocoa) (osgi.os=macosx) (|(osgi.arch=x86)(osgi.arch=ppc)) )
Bundle-Localization: launcher.cocoa.macosx
diff --git a/eclipse/plugins/org.eclipse.equinox.launcher.gtk.aix.ppc64/.project b/eclipse/plugins/org.eclipse.equinox.launcher.gtk.aix.ppc64/.project
new file mode 100644
index 0000000..980375b
--- /dev/null
+++ b/eclipse/plugins/org.eclipse.equinox.launcher.gtk.aix.ppc64/.project
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.equinox.launcher.gtk.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.equinox.launcher.gtk.aix.ppc64/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.launcher.gtk.aix.ppc64/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..9b58379
--- /dev/null
+++ b/eclipse/plugins/org.eclipse.equinox.launcher.gtk.aix.ppc64/META-INF/MANIFEST.MF
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-Vendor: %providerName
+Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.aix.ppc64
+Bundle-Version: 1.0.0.qualifier
+Fragment-Host: org.eclipse.equinox.launcher;bundle-version="1.0.0"
+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=aix) (osgi.arch=ppc64))
+Bundle-Localization: launcher.gtk.aix.ppc64
+Eclipse-BundleShape: dir
diff --git a/eclipse/plugins/org.eclipse.equinox.launcher.carbon.macosx/about.html b/eclipse/plugins/org.eclipse.equinox.launcher.gtk.aix.ppc64/about.html
similarity index 100%
copy from eclipse/plugins/org.eclipse.equinox.launcher.carbon.macosx/about.html
copy to eclipse/plugins/org.eclipse.equinox.launcher.gtk.aix.ppc64/about.html
diff --git a/eclipse/plugins/org.eclipse.equinox.launcher.gtk.aix.ppc64/build.properties b/eclipse/plugins/org.eclipse.equinox.launcher.gtk.aix.ppc64/build.properties
new file mode 100644
index 0000000..7be314c
--- /dev/null
+++ b/eclipse/plugins/org.eclipse.equinox.launcher.gtk.aix.ppc64/build.properties
@@ -0,0 +1,7 @@
+bin.includes = META-INF/,\
+ eclipse_*.so,\
+ launcher.gtk.aix.ppc64.properties,\
+ about.html
+
+customBuildCallbacks=customBuildCallbacks.xml
+generateSourceBundle=false
diff --git a/eclipse/plugins/org.eclipse.equinox.launcher.carbon.macosx/customBuildCallbacks.xml b/eclipse/plugins/org.eclipse.equinox.launcher.gtk.aix.ppc64/customBuildCallbacks.xml
similarity index 100%
copy from eclipse/plugins/org.eclipse.equinox.launcher.carbon.macosx/customBuildCallbacks.xml
copy to eclipse/plugins/org.eclipse.equinox.launcher.gtk.aix.ppc64/customBuildCallbacks.xml
diff --git a/eclipse/plugins/org.eclipse.equinox.launcher.gtk.aix.ppc64/launcher.gtk.aix.ppc64.properties b/eclipse/plugins/org.eclipse.equinox.launcher.gtk.aix.ppc64/launcher.gtk.aix.ppc64.properties
new file mode 100644
index 0000000..425bb64
--- /dev/null
+++ b/eclipse/plugins/org.eclipse.equinox.launcher.gtk.aix.ppc64/launcher.gtk.aix.ppc64.properties
@@ -0,0 +1,12 @@
+###############################################################################
+# Copyright (c) 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
+###############################################################################
+pluginName = Equinox Launcher GTK AIX PPC64 Fragment
+providerName = Eclipse.org - Equinox
diff --git a/eclipse/plugins/org.eclipse.equinox.launcher.gtk.linux.ppc/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.launcher.gtk.linux.ppc/META-INF/MANIFEST.MF
index a90e479..90d6f67 100644
--- a/eclipse/plugins/org.eclipse.equinox.launcher.gtk.linux.ppc/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.launcher.gtk.linux.ppc/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.ppc;singleton:=true
-Bundle-Version: 1.1.1.qualifier
+Bundle-Version: 1.1.2.qualifier
Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.2.0)"
Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=ppc))
Bundle-Localization: launcher.gtk.linux.ppc
diff --git a/eclipse/plugins/org.eclipse.equinox.launcher.gtk.linux.ppc64/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.launcher.gtk.linux.ppc64/META-INF/MANIFEST.MF
index 0c55814..1df2f3e 100644
--- a/eclipse/plugins/org.eclipse.equinox.launcher.gtk.linux.ppc64/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.launcher.gtk.linux.ppc64/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.ppc64;singleton:=true
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.0.2.qualifier
Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.2.0)"
Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=ppc64))
Bundle-Localization: launcher.gtk.linux.ppc64
diff --git a/eclipse/plugins/org.eclipse.equinox.launcher.gtk.linux.x86/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.launcher.gtk.linux.x86/META-INF/MANIFEST.MF
index 4874f8a..1ce7aa5 100644
--- a/eclipse/plugins/org.eclipse.equinox.launcher.gtk.linux.x86/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.launcher.gtk.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.gtk.linux.x86;singleton:=true
-Bundle-Version: 1.1.1.qualifier
+Bundle-Version: 1.1.2.qualifier
Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.2.0)"
Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86))
Bundle-Localization: launcher.gtk.linux.x86
diff --git a/eclipse/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64/META-INF/MANIFEST.MF
index c1691e4..364f608 100644
--- a/eclipse/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.x86_64;singleton:=true
-Bundle-Version: 1.1.1.qualifier
+Bundle-Version: 1.1.2.qualifier
Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.2.0)"
Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86_64))
Bundle-Localization: launcher.gtk.linux.x86_64
diff --git a/eclipse/plugins/org.eclipse.equinox.launcher.gtk.solaris.sparc/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.launcher.gtk.solaris.sparc/META-INF/MANIFEST.MF
index 4c2df53..c60d378 100644
--- a/eclipse/plugins/org.eclipse.equinox.launcher.gtk.solaris.sparc/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.launcher.gtk.solaris.sparc/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.solaris.sparc;singleton:=true
-Bundle-Version: 1.1.1.qualifier
+Bundle-Version: 1.1.2.qualifier
Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.2.0)"
Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=solaris) (osgi.arch=sparc))
Bundle-Localization: launcher.gtk.solaris.sparc
diff --git a/eclipse/plugins/org.eclipse.equinox.launcher.gtk.solaris.x86/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.launcher.gtk.solaris.x86/META-INF/MANIFEST.MF
index cf6ad8a..f988fc0 100644
--- a/eclipse/plugins/org.eclipse.equinox.launcher.gtk.solaris.x86/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.launcher.gtk.solaris.x86/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.solaris.x86;singleton:=true
-Bundle-Version: 1.1.1.qualifier
+Bundle-Version: 1.1.2.qualifier
Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.2.0)"
Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=solaris) (osgi.arch=x86))
Bundle-Localization: launcher.gtk.solaris.x86
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 ae7748f..497120a 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.1.1.qualifier
+Bundle-Version: 1.1.2.qualifier
Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.2.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.hpux.ia64_32/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.launcher.motif.hpux.ia64_32/META-INF/MANIFEST.MF
index 8599977..5fda8d5 100644
--- a/eclipse/plugins/org.eclipse.equinox.launcher.motif.hpux.ia64_32/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.launcher.motif.hpux.ia64_32/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.equinox.launcher.motif.hpux.ia64_32;singleton:=true
-Bundle-Version: 1.1.1.qualifier
+Bundle-Version: 1.1.2.qualifier
Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.2.0)"
Bundle-Vendor: %providerName
Eclipse-PlatformFilter: (& (osgi.ws=motif) (osgi.os=hpux) (osgi.arch=ia64_32) )
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 bd375a7..bcd19b5 100644
--- 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.1.1.qualifier
+Bundle-Version: 1.1.2.qualifier
Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.2.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 1604561..705be99 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.1.1.qualifier
+Bundle-Version: 1.1.2.qualifier
Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.2.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.launcher.win32.win32.ia64/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.launcher.win32.win32.ia64/META-INF/MANIFEST.MF
index e69c7f3..bf49462 100644
--- a/eclipse/plugins/org.eclipse.equinox.launcher.win32.win32.ia64/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.launcher.win32.win32.ia64/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.equinox.launcher.win32.win32.ia64;singleton:=true
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.2.2.qualifier
Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.2.0)"
Eclipse-PlatformFilter: (& (osgi.ws=win32) (osgi.os=win32) (osgi.arch=ia64))
Bundle-Localization: launcher.win32.win32.ia64
diff --git a/eclipse/plugins/org.eclipse.equinox.launcher.win32.win32.x86/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.launcher.win32.win32.x86/META-INF/MANIFEST.MF
index dd5cfdc..ba4014b 100644
--- a/eclipse/plugins/org.eclipse.equinox.launcher.win32.win32.x86/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.launcher.win32.win32.x86/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.equinox.launcher.win32.win32.x86; singleton:=true
-Bundle-Version: 1.1.1.qualifier
+Bundle-Version: 1.1.2.qualifier
Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.2.0)"
Eclipse-PlatformFilter: (& (osgi.ws=win32) (osgi.os=win32) (osgi.arch=x86))
Bundle-Localization: launcher.win32.win32.x86
diff --git a/eclipse/plugins/org.eclipse.equinox.launcher.win32.win32.x86_64/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.launcher.win32.win32.x86_64/META-INF/MANIFEST.MF
index a5a4fb5..1f8f59e 100644
--- a/eclipse/plugins/org.eclipse.equinox.launcher.win32.win32.x86_64/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.launcher.win32.win32.x86_64/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.equinox.launcher.win32.win32.x86_64;singleton:=true
-Bundle-Version: 1.1.1.qualifier
+Bundle-Version: 1.1.2.qualifier
Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.2.0)"
Eclipse-PlatformFilter: (& (osgi.ws=win32) (osgi.os=win32) (osgi.arch=x86_64))
Bundle-Localization: launcher.win32.win32.x86_64
diff --git a/eclipse/plugins/org.eclipse.equinox.launcher.wpf.win32.x86/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.launcher.wpf.win32.x86/META-INF/MANIFEST.MF
index 6ca4a07..62809da 100644
--- a/eclipse/plugins/org.eclipse.equinox.launcher.wpf.win32.x86/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.launcher.wpf.win32.x86/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.equinox.launcher.wpf.win32.x86; singleton:=true
-Bundle-Version: 1.1.1.qualifier
+Bundle-Version: 1.1.2.qualifier
Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.2.0)"
Eclipse-PlatformFilter: (& (osgi.ws=wpf) (osgi.os=win32) (osgi.arch=x86))
Bundle-Localization: launcher.wpf.win32.x86
diff --git a/eclipse/plugins/org.eclipse.equinox.launcher/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.launcher/META-INF/MANIFEST.MF
index e0111e8..2b676ce 100644
--- a/eclipse/plugins/org.eclipse.equinox.launcher/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.launcher/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.equinox.launcher;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
Main-Class: org.eclipse.equinox.launcher.Main
Bundle-ClassPath: .
Bundle-Vendor: %providerName
diff --git a/eclipse/plugins/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.linux.s390/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.linux.s390/META-INF/MANIFEST.MF
index f81992a..57288ac 100644
--- a/eclipse/plugins/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.linux.s390/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.linux.s390/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.s390;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
Fragment-Host: org.eclipse.equinox.launcher;bundle-version="1.0.0"
Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=s390))
Bundle-Localization: launcher.gtk.linux.s390
diff --git a/eclipse/plugins/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.linux.s390x/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.linux.s390x/META-INF/MANIFEST.MF
index 87a2366..28fa3d0 100644
--- a/eclipse/plugins/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.linux.s390x/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.linux.s390x/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.s390x;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
Fragment-Host: org.eclipse.equinox.launcher;bundle-version="1.0.0"
Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=s390x))
Bundle-Localization: launcher.gtk.linux.s390x
diff --git a/eclipse/plugins/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.solaris.x86/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.solaris.x86/META-INF/MANIFEST.MF
index 5acb9fc..f988fc0 100644
--- a/eclipse/plugins/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.solaris.x86/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.solaris.x86/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.solaris.x86;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.2.qualifier
Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.2.0)"
Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=solaris) (osgi.arch=x86))
Bundle-Localization: launcher.gtk.solaris.x86
diff --git a/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.carbon.macosx/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.carbon.macosx/META-INF/MANIFEST.MF
index f0ca9a2..069a235 100644
--- a/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.carbon.macosx/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.carbon.macosx/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.equinox.launcher.carbon.macosx;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.2.qualifier
Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.2.0)"
Eclipse-PlatformFilter: (& (osgi.ws=carbon) (osgi.os=macosx) (|(osgi.arch=x86)(osgi.arch=ppc)) )
Bundle-Localization: launcher.carbon.macosx
diff --git a/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/META-INF/MANIFEST.MF
index c2d0db1..c7df9b3 100644
--- a/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.equinox.launcher.cocoa.macosx.x86_64;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.2.qualifier
Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.2.0)"
Eclipse-PlatformFilter: (& (osgi.ws=cocoa) (osgi.os=macosx) (osgi.arch=x86_64) )
Bundle-Localization: launcher.cocoa.macosx.x86_64
diff --git a/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.cocoa.macosx/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.cocoa.macosx/META-INF/MANIFEST.MF
index 62a4c00..a284c15 100644
--- a/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.cocoa.macosx/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.cocoa.macosx/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.equinox.launcher.cocoa.macosx;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.2.qualifier
Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.2.0)"
Eclipse-PlatformFilter: (& (osgi.ws=cocoa) (osgi.os=macosx) (|(osgi.arch=x86)(osgi.arch=ppc)) )
Bundle-Localization: launcher.cocoa.macosx
diff --git a/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.aix.ppc64/.project b/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.aix.ppc64/.project
new file mode 100644
index 0000000..980375b
--- /dev/null
+++ b/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.aix.ppc64/.project
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.equinox.launcher.gtk.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.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.aix.ppc64/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.aix.ppc64/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..9b58379
--- /dev/null
+++ b/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.aix.ppc64/META-INF/MANIFEST.MF
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-Vendor: %providerName
+Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.aix.ppc64
+Bundle-Version: 1.0.0.qualifier
+Fragment-Host: org.eclipse.equinox.launcher;bundle-version="1.0.0"
+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=aix) (osgi.arch=ppc64))
+Bundle-Localization: launcher.gtk.aix.ppc64
+Eclipse-BundleShape: dir
diff --git a/eclipse/plugins/org.eclipse.equinox.launcher.carbon.macosx/about.html b/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.aix.ppc64/about.html
similarity index 100%
copy from eclipse/plugins/org.eclipse.equinox.launcher.carbon.macosx/about.html
copy to eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.aix.ppc64/about.html
diff --git a/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.aix.ppc64/build.properties b/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.aix.ppc64/build.properties
new file mode 100644
index 0000000..7be314c
--- /dev/null
+++ b/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.aix.ppc64/build.properties
@@ -0,0 +1,7 @@
+bin.includes = META-INF/,\
+ eclipse_*.so,\
+ launcher.gtk.aix.ppc64.properties,\
+ about.html
+
+customBuildCallbacks=customBuildCallbacks.xml
+generateSourceBundle=false
diff --git a/eclipse/plugins/org.eclipse.equinox.launcher.carbon.macosx/customBuildCallbacks.xml b/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.aix.ppc64/customBuildCallbacks.xml
similarity index 100%
copy from eclipse/plugins/org.eclipse.equinox.launcher.carbon.macosx/customBuildCallbacks.xml
copy to eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.aix.ppc64/customBuildCallbacks.xml
diff --git a/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.aix.ppc64/launcher.gtk.aix.ppc64.properties b/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.aix.ppc64/launcher.gtk.aix.ppc64.properties
new file mode 100644
index 0000000..425bb64
--- /dev/null
+++ b/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.aix.ppc64/launcher.gtk.aix.ppc64.properties
@@ -0,0 +1,12 @@
+###############################################################################
+# Copyright (c) 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
+###############################################################################
+pluginName = Equinox Launcher GTK AIX PPC64 Fragment
+providerName = Eclipse.org - Equinox
diff --git a/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.ppc/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.ppc/META-INF/MANIFEST.MF
index 015b6bd..90d6f67 100644
--- a/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.ppc/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.ppc/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.ppc;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.2.qualifier
Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.2.0)"
Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=ppc))
Bundle-Localization: launcher.gtk.linux.ppc
diff --git a/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.ppc64/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.ppc64/META-INF/MANIFEST.MF
index ef15459..1df2f3e 100644
--- a/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.ppc64/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.ppc64/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.ppc64;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.2.qualifier
Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.2.0)"
Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=ppc64))
Bundle-Localization: launcher.gtk.linux.ppc64
diff --git a/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.x86/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.x86/META-INF/MANIFEST.MF
index 544b8c3..1ce7aa5 100644
--- a/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.x86/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.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.gtk.linux.x86;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.2.qualifier
Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.2.0)"
Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86))
Bundle-Localization: launcher.gtk.linux.x86
diff --git a/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.x86_64/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.x86_64/META-INF/MANIFEST.MF
index e2a8efc..364f608 100644
--- a/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.x86_64/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.x86_64/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.x86_64;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.2.qualifier
Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.2.0)"
Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86_64))
Bundle-Localization: launcher.gtk.linux.x86_64
diff --git a/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.solaris.sparc/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.solaris.sparc/META-INF/MANIFEST.MF
index db9f427..c60d378 100644
--- a/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.solaris.sparc/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.solaris.sparc/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.solaris.sparc;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.2.qualifier
Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.2.0)"
Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=solaris) (osgi.arch=sparc))
Bundle-Localization: launcher.gtk.solaris.sparc
diff --git a/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.aix.ppc/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.aix.ppc/META-INF/MANIFEST.MF
index 09d2a7c..497120a 100644
--- a/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.aix.ppc/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.launcher/fragments/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.1.0.qualifier
+Bundle-Version: 1.1.2.qualifier
Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.2.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/fragments/org.eclipse.equinox.launcher.motif.hpux.ia64_32/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.hpux.ia64_32/META-INF/MANIFEST.MF
index 3b9a7c1..5fda8d5 100644
--- a/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.hpux.ia64_32/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.hpux.ia64_32/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.equinox.launcher.motif.hpux.ia64_32;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.2.qualifier
Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.2.0)"
Bundle-Vendor: %providerName
Eclipse-PlatformFilter: (& (osgi.ws=motif) (osgi.os=hpux) (osgi.arch=ia64_32) )
diff --git a/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.linux.x86/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.linux.x86/META-INF/MANIFEST.MF
index 2ff0f8f..bcd19b5 100644
--- a/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.linux.x86/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.launcher/fragments/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.1.0.qualifier
+Bundle-Version: 1.1.2.qualifier
Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.2.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/fragments/org.eclipse.equinox.launcher.motif.solaris.sparc/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.solaris.sparc/META-INF/MANIFEST.MF
index 228b4b5..705be99 100644
--- a/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.solaris.sparc/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.launcher/fragments/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.1.0.qualifier
+Bundle-Version: 1.1.2.qualifier
Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.2.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.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.ia64/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.ia64/META-INF/MANIFEST.MF
index 0401283..bf49462 100644
--- a/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.ia64/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.ia64/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.equinox.launcher.win32.win32.ia64;singleton:=true
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.2.2.qualifier
Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.2.0)"
Eclipse-PlatformFilter: (& (osgi.ws=win32) (osgi.os=win32) (osgi.arch=ia64))
Bundle-Localization: launcher.win32.win32.ia64
diff --git a/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.x86/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.x86/META-INF/MANIFEST.MF
index 6abe8ba..ba4014b 100644
--- a/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.x86/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.x86/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.equinox.launcher.win32.win32.x86; singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.2.qualifier
Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.2.0)"
Eclipse-PlatformFilter: (& (osgi.ws=win32) (osgi.os=win32) (osgi.arch=x86))
Bundle-Localization: launcher.win32.win32.x86
diff --git a/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.x86_64/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.x86_64/META-INF/MANIFEST.MF
index 8675dc0..1f8f59e 100644
--- a/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.x86_64/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.x86_64/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.equinox.launcher.win32.win32.x86_64;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.2.qualifier
Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.2.0)"
Eclipse-PlatformFilter: (& (osgi.ws=win32) (osgi.os=win32) (osgi.arch=x86_64))
Bundle-Localization: launcher.win32.win32.x86_64
diff --git a/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.wpf.win32.x86/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.wpf.win32.x86/META-INF/MANIFEST.MF
index 01280ea..62809da 100644
--- a/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.wpf.win32.x86/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.wpf.win32.x86/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.equinox.launcher.wpf.win32.x86; singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.2.qualifier
Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.2.0)"
Eclipse-PlatformFilter: (& (osgi.ws=wpf) (osgi.os=win32) (osgi.arch=x86))
Bundle-Localization: launcher.wpf.win32.x86
diff --git a/eclipse/plugins/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java b/eclipse/plugins/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java
index da30753..82a5b3f 100644
--- a/eclipse/plugins/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java
+++ b/eclipse/plugins/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java
@@ -34,6 +34,7 @@ import org.eclipse.equinox.internal.launcher.Constants;
* @noinstantiate This class is not intended to be instantiated by clients.
*/
public class Main {
+
/**
* Indicates whether this instance is running in debug mode.
*/
@@ -855,7 +856,7 @@ public class Main {
for (int j = 0; j < entries.length; j++)
qualifiedPath += ", " + FILE_SCHEME + path + entries[j]; //$NON-NLS-1$
extensionProperties.put(PROP_CLASSPATH, qualifiedPath);
- mergeProperties(System.getProperties(), extensionProperties);
+ mergeProperties(System.getProperties(), extensionProperties, null);
if (inDevelopmentMode) {
String name = extensions[i];
if (name.startsWith(REFERENCE_SCHEME)) {
@@ -1745,7 +1746,7 @@ public class Main {
Properties configuration = baseConfiguration;
if (configuration == null || !getConfigurationLocation().equals(baseConfigurationLocation))
configuration = loadConfiguration(getConfigurationLocation());
- mergeProperties(System.getProperties(), configuration);
+ mergeProperties(System.getProperties(), configuration, null);
if ("false".equalsIgnoreCase(System.getProperty(PROP_CONFIG_CASCADED))) //$NON-NLS-1$
// if we are not cascaded then remove the parent property even if it was set.
System.getProperties().remove(PROP_SHARED_CONFIG_AREA);
@@ -1767,10 +1768,10 @@ public class Main {
else {
// if the parent we are about to read is the same as the base config we read above,
// just reuse the base
- configuration = baseConfiguration;
+ Properties sharedConfiguration = baseConfiguration;
if (!sharedConfigURL.equals(baseConfigurationLocation))
- configuration = loadConfiguration(sharedConfigURL);
- mergeProperties(System.getProperties(), configuration);
+ sharedConfiguration = loadConfiguration(sharedConfigURL);
+ mergeProperties(System.getProperties(), sharedConfiguration, configuration);
System.getProperties().put(PROP_SHARED_CONFIG_AREA, sharedConfigURL.toExternalForm());
if (debug)
System.out.println("Shared configuration location:\n " + sharedConfigURL.toExternalForm()); //$NON-NLS-1$
@@ -2482,7 +2483,8 @@ public class Main {
}
}
- private void mergeProperties(Properties destination, Properties source) {
+ private void mergeProperties(Properties destination, Properties source, Properties userConfiguration) {
+ final String EXT_OVERRIDE_USER = ".override.user"; //$NON-NLS-1$
if (destination == null || source == null)
return;
for (Enumeration e = source.keys(); e.hasMoreElements();) {
@@ -2498,6 +2500,23 @@ public class Main {
continue;
}
String value = source.getProperty(key);
+
+ // Check to see if we are supposed to override existing values from the user configuraiton.
+ // This is done only in the case of shared install where we have already set the user values
+ // but want to override them with values from the shared location's config.
+ if (userConfiguration != null && !key.endsWith(EXT_OVERRIDE_USER)) {
+ // check all levels to see if the "override" property was set
+ final String overrideKey = key + EXT_OVERRIDE_USER;
+ boolean shouldOverride = destination.getProperty(overrideKey) != null || source.getProperty(overrideKey) != null;
+ // only set the value if the user specified the override property and if the
+ // original property wasn't set by a commad-line arg
+ if (shouldOverride && !userConfiguration.contains(key)) {
+ destination.put(key, value);
+ continue;
+ }
+ }
+
+ // only set the value if it doesn't already exist to preserve ordering (command-line, user config, shared config)
if (destination.getProperty(key) == null)
destination.put(key, value);
}
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF
index 0bad3ef..4b1bcb6 100644
--- a/eclipse/plugins/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.equinox.p2.core;singleton:=true
-Bundle-Version: 2.0.2.qualifier
+Bundle-Version: 2.0.3.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.equinox.internal.p2.core.Activator
Bundle-Vendor: %providerName
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/StringPool.java b/eclipse/plugins/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/StringPool.java
deleted file mode 100644
index f7ff68c..0000000
--- a/eclipse/plugins/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/StringPool.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 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 - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.internal.p2.core;
-
-import java.util.HashMap;
-
-/**
- * A string pool is used for sharing strings in a way that eliminates duplicate
- * equal strings. A string pool instance can be maintained over a long period
- * of time, or used as a temporary structure during a string sharing pass over
- * a data structure.
- * <p>
- * This class is not intended to be subclassed by clients.
- * </p>
- */
-public final class StringPool {
- private int savings;
- private final HashMap<String, String> map = new HashMap<String, String>();
-
- /**
- * Creates a new string pool.
- */
- public StringPool() {
- super();
- }
-
- /**
- * Adds a <code>String</code> to the pool. Returns a <code>String</code>
- * that is equal to the argument but that is unique within this pool.
- * @param string The string to add to the pool
- * @return A string that is equal to the argument.
- */
- public String add(String string) {
- if (string == null)
- return string;
- String result = map.get(string);
- if (result != null) {
- if (result != string)
- savings += 44 + 2 * string.length();
- return result;
- }
- //explicitly copy the string to trim excess baggage
- String trim = new String(string.toCharArray());
- map.put(string, trim);
- return trim;
- }
-
- /**
- * Returns an estimate of the size in bytes that was saved by sharing strings in
- * the pool. In particular, this returns the size of all strings that were added to the
- * pool after an equal string had already been added. This value can be used
- * to estimate the effectiveness of a string sharing operation, in order to
- * determine if or when it should be performed again.
- *
- * In some cases this does not precisely represent the number of bytes that
- * were saved. For example, say the pool already contains string S1. Now
- * string S2, which is equal to S1 but not identical, is added to the pool five
- * times. This method will return the size of string S2 multiplied by the
- * number of times it was added, even though the actual savings in this case
- * is only the size of a single copy of S2.
- */
- public int getSavedStringCount() {
- return savings;
- }
-}
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 0fdb954..e5fb562 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
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.equinox.p2.director;singleton:=true
-Bundle-Version: 2.0.2.qualifier
+Bundle-Version: 2.0.3.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.equinox.internal.p2.director.DirectorActivator
Bundle-Vendor: %providerName
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 1d77cdc..48c0756 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
@@ -302,7 +302,7 @@ public class Projector {
// no need to add one here, since maxWeight is strictly greater than the
// maximal weight used so far.
- maxWeight = maxWeight.multiply(POWER);
+ maxWeight = maxWeight.multiply(POWER).multiply(BigInteger.valueOf(s.size()));
// Add the abstract variables
BigInteger abstractWeight = maxWeight.negate();
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.directorywatcher/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.p2.directorywatcher/META-INF/MANIFEST.MF
index 252df21..208e370 100644
--- a/eclipse/plugins/org.eclipse.equinox.p2.directorywatcher/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.p2.directorywatcher/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.equinox.p2.directorywatcher;singleton:=true
-Bundle-Version: 1.0.202.qualifier
+Bundle-Version: 1.0.203.qualifier
Bundle-Activator: org.eclipse.equinox.internal.provisional.p2.directorywatcher.Activator
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/internal/provisional/p2/directorywatcher/RepositoryListener.java b/eclipse/plugins/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/internal/provisional/p2/directorywatcher/RepositoryListener.java
index 36302dd..721a6d9 100644
--- a/eclipse/plugins/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/internal/provisional/p2/directorywatcher/RepositoryListener.java
+++ b/eclipse/plugins/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/internal/provisional/p2/directorywatcher/RepositoryListener.java
@@ -37,8 +37,8 @@ public class RepositoryListener extends DirectoryChangeListener {
public static final String ARTIFACT_REFERENCE = "artifact.reference"; //$NON-NLS-1$
public static final String FILE_LAST_MODIFIED = "file.lastModified"; //$NON-NLS-1$
public static final String FILE_NAME = "file.name"; //$NON-NLS-1$
- private final IMetadataRepository metadataRepository;
- private final CachingArtifactRepository artifactRepository;
+ private IMetadataRepository metadataRepository;
+ private CachingArtifactRepository artifactRepository;
// at any point in time currentFiles is the list of files/dirs that the watcher has seen and
// believes to be on disk.
private final Map<File, Long> currentFiles = new HashMap<File, Long>();
@@ -56,9 +56,22 @@ public class RepositoryListener extends DirectoryChangeListener {
* @param hidden <code>true</code> if the repository should be hidden, <code>false</code> if not.
*/
public RepositoryListener(String repositoryName, boolean hidden) {
- URI location = Activator.getDefaultRepositoryLocation(this, repositoryName);
- metadataRepository = initializeMetadataRepository(repositoryName, location, hidden);
- artifactRepository = initializeArtifactRepository(repositoryName, location, hidden);
+ Map<String, String> properties = null;
+ if (hidden) {
+ properties = new HashMap<String, String>();
+ properties.put(IRepository.PROP_SYSTEM, Boolean.TRUE.toString());
+ }
+ initialize(repositoryName, properties);
+ }
+
+ public RepositoryListener(String name, Map<String, String> properties) {
+ initialize(name, properties);
+ }
+
+ private void initialize(String name, Map<String, String> properties) {
+ URI location = Activator.getDefaultRepositoryLocation(this, name);
+ metadataRepository = initializeMetadataRepository(name, location, properties);
+ artifactRepository = initializeArtifactRepository(name, location, properties);
initializePublisher();
}
@@ -76,7 +89,7 @@ public class RepositoryListener extends DirectoryChangeListener {
info.setArtifactOptions(IPublisherInfo.A_INDEX | IPublisherInfo.A_NO_MD5);
}
- protected CachingArtifactRepository initializeArtifactRepository(String repositoryName, URI repositoryLocation, boolean hidden) {
+ protected CachingArtifactRepository initializeArtifactRepository(String name, URI repositoryLocation, Map<String, String> properties) {
IArtifactRepositoryManager manager = Activator.getArtifactRepositoryManager();
if (manager == null)
throw new IllegalStateException(Messages.artifact_repo_manager_not_registered);
@@ -88,12 +101,6 @@ public class RepositoryListener extends DirectoryChangeListener {
//fall through and create a new repository
}
try {
- String name = repositoryName;
- Map<String, String> properties = new HashMap<String, String>(1);
- if (hidden) {
- properties.put(IRepository.PROP_SYSTEM, Boolean.TRUE.toString());
- name = "artifact listener " + repositoryName; //$NON-NLS-1$
- }
IArtifactRepository result = manager.createRepository(repositoryLocation, name, IArtifactRepositoryManager.TYPE_SIMPLE_REPOSITORY, properties);
return result == null ? null : new CachingArtifactRepository(result);
} catch (ProvisionException e) {
@@ -102,7 +109,7 @@ public class RepositoryListener extends DirectoryChangeListener {
}
}
- protected IMetadataRepository initializeMetadataRepository(String repositoryName, URI repositoryLocation, boolean hidden) {
+ protected IMetadataRepository initializeMetadataRepository(String name, URI repositoryLocation, Map<String, String> properties) {
IMetadataRepositoryManager manager = Activator.getMetadataRepositoryManager();
if (manager == null)
throw new IllegalStateException(Messages.metadata_repo_manager_not_registered);
@@ -113,12 +120,6 @@ public class RepositoryListener extends DirectoryChangeListener {
//fall through and create new repository
}
try {
- String name = repositoryName;
- Map<String, String> properties = new HashMap<String, String>(1);
- if (hidden) {
- properties.put(IRepository.PROP_SYSTEM, Boolean.TRUE.toString());
- name = "metadata listener " + repositoryName; //$NON-NLS-1$
- }
return manager.createRepository(repositoryLocation, name, IMetadataRepositoryManager.TYPE_SIMPLE_REPOSITORY, properties);
} catch (ProvisionException e) {
LogHelper.log(e);
@@ -213,10 +214,14 @@ public class RepositoryListener extends DirectoryChangeListener {
metadataRepository.removeInstallableUnits(changes);
// create a query that will identify all ius related to removed files.
- // It's safe to compare a String with a File since the auto coercion will
- // first convert the String into a File.
+ // We convert the java.io.File objects to Strings before doing the comparison
+ // because when we have large numbers of files, the performance is much better.
+ // See bug 324353.
+ Collection<String> paths = new HashSet<String>(removedFiles.size());
+ for (File file : removedFiles)
+ paths.add(file.getAbsolutePath());
IQuery<IInstallableUnit> removeQuery = QueryUtil.createMatchQuery( //
- "$1.exists(x | properties[$0] == x)", FILE_NAME, removedFiles); //$NON-NLS-1$
+ "$1.exists(x | properties[$0] == x)", FILE_NAME, paths); //$NON-NLS-1$
IQueryResult<IInstallableUnit> toRemove = metadataRepository.query(removeQuery, null);
metadataRepository.removeInstallableUnits(toRemove.toUnmodifiableSet());
}
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.discovery.compatibility/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.p2.discovery.compatibility/META-INF/MANIFEST.MF
index 6b13c01..8382b99 100644
--- a/eclipse/plugins/org.eclipse.equinox.p2.discovery.compatibility/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.p2.discovery.compatibility/META-INF/MANIFEST.MF
@@ -2,13 +2,15 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.equinox.p2.discovery.compatibility;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.1.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.3.0",
org.eclipse.equinox.p2.core;bundle-version="2.0.0",
org.eclipse.equinox.p2.discovery;bundle-version="1.0.0",
- org.eclipse.equinox.p2.repository;bundle-version="2.0.0"
+ org.eclipse.equinox.p2.repository;bundle-version="[2.0.0,2.1.0)"
Export-Package: org.eclipse.equinox.internal.p2.discovery.compatibility;x-friends:="org.eclipse.equinox.p2.ui.discovery",
org.eclipse.equinox.internal.p2.discovery.compatibility.util;x-friends:="org.eclipse.equinox.p2.ui.discovery"
Bundle-Localization: plugin
+Bundle-Activator: org.eclipse.equinox.internal.p2.discovery.compatibility.Activator
+Bundle-ActivationPolicy: lazy
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.discovery.compatibility/src/org/eclipse/equinox/internal/p2/discovery/compatibility/Activator.java b/eclipse/plugins/org.eclipse.equinox.p2.discovery.compatibility/src/org/eclipse/equinox/internal/p2/discovery/compatibility/Activator.java
new file mode 100644
index 0000000..6210e04
--- /dev/null
+++ b/eclipse/plugins/org.eclipse.equinox.p2.discovery.compatibility/src/org/eclipse/equinox/internal/p2/discovery/compatibility/Activator.java
@@ -0,0 +1,47 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Sonatype, Inc.
+ * 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:
+ * Sonatype, Inc. - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.equinox.internal.p2.discovery.compatibility;
+
+import org.eclipse.core.runtime.Plugin;
+import org.eclipse.equinox.internal.p2.discovery.compatibility.util.CacheManager;
+import org.eclipse.equinox.internal.p2.repository.RepositoryTransport;
+import org.osgi.framework.BundleContext;
+
+public class Activator extends Plugin {
+
+ private static Activator plugin;
+
+ private CacheManager manager;
+
+ public static final String ID = "org.eclipse.equinox.p2.discovery.compatibility"; //$NON-NLS-1$
+
+ public void start(BundleContext context) throws Exception {
+ super.start(context);
+ plugin = this;
+ }
+
+ public void stop(BundleContext context) throws Exception {
+ super.stop(context);
+ plugin = null;
+ }
+
+ public static Activator getDefault() {
+ return plugin;
+ }
+
+ public synchronized CacheManager getCacheManager() {
+ if (manager == null) {
+ manager = new CacheManager(new RepositoryTransport());
+ }
+ return manager;
+ }
+}
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.discovery.compatibility/src/org/eclipse/equinox/internal/p2/discovery/compatibility/Messages.java b/eclipse/plugins/org.eclipse.equinox.p2.discovery.compatibility/src/org/eclipse/equinox/internal/p2/discovery/compatibility/Messages.java
index 3e334b2..5626eaa 100644
--- a/eclipse/plugins/org.eclipse.equinox.p2.discovery.compatibility/src/org/eclipse/equinox/internal/p2/discovery/compatibility/Messages.java
+++ b/eclipse/plugins/org.eclipse.equinox.p2.discovery.compatibility/src/org/eclipse/equinox/internal/p2/discovery/compatibility/Messages.java
@@ -7,6 +7,7 @@
*
* Contributors:
* Tasktop Technologies - initial API and implementation
+ * Sonatype, Inc. - added caching support
*******************************************************************************/
package org.eclipse.equinox.internal.p2.discovery.compatibility;
@@ -16,7 +17,7 @@ import org.eclipse.osgi.util.NLS;
/**
* @author David Green
*/
-class Messages extends NLS {
+public class Messages extends NLS {
private static final String BUNDLE_NAME = "org.eclipse.equinox.internal.p2.discovery.compatibility.messages"; //$NON-NLS-1$
@@ -30,6 +31,14 @@ class Messages extends NLS {
public static String BundleDiscoveryStrategy_unexpected_element;
+ public static String CacheManager_AuthenticationFaileFor_0;
+
+ public static String CacheManager_FailedCommunication_0;
+
+ public static String CacheManager_Neither_0_nor_1_found;
+
+ public static String CacheManage_ErrorRenamingCache;
+
public static String ConnectorDiscoveryExtensionReader_Documents;
public static String ConnectorDiscoveryExtensionReader_Tasks;
@@ -74,6 +83,8 @@ class Messages extends NLS {
public static String SiteVerifier_Verify_Job_Label;
+ public static String TransportUtil_InternalError;
+
static {
// initialize resource bundle
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.discovery.compatibility/src/org/eclipse/equinox/internal/p2/discovery/compatibility/RemoteBundleDiscoveryStrategy.java b/eclipse/plugins/org.eclipse.equinox.p2.discovery.compatibility/src/org/eclipse/equinox/internal/p2/discovery/compatibility/RemoteBundleDiscoveryStrategy.java
index ddafba1..707aa94 100644
--- a/eclipse/plugins/org.eclipse.equinox.p2.discovery.compatibility/src/org/eclipse/equinox/internal/p2/discovery/compatibility/RemoteBundleDiscoveryStrategy.java
+++ b/eclipse/plugins/org.eclipse.equinox.p2.discovery.compatibility/src/org/eclipse/equinox/internal/p2/discovery/compatibility/RemoteBundleDiscoveryStrategy.java
@@ -7,6 +7,7 @@
*
* Contributors:
* Tasktop Technologies - initial API and implementation
+ * Sonatype, Inc. - added caching support
*******************************************************************************/
package org.eclipse.equinox.internal.p2.discovery.compatibility;
@@ -192,10 +193,6 @@ public class RemoteBundleDiscoveryStrategy extends BundleDiscoveryStrategy {
String bundleUrl = entry.getLocation();
for (int attemptCount = 0; attemptCount < maxDiscoveryJarDownloadAttempts; ++attemptCount) {
try {
- if (!bundleUrl.startsWith("http://") && !bundleUrl.startsWith("https://")) { //$NON-NLS-1$//$NON-NLS-2$
- LogHelper.log(new Status(IStatus.WARNING, DiscoveryCore.ID_PLUGIN, NLS.bind(Messages.RemoteBundleDiscoveryStrategy_unrecognized_discovery_url, bundleUrl)));
- continue;
- }
String lastPathElement = bundleUrl.lastIndexOf('/') == -1 ? bundleUrl : bundleUrl.substring(bundleUrl.lastIndexOf('/'));
File target = File.createTempFile(lastPathElement.replaceAll("^[a-zA-Z0-9_.]", "_") + "_", ".jar", temporaryStorage); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$
@@ -217,6 +214,8 @@ public class RemoteBundleDiscoveryStrategy extends BundleDiscoveryStrategy {
if (isUnknownHostException(e)) {
break;
}
+ } catch (CoreException e) {
+ LogHelper.log(new Status(IStatus.ERROR, DiscoveryCore.ID_PLUGIN, NLS.bind(Messages.RemoteBundleDiscoveryStrategy_cannot_download_bundle, bundleUrl, e.getMessage()), e));
}
}
return this;
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.discovery.compatibility/src/org/eclipse/equinox/internal/p2/discovery/compatibility/messages.properties b/eclipse/plugins/org.eclipse.equinox.p2.discovery.compatibility/src/org/eclipse/equinox/internal/p2/discovery/compatibility/messages.properties
index d4c1a86..f20bfad 100644
--- a/eclipse/plugins/org.eclipse.equinox.p2.discovery.compatibility/src/org/eclipse/equinox/internal/p2/discovery/compatibility/messages.properties
+++ b/eclipse/plugins/org.eclipse.equinox.p2.discovery.compatibility/src/org/eclipse/equinox/internal/p2/discovery/compatibility/messages.properties
@@ -7,12 +7,17 @@
#
# Contributors:
# Tasktop Technologies - initial API and implementation
+# Sonatype, Inc. - added caching support
###############################################################################
BundleDiscoveryStrategy_3={0}: {1}
BundleDiscoveryStrategy_categoryDisallowed=Cannot create category ''{0}'' with id ''{1}'' from {2}: disallowed
BundleDiscoveryStrategy_task_loading_local_extensions=Loading local extensions
BundleDiscoveryStrategy_task_processing_extensions=Processing extensions
BundleDiscoveryStrategy_unexpected_element=unexpected element ''{0}''
+CacheManager_Neither_0_nor_1_found=Neither {0} nor {1} found.
+CacheManager_AuthenticationFaileFor_0=Authentication failed for {0}.
+CacheManager_FailedCommunication_0=Communication with {0} failed.
+CacheManage_ErrorRenamingCache=An error occurred while downloading {0}. The cache file {1} could not be renamed to {2}.
ConnectorDiscoveryExtensionReader_Documents=Documents
ConnectorDiscoveryExtensionReader_Tasks=Tasks
ConnectorDiscoveryExtensionReader_unexpected_element_icon=Unexpected element icon
@@ -35,3 +40,4 @@ RemoteBundleDiscoveryStrategy_unrecognized_discovery_url=Unrecognized discovery
SiteVerifier_Error_with_cause={0}: {1}
SiteVerifier_Unexpected_Error=Unexpected error while verifying site availability
SiteVerifier_Verify_Job_Label=Verifying availability
+TransportUtil_InternalError=Internal Error
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.discovery.compatibility/src/org/eclipse/equinox/internal/p2/discovery/compatibility/util/CacheManager.java b/eclipse/plugins/org.eclipse.equinox.p2.discovery.compatibility/src/org/eclipse/equinox/internal/p2/discovery/compatibility/util/CacheManager.java
new file mode 100644
index 0000000..adf3b99
--- /dev/null
+++ b/eclipse/plugins/org.eclipse.equinox.p2.discovery.compatibility/src/org/eclipse/equinox/internal/p2/discovery/compatibility/util/CacheManager.java
@@ -0,0 +1,218 @@
+/*******************************************************************************
+ * 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ * Cloudsmith Inc - additional implementation
+ * Sonatype, Inc. - additional implementation and p2 discovery support
+ *******************************************************************************/
+package org.eclipse.equinox.internal.p2.discovery.compatibility.util;
+
+import java.io.*;
+import java.net.URI;
+import org.eclipse.core.runtime.*;
+import org.eclipse.equinox.internal.p2.core.helpers.LogHelper;
+import org.eclipse.equinox.internal.p2.discovery.compatibility.Activator;
+import org.eclipse.equinox.internal.p2.discovery.compatibility.Messages;
+import org.eclipse.equinox.internal.p2.repository.AuthenticationFailedException;
+import org.eclipse.equinox.internal.p2.repository.RepositoryTransport;
+import org.eclipse.equinox.internal.provisional.p2.repository.IStateful;
+import org.eclipse.equinox.p2.core.ProvisionException;
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * A class to manage discovery cache files. Creating the cache files will place
+ * the file in the plugin state location in a cache directory.
+ */
+ at SuppressWarnings("restriction")
+public class CacheManager {
+
+ private static final String PREFIX = "discovery"; //$NON-NLS-1$
+
+ private static final String DOWNLOADING = "downloading"; //$NON-NLS-1$
+
+ private final RepositoryTransport transport;
+
+ /**
+ * IStateful implementation of BufferedOutputStream. Class is used to get the status from
+ * a download operation.
+ */
+ private static class StatefulStream extends BufferedOutputStream implements IStateful {
+ private IStatus status;
+
+ public StatefulStream(OutputStream stream) {
+ super(stream);
+ }
+
+ public IStatus getStatus() {
+
+ return status;
+ }
+
+ public void setStatus(IStatus aStatus) {
+ status = aStatus;
+ }
+
+ }
+
+ public CacheManager(RepositoryTransport transport) {
+ this.transport = transport;
+ }
+
+ /**
+ * Returns a hash of the location.
+ */
+ private int computeHash(URI location) {
+ return location.hashCode();
+ }
+
+ /**
+ * Returns a local cache file with the contents of the given remote location,
+ * or <code>null</code> if a local cache could not be created.
+ *
+ * @param location the remote location to be cached
+ * @param monitor a progress monitor
+ * @return A {@link File} object pointing to the cache file or <code>null</code>
+ * @throws FileNotFoundException if neither jar nor xml index file exists at given location
+ * @throws AuthenticationFailedException if jar not available and xml causes authentication fail
+ * @throws IOException on general IO errors
+ * @throws ProvisionException on any error (e.g. user cancellation, unknown host, malformed address, connection refused, etc.)
+ * @throws OperationCanceledException - if user cancelled
+ */
+ public File createCache(URI location, IProgressMonitor monitor) throws IOException, ProvisionException {
+ SubMonitor submonitor = SubMonitor.convert(monitor, 1000);
+ try {
+ File cacheFile = getCache(location);
+
+ boolean stale = true;
+ long lastModified = 0L;
+
+ if (cacheFile != null) {
+ lastModified = cacheFile.lastModified();
+ }
+ // get last modified on jar
+ long lastModifiedRemote = 0L;
+ // bug 269588 - server may return 0 when file exists, so extra flag is needed
+ try {
+ lastModifiedRemote = transport.getLastModified(location, submonitor.newChild(1));
+ if (lastModifiedRemote <= 0)
+ LogHelper.log(new Status(IStatus.WARNING, Activator.ID, "Server returned lastModified <= 0 for " + location)); //$NON-NLS-1$
+ } catch (AuthenticationFailedException e) {
+ // it is not meaningful to continue - the credentials are for the server
+ // do not pass the exception - it gives no additional meaningful user information
+ throw new ProvisionException(new Status(IStatus.ERROR, Activator.ID, ProvisionException.REPOSITORY_FAILED_AUTHENTICATION, NLS.bind(Messages.CacheManager_AuthenticationFaileFor_0, location), null));
+ } catch (CoreException e) {
+ throw new ProvisionException(e.getStatus());
+ } catch (OperationCanceledException e) {
+ // must pass this on
+ throw e;
+ }
+ if (submonitor.isCanceled())
+ throw new OperationCanceledException();
+ stale = lastModifiedRemote > lastModified || lastModifiedRemote <= 0;
+
+ if (!stale)
+ return cacheFile;
+
+ // The cache is stale or missing, so we need to update it from the remote location
+ cacheFile = getCacheFile(location);
+ updateCache(cacheFile, location, lastModifiedRemote, submonitor);
+ return cacheFile;
+ } finally {
+ submonitor.done();
+ }
+ }
+
+ /**
+ * Deletes the local cache file(s) for the given location
+ * @param location
+ */
+ void deleteCache(URI location) {
+ File cacheFile = getCache(location);
+ // delete the cache file if it exists
+ safeDelete(cacheFile);
+ // delete a resumable download if it exists
+ safeDelete(new File(new File(cacheFile.getParentFile(), DOWNLOADING), cacheFile.getName()));
+ }
+
+ /**
+ * Determines the local file paths of the locations potential cache file.
+ * @param location The location to compute the cache for
+ * @param PREFIX The prefix to use for this location
+ * @return A {@link File} array with the cache files for JAR and XML extensions.
+ */
+ private File getCache(URI location) {
+ File cacheFile = getCacheFile(location);
+ return cacheFile.exists() ? cacheFile : null;
+ }
+
+ private File getCacheFile(URI location) {
+ return new File(getCacheDirectory(), PREFIX + computeHash(location));
+ }
+
+ /**
+ * Returns the file corresponding to the data area to be used by the cache manager.
+ */
+ protected File getCacheDirectory() {
+ return Activator.getDefault().getStateLocation().append("cache").toFile(); //$NON-NLS-1$
+ }
+
+ private boolean safeDelete(File file) {
+ if (file.exists()) {
+ if (!file.delete()) {
+ file.deleteOnExit();
+ return true;
+ }
+ }
+ return false;
+ }
+
+ protected void updateCache(File cacheFile, URI remoteFile, long lastModifiedRemote, SubMonitor submonitor) throws FileNotFoundException, IOException, ProvisionException {
+ cacheFile.getParentFile().mkdirs();
+ File downloadDir = new File(cacheFile.getParentFile(), DOWNLOADING);
+ if (!downloadDir.exists())
+ downloadDir.mkdir();
+ File tempFile = new File(downloadDir, cacheFile.getName());
+ // Ensure that the file from a previous download attempt is removed
+ if (tempFile.exists())
+ safeDelete(tempFile);
+
+ tempFile.createNewFile();
+
+ StatefulStream stream = null;
+ try {
+ stream = new StatefulStream(new FileOutputStream(tempFile));
+ } catch (Exception e) {
+ throw new ProvisionException(new Status(IStatus.ERROR, Activator.ID, e.getMessage(), e));
+ }
+ IStatus result = null;
+ try {
+ submonitor.setWorkRemaining(1000);
+ result = transport.download(remoteFile, stream, submonitor.newChild(1000));
+ } catch (OperationCanceledException e) {
+ // need to pick up the status - a new operation canceled exception is thrown at the end
+ // as status will be CANCEL.
+ result = stream.getStatus();
+ } finally {
+ stream.close();
+ // If there was any problem fetching the file, delete the temp file
+ if (result == null || !result.isOK())
+ safeDelete(tempFile);
+ }
+ if (result.isOK()) {
+ if (cacheFile.exists())
+ safeDelete(cacheFile);
+ if (tempFile.renameTo(cacheFile))
+ return;
+ result = new Status(IStatus.ERROR, Activator.ID, NLS.bind(Messages.CacheManage_ErrorRenamingCache, new Object[] {remoteFile.toString(), tempFile.getAbsolutePath(), cacheFile.getAbsolutePath()}));
+ }
+
+ if (result.getSeverity() == IStatus.CANCEL || submonitor.isCanceled())
+ throw new OperationCanceledException();
+ throw new ProvisionException(result);
+ }
+}
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.discovery.compatibility/src/org/eclipse/equinox/internal/p2/discovery/compatibility/util/TransportUtil.java b/eclipse/plugins/org.eclipse.equinox.p2.discovery.compatibility/src/org/eclipse/equinox/internal/p2/discovery/compatibility/util/TransportUtil.java
index 22d9db1..59e9892 100644
--- a/eclipse/plugins/org.eclipse.equinox.p2.discovery.compatibility/src/org/eclipse/equinox/internal/p2/discovery/compatibility/util/TransportUtil.java
+++ b/eclipse/plugins/org.eclipse.equinox.p2.discovery.compatibility/src/org/eclipse/equinox/internal/p2/discovery/compatibility/util/TransportUtil.java
@@ -7,14 +7,16 @@
*
* Contributors:
* Tasktop Technologies - initial API and implementation
+ * Sonatype, Inc. - transport split and caching support
*******************************************************************************/
package org.eclipse.equinox.internal.p2.discovery.compatibility.util;
import java.io.*;
import java.net.URI;
import java.util.List;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.*;
+import org.eclipse.equinox.internal.p2.discovery.compatibility.Activator;
+import org.eclipse.equinox.internal.p2.discovery.compatibility.Messages;
import org.eclipse.equinox.internal.p2.repository.AuthenticationFailedException;
import org.eclipse.equinox.internal.p2.repository.RepositoryTransport;
@@ -47,13 +49,37 @@ public class TransportUtil {
* the monitor
* @throws IOException
* if a network or IO problem occurs
+ * @throws CoreException
*/
- public static void downloadResource(URI location, File target, IProgressMonitor monitor) throws IOException {
- OutputStream out = new BufferedOutputStream(new FileOutputStream(target));
+ public static void downloadResource(URI location, File target, IProgressMonitor monitor) throws IOException, CoreException {
+ CacheManager cm = Activator.getDefault().getCacheManager();
+ File cacheFile = cm.createCache(location, monitor);
+ if (cacheFile == null) {
+ throw new CoreException(new Status(IStatus.ERROR, Activator.ID, Messages.TransportUtil_InternalError));
+ }
+ copyStream(new BufferedInputStream(new FileInputStream(cacheFile)), true, new BufferedOutputStream(new FileOutputStream(target)), true);
+ }
+
+ public static int copyStream(InputStream in, boolean closeIn, OutputStream out, boolean closeOut) throws IOException {
try {
- RepositoryTransport.getInstance().download(location, out, monitor);
+ int written = 0;
+ byte[] buffer = new byte[16 * 1024];
+ int len;
+ while ((len = in.read(buffer)) != -1) {
+ out.write(buffer, 0, len);
+ written += len;
+ }
+ return written;
} finally {
- out.close();
+ try {
+ if (closeIn) {
+ in.close();
+ }
+ } finally {
+ if (closeOut) {
+ out.close();
+ }
+ }
}
}
@@ -71,7 +97,12 @@ public class TransportUtil {
* @throws CoreException
*/
public static void readResource(URI location, TextContentProcessor processor, IProgressMonitor monitor) throws IOException, CoreException {
- InputStream in = RepositoryTransport.getInstance().stream(location, monitor);
+ CacheManager cm = Activator.getDefault().getCacheManager();
+ File cacheFile = cm.createCache(location, monitor);
+ if (cacheFile == null) {
+ throw new CoreException(new Status(IStatus.ERROR, Activator.ID, Messages.TransportUtil_InternalError));
+ }
+ InputStream in = new BufferedInputStream(new FileInputStream(cacheFile));
try {
// FIXME how can the charset be determined?
BufferedReader reader = new BufferedReader(new InputStreamReader(in, "UTF-8")); //$NON-NLS-1$
@@ -101,7 +132,7 @@ public class TransportUtil {
int countFound = 0;
for (URI location : locations) {
try {
- RepositoryTransport.getInstance().getLastModified(location, monitor);
+ new RepositoryTransport().getLastModified(location, monitor);
if (one) {
return true;
}
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 d178f77..48d9847 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
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.equinox.p2.engine;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.1.qualifier
Bundle-Activator: org.eclipse.equinox.internal.p2.engine.EngineActivator
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/DownloadManager.java b/eclipse/plugins/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/DownloadManager.java
index 833aad8..8daa26b 100644
--- a/eclipse/plugins/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/DownloadManager.java
+++ b/eclipse/plugins/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/DownloadManager.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
+ * Copyright (c) 2007, 2011 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
@@ -11,8 +11,7 @@
*******************************************************************************/
package org.eclipse.equinox.internal.p2.engine;
-import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.*;
import org.eclipse.core.runtime.*;
import org.eclipse.equinox.internal.p2.engine.phases.Collect;
import org.eclipse.equinox.p2.core.IProvisioningAgent;
@@ -27,6 +26,25 @@ public class DownloadManager {
ArrayList<IArtifactRequest> requestsToProcess = new ArrayList<IArtifactRequest>();
private IProvisioningAgent agent = null;
+ /**
+ * This Comparator sorts the repositories such that local repositories are first.
+ * TODO: This is copied from the ProvisioningContext class. Can we combine them?
+ * See https://bugs.eclipse.org/335153.
+ */
+ private static final Comparator<IArtifactRepository> LOCAL_FIRST_COMPARATOR = new Comparator<IArtifactRepository>() {
+ private static final String FILE_PROTOCOL = "file"; //$NON-NLS-1$
+
+ public int compare(IArtifactRepository arg0, IArtifactRepository arg1) {
+ String protocol0 = arg0.getLocation().getScheme();
+ String protocol1 = arg1.getLocation().getScheme();
+ if (FILE_PROTOCOL.equals(protocol0) && !FILE_PROTOCOL.equals(protocol1))
+ return -1;
+ if (!FILE_PROTOCOL.equals(protocol0) && FILE_PROTOCOL.equals(protocol1))
+ return 1;
+ return 0;
+ }
+ };
+
public DownloadManager(ProvisioningContext context, IProvisioningAgent agent) {
provContext = context;
this.agent = agent;
@@ -74,6 +92,10 @@ public class DownloadManager {
IArtifactRepository[] repositories = repoQueryable.query(all, subMonitor.newChild(250)).toArray(IArtifactRepository.class);
if (repositories.length == 0)
return new Status(IStatus.ERROR, EngineActivator.ID, Messages.download_no_repository, new Exception(Collect.NO_ARTIFACT_REPOSITORIES_AVAILABLE));
+ // Although we get a sorted list back from the ProvisioningContext above, it
+ // gets unsorted when we convert the queryable into an array so we must re-sort it.
+ // See https://bugs.eclipse.org/335153.
+ Arrays.sort(repositories, LOCAL_FIRST_COMPARATOR);
fetch(repositories, subMonitor.newChild(500));
return overallStatus(monitor);
} finally {
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 d6b8e49..6dd9150 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
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.equinox.p2.metadata.generator;singleton:=true
-Bundle-Version: 1.0.200.qualifier
+Bundle-Version: 1.0.202.qualifier
Bundle-Activator: org.eclipse.equinox.internal.p2.metadata.generator.Activator
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/EclipseInstallGeneratorInfoProvider.java b/eclipse/plugins/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/EclipseInstallGeneratorInfoProvider.java
index 3b63dbf..a48dac7 100644
--- a/eclipse/plugins/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/EclipseInstallGeneratorInfoProvider.java
+++ b/eclipse/plugins/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/EclipseInstallGeneratorInfoProvider.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
+ * Copyright (c) 2007, 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
@@ -210,7 +210,6 @@ public class EclipseInstallGeneratorInfoProvider implements IGeneratorInfo {
result.setVersion("0.0.0"); //$NON-NLS-1$
result.setMarkedAsStarted(true);
result.setSpecialConfigCommands("mkdir(path:${installFolder}/dropins)"); //$NON-NLS-1$
- result.setSpecialUnconfigCommands("rmdir(path:${installFolder}/dropins)"); //$NON-NLS-1$
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 dd1c720..52afe4b 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
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.equinox.p2.metadata;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.1.qualifier
Bundle-Activator: org.eclipse.equinox.internal.p2.metadata.MetadataActivator
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -19,7 +19,8 @@ Export-Package: org.eclipse.equinox.internal.p2.metadata;
org.eclipse.equinox.p2.operations,
org.eclipse.equinox.p2.publisher,
org.eclipse.equinox.p2.ql,
- org.eclipse.equinox.p2.ui",
+ org.eclipse.equinox.p2.ui,
+ org.eclipse.equinox.p2.touchpoint.eclipse",
org.eclipse.equinox.internal.p2.metadata.expression;
x-friends:="org.eclipse.equinox.p2.artifact.repository,
org.eclipse.equinox.p2.directorywatcher,
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.reconciler.dropins/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.p2.reconciler.dropins/META-INF/MANIFEST.MF
index a0293d7..b6cae71 100644
--- a/eclipse/plugins/org.eclipse.equinox.p2.reconciler.dropins/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.p2.reconciler.dropins/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.equinox.p2.reconciler.dropins;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.2.qualifier
Bundle-Activator: org.eclipse.equinox.internal.p2.reconciler.dropins.Activator
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/Activator.java b/eclipse/plugins/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/Activator.java
index d182d0b..8abde42 100644
--- a/eclipse/plugins/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/Activator.java
+++ b/eclipse/plugins/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/Activator.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2007, 2011 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
@@ -68,7 +68,13 @@ public class Activator implements BundleActivator {
throw new IllegalStateException("MetadataRepositoryManager not registered."); //$NON-NLS-1$
ExtensionLocationMetadataRepositoryFactory factory = new ExtensionLocationMetadataRepositoryFactory();
factory.setAgent(agent);
- IMetadataRepository repository = factory.create(location, name, ExtensionLocationMetadataRepository.TYPE, properties);
+
+ // always compress repositories that we are creating.
+ Map<String, String> repositoryProperties = new HashMap<String, String>();
+ repositoryProperties.put(IRepository.PROP_COMPRESSED, Boolean.TRUE.toString());
+ if (properties != null)
+ repositoryProperties.putAll(properties);
+ IMetadataRepository repository = factory.create(location, name, ExtensionLocationMetadataRepository.TYPE, repositoryProperties);
//we need to add the concrete repository to the repository manager, or its properties will not be correct
((MetadataRepositoryManager) manager).addRepository(repository);
manager.setRepositoryProperty(location, IRepository.PROP_SYSTEM, String.valueOf(true));
@@ -110,7 +116,13 @@ public class Activator implements BundleActivator {
throw new IllegalStateException("ArtifactRepositoryManager not registered."); //$NON-NLS-1$
ExtensionLocationArtifactRepositoryFactory factory = new ExtensionLocationArtifactRepositoryFactory();
factory.setAgent(agent);
- IArtifactRepository repository = factory.create(location, name, ExtensionLocationArtifactRepository.TYPE, properties);
+
+ // always compress repositories that we are creating.
+ Map<String, String> repositoryProperties = new HashMap<String, String>();
+ repositoryProperties.put(IRepository.PROP_COMPRESSED, Boolean.TRUE.toString());
+ if (properties != null)
+ repositoryProperties.putAll(properties);
+ IArtifactRepository repository = factory.create(location, name, ExtensionLocationArtifactRepository.TYPE, repositoryProperties);
//we need to add the concrete repository to the repository manager, or its properties will not be correct
((ArtifactRepositoryManager) manager).addRepository(repository);
manager.setRepositoryProperty(location, IRepository.PROP_SYSTEM, String.valueOf(true));
@@ -470,7 +482,11 @@ public class Activator implements BundleActivator {
if (directories.isEmpty())
return;
- DropinsRepositoryListener listener = new DropinsRepositoryListener(getAgent(), DROPINS);
+ // we will compress the repositories and mark them hidden as "system" repos.
+ Map<String, String> properties = new HashMap<String, String>();
+ properties.put(IRepository.PROP_COMPRESSED, Boolean.TRUE.toString());
+ properties.put(IRepository.PROP_SYSTEM, Boolean.TRUE.toString());
+ DropinsRepositoryListener listener = new DropinsRepositoryListener(getAgent(), DROPINS, properties);
DirectoryWatcher watcher = new DirectoryWatcher(directories.toArray(new File[directories.size()]));
watcher.addListener(listener);
watcher.poll();
@@ -581,8 +597,11 @@ public class Activator implements BundleActivator {
List<File> dropinsDirectories = new ArrayList<File>();
// did the user specify one via System properties?
String watchedDirectoryProperty = bundleContext.getProperty(DROPINS_DIRECTORY);
- if (watchedDirectoryProperty != null)
+ if (watchedDirectoryProperty != null) {
+ // perform a variable substitution if necessary
+ watchedDirectoryProperty = substituteVariables(watchedDirectoryProperty);
dropinsDirectories.add(new File(watchedDirectoryProperty));
+ }
// always add the one in the Eclipse home directory
File root = getEclipseHome();
@@ -610,4 +629,30 @@ public class Activator implements BundleActivator {
return null;
return profileRegistry.getProfile(IProfileRegistry.SELF);
}
+
+ /*
+ * Perform variable substitution on the given string. Replace vars in the form %foo%
+ * with the equivalent property set in the System properties.
+ */
+ public static String substituteVariables(String path) {
+ if (path == null)
+ return path;
+ int beginIndex = path.indexOf('%');
+ // no variable
+ if (beginIndex == -1)
+ return path;
+ beginIndex++;
+ int endIndex = path.indexOf('%', beginIndex);
+ // no matching end % to indicate variable
+ if (endIndex == -1)
+ return path;
+ // get the variable name and do a lookup
+ String var = path.substring(beginIndex, endIndex);
+ if (var.length() == 0 || var.indexOf(File.pathSeparatorChar) != -1)
+ return path;
+ var = getContext().getProperty(var);
+ if (var == null)
+ return path;
+ return path.substring(0, beginIndex - 1) + var + path.substring(endIndex + 1);
+ }
}
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/DropinsRepositoryListener.java b/eclipse/plugins/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/DropinsRepositoryListener.java
index ddf584f..a6f63d2 100644
--- a/eclipse/plugins/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/DropinsRepositoryListener.java
+++ b/eclipse/plugins/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/DropinsRepositoryListener.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2010 IBM Corporation and others.
+ * Copyright (c) 2008, 2011 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
@@ -11,8 +11,6 @@
*******************************************************************************/
package org.eclipse.equinox.internal.p2.reconciler.dropins;
-import org.eclipse.equinox.p2.query.QueryUtil;
-
import java.io.*;
import java.net.URI;
import java.net.URISyntaxException;
@@ -28,6 +26,7 @@ import org.eclipse.equinox.p2.core.IProvisioningAgent;
import org.eclipse.equinox.p2.core.ProvisionException;
import org.eclipse.equinox.p2.metadata.IInstallableUnit;
import org.eclipse.equinox.p2.query.IQueryResult;
+import org.eclipse.equinox.p2.query.QueryUtil;
import org.eclipse.equinox.p2.repository.IRepository;
import org.eclipse.equinox.p2.repository.artifact.IArtifactRepository;
import org.eclipse.equinox.p2.repository.artifact.IArtifactRepositoryManager;
@@ -50,8 +49,8 @@ public class DropinsRepositoryListener extends RepositoryListener {
private List<IMetadataRepository> metadataRepositories = new ArrayList<IMetadataRepository>();
private List<IArtifactRepository> artifactRepositories = new ArrayList<IArtifactRepository>();
- public DropinsRepositoryListener(IProvisioningAgent agent, String repositoryName) {
- super(repositoryName, true);
+ public DropinsRepositoryListener(IProvisioningAgent agent, String repositoryName, Map<String, String> properties) {
+ super(repositoryName, properties);
this.agent = agent;
}
@@ -125,6 +124,7 @@ public class DropinsRepositoryListener extends RepositoryListener {
} else {
path = path.trim();
}
+ path = Activator.substituteVariables(path);
File linkedFile = new File(path);
if (!linkedFile.isAbsolute()) {
// link support is relative to the install root
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java b/eclipse/plugins/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java
index 5e5bea0..bfdc05e 100644
--- a/eclipse/plugins/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java
+++ b/eclipse/plugins/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java
@@ -702,6 +702,11 @@ public class ProfileSynchronizer {
* Execute the given plan.
*/
private IStatus executePlan(IProvisioningPlan plan, ProvisioningContext provisioningContext, IProgressMonitor monitor) {
+ // the plan verifier has been given the opportunity to veto the plan. check to see if that was the case.
+ // warnings are ignored
+ if (plan.getStatus().getSeverity() == IStatus.ERROR)
+ return plan.getStatus();
+
IEngine engine = (IEngine) agent.getService(IEngine.SERVICE_NAME);
IPhaseSet phaseSet = PhaseSetFactory.createDefaultPhaseSetExcluding(new String[] {PhaseSetFactory.PHASE_COLLECT, PhaseSetFactory.PHASE_CHECK_TRUST});
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.repository/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.p2.repository/META-INF/MANIFEST.MF
index ca2653e..2212b0d 100644
--- a/eclipse/plugins/org.eclipse.equinox.p2.repository/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.p2.repository/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.equinox.p2.repository;singleton:=true
-Bundle-Version: 2.0.1.qualifier
+Bundle-Version: 2.0.2.qualifier
Bundle-Activator: org.eclipse.equinox.internal.p2.repository.Activator
Bundle-Vendor: %providerName
Bundle-Localization: plugin
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 6f4e444..f34da70 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
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
+ * Copyright (c) 2007, 2011 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,18 +10,16 @@
*******************************************************************************/
package org.eclipse.equinox.internal.p2.persistence;
-import org.eclipse.equinox.p2.metadata.Version;
-import org.eclipse.equinox.p2.metadata.VersionRange;
-
import java.net.*;
import java.util.List;
import java.util.StringTokenizer;
import javax.xml.parsers.*;
import org.eclipse.core.runtime.*;
import org.eclipse.equinox.internal.p2.core.Activator;
-import org.eclipse.equinox.internal.p2.core.StringPool;
import org.eclipse.equinox.internal.p2.core.helpers.OrderedProperties;
import org.eclipse.equinox.internal.p2.core.helpers.Tracing;
+import org.eclipse.equinox.p2.metadata.Version;
+import org.eclipse.equinox.p2.metadata.VersionRange;
import org.eclipse.osgi.util.NLS;
import org.osgi.framework.BundleContext;
import org.osgi.util.tracker.ServiceTracker;
@@ -45,7 +43,6 @@ public abstract class XMLParser extends DefaultHandler implements XMLConstants {
protected MultiStatus status = null; // accumulation of non-fatal errors
protected Locator locator = null; // document locator, if supported by the parser
- protected StringPool stringPool = new StringPool();//used to eliminate string duplication
private IProgressMonitor monitor;
private static ServiceTracker xmlTracker = null;
@@ -63,14 +60,6 @@ public abstract class XMLParser extends DefaultHandler implements XMLConstants {
return (status != null ? status : Status.OK_STATUS);
}
- /**
- * Returns the canonical form of a string. Used to eliminate duplicate equal
- * strings.
- */
- protected String canonicalize(String string) {
- return stringPool == null ? string : stringPool.add(string);
- }
-
public boolean isValidXML() {
return (status == null || !status.matches(IStatus.ERROR | IStatus.CANCEL));
}
@@ -321,7 +310,7 @@ public abstract class XMLParser extends DefaultHandler implements XMLConstants {
String[] result = new String[required.length + optional.length];
for (int i = 0; i < attributes.getLength(); i += 1) {
String name = attributes.getLocalName(i);
- String value = canonicalize(attributes.getValue(i).trim());
+ String value = attributes.getValue(i).trim().intern();
int j;
if ((j = indexOf(required, name)) >= 0) {
result[j] = value;
@@ -469,7 +458,7 @@ public abstract class XMLParser extends DefaultHandler implements XMLConstants {
}
protected void processCharacters(String data) {
- this.text = canonicalize(data);
+ this.text = data == null ? null : data.intern();
}
}
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/Messages.java b/eclipse/plugins/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/Messages.java
index daf6642..ccdee42 100644
--- a/eclipse/plugins/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/Messages.java
+++ b/eclipse/plugins/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/Messages.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
+ * Copyright (c) 2007, 2011 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
@@ -79,6 +79,9 @@ public class Messages extends NLS {
public static String UnableToRead_0_TooManyAttempts;
public static String UnableToRead_0_UserCanceled;
+
+ public static String RepositoryTransport_failedReadRepo;
+
static {
// initialize resource bundles
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/RepositoryTransport.java b/eclipse/plugins/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/RepositoryTransport.java
index 3ab7b7a..e2a825a 100644
--- a/eclipse/plugins/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/RepositoryTransport.java
+++ b/eclipse/plugins/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/RepositoryTransport.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006-2009, IBM Corporation and other.
+ * Copyright (c) 2006, 2011 IBM Corporation and other.
* The code, documentation and other materials contained herein have been
* licensed under the Eclipse Public License - v 1.0 by the copyright holder
* listed above, as the Initial Contributor under such license. The text of
@@ -72,6 +72,11 @@ public class RepositoryTransport extends Transport {
// check that job ended ok - throw exceptions otherwise
IStatus result = reader.getResult();
+ if (result == null) {
+ String msg = NLS.bind(Messages.RepositoryTransport_failedReadRepo, toDownload);
+ DownloadStatus ds = new DownloadStatus(IStatus.ERROR, Activator.ID, ProvisionException.REPOSITORY_FAILED_READ, msg, null);
+ return statusOn(target, ds, reader);
+ }
if (result.getSeverity() == IStatus.CANCEL)
throw new UserCancelledException();
if (!result.isOK())
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/messages.properties b/eclipse/plugins/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/messages.properties
index 510885b..092c168 100644
--- a/eclipse/plugins/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/messages.properties
+++ b/eclipse/plugins/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/messages.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2007, 2009 IBM Corporation and others.
+# Copyright (c) 2007, 2011 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,3 +72,4 @@ FileTransport_cancelCheck=File Transport Cancel Handler
connection_to_0_failed_on_1_retry_attempt_2=Connection to {0} failed on {1}. Retry attempt {2} started
UnableToRead_0_TooManyAttempts=Unable to read repository at: {0}. Too many failed login attempts.
UnableToRead_0_UserCanceled=Unable to read repository at: {0}. Login canceled by user.
+RepositoryTransport_failedReadRepo=Error while reading from repository: {0}.
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.touchpoint.eclipse/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.p2.touchpoint.eclipse/META-INF/MANIFEST.MF
index a39151a..62fcbed 100644
--- a/eclipse/plugins/org.eclipse.equinox.p2.touchpoint.eclipse/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.p2.touchpoint.eclipse/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.equinox.p2.touchpoint.eclipse;singleton:=true
-Bundle-Version: 2.0.2.qualifier
+Bundle-Version: 2.0.3.qualifier
Bundle-Activator: org.eclipse.equinox.internal.p2.touchpoint.eclipse.Activator
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -20,6 +20,7 @@ Import-Package: javax.xml.parsers,
org.eclipse.equinox.internal.p2.core.helpers,
org.eclipse.equinox.internal.p2.engine,
org.eclipse.equinox.internal.p2.garbagecollector,
+ org.eclipse.equinox.internal.p2.metadata,
org.eclipse.equinox.internal.provisional.frameworkadmin,
org.eclipse.equinox.internal.provisional.p2.director;resolution:=optional,
org.eclipse.equinox.internal.provisional.p2.repository,
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Util.java b/eclipse/plugins/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Util.java
index d0cb5c6..982e90f 100644
--- a/eclipse/plugins/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Util.java
+++ b/eclipse/plugins/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Util.java
@@ -12,12 +12,14 @@
*******************************************************************************/
package org.eclipse.equinox.internal.p2.touchpoint.eclipse;
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
import java.net.*;
import java.util.*;
import org.eclipse.core.runtime.*;
import org.eclipse.equinox.frameworkadmin.BundleInfo;
import org.eclipse.equinox.internal.p2.core.helpers.*;
+import org.eclipse.equinox.internal.p2.metadata.IRequiredCapability;
import org.eclipse.equinox.p2.core.*;
import org.eclipse.equinox.p2.engine.IProfile;
import org.eclipse.equinox.p2.metadata.*;
@@ -25,10 +27,7 @@ import org.eclipse.equinox.p2.repository.IRepository;
import org.eclipse.equinox.p2.repository.artifact.*;
import org.eclipse.osgi.service.datalocation.Location;
import org.eclipse.osgi.service.environment.EnvironmentInfo;
-import org.eclipse.osgi.util.ManifestElement;
import org.eclipse.osgi.util.NLS;
-import org.osgi.framework.BundleException;
-import org.osgi.framework.Constants;
public class Util {
@@ -157,43 +156,48 @@ public class Util {
return listProperty;
}
- public static BundleInfo createBundleInfo(File bundleFile, String manifest) {
+ public static BundleInfo createBundleInfo(File bundleFile, IInstallableUnit unit) {
BundleInfo bundleInfo = new BundleInfo();
if (bundleFile != null)
bundleInfo.setLocation(bundleFile.toURI());
- bundleInfo.setManifest(manifest);
- try {
- @SuppressWarnings("unchecked")
- Map<String, String> headers = ManifestElement.parseBundleManifest(new ByteArrayInputStream(manifest.getBytes("UTF-8")), new HashMap<String, String>()); //$NON-NLS-1$
- ManifestElement[] element = ManifestElement.parseHeader("bsn", headers.get(Constants.BUNDLE_SYMBOLICNAME)); //$NON-NLS-1$
- if (element == null || element.length == 0)
- return null;
- bundleInfo.setSymbolicName(element[0].getValue());
-
- String version = headers.get(Constants.BUNDLE_VERSION);
- if (version == null)
- return null;
- // convert to a Version object first to ensure we are consistent with our version number w.r.t.
- // padding zeros at the end
- bundleInfo.setVersion(Version.parseVersion(version).toString());
-
- String fragmentHost = headers.get(Constants.FRAGMENT_HOST);
- if (fragmentHost != null)
- bundleInfo.setFragmentHost(fragmentHost.trim());
-
- } catch (BundleException e) {
- // unexpected
- LogHelper.log(new Status(IStatus.ERROR, Activator.ID, e.getMessage(), e));
- return null;
- } catch (IOException e) {
- // unexpected
- LogHelper.log(new Status(IStatus.ERROR, Activator.ID, e.getMessage(), e));
- return null;
+ Collection<IProvidedCapability> capabilities = unit.getProvidedCapabilities();
+ for (IProvidedCapability capability : capabilities) {
+ String nameSpace = capability.getNamespace();
+ if (nameSpace.equals("osgi.bundle")) { //$NON-NLS-1$
+ bundleInfo.setSymbolicName(capability.getName());
+ bundleInfo.setVersion(capability.getVersion().toString());
+ } else if (nameSpace.equals("osgi.fragment")) { //$NON-NLS-1$
+ String fragmentName = capability.getName();
+ String fragmentHost = getFragmentHost(unit, fragmentName);
+ // shouldn't happen as long as the metadata is well-formed
+ if (fragmentHost == null)
+ LogHelper.log(createError("Unable to find fragment host for IU: " + unit)); //$NON-NLS-1$
+ else
+ bundleInfo.setFragmentHost(fragmentHost);
+ bundleInfo.setVersion(capability.getVersion().toString());
+ }
}
return bundleInfo;
}
+ private static String getFragmentHost(IInstallableUnit unit, String fragmentName) {
+ Collection<IRequirement> requires = unit.getRequirements();
+ for (IRequirement iRequirement : requires) {
+ if (iRequirement instanceof IRequiredCapability) {
+ IRequiredCapability requiredCapability = (IRequiredCapability) iRequirement;
+ if (fragmentName.equals(requiredCapability.getName())) {
+ String fragmentHost = requiredCapability.getName();
+ if (!requiredCapability.getRange().toString().equals("0.0.0")) { //$NON-NLS-1$
+ fragmentHost += ";bundle-version=\"" + requiredCapability.getRange() + '"'; //$NON-NLS-1$
+ }
+ return fragmentHost;
+ }
+ }
+ }
+ return null;
+ }
+
public static File getArtifactFile(IProvisioningAgent agent, IArtifactKey artifactKey, IProfile profile) {
IFileArtifactRepository aggregatedView = getAggregatedBundleRepository(agent, profile);
File bundleJar = aggregatedView.getArtifactFile(artifactKey);
@@ -314,18 +318,6 @@ public class Util {
return null;
}
- public static String getManifest(Collection<ITouchpointData> data) {
- for (ITouchpointData td : data) {
- ITouchpointInstruction manifestInstruction = td.getInstruction("manifest"); //$NON-NLS-1$
- if (manifestInstruction == null)
- return null;
- String manifest = manifestInstruction.getBody();
- if (manifest != null && manifest.length() > 0)
- return manifest;
- }
- return null;
- }
-
public static IStatus createError(String message) {
return createError(message, null);
}
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/InstallBundleAction.java b/eclipse/plugins/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/InstallBundleAction.java
index fab1f90..4a2ecfe 100644
--- a/eclipse/plugins/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/InstallBundleAction.java
+++ b/eclipse/plugins/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/InstallBundleAction.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others. All rights reserved. This
+ * Copyright (c) 2008, 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
@@ -69,12 +69,7 @@ public class InstallBundleAction extends ProvisioningAction {
if (bundleFile == null || !bundleFile.exists())
return Util.createError(NLS.bind(Messages.artifact_file_not_found, artifactKey));
- //By now we always have the manifest in the touchpoint data
- String manifest = Util.getManifest(iu.getTouchpointData());
- if (manifest == null)
- return Util.createError(NLS.bind(Messages.missing_manifest, iu));
-
- BundleInfo bundleInfo = Util.createBundleInfo(bundleFile, manifest);
+ BundleInfo bundleInfo = Util.createBundleInfo(bundleFile, iu);
if (bundleInfo == null)
return Util.createError(NLS.bind(Messages.failed_bundleinfo, iu));
manipulator.getConfigData().addBundle(bundleInfo);
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/MarkStartedAction.java b/eclipse/plugins/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/MarkStartedAction.java
index 52e1f68..832c147 100644
--- a/eclipse/plugins/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/MarkStartedAction.java
+++ b/eclipse/plugins/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/MarkStartedAction.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2009 IBM Corporation and others.
+ * Copyright (c) 2008, 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
@@ -47,11 +47,7 @@ public class MarkStartedAction extends ProvisioningAction {
// the bundleFile might be null here, that's OK.
File bundleFile = Util.getArtifactFile(agent, artifactKey, profile);
- String manifest = Util.getManifest(iu.getTouchpointData());
- if (manifest == null)
- return Util.createError(NLS.bind(Messages.missing_manifest, iu));
-
- BundleInfo bundleInfo = Util.createBundleInfo(bundleFile, manifest);
+ BundleInfo bundleInfo = Util.createBundleInfo(bundleFile, iu);
if (bundleInfo == null)
return Util.createError(NLS.bind(Messages.failed_bundleinfo, iu));
@@ -87,11 +83,7 @@ public class MarkStartedAction extends ProvisioningAction {
// the bundleFile might be null here, that's OK.
File bundleFile = Util.getArtifactFile(agent, artifactKey, profile);
- String manifest = Util.getManifest(iu.getTouchpointData());
- if (manifest == null)
- return Util.createError(NLS.bind(Messages.missing_manifest, iu));
-
- BundleInfo bundleInfo = Util.createBundleInfo(bundleFile, manifest);
+ BundleInfo bundleInfo = Util.createBundleInfo(bundleFile, iu);
if (bundleInfo == null)
return Util.createError(NLS.bind(Messages.failed_bundleinfo, iu));
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/SetStartLevelAction.java b/eclipse/plugins/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/SetStartLevelAction.java
index 9d2f3c4..9452c71 100644
--- a/eclipse/plugins/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/SetStartLevelAction.java
+++ b/eclipse/plugins/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/SetStartLevelAction.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2009 IBM Corporation and others.
+ * Copyright (c) 2008, 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
@@ -46,11 +46,7 @@ public class SetStartLevelAction extends ProvisioningAction {
// the bundleFile might be null here, that's OK.
File bundleFile = Util.getArtifactFile(agent, artifactKey, profile);
- String manifest = Util.getManifest(iu.getTouchpointData());
- if (manifest == null)
- return Util.createError(NLS.bind(Messages.missing_manifest, iu));
-
- BundleInfo bundleInfo = Util.createBundleInfo(bundleFile, manifest);
+ BundleInfo bundleInfo = Util.createBundleInfo(bundleFile, iu);
if (bundleInfo == null)
return Util.createError(NLS.bind(Messages.failed_bundleinfo, iu));
@@ -90,11 +86,7 @@ public class SetStartLevelAction extends ProvisioningAction {
// the bundleFile might be null here, that's OK.
File bundleFile = Util.getArtifactFile(agent, artifactKey, profile);
- String manifest = Util.getManifest(iu.getTouchpointData());
- if (manifest == null)
- return Util.createError(NLS.bind(Messages.missing_manifest, iu));
-
- BundleInfo bundleInfo = Util.createBundleInfo(bundleFile, manifest);
+ BundleInfo bundleInfo = Util.createBundleInfo(bundleFile, iu);
if (bundleInfo == null)
return Util.createError(NLS.bind(Messages.failed_bundleinfo, iu));
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/UninstallBundleAction.java b/eclipse/plugins/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/UninstallBundleAction.java
index 0d40709..a20aae9 100644
--- a/eclipse/plugins/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/UninstallBundleAction.java
+++ b/eclipse/plugins/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/UninstallBundleAction.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others. All rights reserved. This
+ * Copyright (c) 2008, 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
@@ -68,11 +68,7 @@ public class UninstallBundleAction extends ProvisioningAction {
// the bundleFile might be null here, that's OK.
File bundleFile = Util.getArtifactFile(agent, artifactKey, profile);
- String manifest = Util.getManifest(iu.getTouchpointData());
- if (manifest == null)
- return Util.createError(NLS.bind(Messages.missing_manifest, iu));
-
- BundleInfo bundleInfo = Util.createBundleInfo(bundleFile, manifest);
+ BundleInfo bundleInfo = Util.createBundleInfo(bundleFile, iu);
if (bundleInfo == null)
return Util.createError(NLS.bind(Messages.failed_bundleinfo, iu));
manipulator.getConfigData().removeBundle(bundleInfo);
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.touchpoint.natives/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.p2.touchpoint.natives/META-INF/MANIFEST.MF
index 03fbcd4..98ee2c4 100644
--- a/eclipse/plugins/org.eclipse.equinox.p2.touchpoint.natives/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.p2.touchpoint.natives/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.equinox.p2.touchpoint.natives;singleton:=true
-Bundle-Version: 1.0.200.qualifier
+Bundle-Version: 1.0.201.qualifier
Bundle-Activator: org.eclipse.equinox.internal.p2.touchpoint.natives.Activator
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/actions/RmdirAction.java b/eclipse/plugins/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/actions/RmdirAction.java
index 8473a2a..d333b6e 100644
--- a/eclipse/plugins/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/actions/RmdirAction.java
+++ b/eclipse/plugins/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/actions/RmdirAction.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2009 IBM Corporation and others.
+ * Copyright (c) 2008, 2011 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
@@ -36,13 +36,11 @@ public class RmdirAction extends ProvisioningAction {
try {
store.backupDirectory(dir);
} catch (IOException e) {
- return new Status(IStatus.ERROR, Activator.ID, IStatus.OK, NLS.bind(Messages.rmdir_failed, path, ID), e);
+ // Only return a warning here, not an error. See Bug 331609 for more detail.
+ return new Status(IStatus.WARNING, Activator.ID, IStatus.OK, NLS.bind(Messages.rmdir_failed, path, ID), e);
} catch (IllegalArgumentException e) {
// Ignore the delete/backup if the directory was not empty as this preserves the
- // the original semantics.
- // See Bug 272312 for more detail.
- // return new Status(IStatus.ERROR, Activator.ID, IStatus.OK, NLS.bind(Messages.rmdir_failed, ActionConstants.PARM_PATH, ID), e);
- //
+ // the original semantics. See Bug 272312 for more detail.
}
else
dir.delete();
diff --git a/eclipse/plugins/org.eclipse.equinox.supplement/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.supplement/META-INF/MANIFEST.MF
index d8ff0de..0a72e47 100644
--- a/eclipse/plugins/org.eclipse.equinox.supplement/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.supplement/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.equinox.supplement
-Bundle-Version: 1.3.0.qualifier
+Bundle-Version: 1.3.1.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Export-Package: org.eclipse.osgi.framework.log;version="1.0",
diff --git a/eclipse/plugins/org.eclipse.help.base/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.help.base/META-INF/MANIFEST.MF
index 7ec8d5a..e19251a 100644
--- a/eclipse/plugins/org.eclipse.help.base/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.help.base/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %help_base_plugin_name
Bundle-SymbolicName: org.eclipse.help.base; singleton:=true
-Bundle-Version: 3.5.2.qualifier
+Bundle-Version: 3.5.3.qualifier
Bundle-Activator: org.eclipse.help.internal.base.HelpBasePlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/eclipse/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/HttpsUtility.java b/eclipse/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/HttpsUtility.java
index d8f4571..e07bc3c 100644
--- a/eclipse/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/HttpsUtility.java
+++ b/eclipse/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/HttpsUtility.java
@@ -37,8 +37,6 @@ public class HttpsUtility {
InputStream in =null;
try
{
- System.setProperty( "java.protocol.handler.pkgs" , "javax.net.ssl" ); //$NON-NLS-1$ //$NON-NLS-2$
- // java.security.Security.addProvider( new com.sun.net.ssl.internal.ssl.Provider() );
TrustManager[] trustAllCerts = new TrustManager[] {
new X509TrustManager(){
public java.security.cert.X509Certificate[] getAcceptedIssuers(){
@@ -68,8 +66,6 @@ public class HttpsUtility {
InputStream in = null;
try
{
- System.setProperty( "java.protocol.handler.pkgs" , "javax.net.ssl" ); //$NON-NLS-1$ //$NON-NLS-2$
- // java.security.Security.addProvider( new com.sun.net.ssl.internal.ssl.Provider() );
TrustManager[] trustAllCerts = new TrustManager[] {
new X509TrustManager(){
public java.security.cert.X509Certificate[] getAcceptedIssuers(){
@@ -101,8 +97,6 @@ public class HttpsUtility {
URL url=null;
try
{
- System.setProperty( "java.protocol.handler.pkgs" , "javax.net.ssl" ); //$NON-NLS-1$ //$NON-NLS-2$
- // java.security.Security.addProvider( new com.sun.net.ssl.internal.ssl.Provider() );
TrustManager[] trustAllCerts = new TrustManager[] {
new X509TrustManager(){
public java.security.cert.X509Certificate[] getAcceptedIssuers(){
@@ -131,8 +125,6 @@ public class HttpsUtility {
URL url=null;
try
{
- System.setProperty( "java.protocol.handler.pkgs" , "javax.net.ssl" ); //$NON-NLS-1$ //$NON-NLS-2$
- // java.security.Security.addProvider( new com.sun.net.ssl.internal.ssl.Provider() );
TrustManager[] trustAllCerts = new TrustManager[] {
new X509TrustManager(){
public java.security.cert.X509Certificate[] getAcceptedIssuers(){
@@ -161,8 +153,6 @@ public class HttpsUtility {
URL url=null;
try
{
- System.setProperty( "java.protocol.handler.pkgs" , "javax.net.ssl" ); //$NON-NLS-1$ //$NON-NLS-2$
- // java.security.Security.addProvider( new com.sun.net.ssl.internal.ssl.Provider() );
TrustManager[] trustAllCerts = new TrustManager[] {
new X509TrustManager(){
public java.security.cert.X509Certificate[] getAcceptedIssuers(){
@@ -191,8 +181,6 @@ public class HttpsUtility {
boolean validConnection=true;
try
{
- System.setProperty( "java.protocol.handler.pkgs" , "javax.net.ssl" ); //$NON-NLS-1$ //$NON-NLS-2$
- // java.security.Security.addProvider( new com.sun.net.ssl.internal.ssl.Provider() );
TrustManager[] trustAllCerts = new TrustManager[] {
new X509TrustManager(){
public java.security.cert.X509Certificate[] getAcceptedIssuers(){
diff --git a/eclipse/plugins/org.eclipse.help.ui/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.help.ui/META-INF/MANIFEST.MF
index 3f23867..44947f2 100644
--- a/eclipse/plugins/org.eclipse.help.ui/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.help.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %help_system_plugin_name
Bundle-SymbolicName: org.eclipse.help.ui; singleton:=true
-Bundle-Version: 3.5.2.qualifier
+Bundle-Version: 3.5.3.qualifier
Bundle-Activator: org.eclipse.help.ui.internal.HelpUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/eclipse/plugins/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/BrowserPart.java b/eclipse/plugins/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/BrowserPart.java
index 11cb392..4be56d9 100644
--- a/eclipse/plugins/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/BrowserPart.java
+++ b/eclipse/plugins/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/BrowserPart.java
@@ -194,12 +194,7 @@ public class BrowserPart extends AbstractFormPart implements IHelpPart {
}
private String executeQuery(String domValue) {
- String query = "window.status=\"" + QUERY + "\"+" + domValue + ";"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- boolean status = browser.execute(query);
- if (status) {
- return (String) browser.getData("query"); //$NON-NLS-1$
- }
- return null;
+ return (String)browser.evaluate("return " + domValue + ';'); //$NON-NLS-1$
}
private boolean processQuery(String text) {
diff --git a/eclipse/plugins/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/ContextHelpPart.java b/eclipse/plugins/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/ContextHelpPart.java
index 85a92a0..11c6598 100644
--- a/eclipse/plugins/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/ContextHelpPart.java
+++ b/eclipse/plugins/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/ContextHelpPart.java
@@ -44,6 +44,9 @@ import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.window.Window;
import org.eclipse.jface.wizard.IWizardContainer;
import org.eclipse.osgi.util.NLS;
+import org.eclipse.swt.accessibility.ACC;
+import org.eclipse.swt.accessibility.AccessibleAdapter;
+import org.eclipse.swt.accessibility.AccessibleEvent;
import org.eclipse.swt.custom.CTabFolder;
import org.eclipse.swt.custom.CTabItem;
import org.eclipse.swt.graphics.Font;
@@ -156,6 +159,16 @@ public class ContextHelpPart extends SectionPart implements IHelpPart {
}
});
text.setText(defaultText, false, false);
+ text.getAccessible().addAccessibleListener(new AccessibleAdapter() {
+ public void getName(AccessibleEvent e) {
+ if (e.childID == ACC.CHILDID_SELF) {
+ String currentName = e.result;
+ e.result = Messages.ReusableHelpPart_contextHelpPage_name
+ + ' ' + getSection().getText()+ ' ' +currentName;
+ }
+ }
+ });
+
}
private static int getSectionStyle() {
diff --git a/eclipse/plugins/org.eclipse.help.webapp/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.help.webapp/META-INF/MANIFEST.MF
index afeb608..e8d69be 100644
--- a/eclipse/plugins/org.eclipse.help.webapp/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.help.webapp/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %help_webapp_plugin_name
Bundle-SymbolicName: org.eclipse.help.webapp;singleton:=true
-Bundle-Version: 3.5.2.qualifier
+Bundle-Version: 3.5.3.qualifier
Bundle-Activator: org.eclipse.help.internal.webapp.HelpWebappPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/eclipse/plugins/org.eclipse.help.webapp/advanced/content.jsp b/eclipse/plugins/org.eclipse.help.webapp/advanced/content.jsp
index 74ad31c..5e47dd1 100644
--- a/eclipse/plugins/org.eclipse.help.webapp/advanced/content.jsp
+++ b/eclipse/plugins/org.eclipse.help.webapp/advanced/content.jsp
@@ -45,7 +45,7 @@ FRAMESET {
</head>
<frameset id="contentFrameset" rows="<%=frameData.getContentAreaFrameSizes()%>" frameborder=0" framespacing="0" border="0" spacing="0">
- <frame name="ContentToolbarFrame" title="<%=ServletResources.getString("topicViewToolbar", request)%>" src='<%="contentToolbar.jsp"+data.getQuery()%>' marginwidth="0" marginheight="0" scrolling="no" frameborder="0" >
+ <frame name="ContentToolbarFrame" title="<%=ServletResources.getString("topicViewToolbar", request)%>" src='<%="contentToolbar.jsp"+UrlUtil.htmlEncode(data.getQuery())%>' marginwidth="0" marginheight="0" scrolling="no" frameborder="0" >
<frame ACCESSKEY="K" name="ContentViewFrame" title="<%=ServletResources.getString("topicView", request)%>" src='<%=UrlUtil.htmlEncode(data.getContentURL())%>' marginwidth="10"<%=(data.isIE() && "6.0".compareTo(data.getIEVersion()) <=0)?"scrolling=\"yes\"":""%> marginheight="0" frameborder="0" >
<%
AbstractFrame[] frames = frameData.getFrames(AbstractFrame.BELOW_CONTENT);
diff --git a/eclipse/plugins/org.eclipse.help.webapp/advanced/helptree.js b/eclipse/plugins/org.eclipse.help.webapp/advanced/helptree.js
index 4edb8ce..6bce19c 100644
--- a/eclipse/plugins/org.eclipse.help.webapp/advanced/helptree.js
+++ b/eclipse/plugins/org.eclipse.help.webapp/advanced/helptree.js
@@ -15,11 +15,11 @@
var oldActive;
var oldActiveClass;
-// WAI Roles
-var WAI_TREEITEM = "wairole:treeitem";
-var WAI_TREE = "wairole:tree";
-var WAI_GROUP = "wairole:group";
-var WAI_APPLICATION = "wairole:application";
+// WAI-ARIA Roles
+var WAI_TREEITEM = "treeitem";
+var WAI_TREE = "tree";
+var WAI_GROUP = "group";
+var WAI_APPLICATION = "application";
/**
* Returns the currently selected (highlighted) tree node anchor.
@@ -418,24 +418,46 @@ function changeExpanderImage(treeItem, isExpanded) {
// Accessibility
-var isNamespaceSupport = typeof document.documentElement.setAttributeNS != 'undefined';
+
+// Accessibility roles are now set for all browsers
+var setAccessibilityRoles = true;
function setAccessibilityRole(node, role) {
- if (isNamespaceSupport) {
- node.setAttributeNS("http://www.w3.org/TR/xhtml2", "role", role);
- node.role = role;
+ if (setAccessibilityRoles) {
+ node.setAttribute("role", role);
+ }
+}
+
+function setAccessibilitySetsize( node, setsize )
+{
+ if (setAccessibilityRoles) {
+ node.setAttribute("aria-setsize", setsize);
+ }
+}
+
+function setAccessibilityPosition( node, posinset)
+{
+ if (setAccessibilityRoles) {
+ node.setAttribute("aria-posinset", posinset);
+ }
+}
+
+function setAccessibilityTreeLevel( node,level )
+{
+ if (setAccessibilityRoles) {
+ node.setAttribute("aria-level", level);
}
}
function setWAIExpanded(node, value) {
- if (isNamespaceSupport) {
+ if (setAccessibilityRoles && node.id != "tree_root") {
var valueAsString = value? "true" : "false";
- node.setAttributeNS("http://www.w3.org/2005/07/aaa", "expanded", valueAsString);
+ node.setAttribute("aria-expanded", valueAsString);
}
}
function setRootAccessibility() {
- if (isNamespaceSupport) {
+ if (setAccessibilityRoles) {
var treeItem = document.getElementById("tree_root");
if (treeItem) {
setAccessibilityRole(treeItem, WAI_TREE);
@@ -448,7 +470,7 @@ function setRootAccessibility() {
}
function setWAIExpansionState(treeItem, isExpanded) {
- if (isNamespaceSupport) {
+ if (setAccessibilityRoles) {
var anchor = findAnchor(treeItem);
if (anchor) {
setWAIExpanded(anchor, isExpanded);
diff --git a/eclipse/plugins/org.eclipse.help.webapp/advanced/helptreechildren.js b/eclipse/plugins/org.eclipse.help.webapp/advanced/helptreechildren.js
index 590c0b9..bff02d8 100644
--- a/eclipse/plugins/org.eclipse.help.webapp/advanced/helptreechildren.js
+++ b/eclipse/plugins/org.eclipse.help.webapp/advanced/helptreechildren.js
@@ -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
@@ -24,7 +24,7 @@ function updateTree(xml) {
var treeRoot = document.getElementById("tree_root");
var nodes = tocData.childNodes;
selectedNode = null;
- mergeChildren(treeRoot, nodes);
+ mergeChildren(treeRoot, nodes, 0);
if (selectedNode !== null) {
// Focusing on the last child will increase the chance that it is visible
if (!highlightSelectedNode) {
@@ -49,7 +49,7 @@ function updateTree(xml) {
return errorTags.length > 0;
}
-function mergeChildren(treeItem, nodes) {
+function mergeChildren(treeItem, nodes, level) {
var childContainer;
if (treeItem.id == "tree_root") {
childContainer=treeItem;
@@ -59,12 +59,25 @@ function mergeChildren(treeItem, nodes) {
var childAdded = false;
var hasPlaceholder = childContainer !== null && childContainer.className == "unopened";
var existingChildren = hasExistingChildren(childContainer);
+ var childCount = 0;
+ var nodeIndex = 0;
+
+ // Compute total # of nodes for accessibility attributes
+ // nodes.length cannot be used because the list may contain xml elements
+ // which are not nodes
+
+ for (var i = 0; i < nodes.length; i++) {
+ if (nodes[i].tagName == "node") {
+ childCount++;
+ }
+ }
if (nodes) {
for (var i = 0; i < nodes.length; i++) {
var node = nodes[i];
// If the children of this node have already been evaluated
// and the child XML node has no children we can safely skip it
if (node.tagName == "node" && (!existingChildren || node.childNodes.length > 0)) {
+ nodeIndex++;
if (hasPlaceholder) {
// Remove the loading message
treeItem.removeChild(childContainer);
@@ -102,11 +115,11 @@ function mergeChildren(treeItem, nodes) {
if (node.getAttribute("closedImage")) {
closedImage = "../topic" + node.getAttribute("closedImage");
}
- childItem = addChild(childContainer, id, title, href, openImage, closedImage, imageAltText, isLeaf);
+ childItem = addChild(childContainer, id, title, href, openImage, closedImage, imageAltText, isLeaf, nodeIndex, childCount, level + 1);
}
if (!isLeaf) {
- mergeChildren(childItem, node.childNodes);
+ mergeChildren(childItem, node.childNodes, level + 1);
}
var isSelected = node.getAttribute("is_selected");
if (isSelected) {
@@ -155,7 +168,8 @@ function findChildById(treeItem, id) {
}
// Create a child of treeItem
-function addChild(treeItem, id, name, href, image, closedImage, imageAltText, isLeaf) {
+function addChild(treeItem, id, name, href, image, closedImage, imageAltText,
+ isLeaf, position, setsize, level) {
var childItem = document.createElement("DIV");
// roots should have a className of "root" to prevent indentation
if (treeItem.id == "tree_root") {
@@ -208,7 +222,10 @@ function addChild(treeItem, id, name, href, image, closedImage, imageAltText, is
anchor.href = href;
}
anchor.title = name;
- setAccessibilityRole(anchor, WAI_TREEITEM);
+ setAccessibilityRole(anchor, WAI_TREEITEM);
+ setAccessibilitySetsize(anchor, setsize);
+ setAccessibilityPosition(anchor, position);
+ setAccessibilityTreeLevel(anchor, level);
if (topicImage) {
anchor.appendChild(topicImage);
diff --git a/eclipse/plugins/org.eclipse.help.webapp/advanced/indexToolbar.jsp b/eclipse/plugins/org.eclipse.help.webapp/advanced/indexToolbar.jsp
index 3a33c6e..5d25bfb 100644
--- a/eclipse/plugins/org.eclipse.help.webapp/advanced/indexToolbar.jsp
+++ b/eclipse/plugins/org.eclipse.help.webapp/advanced/indexToolbar.jsp
@@ -15,4 +15,12 @@
<jsp:include page="toolbar.jsp">
<jsp:param name="script" value="navActions.js"/>
<jsp:param name="view" value="index"/>
+
+ <jsp:param name="name" value="show_all"/>
+ <jsp:param name="tooltip" value='show_all'/>
+ <jsp:param name="image" value="show_all.gif"/>
+ <jsp:param name="action" value="toggleShowAll"/>
+ <jsp:param name="param" value=""/>
+ <jsp:param name="state" value="<%=(new ActivitiesData(application, request, response)).getButtonState()%>"/>
+
</jsp:include>
diff --git a/eclipse/plugins/org.eclipse.help.webapp/advanced/searchToolbar.jsp b/eclipse/plugins/org.eclipse.help.webapp/advanced/searchToolbar.jsp
index 4ddfe04..c334d4d 100644
--- a/eclipse/plugins/org.eclipse.help.webapp/advanced/searchToolbar.jsp
+++ b/eclipse/plugins/org.eclipse.help.webapp/advanced/searchToolbar.jsp
@@ -20,6 +20,13 @@
<jsp:param name="script" value="navActions.js"/>
<jsp:param name="view" value="search"/>
+ <jsp:param name="name" value="show_all"/>
+ <jsp:param name="tooltip" value='show_all'/>
+ <jsp:param name="image" value="show_all.gif"/>
+ <jsp:param name="action" value="toggleShowAll"/>
+ <jsp:param name="param" value=""/>
+ <jsp:param name="state" value="<%=(new ActivitiesData(application, request, response)).getButtonState()%>"/>
+
<jsp:param name="name" value="show_categories"/>
<jsp:param name="tooltip" value='show_categories'/>
<jsp:param name="image" value="show_categories.gif"/>
diff --git a/eclipse/plugins/org.eclipse.help.webapp/advanced/tocToolbar.jsp b/eclipse/plugins/org.eclipse.help.webapp/advanced/tocToolbar.jsp
index c07b00e..2411323 100644
--- a/eclipse/plugins/org.eclipse.help.webapp/advanced/tocToolbar.jsp
+++ b/eclipse/plugins/org.eclipse.help.webapp/advanced/tocToolbar.jsp
@@ -30,6 +30,13 @@
<jsp:param name="script" value="navActions.js"/>
<jsp:param name="view" value="toc"/>
+ <jsp:param name="name" value="show_all"/>
+ <jsp:param name="tooltip" value='show_all'/>
+ <jsp:param name="image" value="show_all.gif"/>
+ <jsp:param name="action" value="toggleShowAll"/>
+ <jsp:param name="param" value=""/>
+ <jsp:param name="state" value="<%=(new ActivitiesData(application, request, response)).getButtonState()%>"/>
+
<jsp:param name="name" value="print_toc"/>
<jsp:param name="tooltip" value='PrintMulti'/>
<jsp:param name="image" value="print_toc.gif"/>
diff --git a/eclipse/plugins/org.eclipse.help.webapp/advanced/toolbar.jsp b/eclipse/plugins/org.eclipse.help.webapp/advanced/toolbar.jsp
index 1fb1da2..555d4bd 100644
--- a/eclipse/plugins/org.eclipse.help.webapp/advanced/toolbar.jsp
+++ b/eclipse/plugins/org.eclipse.help.webapp/advanced/toolbar.jsp
@@ -196,8 +196,12 @@ function setTitle(label)
function registerMaximizedChangedListener(){
// get to the frameset
var p = parent;
- while (p && !p.registerMaximizeListener)
+ while (p && !p.registerMaximizeListener) {
+ if (p === p.parent) {
+ return;
+ }
p = p.parent;
+ }
if (p!= null){
p.registerMaximizeListener('<%=UrlUtil.JavaScriptEncode(data.getName())%>Toolbar', maximizedChanged);
@@ -227,8 +231,12 @@ function restore_maximize(button)
function toggleFrame(){
// get to the frameset
var p = parent;
- while (p && !p.toggleFrame)
+ while (p && !p.toggleFrame) {
+ if (p === p.parent) {
+ return;
+ }
p = p.parent;
+ }
if (p!= null){
p.toggleFrame('<%=UrlUtil.JavaScriptEncode(data.getTitle())%>');
diff --git a/eclipse/plugins/org.eclipse.help.webapp/basic/index.jsp b/eclipse/plugins/org.eclipse.help.webapp/basic/index.jsp
index cce5202..428cf6a 100644
--- a/eclipse/plugins/org.eclipse.help.webapp/basic/index.jsp
+++ b/eclipse/plugins/org.eclipse.help.webapp/basic/index.jsp
@@ -29,8 +29,8 @@
<%
}
%>
- <frame name="TabsFrame" title="<%=ServletResources.getString("helpToolbarFrame", request)%>" src='<%="basic/tabs.jsp"+data.getQuery()%>' marginwidth="5" marginheight="5" scrolling="no">
- <frame name="HelpFrame" title="<%=ServletResources.getString("ignore", "HelpFrame", request)%>" src='<%="basic/help.jsp"+data.getQuery()%>' frameborder="no" marginwidth="0" marginheight="0" scrolling="no">
+ <frame name="TabsFrame" title="<%=ServletResources.getString("helpToolbarFrame", request)%>" src='<%="basic/tabs.jsp"+UrlUtil.htmlEncode(data.getQuery())%>' marginwidth="5" marginheight="5" scrolling="no">
+ <frame name="HelpFrame" title="<%=ServletResources.getString("ignore", "HelpFrame", request)%>" src='<%="basic/help.jsp"+UrlUtil.htmlEncode(data.getQuery())%>' frameborder="no" marginwidth="0" marginheight="0" scrolling="no">
<%
if(!("0".equals(data.getFooterHeight()))){
%>
diff --git a/eclipse/plugins/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/RequestScope.java b/eclipse/plugins/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/RequestScope.java
index 65b15e5..ea87628 100644
--- a/eclipse/plugins/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/RequestScope.java
+++ b/eclipse/plugins/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/RequestScope.java
@@ -25,6 +25,7 @@ import org.eclipse.help.base.AbstractHelpScope;
import org.eclipse.help.internal.base.HelpBasePlugin;
import org.eclipse.help.internal.base.HelpBaseResources;
import org.eclipse.help.internal.base.IHelpBaseConstants;
+import org.eclipse.help.internal.base.scope.EnablementScope;
import org.eclipse.help.internal.base.scope.FilterScope;
import org.eclipse.help.internal.base.scope.IntersectionScope;
import org.eclipse.help.internal.base.scope.ScopeRegistry;
@@ -77,6 +78,10 @@ public class RequestScope {
scopes.add(scope);
}
}
+ // If not in infocenter mode test whether disabled topics should be displayed
+ if (!HelpSystem.isShared() && HelpBasePlugin.getActivitySupport().isFilteringEnabled()) {
+ scopes.add(new EnablementScope());
+ }
// Add filter by search scope if not called from Help View
boolean isHelpViewTopic = "/ntopic".equals(req.getServletPath()); //$NON-NLS-1$
if (!isSearchFilter && !isHelpViewTopic) {
diff --git a/eclipse/plugins/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/TopicFinder.java b/eclipse/plugins/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/TopicFinder.java
index 1774a3e..1651fcc 100644
--- a/eclipse/plugins/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/TopicFinder.java
+++ b/eclipse/plugins/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/TopicFinder.java
@@ -40,10 +40,16 @@ public class TopicFinder {
int index = -1;
do {
selectedToc = findTocContainingTopic(topicHref);
-
- ITopic topic = findTopic(UrlUtil.getHelpURL(topicHref));
- if (topic != null && selectedToc >= 0) {
- foundTopicPath = getTopicPathInToc(topic, tocs[selectedToc]);
+ index = topicHref.indexOf("/nav/"); //$NON-NLS-1$
+ if (index != -1) {
+ foundTopicPath = getTopicPathFromNav(topicHref.substring(index + 5));
+
+ } else {
+ ITopic topic = findTopic(UrlUtil.getHelpURL(topicHref));
+ if (topic != null && selectedToc >= 0) {
+ foundTopicPath = getTopicPathInToc(topic,
+ tocs[selectedToc]);
+ }
}
// if no match has been found, check if there is an anchor
if (foundTopicPath == null && topicHref != null) {
@@ -58,6 +64,28 @@ public class TopicFinder {
foundTopicPath = null;
}
}
+
+ public ITopic[] getTopicPathFromNav(String nav) {
+ StringTokenizer tok = new StringTokenizer(nav, "_"); //$NON-NLS-1$
+ try {
+ int segments = tok.countTokens();
+ ITopic[] path = new ITopic[segments - 1];
+ // first number is toc index
+ int index = Integer.parseInt(tok.nextToken());
+ IToc toc = tocs[index];
+ ITopic current = toc.getTopic(null);
+ for (int i = 0; tok.hasMoreTokens(); i++) {
+ index = Integer.parseInt(tok.nextToken());
+ appendFilteredIndex(index, current.getSubtopics());
+ current = current.getSubtopics()[index];
+ path[i] = current;
+ }
+ return path;
+ } catch (Exception e) {
+ numericPath = null;
+ return null;
+ }
+ }
public ITopic[] getTopicPath() {
return foundTopicPath;
@@ -85,7 +113,7 @@ public class TopicFinder {
// returns path in reverse order
List reversePath = getTopicPathInTopic(topicToFind, topics[i]);
if (reversePath != null) {
- appendFilteredIndex(i, topics);
+ prependFilteredIndex(i, topics);
return invertPath(reversePath);
}
}
@@ -131,7 +159,7 @@ public class TopicFinder {
// it was in a subtopic.. add to the path and return
path.add(topic);
// Add to the numeric path counting only enabled topics
- appendFilteredIndex(i, subtopics);
+ prependFilteredIndex(i, subtopics);
return path;
}
}
@@ -153,6 +181,24 @@ public class TopicFinder {
if (numericPath == null) {
numericPath = "" + indexInFilteredList; //$NON-NLS-1$
} else {
+ numericPath = numericPath + '_' + indexInFilteredList;
+ }
+ }
+
+ // Prepend an entry to the numeric path representing the position in the list
+ // of filtered topics. Note that we need to convert the index in the unfiltered
+ // list to an index in a filtered list of topics
+ private void prependFilteredIndex(int indexInUnfilteredList, ITopic[] unfiltered) {
+ int indexInFilteredList = 0;
+ for (int i = 0; i < indexInUnfilteredList; i++) {
+ if (ScopeUtils.showInTree(unfiltered[i], scope)) {
+ indexInFilteredList++;
+ }
+ }
+
+ if (numericPath == null) {
+ numericPath = "" + indexInFilteredList; //$NON-NLS-1$
+ } else {
numericPath = "" + indexInFilteredList + '_' + numericPath; //$NON-NLS-1$
}
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 2a0e40d..e8d8521 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.401.qualifier
+Bundle-Version: 3.3.402.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 9fa837b..c5d44e3 100644
--- a/eclipse/plugins/org.eclipse.jdt.apt.core/build_notes.html
+++ b/eclipse/plugins/org.eclipse.jdt.apt.core/build_notes.html
@@ -11,6 +11,11 @@
<h1>Eclipse Platform Build Notes (3.6)<br>
JDT Annotation Processing</h1>
+<p>Integration Build (January 20, 2011)</p>
+ <p>Problem reports updated</p>
+ <p>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=301894">Bug 301894</a>. OutOfMemory error when building a large project with annotations<br>
+ </p>
<p>Integration Build (July 26, 2010, 11:09 p.m.)</p>
<p>Problem reports updated</p>
diff --git a/eclipse/plugins/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/APTDispatchRunnable.java b/eclipse/plugins/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/APTDispatchRunnable.java
index ce75ab9..145fb20 100644
--- a/eclipse/plugins/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/APTDispatchRunnable.java
+++ b/eclipse/plugins/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/APTDispatchRunnable.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2007 BEA Systems, Inc.
+ * Copyright (c) 2005, 2011 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
@@ -7,6 +7,7 @@
*
* Contributors:
* mkaufman at bea.com - initial API and implementation
+ * IBM Corporation - modified to split files
*******************************************************************************/
@@ -104,6 +105,7 @@ public class APTDispatchRunnable implements IWorkspaceRunnable
}
private static final BuildContext[] NO_FILES_TO_PROCESS = new BuildContext[0];
+ private static final int MAX_FILES_PER_ITERATION = 1000;
private /*final*/ BuildContext[] _filesWithAnnotation = null;
private /*final*/ BuildContext[] _filesWithoutAnnotation = null;
private /*final*/ Map<IFile, CategorizedProblem[]> _problemRecorder = null;
@@ -114,7 +116,13 @@ public class APTDispatchRunnable implements IWorkspaceRunnable
/** Batch processor dispatched in the current round */
private Set<AnnotationProcessorFactory> _currentDispatchBatchFactories = Collections.emptySet();
private final boolean _isFullBuild;
+ private static final boolean SPLIT_FILES;
+ private static final String SPLIT_FILES_PROPERTY = "org.eclipse.jdt.apt.core.split_files"; //$NON-NLS-1$
+ static {
+ String setting = System.getProperty(SPLIT_FILES_PROPERTY);
+ SPLIT_FILES = setting != null && setting.equalsIgnoreCase("true"); //$NON-NLS-1$
+ }
public static Set<AnnotationProcessorFactory> runAPTDuringBuild(
BuildContext[] filesWithAnnotations,
@@ -265,14 +273,33 @@ public class APTDispatchRunnable implements IWorkspaceRunnable
build((BuildEnv)env);
}
};
-
- // Construct build environment, this invokes the build inside a callback
- // in order to keep open the DOM AST pipeline
- BuildEnv.newBuildEnv(
- _filesWithAnnotation,
- _filesWithoutAnnotation,
- _aptProject.getJavaProject(),
- buildCallback);
+ boolean split = false;
+ if (SPLIT_FILES && !hasBatchFactory()) { // don't split the files if batch processors are present
+ split = _filesWithAnnotation.length > MAX_FILES_PER_ITERATION ? true : false;
+ }
+ if (!split) {
+ // Construct build environment, this invokes the build inside a callback
+ // in order to keep open the DOM AST pipeline
+ BuildEnv.newBuildEnv(
+ _filesWithAnnotation,
+ _filesWithoutAnnotation,
+ _aptProject.getJavaProject(),
+ buildCallback);
+ } else {
+ for (int index = 0; index < _filesWithAnnotation.length;) {
+ int numberToProcess = (index + MAX_FILES_PER_ITERATION) > _filesWithAnnotation.length ? _filesWithAnnotation.length - index : MAX_FILES_PER_ITERATION;
+ BuildContext[] filesToProcess = new BuildContext[numberToProcess];
+ System.arraycopy(_filesWithAnnotation, index, filesToProcess, 0, numberToProcess);
+ // Construct build environment, this invokes the build inside a callback
+ // in order to keep open the DOM AST pipeline
+ BuildEnv.newBuildEnv(
+ filesToProcess,
+ _filesWithoutAnnotation,
+ _aptProject.getJavaProject(),
+ buildCallback);
+ index += numberToProcess;
+ }
+ }
}
// We need to save the file dependency state regardless of whether any Java 5 processing
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 5fd845e..08cdaa1 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.6.1.qualifier
+Bundle-Version: 3.6.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 b2415d6..f5758b1 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
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2000, 2010 IBM Corporation and others.
+# Copyright (c) 2000, 2011 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,7 +15,7 @@
#Format: compiler.name = word1 word2 word3
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.A68_R36x, 3.6.1
+compiler.version = 0.A76_R36x, 3.6.2
compiler.copyright = Copyright IBM Corp 2000, 2010. 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 3398d55..46d9ae9 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/buildnotes_jdt-core.html
+++ b/eclipse/plugins/org.eclipse.jdt.core/buildnotes_jdt-core.html
@@ -40,6 +40,115 @@
</td>
</tr>
</table>
+<a name="v_A76_R36x"></a>
+<hr><h1>
+Eclipse Platform Build Notes<br>
+Java development tools core</h1>
+Eclipse SDK 3.6.2 - February 8, 2011 - 3.6.2
+<br>Project org.eclipse.jdt.core v_A76_R36x
+(<a href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.jdt.core/?only_with_tag=v_A76_R36x">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=336544">336544</a>
+[regression][compiler] Source flagged as dead code incorrectly.
+
+<a name="v_A75_R36x"></a>
+<hr><h1>
+Eclipse Platform Build Notes<br>
+Java development tools core</h1>
+Eclipse SDK 3.6.2 - February 3, 2011
+<br>Project org.eclipse.jdt.core v_A75_R36x
+(<a href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.jdt.core/?only_with_tag=v_A75_R36x">cvs</a>).
+<h2>What's new in this drop</h2>
+<ul>
+<li>Bundle version has been increment to 3.6.2.qualifier.</li>
+</ul>
+
+<h3>Problem Reports Fixed</h3>
+
+<a name="v_A74_R36x"></a>
+<hr><h1>
+Eclipse Platform Build Notes<br>
+Java development tools core</h1>
+Eclipse SDK 3.6.2 - January 19, 2011
+<br>Project org.eclipse.jdt.core v_A74_R36x
+(<a href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.jdt.core/?only_with_tag=v_A74_R36x">cvs</a>).
+<h2>What's new in this drop</h2>
+<ul>
+<li>Only copyrights update with the previous version.</li>
+</ul>
+<h3>Problem Reports Fixed</h3>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=329288">329288</a>
+Fetching parameter names literally hangs on a class with a lot of methods
+
+<a name="v_A73_R36x"></a>
+<hr><h1>
+Eclipse Platform Build Notes<br>
+Java development tools core</h1>
+Eclipse SDK 3.6.2 - January 12, 2011
+<br>Project org.eclipse.jdt.core v_A73_R36x
+(<a href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.jdt.core/?only_with_tag=v_A73_R36x">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=327654">327654</a>
+FUP of bug 317264: Refactoring is not possible if the commons-lang.jar is in the path
+
+<a name="v_A72_R36x"></a>
+<hr><h1>
+Eclipse Platform Build Notes<br>
+Java development tools core</h1>
+Eclipse SDK 3.6.2 - December 17, 2010
+<br>Project org.eclipse.jdt.core v_A72_R36x
+(<a href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.jdt.core/?only_with_tag=v_A72_R36x">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=323514">323514</a>
+[indexing] The Java Indexer is taking longer to run in eclipse 3.6 when opening projects
+
+<a name="v_A71_R36x"></a>
+<hr><h1>
+Eclipse Platform Build Notes<br>
+Java development tools core</h1>
+Eclipse SDK 3.6.2 - November 16, 2010
+<br>Project org.eclipse.jdt.core v_A71_R36x
+(<a href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.jdt.core/?only_with_tag=v_A71_R36x">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=330081">330081</a>
+[compiler] ArrayIndexOutOfBoundsException when Switched from C/C++ Perspective to Java Perspective
+
+<a name="v_A70_R36x"></a>
+<hr><h1>
+Eclipse Platform Build Notes<br>
+Java development tools core</h1>
+Eclipse SDK 3.6.2 - November 16, 2010
+<br>Project org.eclipse.jdt.core v_A70_R36x
+(<a href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.jdt.core/?only_with_tag=v_A70_R36x">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=328400">328400</a>
+TextEdit computed incorrectly for inserting annotation before package declaration
+<br><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=326354">326354</a>
+[3.6][compiler][regression] Compiler in 3.6 and 3.6.1 generates bad code
+
+<a name="v_A69_R36x"></a>
+<hr><h1>
+Eclipse Platform Build Notes<br>
+Java development tools core</h1>
+Eclipse SDK 3.6.2 - October 6, 2010
+<br>Project org.eclipse.jdt.core v_A69_R36x
+(<a href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.jdt.core/?only_with_tag=v_A69_R36x">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=326434">326434</a>
+New issues with NPE refreshing external folders with 3.6.1
+
<a name="v_A68_R36x"></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 94a9110..4ff8e23 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
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 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
@@ -68,7 +68,6 @@ import org.eclipse.jdt.internal.core.BinaryTypeConverter;
import org.eclipse.jdt.internal.core.SearchableEnvironment;
import org.eclipse.jdt.internal.core.SourceTypeElementInfo;
import org.eclipse.jdt.internal.core.search.matching.JavaSearchNameEnvironment;
-import org.eclipse.jdt.internal.core.search.matching.MatchLocator;
import org.eclipse.jdt.internal.core.util.Messages;
/**
@@ -11728,7 +11727,7 @@ public final class CompletionEngine
// filter packages ending with enum for projects above 1.5
// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=317264
- if (MatchLocator.SHOULD_FILTER_ENUM && this.compilerOptions.sourceLevel >= ClassFileConstants.JDK1_5 &&
+ if (this.compilerOptions.sourceLevel >= ClassFileConstants.JDK1_5 &&
CharOperation.endsWith(givenPkgName, DOT_ENUM)) { //note: it should be .enum and not just enum
return true;
}
diff --git a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Assignment.java b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Assignment.java
index c63b73c..ec68428 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Assignment.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Assignment.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 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
@@ -37,6 +37,9 @@ public FlowInfo analyseCode(BlockScope currentScope, FlowContext flowContext, Fl
// a field reference, a blank final field reference, a field of an enclosing instance or
// just a local variable.
LocalVariableBinding local = this.lhs.localVariableBinding();
+ flowInfo = ((Reference) this.lhs)
+ .analyseAssignment(currentScope, flowContext, flowInfo, this, false)
+ .unconditionalInits();
int nullStatus = this.expression.nullStatus(flowInfo);
if (local != null && (local.type.tagBits & TagBits.IsBaseType) == 0) {
if (nullStatus == FlowInfo.NULL) {
@@ -44,9 +47,6 @@ public FlowInfo analyseCode(BlockScope currentScope, FlowContext flowContext, Fl
FlowContext.CAN_ONLY_NULL | FlowContext.IN_ASSIGNMENT, flowInfo);
}
}
- flowInfo = ((Reference) this.lhs)
- .analyseAssignment(currentScope, flowContext, flowInfo, this, false)
- .unconditionalInits();
if (local != null && (local.type.tagBits & TagBits.IsBaseType) == 0) {
switch(nullStatus) {
case FlowInfo.NULL :
diff --git a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/DoStatement.java b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/DoStatement.java
index 3373f89..1e00810 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/DoStatement.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/DoStatement.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 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
diff --git a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ForStatement.java b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ForStatement.java
index 300fd48..7330bb8 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ForStatement.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ForStatement.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 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
diff --git a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/LocalDeclaration.java b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/LocalDeclaration.java
index ee43566..83de2d9 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/LocalDeclaration.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/LocalDeclaration.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 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
@@ -40,11 +40,11 @@ public FlowInfo analyseCode(BlockScope currentScope, FlowContext flowContext, Fl
if (this.initialization == null) {
return flowInfo;
}
- int nullStatus = this.initialization.nullStatus(flowInfo);
flowInfo =
this.initialization
.analyseCode(currentScope, flowContext, flowInfo)
.unconditionalInits();
+ int nullStatus = this.initialization.nullStatus(flowInfo);
if (!flowInfo.isDefinitelyAssigned(this.binding)){// for local variable debug attributes
this.bits |= FirstAssignmentToLocal;
} else {
diff --git a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Statement.java b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Statement.java
index ec7212e..faaa9eb 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Statement.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Statement.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 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
diff --git a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/TryStatement.java b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/TryStatement.java
index 1404c76..ab49caf 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/TryStatement.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/TryStatement.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
@@ -7,6 +7,7 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
+ * Stephan Herrmann - Contribution for bug 332637 - Dead Code detection removing code that isn't dead
*******************************************************************************/
package org.eclipse.jdt.internal.compiler.ast;
@@ -126,15 +127,15 @@ public FlowInfo analyseCode(BlockScope currentScope, FlowContext flowContext, Fl
addPotentialInitializationsFrom(
handlingContext.initsOnReturn));
} else {
+ FlowInfo initsOnException = handlingContext.initsOnException(this.caughtExceptionTypes[i]);
catchInfo =
- flowInfo.unconditionalCopy().
- addPotentialInitializationsFrom(
- handlingContext.initsOnException(
- this.caughtExceptionTypes[i]))
- .addPotentialInitializationsFrom(tryInfo.unconditionalCopy())
+ flowInfo.nullInfoLessUnconditionalCopy()
+ .addPotentialInitializationsFrom(initsOnException)
+ .addNullInfoFrom(initsOnException) // null info only from here, this is the only way to enter the catch block
.addPotentialInitializationsFrom(
- handlingContext.initsOnReturn.
- nullInfoLessUnconditionalCopy());
+ tryInfo.nullInfoLessUnconditionalCopy())
+ .addPotentialInitializationsFrom(
+ handlingContext.initsOnReturn.nullInfoLessUnconditionalCopy());
}
// catch var is always set
@@ -235,15 +236,15 @@ public FlowInfo analyseCode(BlockScope currentScope, FlowContext flowContext, Fl
addPotentialInitializationsFrom(
handlingContext.initsOnReturn));
}else {
+ FlowInfo initsOnException = handlingContext.initsOnException(this.caughtExceptionTypes[i]);
catchInfo =
- flowInfo.unconditionalCopy()
+ flowInfo.nullInfoLessUnconditionalCopy()
+ .addPotentialInitializationsFrom(initsOnException)
+ .addNullInfoFrom(initsOnException) // null info only from here, this is the only way to enter the catch block
.addPotentialInitializationsFrom(
- handlingContext.initsOnException(
- this.caughtExceptionTypes[i]))
- .addPotentialInitializationsFrom(tryInfo.unconditionalCopy())
+ tryInfo.nullInfoLessUnconditionalCopy())
.addPotentialInitializationsFrom(
- handlingContext.initsOnReturn.
- nullInfoLessUnconditionalCopy());
+ handlingContext.initsOnReturn.nullInfoLessUnconditionalCopy());
}
// catch var is always set
diff --git a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/WhileStatement.java b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/WhileStatement.java
index 4362a9a..4b80b5b 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/WhileStatement.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/WhileStatement.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 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
diff --git a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/ConditionalFlowInfo.java b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/ConditionalFlowInfo.java
index 3470fa7..5e1681e 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/ConditionalFlowInfo.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/ConditionalFlowInfo.java
@@ -7,6 +7,7 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
+ * Stephan Herrmann - Contribution for bug 332637 - Dead Code detection removing code that isn't dead
*******************************************************************************/
package org.eclipse.jdt.internal.compiler.flow;
@@ -35,6 +36,13 @@ public FlowInfo addInitializationsFrom(FlowInfo otherInits) {
return this;
}
+public FlowInfo addNullInfoFrom(FlowInfo otherInits) {
+
+ this.initsWhenTrue.addNullInfoFrom(otherInits);
+ this.initsWhenFalse.addNullInfoFrom(otherInits);
+ return this;
+}
+
public FlowInfo addPotentialInitializationsFrom(FlowInfo otherInits) {
this.initsWhenTrue.addPotentialInitializationsFrom(otherInits);
diff --git a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/FlowInfo.java b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/FlowInfo.java
index fed1648..886309e 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/FlowInfo.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/FlowInfo.java
@@ -7,6 +7,7 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
+ * Stephan Herrmann <stephan at cs.tu-berlin.de> - Contribution for bug 332637 - Dead Code detection removing code that isn't dead
*******************************************************************************/
package org.eclipse.jdt.internal.compiler.flow;
@@ -41,6 +42,13 @@ public abstract class FlowInfo {
*/
abstract public FlowInfo addInitializationsFrom(FlowInfo otherInits);
+/**
+ * Add all null information from otherInits to this flow info and return this.
+ * The operation models the effect of an unconditional sequence of this flow info
+ * and otherInits.
+ */
+abstract public FlowInfo addNullInfoFrom(FlowInfo otherInits);
+
/**
* Compose other inits over this flow info, then return this. The operation
diff --git a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/UnconditionalFlowInfo.java b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/UnconditionalFlowInfo.java
index 9424e2f..0287c1f 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/UnconditionalFlowInfo.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/UnconditionalFlowInfo.java
@@ -7,6 +7,7 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
+ * Stephan Herrmann <stephan at cs.tu-berlin.de> - Contribution for bug 332637
*******************************************************************************/
package org.eclipse.jdt.internal.compiler.flow;
@@ -87,16 +88,25 @@ public class UnconditionalFlowInfo extends FlowInfo {
public int[] nullStatusChangedInAssert; // https://bugs.eclipse.org/bugs/show_bug.cgi?id=303448
public FlowInfo addInitializationsFrom(FlowInfo inits) {
+ return addInfoFrom(inits, true);
+}
+public FlowInfo addNullInfoFrom(FlowInfo inits) {
+ return addInfoFrom(inits, false);
+}
+private FlowInfo addInfoFrom(FlowInfo inits, boolean handleInits) {
if (this == DEAD_END)
return this;
if (inits == DEAD_END)
return this;
UnconditionalFlowInfo otherInits = inits.unconditionalInits();
- // union of definitely assigned variables,
- this.definiteInits |= otherInits.definiteInits;
- // union of potentially set ones
- this.potentialInits |= otherInits.potentialInits;
+ if (handleInits) {
+ // union of definitely assigned variables,
+ this.definiteInits |= otherInits.definiteInits;
+ // union of potentially set ones
+ this.potentialInits |= otherInits.potentialInits;
+ }
+
// combine null information
boolean thisHadNulls = (this.tagBits & NULL_FLAG_MASK) != 0,
otherHasNulls = (otherInits.tagBits & NULL_FLAG_MASK) != 0;
@@ -218,14 +228,17 @@ public FlowInfo addInitializationsFrom(FlowInfo inits) {
}
}
int i;
- // manage definite assignment info
- for (i = 0; i < mergeLimit; i++) {
- this.extra[0][i] |= otherInits.extra[0][i];
- this.extra[1][i] |= otherInits.extra[1][i];
- }
- for (; i < copyLimit; i++) {
- this.extra[0][i] = otherInits.extra[0][i];
- this.extra[1][i] = otherInits.extra[1][i];
+ if (handleInits) {
+ // manage definite assignment info
+ for (i = 0; i < mergeLimit; i++) {
+ this.extra[0][i] |= otherInits.extra[0][i];
+ this.extra[1][i] |= otherInits.extra[1][i];
+ }
+ for (; i < copyLimit; i++) {
+ this.extra[0][i] = otherInits.extra[0][i];
+ this.extra[1][i] = otherInits.extra[1][i];
+
+ }
}
// tweak limits for nulls
if (!thisHadNulls) {
diff --git a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/InvocationSite.java b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/InvocationSite.java
index 061da43..a09b056 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/InvocationSite.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/InvocationSite.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 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
diff --git a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/LocalTypeBinding.java b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/LocalTypeBinding.java
index 4344638..4bf4096 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/LocalTypeBinding.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/LocalTypeBinding.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 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
diff --git a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/MethodScope.java b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/MethodScope.java
index 2ca0a42..f78b1b2 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/MethodScope.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/MethodScope.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 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
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 e7dd1db..9a41b69 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
@@ -399,7 +399,7 @@ void checkMethods() {
for (int i = 0; i < length; i++) {
MethodBinding inheritedMethod = inherited[i];
if (inheritedMethod.isPublic() && !inheritedMethod.declaringClass.isPublic())
- this.type.addSyntheticBridgeMethod(inheritedMethod);
+ this.type.addSyntheticBridgeMethod(inheritedMethod.original());
}
}
@@ -455,7 +455,7 @@ void checkMethods() {
if (matchMethod == null && current != null && this.type.isPublic()) { // current == null case handled already.
MethodBinding inheritedMethod = inherited[i];
if (inheritedMethod.isPublic() && !inheritedMethod.declaringClass.isPublic()) {
- this.type.addSyntheticBridgeMethod(inheritedMethod);
+ this.type.addSyntheticBridgeMethod(inheritedMethod.original());
}
}
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=296660, if current type is exposed,
diff --git a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ParameterizedGenericMethodBinding.java b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ParameterizedGenericMethodBinding.java
index b58bc94..e0a6bf2 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ParameterizedGenericMethodBinding.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ParameterizedGenericMethodBinding.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 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
diff --git a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/Scanner.java b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/Scanner.java
index 24e8325..2e68575 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/Scanner.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/Scanner.java
@@ -2977,20 +2977,23 @@ private int internalScanIdentifierOrKeyword(int index, int length, char[] data)
case 'e' : //else extends
switch (length) {
case 4 :
- if ((data[++index] == 'l') && (data[++index] == 's') && (data[++index] == 'e'))
- return TokenNameelse;
- else if ((data[index] == 'n')
- && (data[++index] == 'u')
- && (data[++index] == 'm')) {
- if (this.sourceLevel >= ClassFileConstants.JDK1_5) {
- return TokenNameenum;
- } else {
- this.useEnumAsAnIndentifier = true;
- return TokenNameIdentifier;
- }
+ if (data[++index] == 'l') {
+ if ((data[++index] == 's') && (data[++index] == 'e')) {
+ return TokenNameelse;
} else {
return TokenNameIdentifier;
}
+ } else if ((data[index] == 'n')
+ && (data[++index] == 'u')
+ && (data[++index] == 'm')) {
+ if (this.sourceLevel >= ClassFileConstants.JDK1_5) {
+ return TokenNameenum;
+ } else {
+ this.useEnumAsAnIndentifier = true;
+ return TokenNameIdentifier;
+ }
+ }
+ return TokenNameIdentifier;
case 7 :
if ((data[++index] == 'x')
&& (data[++index] == 't')
diff --git a/eclipse/plugins/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/CompilationUnit.java b/eclipse/plugins/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/CompilationUnit.java
index 68b3c40..08c3721 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/CompilationUnit.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/CompilationUnit.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 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
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 235e582..88fd275 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
@@ -2544,7 +2544,7 @@ public final class ASTRewriteAnalyzer extends ASTVisitor {
}
if (node.getAST().apiLevel() >= AST.JLS3) {
int pos= rewriteJavadoc(node, PackageDeclaration.JAVADOC_PROPERTY);
- rewriteNodeList(node, PackageDeclaration.ANNOTATIONS_PROPERTY, pos, "", " "); //$NON-NLS-1$ //$NON-NLS-2$
+ rewriteModifiers2(node, PackageDeclaration.ANNOTATIONS_PROPERTY, pos);
}
rewriteRequiredNode(node, PackageDeclaration.NAME_PROPERTY);
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 1a66dd4..728e5c1 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
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 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
diff --git a/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IPackageFragment.java b/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IPackageFragment.java
index 4c075b2..cea9e2b 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IPackageFragment.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IPackageFragment.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 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
diff --git a/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/core/ITypeHierarchy.java b/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/core/ITypeHierarchy.java
index 59d37a4..51f0755 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/core/ITypeHierarchy.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/core/ITypeHierarchy.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 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
diff --git a/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IWorkingCopy.java b/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IWorkingCopy.java
index f2961e7..e7537ea 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IWorkingCopy.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IWorkingCopy.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 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
diff --git a/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/DeltaProcessor.java b/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/DeltaProcessor.java
index 5c6cad4..d92c42c 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/DeltaProcessor.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/DeltaProcessor.java
@@ -353,7 +353,7 @@ public class DeltaProcessor {
// java project doesn't exist: ignore
}
removeFromParentInfo(javaProject);
- this.manager.removePerProjectInfo(javaProject);
+ this.manager.removePerProjectInfo(javaProject, false /* don't remove index files and timestamp info of external jar */);
this.manager.containerRemove(javaProject);
}
this.state.rootsAreStale = true;
@@ -376,7 +376,7 @@ public class DeltaProcessor {
checkExternalFolderChange(project, javaProject);
} else {
// remove classpath cache so that initializeRoots() will not consider the project has a classpath
- this.manager.removePerProjectInfo(javaProject);
+ this.manager.removePerProjectInfo(javaProject, true /* remove external jar files indexes and timestamps */);
// remove container cache for this project
this.manager.containerRemove(javaProject);
// close project
@@ -409,7 +409,7 @@ public class DeltaProcessor {
this.manager.forceBatchInitializations(false/*not initAfterLoad*/);
// remove classpath cache so that initializeRoots() will not consider the project has a classpath
- this.manager.removePerProjectInfo(javaProject);
+ this.manager.removePerProjectInfo(javaProject, true /* remove external jar files indexes and timestamps*/);
// remove container cache for this project
this.manager.containerRemove(javaProject);
@@ -893,6 +893,7 @@ public class DeltaProcessor {
externalArchivesStatus.put(entryPath, EXTERNAL_JAR_ADDED);
this.state.getExternalLibTimeStamps().put(entryPath, new Long(newTimeStamp));
// index the new jar
+ this.manager.indexManager.removeIndex(entryPath);
this.manager.indexManager.indexLibrary(entryPath, project.getProject());
}
}
diff --git a/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/DiscardWorkingCopyOperation.java b/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/DiscardWorkingCopyOperation.java
index fa533e6..4e3409d 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/DiscardWorkingCopyOperation.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/DiscardWorkingCopyOperation.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
@@ -32,7 +32,7 @@ public class DiscardWorkingCopyOperation extends JavaModelOperation {
if (useCount == 0) {
IJavaProject javaProject = workingCopy.getJavaProject();
if (ExternalJavaProject.EXTERNAL_PROJECT_NAME.equals(javaProject.getElementName())) {
- manager.removePerProjectInfo((JavaProject) javaProject);
+ manager.removePerProjectInfo((JavaProject) javaProject, true /* remove external jar files indexes and timestamps*/);
manager.containerRemove(javaProject);
}
if (!workingCopy.isPrimary()) {
diff --git a/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ExternalFoldersManager.java b/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ExternalFoldersManager.java
index 5ee8783..150768e 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ExternalFoldersManager.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ExternalFoldersManager.java
@@ -384,7 +384,8 @@ public class ExternalFoldersManager {
for (int index = 0; index < this.externalFolders.size(); index++ ) {
if ((externalPath = (IPath)this.externalFolders.get(index)) != null) {
IFolder folder = getFolder(externalPath);
- folder.refreshLocal(IResource.DEPTH_INFINITE, pm);
+ if (folder != null)
+ folder.refreshLocal(IResource.DEPTH_INFINITE, pm);
}
// Set the processed ones to null instead of removing the element altogether,
// so that they will not be considered as duplicates.
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 65d27c4..1a2a73d 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
@@ -3655,13 +3655,15 @@ public class JavaModelManager implements ISaveParticipant, IContentTypeChangeLis
return null;
}
- public void removePerProjectInfo(JavaProject javaProject) {
+ public void removePerProjectInfo(JavaProject javaProject, boolean removeExtJarInfo) {
synchronized(this.perProjectInfos) { // use the perProjectInfo collection as its own lock
IProject project = javaProject.getProject();
PerProjectInfo info= (PerProjectInfo) this.perProjectInfos.get(project);
if (info != null) {
this.perProjectInfos.remove(project);
- info.forgetExternalTimestampsAndIndexes();
+ if (removeExtJarInfo) {
+ info.forgetExternalTimestampsAndIndexes();
+ }
}
}
resetNonChainingJarsCache();
diff --git a/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavadocContents.java b/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavadocContents.java
index 284b032..1f0c6d8 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavadocContents.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavadocContents.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
+ * Copyright (c) 2009, 2011 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
@@ -145,7 +145,7 @@ public class JavadocContents {
for (int i = 0; i < this.tempAnchorIndexesCount; i++) {
int anchorEndStart = this.tempAnchorIndexes[i];
- if (anchorEndStart != -1 && CharOperation.indexOf(anchor, this.content, false, anchorEndStart) == anchorEndStart) {
+ if (anchorEndStart != -1 && Util.prefixEquals(anchor, this.content, false, anchorEndStart)) {
this.tempAnchorIndexes[i] = -1;
@@ -165,7 +165,7 @@ public class JavadocContents {
this.tempLastAnchorFoundIndex = anchorEndStart;
- if (CharOperation.indexOf(anchor, this.content, false, anchorEndStart) == anchorEndStart) {
+ if (Util.prefixEquals(anchor, this.content, false, anchorEndStart)) {
return computeChildRange(anchorEndStart, anchor, indexOfSectionBottom);
} else {
if (this.tempAnchorIndexes.length == this.tempAnchorIndexesCount) {
diff --git a/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ModelUpdater.java b/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ModelUpdater.java
index 5f3bc20..2996543 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ModelUpdater.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ModelUpdater.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
@@ -130,7 +130,7 @@ public class ModelUpdater {
case IJavaElement.JAVA_PROJECT :
JavaModelManager manager = JavaModelManager.getJavaModelManager();
JavaProject javaProject = (JavaProject) element;
- manager.removePerProjectInfo(javaProject);
+ manager.removePerProjectInfo(javaProject, true /* remove external jar files indexes and timestamps*/);
manager.containerRemove(javaProject);
break;
case IJavaElement.PACKAGE_FRAGMENT_ROOT :
diff --git a/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/hierarchy/TypeHierarchy.java b/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/hierarchy/TypeHierarchy.java
index d4b4ce1..1688730 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/hierarchy/TypeHierarchy.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/hierarchy/TypeHierarchy.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 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
diff --git a/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/PublicScanner.java b/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/PublicScanner.java
index 1bc8721..6192c20 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/PublicScanner.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/PublicScanner.java
@@ -2964,20 +2964,23 @@ private int internalScanIdentifierOrKeyword(int index, int length, char[] data)
case 'e' : //else extends
switch (length) {
case 4 :
- if ((data[++index] == 'l') && (data[++index] == 's') && (data[++index] == 'e'))
- return TokenNameelse;
- else if ((data[index] == 'n')
- && (data[++index] == 'u')
- && (data[++index] == 'm')) {
- if (this.sourceLevel >= ClassFileConstants.JDK1_5) {
- return TokenNameenum;
- } else {
- this.useEnumAsAnIndentifier = true;
- return TokenNameIdentifier;
- }
+ if (data[++index] == 'l') {
+ if ((data[++index] == 's') && (data[++index] == 'e')) {
+ return TokenNameelse;
} else {
return TokenNameIdentifier;
}
+ } else if ((data[index] == 'n')
+ && (data[++index] == 'u')
+ && (data[++index] == 'm')) {
+ if (this.sourceLevel >= ClassFileConstants.JDK1_5) {
+ return TokenNameenum;
+ } else {
+ this.useEnumAsAnIndentifier = true;
+ return TokenNameIdentifier;
+ }
+ }
+ return TokenNameIdentifier;
case 7 :
if ((data[++index] == 'x')
&& (data[++index] == 't')
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 3c52d43..6265464 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
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 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
@@ -3621,4 +3621,60 @@ public class Util {
}
}
}
+
+ /**
+ * Answers true if the given name, starting from the given index, starts with the given prefix,
+ * false otherwise. isCaseSensitive is used to find out whether or not the comparison should be
+ * case sensitive.
+ * <br>
+ * <br>
+ * For example:
+ * <ol>
+ * <li><pre>
+ * prefix = { 'a' , 'B' }
+ * name = { 'c', 'd', 'a' , 'b', 'b', 'a', 'b', 'a' }
+ * startIndex = 2
+ * isCaseSensitive = false
+ * result => true
+ * </pre>
+ * </li>
+ * <li><pre>
+ * prefix = { 'a' , 'B' }
+ * name = { 'c', 'd', 'a' , 'b', 'b', 'a', 'b', 'a' }
+ * startIndex = 2
+ * isCaseSensitive = true
+ * result => false
+ * </pre>
+ * </li>
+ * </ol>
+ *
+ * @param prefix the given prefix
+ * @param name the given name
+ * @param isCaseSensitive to find out whether or not the comparison should be case sensitive
+ * @param startIndex index from which the prefix should be searched in the name
+ * @return true if the given name starts with the given prefix, false otherwise
+ * @throws NullPointerException if the given name is null or if the given prefix is null
+ */
+ public static final boolean prefixEquals(
+ char[] prefix,
+ char[] name,
+ boolean isCaseSensitive,
+ int startIndex) {
+
+ int max = prefix.length;
+ if (name.length - startIndex < max)
+ return false;
+ if (isCaseSensitive) {
+ for (int i = max; --i >= 0;) // assumes the prefix is not larger than the name
+ if (prefix[i] != name[startIndex + i])
+ return false;
+ return true;
+ }
+
+ for (int i = max; --i >= 0;) // assumes the prefix is not larger than the name
+ if (ScannerHelper.toLowerCase(prefix[i])
+ != ScannerHelper.toLowerCase(name[startIndex + i]))
+ return false;
+ return true;
+ }
}
diff --git a/eclipse/plugins/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/PatternSearchJob.java b/eclipse/plugins/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/PatternSearchJob.java
index b110fb5..459730c 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/PatternSearchJob.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/PatternSearchJob.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 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
@@ -88,9 +88,6 @@ public String getJobFamily() {
public boolean search(Index index, IProgressMonitor progressMonitor) {
if (index == null) return COMPLETE;
if (progressMonitor != null && progressMonitor.isCanceled()) throw new OperationCanceledException();
- if (!MatchLocator.SHOULD_FILTER_ENUM && index.containerPath.indexOf("org.apache.commons.lang_2") != -1) { //$NON-NLS-1$
- MatchLocator.SHOULD_FILTER_ENUM = true;
- }
ReadWriteMonitor monitor = index.monitor;
if (monitor == null) return COMPLETE; // index got deleted since acquired
try {
diff --git a/eclipse/plugins/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/TypeNameMatchRequestorWrapper.java b/eclipse/plugins/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/TypeNameMatchRequestorWrapper.java
index 25c81a0..81a74da 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/TypeNameMatchRequestorWrapper.java
+++ b/eclipse/plugins/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/TypeNameMatchRequestorWrapper.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 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,7 +31,6 @@ import org.eclipse.jdt.internal.compiler.env.AccessRestriction;
import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
import org.eclipse.jdt.internal.core.Openable;
import org.eclipse.jdt.internal.core.PackageFragmentRoot;
-import org.eclipse.jdt.internal.core.search.matching.MatchLocator;
import org.eclipse.jdt.internal.core.util.HandleFactory;
import org.eclipse.jdt.internal.core.util.HashtableOfArrayToObject;
@@ -176,7 +175,7 @@ private IType createTypeFromJar(String resourcePath, int separatorIndex) throws
pkgFragment= ((PackageFragmentRoot) this.lastPkgFragmentRoot).getPackageFragment(pkgName);
// filter org.apache.commons.lang.enum package for projects above 1.5
// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=317264
- if (MatchLocator.SHOULD_FILTER_ENUM && length == 5 && pkgName[4].equals("enum")) { //$NON-NLS-1$
+ if (length == 5 && pkgName[4].equals("enum")) { //$NON-NLS-1$
IJavaProject proj = (IJavaProject)pkgFragment.getAncestor(IJavaElement.JAVA_PROJECT);
if (!proj.equals(this.lastProject)) {
String complianceStr = proj.getOption(CompilerOptions.OPTION_Source, true);
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 a38b732..661b08b 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
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 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
@@ -79,7 +79,6 @@ import org.eclipse.jdt.internal.core.util.Util;
public class MatchLocator implements ITypeRequestor {
public static final int MAX_AT_ONCE;
-public static boolean SHOULD_FILTER_ENUM = false;
static {
long maxMemory = Runtime.getRuntime().maxMemory();
int ratio = (int) Math.round(((double) maxMemory) / (64 * 0x100000));
@@ -741,7 +740,7 @@ private boolean filterEnum(SearchMatch match) {
IJavaElement element = (IJavaElement)match.getElement();
PackageFragment pkg = (PackageFragment)element.getAncestor(IJavaElement.PACKAGE_FRAGMENT);
if (pkg != null) {
- // enum was found in org.apache.commons.lang.enum at index 5
+ // enum was found in org.apache.commons.lang.enum at index 4
if (pkg.names.length == 5 && pkg.names[4].equals("enum")) { //$NON-NLS-1$
if (this.options == null) {
IJavaProject proj = (IJavaProject)pkg.getAncestor(IJavaElement.JAVA_PROJECT);
@@ -1725,7 +1724,7 @@ protected void report(SearchMatch match) throws CoreException {
}
return;
}
- if (MatchLocator.SHOULD_FILTER_ENUM && filterEnum(match)){
+ if (filterEnum(match)){
if (BasicSearchEngine.VERBOSE) {
System.out.println("Filtered package with name enum"); //$NON-NLS-1$
}
diff --git a/eclipse/plugins/org.eclipse.jdt.debug.ui/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.jdt.debug.ui/META-INF/MANIFEST.MF
index 922a16e..7b8751d 100644
--- a/eclipse/plugins/org.eclipse.jdt.debug.ui/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.jdt.debug.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jdt.debug.ui; singleton:=true
-Bundle-Version: 3.5.0.qualifier
+Bundle-Version: 3.5.2.qualifier
Bundle-Activator: org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/eclipse/plugins/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/JavaBreakpointPage.java b/eclipse/plugins/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/JavaBreakpointPage.java
index f1d7f53..9632552 100644
--- a/eclipse/plugins/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/JavaBreakpointPage.java
+++ b/eclipse/plugins/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/JavaBreakpointPage.java
@@ -322,6 +322,9 @@ public class JavaBreakpointPage extends PropertyPage {
setTitle(PropertyPageMessages.JavaLineBreakpointPage_20);
fEditor = new CompositeBreakpointEditor(new AbstractJavaBreakpointEditor[]
{new MethodBreakpointEditor(), new JavaBreakpointConditionEditor()});
+ } else {
+ // use standard editor for any other kind of breakpoint (@see bug 325161)
+ fEditor = new StandardJavaBreakpointEditor();
}
fEditor.createControl(parent);
fEditor.addPropertyListener(new IPropertyListener() {
diff --git a/eclipse/plugins/org.eclipse.jdt.doc.isv/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.jdt.doc.isv/META-INF/MANIFEST.MF
index b28c21a..e9f6049 100644
--- a/eclipse/plugins/org.eclipse.jdt.doc.isv/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.jdt.doc.isv/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jdt.doc.isv; singleton:=true
-Bundle-Version: 3.6.1.qualifier
+Bundle-Version: 3.6.2.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/eclipse/plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt b/eclipse/plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt
index b224695..9b51010 100644
--- a/eclipse/plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt
+++ b/eclipse/plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt
@@ -97,7 +97,7 @@
;org.eclipse.jdt.core.*"
-group "Java development tools UI plug-in packages" "org.eclipse.jdt.ui
;org.eclipse.jdt.ui.*"
--link http://java.sun.com/javase/6/docs/api
+-link http://download.oracle.com/javase/6/docs/api
-linkoffline ./../../../org.eclipse.platform.doc.isv/reference/api ../org.eclipse.platform.doc.isv/reference/api
-link http://bundles.osgi.org/javadoc/r4
-tag 'noimplement:a:Restriction:'
diff --git a/eclipse/plugins/org.eclipse.jdt.doc.isv/jdtaptOptions.txt b/eclipse/plugins/org.eclipse.jdt.doc.isv/jdtaptOptions.txt
index 60fca40..95df4fb 100644
--- a/eclipse/plugins/org.eclipse.jdt.doc.isv/jdtaptOptions.txt
+++ b/eclipse/plugins/org.eclipse.jdt.doc.isv/jdtaptOptions.txt
@@ -93,7 +93,7 @@
-bottom '<font size="-1"><p><a href="{@docRoot}/../misc/api-usage-rules.html">Guidelines for using Eclipse APIs</a>.</p><p>Copyright (c) 2000, 2010 IBM Corporation and others. All rights reserved.</p></font>'
-group "Java development tools APT plug-in packages" "org.eclipse.jdt.apt.core
;org.eclipse.jdt.apt.core.*"
--link http://java.sun.com/javase/6/docs/api
+-link http://download.oracle.com/javase/6/docs/api
-linkoffline ./../../../org.eclipse.platform.doc.isv/reference/api ../org.eclipse.platform.doc.isv/reference/api
-linkoffline ./../../../org.eclipse.jdt.doc.isv/reference/api ./reference/api
-link http://bundles.osgi.org/javadoc/r4
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 904dc93..8092512 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.100.qualifier
+Bundle-Version: 3.5.200.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/LaunchingPlugin.java b/eclipse/plugins/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/LaunchingPlugin.java
index 5dd9665..ffb4253 100644
--- a/eclipse/plugins/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/LaunchingPlugin.java
+++ b/eclipse/plugins/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/LaunchingPlugin.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 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
@@ -26,6 +26,7 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -50,8 +51,8 @@ import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Plugin;
import org.eclipse.core.runtime.Preferences;
-import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.Preferences.PropertyChangeEvent;
+import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.core.runtime.preferences.InstanceScope;
import org.eclipse.debug.core.DebugEvent;
@@ -131,6 +132,20 @@ public class LaunchingPlugin extends Plugin implements Preferences.IPropertyChan
private static Map fgLibraryInfoMap = null;
/**
+ * Mapping of the last time the directory of a given SDK was modified.
+ * <br><br>
+ * Mapping: <code>Map<String,Long></code>
+ * @since 3.7
+ */
+ private static Map fgInstallTimeMap = null;
+ /**
+ * Mutex for checking the time stamp of an install location
+ *
+ * @since 3.7
+ */
+ private static Object installLock = new Object();
+
+ /**
* Whether changes in VM preferences are being batched. When being batched
* the plug-in can ignore processing and changes.
*/
@@ -919,6 +934,137 @@ public class LaunchingPlugin extends Plugin implements Preferences.IPropertyChan
}
/**
+ * Checks to see if the time stamp of the file describe by the given location string
+ * has been modified since the last recorded time stamp. If there is no last recorded
+ * time stamp we assume it has changed.
+ *
+ * @param location the location of the SDK we want to check the time stamp for
+ * @return <code>true</code> if the time stamp has changed compared to the cached one or if there is
+ * no recorded time stamp, <code>false</code> otherwise.
+ *
+ * @since 3.6.2
+ * @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=266651
+ */
+ public static boolean timeStampChanged(String location) {
+ synchronized (installLock) {
+ File file = new File(location);
+ if(file.exists()) {
+ if(fgInstallTimeMap == null) {
+ readInstallInfo();
+ }
+ Long stamp = (Long) fgInstallTimeMap.get(location);
+ long fstamp = file.lastModified();
+ if(stamp != null) {
+ if(stamp.longValue() == fstamp) {
+ return false;
+ }
+ }
+ //if there is no recorded stamp we have to assume it is new
+ stamp = new Long(fstamp);
+ fgInstallTimeMap.put(location, stamp);
+ writeInstallInfo();
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Reads the file of saved time stamps and populates the {@link #fgInstallTimeMap}
+ *
+ * @since 3.6.2
+ * @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=266651
+ */
+ private static void readInstallInfo() {
+ fgInstallTimeMap = new HashMap();
+ IPath libPath = getDefault().getStateLocation();
+ libPath = libPath.append(".install.xml"); //$NON-NLS-1$
+ File file = libPath.toFile();
+ if (file.exists()) {
+ try {
+ InputStream stream = new BufferedInputStream(new FileInputStream(file));
+ DocumentBuilder parser = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+ parser.setErrorHandler(new DefaultHandler());
+ Element root = parser.parse(new InputSource(stream)).getDocumentElement();
+ if(root.getNodeName().equalsIgnoreCase("dirs")) { //$NON-NLS-1$
+ NodeList nodes = root.getChildNodes();
+ Node node = null;
+ Element element = null;
+ for (int i = 0; i < nodes.getLength(); i++) {
+ node = nodes.item(i);
+ if(node.getNodeType() == Node.ELEMENT_NODE) {
+ element = (Element) node;
+ if(element.getNodeName().equalsIgnoreCase("entry")) { //$NON-NLS-1$
+ String loc = element.getAttribute("loc"); //$NON-NLS-1$
+ String stamp = element.getAttribute("stamp"); //$NON-NLS-1$
+ try {
+ Long l = new Long(stamp);
+ fgInstallTimeMap.put(loc, l);
+ }
+ catch(NumberFormatException nfe) {
+ //do nothing
+ }
+ }
+ }
+ }
+ }
+ } catch (IOException e) {
+ log(e);
+ } catch (ParserConfigurationException e) {
+ log(e);
+ } catch (SAXException e) {
+ log(e);
+ }
+ }
+ }
+
+ /**
+ * Writes out the mappings of SDK install time stamps to disk.
+ *
+ * @since 3.6.2
+ * @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=266651
+ */
+ private static synchronized void writeInstallInfo() {
+ if(fgInstallTimeMap != null) {
+ OutputStream stream= null;
+ try {
+ Document doc = DebugPlugin.newDocument();
+ Element root = doc.createElement("dirs"); //$NON-NLS-1$
+ doc.appendChild(root);
+ Entry entry = null;
+ Element e = null;
+ for(Iterator i = fgInstallTimeMap.entrySet().iterator(); i.hasNext();) {
+ entry = (Entry) i.next();
+ e = doc.createElement("entry"); //$NON-NLS-1$
+ root.appendChild(e);
+ e.setAttribute("loc", entry.getKey().toString()); //$NON-NLS-1$
+ e.setAttribute("stamp", entry.getValue().toString()); //$NON-NLS-1$
+ }
+ String xml = DebugPlugin.serializeDocument(doc);
+ IPath libPath = getDefault().getStateLocation();
+ libPath = libPath.append(".install.xml"); //$NON-NLS-1$
+ File file = libPath.toFile();
+ if (!file.exists()) {
+ file.createNewFile();
+ }
+ stream = new BufferedOutputStream(new FileOutputStream(file));
+ stream.write(xml.getBytes("UTF8")); //$NON-NLS-1$
+ } catch (IOException e) {
+ log(e);
+ } catch (CoreException e) {
+ log(e);
+ } finally {
+ if (stream != null) {
+ try {
+ stream.close();
+ } catch (IOException e1) {
+ }
+ }
+ }
+ }
+ }
+
+ /**
* Returns paths stored in XML
* @param lib
* @param pathType
diff --git a/eclipse/plugins/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/StandardVMType.java b/eclipse/plugins/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/StandardVMType.java
index 1fccaee..d5bbdbb 100644
--- a/eclipse/plugins/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/StandardVMType.java
+++ b/eclipse/plugins/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/StandardVMType.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 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
@@ -117,12 +117,10 @@ public class StandardVMType extends AbstractVMInstallType {
* executable.
*/
protected synchronized LibraryInfo getLibraryInfo(File javaHome, File javaExecutable) {
-
- // See if we already know the information for the requested VM. If not, generate it.
String installPath = javaHome.getAbsolutePath();
LibraryInfo info = LaunchingPlugin.getLibraryInfo(installPath);
- if (info == null) {
- info= (LibraryInfo)fgFailedInstallPath.get(installPath);
+ if (info == null || LaunchingPlugin.timeStampChanged(installPath)) {
+ info = (LibraryInfo)fgFailedInstallPath.get(installPath);
if (info == null) {
info = generateLibraryInfo(javaHome, javaExecutable);
if (info == 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 1b4eae0..b0fba75 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.6.1.qualifier
+Bundle-Version: 3.6.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 da64adc..3c9a32f 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
@@ -17,6 +17,7 @@ import org.eclipse.swt.events.TraverseListener;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -63,6 +64,8 @@ import org.eclipse.jdt.internal.ui.util.ExceptionHandler;
*/
public class ChangeCorrectionProposal implements IJavaCompletionProposal, ICommandAccess, ICompletionProposalExtension5, ICompletionProposalExtension6 {
+ private static final NullChange COMPUTING_CHANGE= new NullChange("ChangeCorrectionProposal computing..."); //$NON-NLS-1$
+
private Change fChange;
private String fName;
private int fRelevance;
@@ -301,9 +304,53 @@ public class ChangeCorrectionProposal implements IJavaCompletionProposal, IComma
if (Util.isGtk()) {
// workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=293995 :
// [Widgets] Deadlock while UI thread displaying/computing a change proposal and non-UI thread creating image
- if (fChange == null) {
- fChange= createChange();
+
+ // Solution is to create the change outside a 'synchronized' block.
+ // Synchronization is achieved by polling fChange, using "fChange == COMPUTING_CHANGE" as barrier.
+ // Timeout of 10s for safety reasons (should not be reached).
+ long end= System.currentTimeMillis() + 10000;
+ do {
+ boolean computing;
+ synchronized (this) {
+ computing= fChange == COMPUTING_CHANGE;
+ }
+ if (computing) {
+ try {
+ Display display= Display.getCurrent();
+ if (display != null) {
+ while (! display.isDisposed() && display.readAndDispatch()) {
+ }
+ display.sleep();
+ } else {
+ Thread.sleep(100);
+ }
+ } catch (InterruptedException e) {
+ //continue
+ }
+ } else {
+ synchronized (this) {
+ if (fChange == COMPUTING_CHANGE) {
+ continue;
+ } else if (fChange != null) {
+ return fChange;
+ } else {
+ fChange= COMPUTING_CHANGE;
+ }
+ }
+ Change change= createChange();
+ synchronized (this) {
+ fChange= change;
+ }
+ return change;
+ }
+ } while (System.currentTimeMillis() < end);
+
+ synchronized (this) {
+ if (fChange == COMPUTING_CHANGE) {
+ return null; //failed
+ }
}
+
} else {
synchronized (this) {
if (fChange == null) {
diff --git a/eclipse/plugins/org.eclipse.jface/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.jface/META-INF/MANIFEST.MF
index 4033f32..9f7a4a9 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.6.1.qualifier
+Bundle-Version: 3.6.2.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/eclipse/plugins/org.eclipse.jface/src/org/eclipse/jface/wizard/ProgressMonitorPart.java b/eclipse/plugins/org.eclipse.jface/src/org/eclipse/jface/wizard/ProgressMonitorPart.java
index db6b7de..c647e23 100644
--- a/eclipse/plugins/org.eclipse.jface/src/org/eclipse/jface/wizard/ProgressMonitorPart.java
+++ b/eclipse/plugins/org.eclipse.jface/src/org/eclipse/jface/wizard/ProgressMonitorPart.java
@@ -284,6 +284,7 @@ public class ProgressMonitorPart extends Composite implements
arrowCursor.dispose();
}
});
+ fStopButton.setEnabled(false);
fStopButton.setToolTipText(JFaceResources.getString("ProgressMonitorPart.cancelToolTip")); //$NON-NLS-1$
}
}
diff --git a/eclipse/plugins/org.eclipse.ltk.core.refactoring/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.ltk.core.refactoring/META-INF/MANIFEST.MF
index e2ac94b..2c52c09 100644
--- a/eclipse/plugins/org.eclipse.ltk.core.refactoring/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.ltk.core.refactoring/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.ltk.core.refactoring; singleton:=true
-Bundle-Version: 3.5.100.qualifier
+Bundle-Version: 3.5.101.qualifier
Bundle-Activator: org.eclipse.ltk.internal.core.refactoring.RefactoringCorePlugin
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %providerName
diff --git a/eclipse/plugins/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/UndoDocumentChange.java b/eclipse/plugins/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/UndoDocumentChange.java
index b8ff7b0..3fd2bbd 100644
--- a/eclipse/plugins/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/UndoDocumentChange.java
+++ b/eclipse/plugins/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/UndoDocumentChange.java
@@ -93,7 +93,7 @@ public class UndoDocumentChange extends Change {
ITextFileBufferManager fileBufferManager= FileBuffers.getTextFileBufferManager();
ITextFileBuffer fileBuffer= fileBufferManager.getTextFileBuffer(fDocument);
- if (! fileBuffer.isSynchronizationContextRequested()) {
+ if (fileBuffer == null || ! fileBuffer.isSynchronizationContextRequested()) {
return fUndo.apply(fDocument, TextEdit.CREATE_UNDO);
}
diff --git a/eclipse/plugins/org.eclipse.osgi/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.osgi/META-INF/MANIFEST.MF
index 68e239d..9452d1d 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.6.1.qualifier
+Bundle-Version: 3.6.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/internal/core/AbstractBundle.java b/eclipse/plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/AbstractBundle.java
index 1e10d79..4e33972 100644
--- a/eclipse/plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/AbstractBundle.java
+++ b/eclipse/plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/AbstractBundle.java
@@ -1383,11 +1383,14 @@ public abstract class AbstractBundle implements Bundle, Comparable, KeyedElement
if (filePattern != null)
try {
// create a file pattern filter with 'filename' as the key
- patternFilter = FilterImpl.newInstance("(filename=" + filePattern + ")"); //$NON-NLS-1$ //$NON-NLS-2$
+ patternFilter = FilterImpl.newInstance("(filename=" + sanitizeFilterInput(filePattern) + ")"); //$NON-NLS-1$ //$NON-NLS-2$
// create a single hashtable to be shared during the recursive search
patternProps = new Hashtable(2);
} catch (InvalidSyntaxException e) {
- // cannot happen
+ // something unexpected happened; log error and return nothing
+ Bundle b = framework.systemBundle;
+ framework.publishFrameworkEvent(FrameworkEvent.ERROR, b, e);
+ return null;
}
// find the local entries of this bundle
findLocalEntryPaths(path, patternFilter, patternProps, recurse, pathList);
@@ -1450,6 +1453,46 @@ public abstract class AbstractBundle implements Bundle, Comparable, KeyedElement
};
}
+ private String sanitizeFilterInput(String filePattern) throws InvalidSyntaxException {
+ StringBuffer buffer = null;
+ boolean foundEscape = false;
+ for (int i = 0; i < filePattern.length(); i++) {
+ char c = filePattern.charAt(i);
+ switch (c) {
+ case '\\' :
+ // we either used the escape found or found a new escape.
+ foundEscape = foundEscape ? false : true;
+ if (buffer != null)
+ buffer.append(c);
+ break;
+ case '(' :
+ case ')' :
+ if (!foundEscape) {
+ if (buffer == null) {
+ buffer = new StringBuffer(filePattern.length() + 16);
+ buffer.append(filePattern.substring(0, i));
+ }
+ // must escape with '\'
+ buffer.append('\\');
+ } else {
+ foundEscape = false; // used the escape found
+ }
+ if (buffer != null)
+ buffer.append(c);
+ break;
+ default :
+ // if we found an escape it has been used
+ foundEscape = false;
+ if (buffer != null)
+ buffer.append(c);
+ break;
+ }
+ }
+ if (foundEscape)
+ throw new InvalidSyntaxException("Trailing escape characters must be escaped.", filePattern); //$NON-NLS-1$
+ return buffer == null ? filePattern : buffer.toString();
+ }
+
protected void findLocalEntryPaths(String path, Filter patternFilter, Hashtable patternProps, boolean recurse, List pathList) {
Enumeration entryPaths = bundledata.getEntryPaths(path);
if (entryPaths == null)
diff --git a/eclipse/plugins/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/module/GroupingChecker.java b/eclipse/plugins/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/module/GroupingChecker.java
index 79f9e59..30c5963 100644
--- a/eclipse/plugins/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/module/GroupingChecker.java
+++ b/eclipse/plugins/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/module/GroupingChecker.java
@@ -10,6 +10,7 @@ package org.eclipse.osgi.internal.module;
import java.util.*;
import org.eclipse.osgi.service.resolver.BundleSpecification;
+import org.eclipse.osgi.service.resolver.ExportPackageDescription;
/*
* The GroupingChecker checks the 'uses' directive on exported packages for consistency
@@ -36,11 +37,16 @@ public class GroupingChecker {
isConsistentInternal(bundle, selectedSupplier, new ArrayList(1), true, null);
}
// process all imports
- ResolverImport[] imports = bundle.getImportPackages();
- for (int j = 0; j < imports.length; j++) {
- ResolverExport selectedSupplier = (ResolverExport) imports[j].getSelectedSupplier();
- if (selectedSupplier != null)
- isConsistentInternal(bundle, selectedSupplier, true, null);
+ // must check resolved imports to get any dynamically resolved imports
+ ExportPackageDescription[] imports = bundle.getBundle().getResolvedImports();
+ for (int i = 0; i < imports.length; i++) {
+ ExportPackageDescription importPkg = imports[i];
+ Object[] exports = bundle.getResolver().getResolverExports().get(importPkg.getName());
+ for (int j = 0; j < exports.length; j++) {
+ ResolverExport export = (ResolverExport) exports[j];
+ if (export.getExportPackageDescription() == importPkg)
+ isConsistentInternal(bundle, export, true, null);
+ }
}
}
@@ -137,14 +143,30 @@ public class GroupingChecker {
return null;
visited.add(bundle); // prevent endless cycles
// check imports
- ResolverImport imported = bundle.getImport(packageName);
- if (imported != null && imported.getSelectedSupplier() != null) {
- // make sure we are not resolved to our own import
- ResolverExport selectedExport = (ResolverExport) imported.getSelectedSupplier();
- if (selectedExport.getExporter() != bundle) {
- // found resolved import; get the roots from the resolved exporter;
- // this is all the roots if the package is imported
- return getPackageRoots(selectedExport.getExporter(), packageName, visited);
+ if (bundle.getBundle().isResolved()) {
+ // must check resolved imports to get any dynamically resolved imports
+ ExportPackageDescription[] imports = bundle.getBundle().getResolvedImports();
+ for (int i = 0; i < imports.length; i++) {
+ ExportPackageDescription importPkg = imports[i];
+ if (importPkg.getExporter() == bundle.getBundle() || !importPkg.getName().equals(packageName))
+ continue;
+ Object[] exports = bundle.getResolver().getResolverExports().get(packageName);
+ for (int j = 0; j < exports.length; j++) {
+ ResolverExport export = (ResolverExport) exports[j];
+ if (export.getExportPackageDescription() == importPkg)
+ return getPackageRoots(export.getExporter(), packageName, visited);
+ }
+ }
+ } else {
+ ResolverImport imported = bundle.getImport(packageName);
+ if (imported != null && imported.getSelectedSupplier() != null) {
+ // make sure we are not resolved to our own import
+ ResolverExport selectedExport = (ResolverExport) imported.getSelectedSupplier();
+ if (selectedExport.getExporter() != bundle) {
+ // found resolved import; get the roots from the resolved exporter;
+ // this is all the roots if the package is imported
+ return getPackageRoots(selectedExport.getExporter(), packageName, visited);
+ }
}
}
// check if the bundle exports the package
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 b692b11..85acb74 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
@@ -64,10 +64,6 @@ public abstract class ResolverConstraint {
// returns whether this constraint is optional
abstract boolean isOptional();
- public void setPossibleSuppliers(VersionSupplier[] possibleSuppliers) {
- this.possibleSuppliers = possibleSuppliers;
- }
-
void addPossibleSupplier(VersionSupplier supplier) {
if (supplier == null)
return;
diff --git a/eclipse/plugins/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/module/ResolverImpl.java b/eclipse/plugins/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/module/ResolverImpl.java
index 9286454..24b650a 100644
--- a/eclipse/plugins/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/module/ResolverImpl.java
+++ b/eclipse/plugins/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/module/ResolverImpl.java
@@ -1578,7 +1578,7 @@ public class ResolverImpl implements org.eclipse.osgi.service.resolver.Resolver
resolverImports[j].setName(null);
if (!found) {
// not found or there was a conflict; reset the suppliers and return null
- resolverImports[j].setPossibleSuppliers(null);
+ resolverImports[j].clearPossibleSuppliers();
return null;
}
// If the import resolved then return it's matching export
@@ -1588,7 +1588,7 @@ public class ResolverImpl implements org.eclipse.osgi.service.resolver.Resolver
// If it is a wildcard import then clear the wire, so other
// exported packages can be found for it
if (importName.endsWith("*")) //$NON-NLS-1$
- resolverImports[j].setPossibleSuppliers(null);
+ resolverImports[j].clearPossibleSuppliers();
return matchingExport;
}
}
diff --git a/eclipse/plugins/org.eclipse.osgi/supplement/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.osgi/supplement/META-INF/MANIFEST.MF
index d8ff0de..0a72e47 100644
--- a/eclipse/plugins/org.eclipse.osgi/supplement/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.osgi/supplement/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.equinox.supplement
-Bundle-Version: 1.3.0.qualifier
+Bundle-Version: 1.3.1.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Export-Package: org.eclipse.osgi.framework.log;version="1.0",
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 2a87f9a..68afb38 100644
--- a/eclipse/plugins/org.eclipse.pde.build/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.pde.build/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.pde.build;singleton:=true
-Bundle-Version: 3.6.1.qualifier
+Bundle-Version: 3.6.2.qualifier
Bundle-ClassPath: pdebuild.jar
Bundle-Activator: org.eclipse.pde.internal.build.BuildActivator
Bundle-Vendor: %providerName
diff --git a/eclipse/plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/AbstractScriptGenerator.java b/eclipse/plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/AbstractScriptGenerator.java
index f1c379f..c0c3d85 100644
--- a/eclipse/plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/AbstractScriptGenerator.java
+++ b/eclipse/plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/AbstractScriptGenerator.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 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
@@ -640,8 +640,16 @@ public abstract class AbstractScriptGenerator implements IXMLConstants, IPDEBuil
IProfile profile = registry.getProfile(profileId, timestamp);
if (profile != null) {
String cache = profile.getProperty(IProfile.PROP_CACHE);
- if (cache != null)
- result.add(new File(cache).toURI());
+ if (cache != null) {
+ File cacheFolder = new File(cache);
+ if (cacheFolder.exists()) {
+ result.add(cacheFolder.toURI());
+ } else {
+ //if cache does not exist, this could be a roaming profile that has not
+ //been run yet, lets guess and use the parent of the p2 data area
+ result.add(areaFile.getParentFile().toURI());
+ }
+ }
String sharedCache = profile.getProperty(IProfile.PROP_SHARED_CACHE);
if (sharedCache != null)
result.add(new File(cache).toURI());
@@ -661,6 +669,7 @@ public abstract class AbstractScriptGenerator implements IXMLConstants, IPDEBuil
}
} catch (IllegalStateException e) {
//unable to read profile, may be read only
+ result.add(areaFile.getParentFile().toURI());
}
//download cache
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 5e140d7..589d6da 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.6.1.qualifier
+Bundle-Version: 3.6.2.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/core/plugin/PluginRegistry.java b/eclipse/plugins/org.eclipse.pde.core/src/org/eclipse/pde/core/plugin/PluginRegistry.java
index e2936e7..d8bdd98 100644
--- a/eclipse/plugins/org.eclipse.pde.core/src/org/eclipse/pde/core/plugin/PluginRegistry.java
+++ b/eclipse/plugins/org.eclipse.pde.core/src/org/eclipse/pde/core/plugin/PluginRegistry.java
@@ -341,11 +341,12 @@ public class PluginRegistry {
Version maxV = null;
for (int i = 0; i < models.length; i++) {
IPluginModelBase model = models[i];
+ String versionStr = model.getPluginBase().getVersion();
+ Version version = VersionUtil.validateVersion(versionStr).isOK() ? new Version(versionStr) : Version.emptyVersion;
if (max == null) {
max = model;
- maxV = new Version(model.getPluginBase().getVersion());
+ maxV = version;
} else {
- Version version = new Version(model.getPluginBase().getVersion());
if (VersionUtil.isGreaterOrEqualTo(version, maxV)) {
max = model;
maxV = version;
@@ -378,7 +379,9 @@ public class PluginRegistry {
for (int i = 0; i < models.length; i++) {
IPluginModelBase model = models[i];
if ((filter == null || filter.accept(model)) && id.equals(model.getPluginBase().getId())) {
- if (range == null || range.isIncluded(new Version(model.getPluginBase().getVersion()))) {
+ String versionStr = model.getPluginBase().getVersion();
+ Version version = VersionUtil.validateVersion(versionStr).isOK() ? new Version(versionStr) : Version.emptyVersion;
+ if (range == null || range.isIncluded(version)) {
results.add(model);
}
}
diff --git a/eclipse/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/schema/Schema.java b/eclipse/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/schema/Schema.java
index c02c9d2..fcf7df7 100644
--- a/eclipse/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/schema/Schema.java
+++ b/eclipse/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/schema/Schema.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
@@ -9,1043 +9,1049 @@
* IBM Corporation - initial API and implementation
* David Carver - STAR - bug 213255
*******************************************************************************/
-package org.eclipse.pde.internal.core.schema;
-
-import java.io.*;
-import java.net.URL;
-import java.util.*;
-import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.core.runtime.PlatformObject;
-import org.eclipse.pde.core.*;
-import org.eclipse.pde.core.plugin.IPluginBase;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.*;
-import org.eclipse.pde.internal.core.ischema.*;
-import org.eclipse.pde.internal.core.util.*;
-import org.w3c.dom.*;
-import org.xml.sax.SAXException;
-
-public class Schema extends PlatformObject implements ISchema {
-
- private URL fURL;
-
- private ListenerList fListeners = new ListenerList();
-
- private Vector fElements = new Vector();
-
- private Vector fDocSections = new Vector();
-
- private Vector fIncludes;
-
- private String fPointID;
-
- private String fPluginID;
-
- private ISchemaDescriptor fSchemaDescriptor;
-
- private boolean fLoaded;
-
- private Vector fReferences;
-
- private String fDescription;
-
- private double fTargetVersion;
-
- private String fName = ""; //$NON-NLS-1$
-
- private boolean fNotificationEnabled;
-
- public final static String INDENT = " "; //$NON-NLS-1$
-
- private boolean fDisposed;
-
- private boolean fValid;
-
- private boolean fAbbreviated;
-
- public Schema(String pluginId, String pointId, String name, boolean abbreviated) {
- fPluginID = pluginId;
- fPointID = pointId;
- fName = name;
- fAbbreviated = abbreviated;
- }
-
- public Schema(ISchemaDescriptor schemaDescriptor, URL url, boolean abbreviated) {
- fSchemaDescriptor = schemaDescriptor;
- fURL = url;
- fAbbreviated = abbreviated;
- }
-
- public void addDocumentSection(IDocumentSection docSection) {
- fDocSections.addElement(docSection);
- fireModelChanged(new ModelChangedEvent(this, IModelChangedEvent.INSERT, new Object[] {docSection}, null));
-
- }
-
- public void addElement(ISchemaElement element) {
- addElement(element, null);
- }
-
- public void addElement(ISchemaElement element, ISchemaElement afterElement) {
- int index = -1;
- if (afterElement != null) {
- index = fElements.indexOf(afterElement);
- }
- if (index != -1)
- fElements.add(index + 1, element);
- else
- fElements.add(element);
- fireModelChanged(new ModelChangedEvent(this, IModelChangedEvent.INSERT, new Object[] {element}, null));
- }
-
- public void addInclude(ISchemaInclude include) {
- if (fIncludes == null)
- fIncludes = new Vector();
- fIncludes.add(include);
- fireModelChanged(new ModelChangedEvent(this, IModelChangedEvent.INSERT, new Object[] {include}, null));
- }
-
- public void removeInclude(ISchemaInclude include) {
- if (fIncludes == null)
- return;
- fIncludes.remove(include);
- fireModelChanged(new ModelChangedEvent(this, IModelChangedEvent.REMOVE, new Object[] {include}, null));
- }
-
- public void addModelChangedListener(IModelChangedListener listener) {
- fListeners.add(listener);
- }
-
- private void collectElements(ISchemaCompositor compositor, Vector result) {
- Object[] children = compositor.getChildren();
- for (int i = 0; i < children.length; i++) {
- Object child = children[i];
- if (child instanceof ISchemaCompositor)
- collectElements((ISchemaCompositor) child, result);
- else if (child instanceof ISchemaObjectReference) {
- ISchemaObjectReference ref = (ISchemaObjectReference) child;
- Object referenced = ref.getReferencedObject();
- if (referenced instanceof ISchemaElement)
- result.addElement(referenced);
- }
- }
- }
-
- public void dispose() {
- if (fIncludes != null) {
- for (int i = 0; i < fIncludes.size(); i++) {
- ISchemaInclude include = (ISchemaInclude) fIncludes.get(i);
- include.dispose();
- }
- }
- reset();
- fDisposed = true;
- }
-
- public ISchemaElement findElement(String name) {
- if (!isLoaded())
- load();
- for (int i = 0; i < fElements.size(); i++) {
- ISchemaElement element = (ISchemaElement) fElements.elementAt(i);
- if (element.getName().equals(name))
- return element;
- }
- if (fIncludes != null) {
- for (int i = 0; i < fIncludes.size(); i++) {
- ISchemaInclude include = (ISchemaInclude) fIncludes.get(i);
- ISchema ischema = include.getIncludedSchema();
- if (ischema == null)
- continue;
- ISchemaElement element = ischema.findElement(name);
- if (element != null)
- return element;
- }
- }
- return null;
- }
-
- public void fireModelChanged(IModelChangedEvent event) {
- if (!fNotificationEnabled)
- return;
- Object[] listeners = fListeners.getListeners();
- for (int i = 0; i < listeners.length; i++) {
- ((IModelChangedListener) listeners[i]).modelChanged(event);
- }
- }
-
- public void fireModelObjectChanged(Object object, String property, Object oldValue, Object newValue) {
- fireModelChanged(new ModelChangedEvent(this, object, property, oldValue, newValue));
- }
-
- private String getAttribute(Node node, String name) {
- NamedNodeMap map = node.getAttributes();
- Node attNode = map.getNamedItem(name);
- if (attNode != null) {
- String value = attNode.getNodeValue();
- if (value.length() > 0)
- return value;
- }
- return null;
- }
-
- public ISchemaElement[] getCandidateChildren(ISchemaElement element) {
- Vector candidates = new Vector();
- ISchemaType type = element.getType();
- if (type instanceof ISchemaComplexType) {
- ISchemaCompositor compositor = ((ISchemaComplexType) type).getCompositor();
- if (compositor != null)
- collectElements(compositor, candidates);
- }
- ISchemaElement[] result = new ISchemaElement[candidates.size()];
- candidates.copyInto(result);
- return result;
- }
-
- public String getDescription() {
- return fDescription;
- }
-
- public boolean isValid() {
- return fValid;
- }
-
- public IDocumentSection[] getDocumentSections() {
- IDocumentSection[] result = new IDocumentSection[fDocSections.size()];
- fDocSections.copyInto(result);
- return result;
- }
-
- public int getElementCount() {
- return fElements.size();
- }
-
- public int getResolvedElementCount() {
- int localCount = getElementCount();
- if (fIncludes == null)
- return localCount;
- int totalCount = localCount;
- for (int i = 0; i < fIncludes.size(); i++) {
- ISchemaInclude include = (ISchemaInclude) fIncludes.get(i);
- ISchema schema = include.getIncludedSchema();
- if (schema == null)
- continue;
- totalCount += schema.getResolvedElementCount();
- }
- return totalCount;
- }
-
- public ISchemaElement[] getElements() {
- if (!isLoaded())
- load();
- ISchemaElement[] result = new ISchemaElement[fElements.size()];
- fElements.copyInto(result);
- return result;
- }
-
- public String[] getElementNames() {
- ISchemaElement[] elements = getElements();
- String[] names = new String[elements.length];
- for (int i = 0; i < elements.length; i++)
- names[i] = elements[i].getName();
- return names;
- }
-
- public ISchemaElement[] getResolvedElements() {
- if (fIncludes == null)
- return getElements();
- if (!isLoaded())
- load();
- Vector result = (Vector) fElements.clone();
- for (int i = 0; i < fIncludes.size(); i++) {
- ISchemaInclude include = (ISchemaInclude) fIncludes.get(i);
- ISchema schema = include.getIncludedSchema();
- if (schema == null)
- continue;
- ISchemaElement[] ielements = schema.getElements();
- for (int j = 0; j < ielements.length; j++)
- result.add(ielements[j]);
- }
- return (ISchemaElement[]) result.toArray(new ISchemaElement[result.size()]);
- }
-
- public ISchemaInclude[] getIncludes() {
- if (fIncludes == null)
- return new ISchemaInclude[0];
- return (ISchemaInclude[]) fIncludes.toArray(new ISchemaInclude[fIncludes.size()]);
- }
-
- public String getName() {
- return fName;
- }
-
- private String getNormalizedText(String source) {
- if (source == null)
- return ""; //$NON-NLS-1$
-
- String result = source.replace('\t', ' ');
- result = result.trim();
- return result;
- }
-
- public ISchemaObject getParent() {
- return null;
- }
-
- public void setParent(ISchemaObject obj) {
- }
-
- public ISchemaElement getElementAt(int index) {
- return (ISchemaElement) fElements.get(index);
- }
-
- public String getQualifiedPointId() {
- return fPluginID + "." + fPointID; //$NON-NLS-1$
- }
-
- public String getPluginId() {
- return fPluginID;
- }
-
- public String getPointId() {
- return fPointID;
- }
-
- public ISchema getSchema() {
- return this;
- }
-
- public ISchemaDescriptor getSchemaDescriptor() {
- return fSchemaDescriptor;
- }
-
- public URL getURL() {
- return fURL;
- }
-
- public int indexOf(Object obj) {
- return fElements.indexOf(obj);
- }
-
- public boolean isDisposed() {
- return fDisposed;
- }
-
- public boolean isEditable() {
- return false;
- }
-
- public boolean isLoaded() {
- return fLoaded;
- }
-
- public boolean isNotificationEnabled() {
- return fNotificationEnabled;
- }
-
- public void load() {
- InputStream input = null;
- try {
- input = SchemaUtil.getInputStream(fURL);
- load(input);
- } catch (FileNotFoundException e) {
- fLoaded = false;
- } catch (IOException e) {
- PDECore.logException(e);
- } finally {
- try {
- if (input != null)
- input.close();
- } catch (IOException e1) {
- }
- }
- }
-
- public void load(InputStream stream) {
- try {
- SAXParserWrapper parser = new SAXParserWrapper();
- XMLDefaultHandler handler = new XMLDefaultHandler(fAbbreviated);
- parser.parse(stream, handler);
- traverseDocumentTree(handler.getDocumentElement());
- } catch (SAXException e) {
- // ignore parse errors - 'loaded' will be false anyway
- } catch (IOException e) {
- PDECore.logException(e, "IOException reading following URL: " + fURL); //$NON-NLS-1$
- } catch (Exception e) {
- PDECore.logException(e);
- }
- }
-
- private ISchemaAttribute processAttribute(ISchemaElement element, Node elementNode) {
- String aname = getAttribute(elementNode, "name"); //$NON-NLS-1$
- if (aname == null)
- return null;
- String atype = getAttribute(elementNode, "type"); //$NON-NLS-1$
- String ause = getAttribute(elementNode, "use"); //$NON-NLS-1$
- String avalue = getAttribute(elementNode, "value"); //$NON-NLS-1$
- ISchemaSimpleType type = null;
- if (atype != null) {
- type = (ISchemaSimpleType) resolveTypeReference(atype);
- }
- SchemaAttribute attribute = new SchemaAttribute(element, aname);
- //attribute.bindSourceLocation(elementNode, lineTable);
- if (ause != null) {
- int use = ISchemaAttribute.OPTIONAL;
- if (ause.equals("required")) //$NON-NLS-1$
- use = ISchemaAttribute.REQUIRED;
- else if (ause.equals("optional")) //$NON-NLS-1$
- use = ISchemaAttribute.OPTIONAL;
- else if (ause.equals("default")) //$NON-NLS-1$
- use = ISchemaAttribute.DEFAULT;
- attribute.setUse(use);
- }
- if (avalue != null)
- attribute.setValue(avalue);
- NodeList children = elementNode.getChildNodes();
- for (int i = 0; i < children.getLength(); i++) {
- Node child = children.item(i);
- if (child.getNodeType() == Node.ELEMENT_NODE) {
- String tag = child.getNodeName();
- if (tag.equals("annotation")) { //$NON-NLS-1$
- processAttributeAnnotation(attribute, child);
- } else if (tag.equals("simpleType")) { //$NON-NLS-1$
- processAttributeSimpleType(attribute, child);
- }
- }
- }
- if (type != null && attribute.getType() == null)
- attribute.setType(type);
- return attribute;
- }
-
- private void processAttributeAnnotation(SchemaAttribute element, Node node) {
- NodeList children = node.getChildNodes();
- for (int i = 0; i < children.getLength(); i++) {
- Node child = children.item(i);
- if (child.getNodeType() == Node.ELEMENT_NODE) {
- if (child.getNodeName().equals("documentation")) { //$NON-NLS-1$
- Node doc = child.getFirstChild();
- if (doc != null)
- element.setDescription(getNormalizedText(doc.getNodeValue()));
- } else if (child.getNodeName().equals("appInfo") || child.getNodeName().equals("appinfo")) { //$NON-NLS-1$ //$NON-NLS-2$
- NodeList infos = child.getChildNodes();
- for (int j = 0; j < infos.getLength(); j++) {
- Node meta = infos.item(j);
- if (meta.getNodeType() == Node.ELEMENT_NODE) {
- if (meta.getNodeName().equals("meta.attribute")) { //$NON-NLS-1$
- element.setKind(processKind(getAttribute(meta, "kind"))); //$NON-NLS-1$
- element.setBasedOn(getAttribute(meta, "basedOn")); //$NON-NLS-1$
- element.setTranslatableProperty(processTranslatable(getAttribute(meta, "translatable"))); //$NON-NLS-1$
- element.setDeprecatedProperty(processDeprecated(getAttribute(meta, "deprecated"))); //$NON-NLS-1$
- }
- }
- }
- }
- }
- }
- }
-
- private boolean processTranslatable(String value) {
- return (value != null && "true".equals(value)); //$NON-NLS-1$
- }
-
- private boolean processDeprecated(String value) {
- return value != null && "true".equals(value); //$NON-NLS-1$
- }
-
- private SchemaSimpleType processAttributeRestriction(SchemaAttribute attribute, Node node) {
- NodeList children = node.getChildNodes();
- if (children.getLength() == 0)
- return null;
- String baseName = getAttribute(node, "base"); //$NON-NLS-1$
- if (baseName.equals("string") == false) { //$NON-NLS-1$
- return new SchemaSimpleType(attribute.getSchema(), "string"); //$NON-NLS-1$
- }
- SchemaSimpleType type = new SchemaSimpleType(attribute.getSchema(), baseName);
- Vector items = new Vector();
- for (int i = 0; i < children.getLength(); i++) {
- Node child = children.item(i);
- if (child.getNodeType() == Node.ELEMENT_NODE) {
- if (child.getNodeName().equals("enumeration")) { //$NON-NLS-1$
- ISchemaEnumeration enumeration = processEnumeration(attribute.getSchema(), child);
- if (enumeration != null)
- items.addElement(enumeration);
- }
- }
- }
- ChoiceRestriction restriction = new ChoiceRestriction(attribute.getSchema());
- restriction.setChildren(items);
- type.setRestriction(restriction);
- return type;
- }
-
- private void processAttributeSimpleType(SchemaAttribute attribute, Node node) {
- NodeList children = node.getChildNodes();
- if (children.getLength() == 0)
- return;
- SchemaSimpleType type = null;
- for (int i = 0; i < children.getLength(); i++) {
- Node child = children.item(i);
- if (child.getNodeType() == Node.ELEMENT_NODE) {
- if (child.getNodeName().equals("restriction")) { //$NON-NLS-1$
- type = processAttributeRestriction(attribute, child);
- }
- }
- }
- if (type != null)
- attribute.setType(type);
- }
-
- private SchemaComplexType processComplexType(ISchemaElement owner, Node typeNode) {
- String aname = getAttribute(typeNode, "name"); //$NON-NLS-1$
- String amixed = getAttribute(typeNode, "mixed"); //$NON-NLS-1$
- SchemaComplexType complexType = new SchemaComplexType(this, aname);
- if (amixed != null && amixed.equals("true")) //$NON-NLS-1$
- complexType.setMixed(true);
- NodeList children = typeNode.getChildNodes();
- ISchemaCompositor compositor = null;
- for (int i = 0; i < children.getLength(); i++) {
- Node child = children.item(i);
- if (child.getNodeType() == Node.ELEMENT_NODE) {
- if (child.getNodeName().equals("attribute")) { //$NON-NLS-1$
- complexType.addAttribute(processAttribute(owner, child));
- } else {
- ISchemaObject object = processCompositorChild(owner, child, ISchemaCompositor.ROOT);
- if (object instanceof ISchemaCompositor && compositor == null) {
- compositor = (ISchemaCompositor) object;
- }
- }
- }
- }
- complexType.setCompositor(compositor);
- return complexType;
- }
-
- private ISchemaCompositor processCompositor(ISchemaObject parent, Node node, int type) {
- SchemaCompositor compositor = new SchemaCompositor(parent, type);
- NodeList children = node.getChildNodes();
- int minOccurs = 1;
- int maxOccurs = 1;
- String aminOccurs = getAttribute(node, "minOccurs"); //$NON-NLS-1$
- String amaxOccurs = getAttribute(node, "maxOccurs"); //$NON-NLS-1$
- if (aminOccurs != null)
- minOccurs = Integer.valueOf(aminOccurs).intValue();
- if (amaxOccurs != null) {
- if (amaxOccurs.equals("unbounded")) //$NON-NLS-1$
- maxOccurs = Integer.MAX_VALUE;
- else {
- maxOccurs = Integer.valueOf(amaxOccurs).intValue();
- }
- }
- compositor.setMinOccurs(minOccurs);
- compositor.setMaxOccurs(maxOccurs);
- for (int i = 0; i < children.getLength(); i++) {
- Node child = children.item(i);
- ISchemaObject object = processCompositorChild(compositor, child, type);
- if (object != null)
- compositor.addChild(object);
- }
- return compositor;
- }
-
- private ISchemaObject processCompositorChild(ISchemaObject parent, Node child, int parentKind) {
- String tag = child.getNodeName();
- if (tag.equals("element") && parentKind != ISchemaCompositor.ROOT) { //$NON-NLS-1$
- return processElement(parent, child);
- }
- // sequence: element | group | choice | sequence
- if (tag.equals("sequence") && parentKind != ISchemaCompositor.ALL) { //$NON-NLS-1$
- return processCompositor(parent, child, ISchemaCompositor.SEQUENCE);
- }
- // choice: element | group | choice | sequence
- if (tag.equals("choice") && parentKind != ISchemaCompositor.ALL) { //$NON-NLS-1$
- return processCompositor(parent, child, ISchemaCompositor.CHOICE);
- }
- // all: element
- if (tag.equals("all") //$NON-NLS-1$
- && (parentKind == ISchemaCompositor.ROOT || parentKind == ISchemaCompositor.GROUP)) {
- return processCompositor(parent, child, ISchemaCompositor.SEQUENCE);
- }
- // group: all | choice | sequence
- if (tag.equals("group") //$NON-NLS-1$
- && (parentKind == ISchemaCompositor.CHOICE || parentKind == ISchemaCompositor.SEQUENCE)) {
- return processCompositor(parent, child, ISchemaCompositor.SEQUENCE);
- }
- return null;
- }
-
- private ISchemaElement processElement(ISchemaObject parent, Node elementNode) {
- if (parent instanceof ISchemaCompositor)
- return processElementReference((ISchemaCompositor) parent, elementNode);
- return processElementDeclaration(parent, elementNode);
- }
-
- private ISchemaElement processElementDeclaration(ISchemaObject parent, Node elementNode) {
- String aname = getAttribute(elementNode, "name"); //$NON-NLS-1$
- if (aname == null)
- return null;
- String atype = getAttribute(elementNode, "type"); //$NON-NLS-1$
- int minOccurs = getMinOccurs(elementNode);
- int maxOccurs = getMaxOccurs(elementNode);
-
- ISchemaType type = null;
- if (atype != null) {
- type = resolveTypeReference(atype);
- }
- SchemaElement element;
- if (aname.equals("extension")) //$NON-NLS-1$
- element = new SchemaRootElement(parent, aname);
- else
- element = new SchemaElement(parent, aname);
- //element.bindSourceLocation(elementNode, lineTable);
- element.setMinOccurs(minOccurs);
- element.setMaxOccurs(maxOccurs);
- NodeList children = elementNode.getChildNodes();
- for (int i = 0; i < children.getLength(); i++) {
- Node child = children.item(i);
- if (child.getNodeType() == Node.ELEMENT_NODE) {
- String tag = child.getNodeName();
- if (type == null && tag.equals("complexType")) { //$NON-NLS-1$
- type = processComplexType(element, child);
- }
- if (tag.equals("annotation")) { //$NON-NLS-1$
- processElementAnnotation(element, child);
- }
- }
- }
- element.setType(type);
- return element;
- }
-
- private ISchemaElement processElementReference(ISchemaCompositor compositor, Node elementNode) {
- String aref = getAttribute(elementNode, "ref"); //$NON-NLS-1$
- if (aref == null) {
- return null;
- }
- int minOccurs = getMinOccurs(elementNode);
- int maxOccurs = getMaxOccurs(elementNode);
-
- SchemaElementReference reference = new SchemaElementReference(compositor, aref);
- reference.addComments(elementNode);
- reference.setMinOccurs(minOccurs);
- reference.setMaxOccurs(maxOccurs);
- fReferences.addElement(reference);
- //reference.bindSourceLocation(elementNode, lineTable);
- return reference;
- }
-
- private int getMinOccurs(Node elementNode) {
- String aminOccurs = getAttribute(elementNode, "minOccurs"); //$NON-NLS-1$
- if (aminOccurs != null)
- return Integer.valueOf(aminOccurs).intValue();
- return 1;
-
- }
-
- private int getMaxOccurs(Node elementNode) {
- String amaxOccurs = getAttribute(elementNode, "maxOccurs"); //$NON-NLS-1$
- if (amaxOccurs != null) {
- if (amaxOccurs.equals("unbounded")) //$NON-NLS-1$
- return Integer.MAX_VALUE;
- return Integer.valueOf(amaxOccurs).intValue();
- }
- return 1;
- }
-
- private void processElementAnnotation(SchemaElement element, Node node) {
- NodeList children = node.getChildNodes();
- for (int i = 0; i < children.getLength(); i++) {
- Node child = children.item(i);
- if (child.getNodeType() == Node.ELEMENT_NODE) {
- if (child.getNodeName().equals("documentation") && !fAbbreviated) { //$NON-NLS-1$
- element.setDescription(getNormalizedText(child.getFirstChild().getNodeValue()));
- } else if (child.getNodeName().equals("appInfo") || child.getNodeName().equals("appinfo")) { //$NON-NLS-1$ //$NON-NLS-2$
- NodeList infos = child.getChildNodes();
- for (int j = 0; j < infos.getLength(); j++) {
- Node meta = infos.item(j);
- if (meta.getNodeType() == Node.ELEMENT_NODE) {
- if (meta.getNodeName().equals("meta.element")) { //$NON-NLS-1$
- element.setLabelProperty(getAttribute(meta, "labelAttribute")); //$NON-NLS-1$
- element.setIconProperty(getAttribute(meta, "icon")); //$NON-NLS-1$
- if (element.getIconProperty() == null)
- element.setIconProperty(getAttribute(meta, "iconName")); //$NON-NLS-1$
- element.setTranslatableProperty(processTranslatable(getAttribute(meta, "translatable"))); //$NON-NLS-1$
- element.setDeprecatedProperty(processDeprecated(getAttribute(meta, "deprecated"))); //$NON-NLS-1$
- if (element instanceof ISchemaRootElement) {
- // set deprecated suggestion
- String depSug = getAttribute(meta, ISchemaRootElement.P_DEP_REPLACEMENT);
- ((ISchemaRootElement) element).setDeprecatedSuggestion(depSug);
-
- // set internal
- String internal = getAttribute(meta, ISchemaRootElement.P_INTERNAL);
- ((ISchemaRootElement) element).setInternal(Boolean.valueOf(internal).booleanValue());
- }
- }
- }
- }
- }
- }
- }
- }
-
- private ISchemaEnumeration processEnumeration(ISchema schema, Node node) {
- String name = getAttribute(node, "value"); //$NON-NLS-1$
- return new SchemaEnumeration(schema, name);
- }
-
- private int processKind(String name) {
- if (name != null) {
- if (name.equals("java")) //$NON-NLS-1$
- return IMetaAttribute.JAVA;
- if (name.equals("resource")) //$NON-NLS-1$
- return IMetaAttribute.RESOURCE;
- if (name.equals("identifier")) //$NON-NLS-1$
- return IMetaAttribute.IDENTIFIER;
- }
- return IMetaAttribute.STRING;
- }
-
- private void processSchemaAnnotation(Node node) {
- NodeList children = node.getChildNodes();
- String section = "overview"; //$NON-NLS-1$
- String sectionName = "Overview"; //$NON-NLS-1$
- for (int i = 0; i < children.getLength(); i++) {
- Node child = children.item(i);
- if (child.getNodeType() == Node.ELEMENT_NODE) {
- if (child.getNodeName().equals("documentation") && !fAbbreviated) { //$NON-NLS-1$
- String text = getNormalizedText(child.getFirstChild().getNodeValue());
- if (section != null) {
- if (section.equals("overview")) { //$NON-NLS-1$
- setDescription(text);
- } else {
- DocumentSection sec = new DocumentSection(this, section, sectionName);
- sec.setDescription(text);
- fDocSections.addElement(sec);
- }
- }
- } else if (child.getNodeName().equals("appInfo") || child.getNodeName().equals("appinfo")) { //$NON-NLS-1$ //$NON-NLS-2$
- NodeList infos = child.getChildNodes();
- for (int j = 0; j < infos.getLength(); j++) {
- Node meta = infos.item(j);
- if (meta.getNodeType() == Node.ELEMENT_NODE) {
- if (meta.getNodeName().equals("meta.schema")) { //$NON-NLS-1$
- section = "overview"; //$NON-NLS-1$
- setName(getAttribute(meta, "name")); //$NON-NLS-1$
- fPluginID = getAttribute(meta, "plugin"); //$NON-NLS-1$
- fPointID = getAttribute(meta, "id"); //$NON-NLS-1$
- fValid = true;
- } else if (meta.getNodeName().equals("meta.section")) { //$NON-NLS-1$
- section = getAttribute(meta, "type"); //$NON-NLS-1$
- sectionName = getAttribute(meta, "name"); //$NON-NLS-1$
- if (sectionName == null)
- sectionName = section;
- }
- }
- }
- }
- }
- }
- }
-
- private void processInclude(Node node) {
- String location = getAttribute(node, "schemaLocation"); //$NON-NLS-1$
- SchemaInclude include = new SchemaInclude(this, location, fAbbreviated);
- if (fIncludes == null)
- fIncludes = new Vector();
- fIncludes.add(include);
- }
-
- public void reload() {
- reload(null);
- }
-
- public void reload(InputStream is) {
- setNotificationEnabled(false);
- reset();
- if (is != null)
- load(is);
- else
- load();
- setNotificationEnabled(true);
- if (isLoaded())
- fireModelChanged(new ModelChangedEvent(this, IModelChangedEvent.WORLD_CHANGED, new Object[0], null));
- }
-
- public void removeDocumentSection(IDocumentSection docSection) {
- fDocSections.removeElement(docSection);
- fireModelChanged(new ModelChangedEvent(this, IModelChangedEvent.REMOVE, new Object[] {docSection}, null));
- }
-
- public void moveElementToSibling(ISchemaElement element, ISchemaObject sibling) {
- if (!isLoaded())
- load();
- int index = fElements.indexOf(element);
- int newIndex;
- if (sibling != null && fElements.contains(sibling))
- newIndex = fElements.indexOf(sibling);
- else
- newIndex = fElements.size() - 1;
-
- if (index > newIndex) {
- for (int i = index; i > newIndex; i--) {
- fElements.set(i, fElements.elementAt(i - 1));
- }
- } else if (index < newIndex) {
- for (int i = index; i < newIndex; i++) {
- fElements.set(i, fElements.elementAt(i + 1));
- }
- } else
- // don't need to move
- return;
- fElements.set(newIndex, element);
- fireModelChanged(new ModelChangedEvent(this, IModelChangedEvent.CHANGE, new Object[] {this}, null));
- }
-
- public void removeElement(ISchemaElement element) {
- fElements.removeElement(element);
- fireModelChanged(new ModelChangedEvent(this, IModelChangedEvent.REMOVE, new Object[] {element}, null));
- }
-
- public void removeModelChangedListener(IModelChangedListener listener) {
- fListeners.remove(listener);
- }
-
- private void reset() {
- fElements = new Vector();
- fDocSections = new Vector();
- fIncludes = null;
- fPointID = null;
- fPluginID = null;
- fReferences = null;
- fDescription = null;
- fName = null;
- fValid = false;
- fLoaded = false;
- }
-
- private void resolveElementReference(ISchemaObjectReference reference) {
- ISchemaElement[] elementList = getResolvedElements();
- for (int i = 0; i < elementList.length; i++) {
- ISchemaElement element = elementList[i];
- if (!(element instanceof ISchemaObjectReference) && element.getName().equals(reference.getName())) {
- // Link
- reference.setReferencedObject(element);
- break;
- }
- }
- }
-
- private void resolveReference(ISchemaObjectReference reference) {
- Class clazz = reference.getReferencedObjectClass();
- if (clazz.equals(ISchemaElement.class)) {
- resolveElementReference(reference);
- }
- }
-
- private void resolveReferences(Vector references) {
- for (int i = 0; i < references.size(); i++) {
- ISchemaObjectReference reference = (ISchemaObjectReference) references.elementAt(i);
- resolveReference(reference);
- }
- }
-
- private SchemaType resolveTypeReference(String typeName) {
- // for now, create a simple type
- return new SchemaSimpleType(this, typeName);
- }
-
- public void setDescription(String newDescription) {
- String oldValue = fDescription;
- fDescription = newDescription;
- fireModelObjectChanged(this, P_DESCRIPTION, oldValue, fDescription);
- }
-
- public void setName(String newName) {
- if (newName == null)
- newName = ""; //$NON-NLS-1$
- String oldValue = fName;
- fName = newName;
- fireModelObjectChanged(this, P_NAME, oldValue, fName);
- }
-
- public void setPluginId(String newId) {
- String oldValue = fPluginID;
- fPluginID = newId;
- fireModelObjectChanged(this, P_PLUGIN, oldValue, newId);
- }
-
- public void setPointId(String newId) {
- String oldValue = fPointID;
- fPointID = newId;
- fireModelObjectChanged(this, P_POINT, oldValue, newId);
- }
-
- public void setNotificationEnabled(boolean newNotificationEnabled) {
- fNotificationEnabled = newNotificationEnabled;
- }
-
- public String toString() {
- return fName;
- }
-
- public void traverseDocumentTree(Node root) {
- if (root == null)
- return;
- NodeList children = root.getChildNodes();
- fReferences = new Vector();
- for (int i = 0; i < children.getLength(); i++) {
- Node child = children.item(i);
- if (child.getNodeType() == Node.ELEMENT_NODE) {
- String nodeName = child.getNodeName().toLowerCase(Locale.ENGLISH);
- if (nodeName.equals("element")) { //$NON-NLS-1$
- ISchemaElement element = processElement(this, child);
- if (element == null) {
- fValid = false;
- return;
- }
- ISchemaAttribute[] attributes = element.getAttributes();
- for (int j = 0; j < attributes.length; j++)
- if (attributes[j] == null) {
- fValid = false;
- return;
- }
- fElements.addElement(element);
- } else if (nodeName.equals("annotation")) { //$NON-NLS-1$
- processSchemaAnnotation(child);
- } else if (nodeName.equals("include")) { //$NON-NLS-1$
- processInclude(child);
- }
- }
- }
- addOmittedDocumentSections();
- fLoaded = true;
- if (fReferences.size() > 0)
- resolveReferences(fReferences);
- fReferences = null;
- }
-
- private void addOmittedDocumentSections() {
- for (int i = 0; i < DocumentSection.DOC_SECTIONS.length; i++) {
- DocumentSection section = new DocumentSection(this, DocumentSection.DOC_SECTIONS[i], null);
- if (!fDocSections.contains(section)) {
- addDocumentSection(section);
- }
- }
- Collections.sort(fDocSections);
- }
-
- public void updateReferencesFor(ISchemaElement element) {
- updateReferencesFor(element, ISchema.REFRESH_RENAME);
- }
-
- public void updateReferencesFor(ISchemaElement element, int kind) {
- for (int i = 0; i < fElements.size(); i++) {
- ISchemaElement el = (ISchemaElement) fElements.elementAt(i);
- if (el.equals(element))
- continue;
- ISchemaType type = el.getType();
- if (type instanceof ISchemaComplexType) {
- SchemaCompositor compositor = (SchemaCompositor) ((ISchemaComplexType) type).getCompositor();
- if (compositor != null)
- compositor.updateReferencesFor(element, kind);
- }
- }
- }
-
- public void write(String indent, PrintWriter writer) {
- writer.println("<?xml version='1.0' encoding='UTF-8'?>"); //$NON-NLS-1$
- writer.println("<!-- Schema file written by PDE -->"); //$NON-NLS-1$
- writer.println("<schema targetNamespace=\"" + fPluginID + "\" xmlns=\"http://www.w3.org/2001/XMLSchema\">"); //$NON-NLS-1$ //$NON-NLS-2$
- String indent2 = INDENT + INDENT;
- String indent3 = indent2 + INDENT;
- writer.println(indent + "<annotation>"); //$NON-NLS-1$
-
- writer.println(indent2 + (getSchemaVersion() >= 3.4 ? "<appinfo>" : "<appInfo>")); //$NON-NLS-1$ //$NON-NLS-2$
- writer.print(indent3 + "<meta.schema plugin=\"" + fPluginID + "\""); //$NON-NLS-1$ //$NON-NLS-2$
- writer.print(" id=\"" + fPointID + "\""); //$NON-NLS-1$ //$NON-NLS-2$
- writer.println(" name=\"" + getName() + "\"/>"); //$NON-NLS-1$ //$NON-NLS-2$
- writer.println(indent2 + (getSchemaVersion() >= 3.4 ? "</appinfo>" : "</appInfo>")); //$NON-NLS-1$ //$NON-NLS-2$
- writer.println(indent2 + "<documentation>"); //$NON-NLS-1$
- writer.println(indent3 + getWritableDescription());
- writer.println(indent2 + "</documentation>"); //$NON-NLS-1$
- writer.println(INDENT + "</annotation>"); //$NON-NLS-1$
- writer.println();
- // add includes, if defined
- if (fIncludes != null) {
- for (int i = 0; i < fIncludes.size(); i++) {
- ISchemaInclude include = (ISchemaInclude) fIncludes.get(i);
- include.write(INDENT, writer);
- writer.println();
- }
- }
- // add elements
- for (int i = 0; i < fElements.size(); i++) {
- ISchemaElement element = (ISchemaElement) fElements.elementAt(i);
- element.write(INDENT, writer);
- writer.println();
- }
- // add document sections
- for (int i = 0; i < fDocSections.size(); i++) {
- IDocumentSection section = (IDocumentSection) fDocSections.elementAt(i);
- section.write(INDENT, writer);
- writer.println();
- }
- writer.println("</schema>"); //$NON-NLS-1$
- }
-
- private String getWritableDescription() {
- String lineDelimiter = System.getProperty("line.separator"); //$NON-NLS-1$
- String description = PDEXMLHelper.getWritableString(getDescription());
- String platformDescription = description.replaceAll("\\r\\n|\\r|\\n", lineDelimiter); //$NON-NLS-1$
-
- return platformDescription;
- }
-
- public boolean isDeperecated() {
- Iterator it = fElements.iterator();
- while (it.hasNext()) {
- Object next = it.next();
- if (next instanceof SchemaRootElement)
- return ((SchemaRootElement) next).isDeprecated();
- }
- return false;
- }
-
- public String getDeprecatedSuggestion() {
- Iterator it = fElements.iterator();
- while (it.hasNext()) {
- Object next = it.next();
- if (next instanceof SchemaRootElement)
- return ((SchemaRootElement) next).getDeprecatedSuggestion();
- }
- return null;
- }
-
- public boolean isInternal() {
- Iterator it = fElements.iterator();
- while (it.hasNext()) {
- Object next = it.next();
- if (next instanceof SchemaRootElement)
- return ((SchemaRootElement) next).isInternal();
- }
- return false;
- }
-
- public double getSchemaVersion() {
- if (fTargetVersion == 0) {
- IPluginModelBase model = PDECore.getDefault().getModelManager().findModel(fPluginID);
- if (model != null) {
- IPluginBase base = model.getPluginBase();
- if (base != null) {
- if (base.getSchemaVersion() != null) {
- fTargetVersion = Double.parseDouble(base.getSchemaVersion());
- }
- }
- }
- if (fTargetVersion == 0) {
- // Use default for target platform
- fTargetVersion = Double.parseDouble(TargetPlatformHelper.getSchemaVersion());
- }
- }
- return fTargetVersion;
- }
-}
+package org.eclipse.pde.internal.core.schema;
+
+import java.io.*;
+import java.net.*;
+import java.util.*;
+import org.eclipse.core.runtime.ListenerList;
+import org.eclipse.core.runtime.PlatformObject;
+import org.eclipse.pde.core.*;
+import org.eclipse.pde.core.plugin.IPluginBase;
+import org.eclipse.pde.core.plugin.IPluginModelBase;
+import org.eclipse.pde.internal.core.*;
+import org.eclipse.pde.internal.core.ischema.*;
+import org.eclipse.pde.internal.core.util.*;
+import org.w3c.dom.*;
+import org.xml.sax.SAXException;
+
+public class Schema extends PlatformObject implements ISchema {
+
+ private URL fURL;
+
+ private ListenerList fListeners = new ListenerList();
+
+ private Vector fElements = new Vector();
+
+ private Vector fDocSections = new Vector();
+
+ private Vector fIncludes;
+
+ private String fPointID;
+
+ private String fPluginID;
+
+ private ISchemaDescriptor fSchemaDescriptor;
+
+ private boolean fLoaded;
+
+ private Vector fReferences;
+
+ private String fDescription;
+
+ private double fTargetVersion;
+
+ private String fName = ""; //$NON-NLS-1$
+
+ private boolean fNotificationEnabled;
+
+ public final static String INDENT = " "; //$NON-NLS-1$
+
+ private boolean fDisposed;
+
+ private boolean fValid;
+
+ private boolean fAbbreviated;
+
+ public Schema(String pluginId, String pointId, String name, boolean abbreviated) {
+ fPluginID = pluginId;
+ fPointID = pointId;
+ fName = name;
+ fAbbreviated = abbreviated;
+ }
+
+ public Schema(ISchemaDescriptor schemaDescriptor, URL url, boolean abbreviated) {
+ fSchemaDescriptor = schemaDescriptor;
+ fURL = url;
+ fAbbreviated = abbreviated;
+ }
+
+ public void addDocumentSection(IDocumentSection docSection) {
+ fDocSections.addElement(docSection);
+ fireModelChanged(new ModelChangedEvent(this, IModelChangedEvent.INSERT, new Object[] {docSection}, null));
+
+ }
+
+ public void addElement(ISchemaElement element) {
+ addElement(element, null);
+ }
+
+ public void addElement(ISchemaElement element, ISchemaElement afterElement) {
+ int index = -1;
+ if (afterElement != null) {
+ index = fElements.indexOf(afterElement);
+ }
+ if (index != -1)
+ fElements.add(index + 1, element);
+ else
+ fElements.add(element);
+ fireModelChanged(new ModelChangedEvent(this, IModelChangedEvent.INSERT, new Object[] {element}, null));
+ }
+
+ public void addInclude(ISchemaInclude include) {
+ if (fIncludes == null)
+ fIncludes = new Vector();
+ fIncludes.add(include);
+ fireModelChanged(new ModelChangedEvent(this, IModelChangedEvent.INSERT, new Object[] {include}, null));
+ }
+
+ public void removeInclude(ISchemaInclude include) {
+ if (fIncludes == null)
+ return;
+ fIncludes.remove(include);
+ fireModelChanged(new ModelChangedEvent(this, IModelChangedEvent.REMOVE, new Object[] {include}, null));
+ }
+
+ public void addModelChangedListener(IModelChangedListener listener) {
+ fListeners.add(listener);
+ }
+
+ private void collectElements(ISchemaCompositor compositor, Vector result) {
+ Object[] children = compositor.getChildren();
+ for (int i = 0; i < children.length; i++) {
+ Object child = children[i];
+ if (child instanceof ISchemaCompositor)
+ collectElements((ISchemaCompositor) child, result);
+ else if (child instanceof ISchemaObjectReference) {
+ ISchemaObjectReference ref = (ISchemaObjectReference) child;
+ Object referenced = ref.getReferencedObject();
+ if (referenced instanceof ISchemaElement)
+ result.addElement(referenced);
+ }
+ }
+ }
+
+ public void dispose() {
+ if (fIncludes != null) {
+ for (int i = 0; i < fIncludes.size(); i++) {
+ ISchemaInclude include = (ISchemaInclude) fIncludes.get(i);
+ include.dispose();
+ }
+ }
+ reset();
+ fDisposed = true;
+ }
+
+ public ISchemaElement findElement(String name) {
+ if (!isLoaded())
+ load();
+ for (int i = 0; i < fElements.size(); i++) {
+ ISchemaElement element = (ISchemaElement) fElements.elementAt(i);
+ if (element.getName().equals(name))
+ return element;
+ }
+ if (fIncludes != null) {
+ for (int i = 0; i < fIncludes.size(); i++) {
+ ISchemaInclude include = (ISchemaInclude) fIncludes.get(i);
+ ISchema ischema = include.getIncludedSchema();
+ if (ischema == null)
+ continue;
+ ISchemaElement element = ischema.findElement(name);
+ if (element != null)
+ return element;
+ }
+ }
+ return null;
+ }
+
+ public void fireModelChanged(IModelChangedEvent event) {
+ if (!fNotificationEnabled)
+ return;
+ Object[] listeners = fListeners.getListeners();
+ for (int i = 0; i < listeners.length; i++) {
+ ((IModelChangedListener) listeners[i]).modelChanged(event);
+ }
+ }
+
+ public void fireModelObjectChanged(Object object, String property, Object oldValue, Object newValue) {
+ fireModelChanged(new ModelChangedEvent(this, object, property, oldValue, newValue));
+ }
+
+ private String getAttribute(Node node, String name) {
+ NamedNodeMap map = node.getAttributes();
+ Node attNode = map.getNamedItem(name);
+ if (attNode != null) {
+ String value = attNode.getNodeValue();
+ if (value.length() > 0)
+ return value;
+ }
+ return null;
+ }
+
+ public ISchemaElement[] getCandidateChildren(ISchemaElement element) {
+ Vector candidates = new Vector();
+ ISchemaType type = element.getType();
+ if (type instanceof ISchemaComplexType) {
+ ISchemaCompositor compositor = ((ISchemaComplexType) type).getCompositor();
+ if (compositor != null)
+ collectElements(compositor, candidates);
+ }
+ ISchemaElement[] result = new ISchemaElement[candidates.size()];
+ candidates.copyInto(result);
+ return result;
+ }
+
+ public String getDescription() {
+ return fDescription;
+ }
+
+ public boolean isValid() {
+ return fValid;
+ }
+
+ public IDocumentSection[] getDocumentSections() {
+ IDocumentSection[] result = new IDocumentSection[fDocSections.size()];
+ fDocSections.copyInto(result);
+ return result;
+ }
+
+ public int getElementCount() {
+ return fElements.size();
+ }
+
+ public int getResolvedElementCount() {
+ int localCount = getElementCount();
+ if (fIncludes == null)
+ return localCount;
+ int totalCount = localCount;
+ for (int i = 0; i < fIncludes.size(); i++) {
+ ISchemaInclude include = (ISchemaInclude) fIncludes.get(i);
+ ISchema schema = include.getIncludedSchema();
+ if (schema == null)
+ continue;
+ totalCount += schema.getResolvedElementCount();
+ }
+ return totalCount;
+ }
+
+ public ISchemaElement[] getElements() {
+ if (!isLoaded())
+ load();
+ ISchemaElement[] result = new ISchemaElement[fElements.size()];
+ fElements.copyInto(result);
+ return result;
+ }
+
+ public String[] getElementNames() {
+ ISchemaElement[] elements = getElements();
+ String[] names = new String[elements.length];
+ for (int i = 0; i < elements.length; i++)
+ names[i] = elements[i].getName();
+ return names;
+ }
+
+ public ISchemaElement[] getResolvedElements() {
+ if (fIncludes == null)
+ return getElements();
+ if (!isLoaded())
+ load();
+ Vector result = (Vector) fElements.clone();
+ for (int i = 0; i < fIncludes.size(); i++) {
+ ISchemaInclude include = (ISchemaInclude) fIncludes.get(i);
+ ISchema schema = include.getIncludedSchema();
+ if (schema == null)
+ continue;
+ ISchemaElement[] ielements = schema.getElements();
+ for (int j = 0; j < ielements.length; j++)
+ result.add(ielements[j]);
+ }
+ return (ISchemaElement[]) result.toArray(new ISchemaElement[result.size()]);
+ }
+
+ public ISchemaInclude[] getIncludes() {
+ if (fIncludes == null)
+ return new ISchemaInclude[0];
+ return (ISchemaInclude[]) fIncludes.toArray(new ISchemaInclude[fIncludes.size()]);
+ }
+
+ public String getName() {
+ return fName;
+ }
+
+ private String getNormalizedText(String source) {
+ if (source == null)
+ return ""; //$NON-NLS-1$
+
+ String result = source.replace('\t', ' ');
+ result = result.trim();
+ return result;
+ }
+
+ public ISchemaObject getParent() {
+ return null;
+ }
+
+ public void setParent(ISchemaObject obj) {
+ }
+
+ public ISchemaElement getElementAt(int index) {
+ return (ISchemaElement) fElements.get(index);
+ }
+
+ public String getQualifiedPointId() {
+ return fPluginID + "." + fPointID; //$NON-NLS-1$
+ }
+
+ public String getPluginId() {
+ return fPluginID;
+ }
+
+ public String getPointId() {
+ return fPointID;
+ }
+
+ public ISchema getSchema() {
+ return this;
+ }
+
+ public ISchemaDescriptor getSchemaDescriptor() {
+ return fSchemaDescriptor;
+ }
+
+ public URL getURL() {
+ return fURL;
+ }
+
+ public int indexOf(Object obj) {
+ return fElements.indexOf(obj);
+ }
+
+ public boolean isDisposed() {
+ return fDisposed;
+ }
+
+ public boolean isEditable() {
+ return false;
+ }
+
+ public boolean isLoaded() {
+ return fLoaded;
+ }
+
+ public boolean isNotificationEnabled() {
+ return fNotificationEnabled;
+ }
+
+ public void load() {
+ URLConnection connection = null;
+ InputStream input = null;
+ try {
+ connection = SchemaUtil.getURLConnection(fURL);
+ input = connection.getInputStream();
+ load(input);
+ } catch (FileNotFoundException e) {
+ fLoaded = false;
+ } catch (IOException e) {
+ PDECore.logException(e);
+ } finally {
+ try {
+ if (input != null) {
+ input.close();
+ }
+ if (connection instanceof JarURLConnection) {
+ ((JarURLConnection) connection).getJarFile().close();
+ }
+ } catch (IOException e1) {
+ }
+ }
+ }
+
+ public void load(InputStream stream) {
+ try {
+ SAXParserWrapper parser = new SAXParserWrapper();
+ XMLDefaultHandler handler = new XMLDefaultHandler(fAbbreviated);
+ parser.parse(stream, handler);
+ traverseDocumentTree(handler.getDocumentElement());
+ } catch (SAXException e) {
+ // ignore parse errors - 'loaded' will be false anyway
+ } catch (IOException e) {
+ PDECore.logException(e, "IOException reading following URL: " + fURL); //$NON-NLS-1$
+ } catch (Exception e) {
+ PDECore.logException(e);
+ }
+ }
+
+ private ISchemaAttribute processAttribute(ISchemaElement element, Node elementNode) {
+ String aname = getAttribute(elementNode, "name"); //$NON-NLS-1$
+ if (aname == null)
+ return null;
+ String atype = getAttribute(elementNode, "type"); //$NON-NLS-1$
+ String ause = getAttribute(elementNode, "use"); //$NON-NLS-1$
+ String avalue = getAttribute(elementNode, "value"); //$NON-NLS-1$
+ ISchemaSimpleType type = null;
+ if (atype != null) {
+ type = (ISchemaSimpleType) resolveTypeReference(atype);
+ }
+ SchemaAttribute attribute = new SchemaAttribute(element, aname);
+ //attribute.bindSourceLocation(elementNode, lineTable);
+ if (ause != null) {
+ int use = ISchemaAttribute.OPTIONAL;
+ if (ause.equals("required")) //$NON-NLS-1$
+ use = ISchemaAttribute.REQUIRED;
+ else if (ause.equals("optional")) //$NON-NLS-1$
+ use = ISchemaAttribute.OPTIONAL;
+ else if (ause.equals("default")) //$NON-NLS-1$
+ use = ISchemaAttribute.DEFAULT;
+ attribute.setUse(use);
+ }
+ if (avalue != null)
+ attribute.setValue(avalue);
+ NodeList children = elementNode.getChildNodes();
+ for (int i = 0; i < children.getLength(); i++) {
+ Node child = children.item(i);
+ if (child.getNodeType() == Node.ELEMENT_NODE) {
+ String tag = child.getNodeName();
+ if (tag.equals("annotation")) { //$NON-NLS-1$
+ processAttributeAnnotation(attribute, child);
+ } else if (tag.equals("simpleType")) { //$NON-NLS-1$
+ processAttributeSimpleType(attribute, child);
+ }
+ }
+ }
+ if (type != null && attribute.getType() == null)
+ attribute.setType(type);
+ return attribute;
+ }
+
+ private void processAttributeAnnotation(SchemaAttribute element, Node node) {
+ NodeList children = node.getChildNodes();
+ for (int i = 0; i < children.getLength(); i++) {
+ Node child = children.item(i);
+ if (child.getNodeType() == Node.ELEMENT_NODE) {
+ if (child.getNodeName().equals("documentation")) { //$NON-NLS-1$
+ Node doc = child.getFirstChild();
+ if (doc != null)
+ element.setDescription(getNormalizedText(doc.getNodeValue()));
+ } else if (child.getNodeName().equals("appInfo") || child.getNodeName().equals("appinfo")) { //$NON-NLS-1$ //$NON-NLS-2$
+ NodeList infos = child.getChildNodes();
+ for (int j = 0; j < infos.getLength(); j++) {
+ Node meta = infos.item(j);
+ if (meta.getNodeType() == Node.ELEMENT_NODE) {
+ if (meta.getNodeName().equals("meta.attribute")) { //$NON-NLS-1$
+ element.setKind(processKind(getAttribute(meta, "kind"))); //$NON-NLS-1$
+ element.setBasedOn(getAttribute(meta, "basedOn")); //$NON-NLS-1$
+ element.setTranslatableProperty(processTranslatable(getAttribute(meta, "translatable"))); //$NON-NLS-1$
+ element.setDeprecatedProperty(processDeprecated(getAttribute(meta, "deprecated"))); //$NON-NLS-1$
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ private boolean processTranslatable(String value) {
+ return (value != null && "true".equals(value)); //$NON-NLS-1$
+ }
+
+ private boolean processDeprecated(String value) {
+ return value != null && "true".equals(value); //$NON-NLS-1$
+ }
+
+ private SchemaSimpleType processAttributeRestriction(SchemaAttribute attribute, Node node) {
+ NodeList children = node.getChildNodes();
+ if (children.getLength() == 0)
+ return null;
+ String baseName = getAttribute(node, "base"); //$NON-NLS-1$
+ if (baseName.equals("string") == false) { //$NON-NLS-1$
+ return new SchemaSimpleType(attribute.getSchema(), "string"); //$NON-NLS-1$
+ }
+ SchemaSimpleType type = new SchemaSimpleType(attribute.getSchema(), baseName);
+ Vector items = new Vector();
+ for (int i = 0; i < children.getLength(); i++) {
+ Node child = children.item(i);
+ if (child.getNodeType() == Node.ELEMENT_NODE) {
+ if (child.getNodeName().equals("enumeration")) { //$NON-NLS-1$
+ ISchemaEnumeration enumeration = processEnumeration(attribute.getSchema(), child);
+ if (enumeration != null)
+ items.addElement(enumeration);
+ }
+ }
+ }
+ ChoiceRestriction restriction = new ChoiceRestriction(attribute.getSchema());
+ restriction.setChildren(items);
+ type.setRestriction(restriction);
+ return type;
+ }
+
+ private void processAttributeSimpleType(SchemaAttribute attribute, Node node) {
+ NodeList children = node.getChildNodes();
+ if (children.getLength() == 0)
+ return;
+ SchemaSimpleType type = null;
+ for (int i = 0; i < children.getLength(); i++) {
+ Node child = children.item(i);
+ if (child.getNodeType() == Node.ELEMENT_NODE) {
+ if (child.getNodeName().equals("restriction")) { //$NON-NLS-1$
+ type = processAttributeRestriction(attribute, child);
+ }
+ }
+ }
+ if (type != null)
+ attribute.setType(type);
+ }
+
+ private SchemaComplexType processComplexType(ISchemaElement owner, Node typeNode) {
+ String aname = getAttribute(typeNode, "name"); //$NON-NLS-1$
+ String amixed = getAttribute(typeNode, "mixed"); //$NON-NLS-1$
+ SchemaComplexType complexType = new SchemaComplexType(this, aname);
+ if (amixed != null && amixed.equals("true")) //$NON-NLS-1$
+ complexType.setMixed(true);
+ NodeList children = typeNode.getChildNodes();
+ ISchemaCompositor compositor = null;
+ for (int i = 0; i < children.getLength(); i++) {
+ Node child = children.item(i);
+ if (child.getNodeType() == Node.ELEMENT_NODE) {
+ if (child.getNodeName().equals("attribute")) { //$NON-NLS-1$
+ complexType.addAttribute(processAttribute(owner, child));
+ } else {
+ ISchemaObject object = processCompositorChild(owner, child, ISchemaCompositor.ROOT);
+ if (object instanceof ISchemaCompositor && compositor == null) {
+ compositor = (ISchemaCompositor) object;
+ }
+ }
+ }
+ }
+ complexType.setCompositor(compositor);
+ return complexType;
+ }
+
+ private ISchemaCompositor processCompositor(ISchemaObject parent, Node node, int type) {
+ SchemaCompositor compositor = new SchemaCompositor(parent, type);
+ NodeList children = node.getChildNodes();
+ int minOccurs = 1;
+ int maxOccurs = 1;
+ String aminOccurs = getAttribute(node, "minOccurs"); //$NON-NLS-1$
+ String amaxOccurs = getAttribute(node, "maxOccurs"); //$NON-NLS-1$
+ if (aminOccurs != null)
+ minOccurs = Integer.valueOf(aminOccurs).intValue();
+ if (amaxOccurs != null) {
+ if (amaxOccurs.equals("unbounded")) //$NON-NLS-1$
+ maxOccurs = Integer.MAX_VALUE;
+ else {
+ maxOccurs = Integer.valueOf(amaxOccurs).intValue();
+ }
+ }
+ compositor.setMinOccurs(minOccurs);
+ compositor.setMaxOccurs(maxOccurs);
+ for (int i = 0; i < children.getLength(); i++) {
+ Node child = children.item(i);
+ ISchemaObject object = processCompositorChild(compositor, child, type);
+ if (object != null)
+ compositor.addChild(object);
+ }
+ return compositor;
+ }
+
+ private ISchemaObject processCompositorChild(ISchemaObject parent, Node child, int parentKind) {
+ String tag = child.getNodeName();
+ if (tag.equals("element") && parentKind != ISchemaCompositor.ROOT) { //$NON-NLS-1$
+ return processElement(parent, child);
+ }
+ // sequence: element | group | choice | sequence
+ if (tag.equals("sequence") && parentKind != ISchemaCompositor.ALL) { //$NON-NLS-1$
+ return processCompositor(parent, child, ISchemaCompositor.SEQUENCE);
+ }
+ // choice: element | group | choice | sequence
+ if (tag.equals("choice") && parentKind != ISchemaCompositor.ALL) { //$NON-NLS-1$
+ return processCompositor(parent, child, ISchemaCompositor.CHOICE);
+ }
+ // all: element
+ if (tag.equals("all") //$NON-NLS-1$
+ && (parentKind == ISchemaCompositor.ROOT || parentKind == ISchemaCompositor.GROUP)) {
+ return processCompositor(parent, child, ISchemaCompositor.SEQUENCE);
+ }
+ // group: all | choice | sequence
+ if (tag.equals("group") //$NON-NLS-1$
+ && (parentKind == ISchemaCompositor.CHOICE || parentKind == ISchemaCompositor.SEQUENCE)) {
+ return processCompositor(parent, child, ISchemaCompositor.SEQUENCE);
+ }
+ return null;
+ }
+
+ private ISchemaElement processElement(ISchemaObject parent, Node elementNode) {
+ if (parent instanceof ISchemaCompositor)
+ return processElementReference((ISchemaCompositor) parent, elementNode);
+ return processElementDeclaration(parent, elementNode);
+ }
+
+ private ISchemaElement processElementDeclaration(ISchemaObject parent, Node elementNode) {
+ String aname = getAttribute(elementNode, "name"); //$NON-NLS-1$
+ if (aname == null)
+ return null;
+ String atype = getAttribute(elementNode, "type"); //$NON-NLS-1$
+ int minOccurs = getMinOccurs(elementNode);
+ int maxOccurs = getMaxOccurs(elementNode);
+
+ ISchemaType type = null;
+ if (atype != null) {
+ type = resolveTypeReference(atype);
+ }
+ SchemaElement element;
+ if (aname.equals("extension")) //$NON-NLS-1$
+ element = new SchemaRootElement(parent, aname);
+ else
+ element = new SchemaElement(parent, aname);
+ //element.bindSourceLocation(elementNode, lineTable);
+ element.setMinOccurs(minOccurs);
+ element.setMaxOccurs(maxOccurs);
+ NodeList children = elementNode.getChildNodes();
+ for (int i = 0; i < children.getLength(); i++) {
+ Node child = children.item(i);
+ if (child.getNodeType() == Node.ELEMENT_NODE) {
+ String tag = child.getNodeName();
+ if (type == null && tag.equals("complexType")) { //$NON-NLS-1$
+ type = processComplexType(element, child);
+ }
+ if (tag.equals("annotation")) { //$NON-NLS-1$
+ processElementAnnotation(element, child);
+ }
+ }
+ }
+ element.setType(type);
+ return element;
+ }
+
+ private ISchemaElement processElementReference(ISchemaCompositor compositor, Node elementNode) {
+ String aref = getAttribute(elementNode, "ref"); //$NON-NLS-1$
+ if (aref == null) {
+ return null;
+ }
+ int minOccurs = getMinOccurs(elementNode);
+ int maxOccurs = getMaxOccurs(elementNode);
+
+ SchemaElementReference reference = new SchemaElementReference(compositor, aref);
+ reference.addComments(elementNode);
+ reference.setMinOccurs(minOccurs);
+ reference.setMaxOccurs(maxOccurs);
+ fReferences.addElement(reference);
+ //reference.bindSourceLocation(elementNode, lineTable);
+ return reference;
+ }
+
+ private int getMinOccurs(Node elementNode) {
+ String aminOccurs = getAttribute(elementNode, "minOccurs"); //$NON-NLS-1$
+ if (aminOccurs != null)
+ return Integer.valueOf(aminOccurs).intValue();
+ return 1;
+
+ }
+
+ private int getMaxOccurs(Node elementNode) {
+ String amaxOccurs = getAttribute(elementNode, "maxOccurs"); //$NON-NLS-1$
+ if (amaxOccurs != null) {
+ if (amaxOccurs.equals("unbounded")) //$NON-NLS-1$
+ return Integer.MAX_VALUE;
+ return Integer.valueOf(amaxOccurs).intValue();
+ }
+ return 1;
+ }
+
+ private void processElementAnnotation(SchemaElement element, Node node) {
+ NodeList children = node.getChildNodes();
+ for (int i = 0; i < children.getLength(); i++) {
+ Node child = children.item(i);
+ if (child.getNodeType() == Node.ELEMENT_NODE) {
+ if (child.getNodeName().equals("documentation") && !fAbbreviated) { //$NON-NLS-1$
+ element.setDescription(getNormalizedText(child.getFirstChild().getNodeValue()));
+ } else if (child.getNodeName().equals("appInfo") || child.getNodeName().equals("appinfo")) { //$NON-NLS-1$ //$NON-NLS-2$
+ NodeList infos = child.getChildNodes();
+ for (int j = 0; j < infos.getLength(); j++) {
+ Node meta = infos.item(j);
+ if (meta.getNodeType() == Node.ELEMENT_NODE) {
+ if (meta.getNodeName().equals("meta.element")) { //$NON-NLS-1$
+ element.setLabelProperty(getAttribute(meta, "labelAttribute")); //$NON-NLS-1$
+ element.setIconProperty(getAttribute(meta, "icon")); //$NON-NLS-1$
+ if (element.getIconProperty() == null)
+ element.setIconProperty(getAttribute(meta, "iconName")); //$NON-NLS-1$
+ element.setTranslatableProperty(processTranslatable(getAttribute(meta, "translatable"))); //$NON-NLS-1$
+ element.setDeprecatedProperty(processDeprecated(getAttribute(meta, "deprecated"))); //$NON-NLS-1$
+ if (element instanceof ISchemaRootElement) {
+ // set deprecated suggestion
+ String depSug = getAttribute(meta, ISchemaRootElement.P_DEP_REPLACEMENT);
+ ((ISchemaRootElement) element).setDeprecatedSuggestion(depSug);
+
+ // set internal
+ String internal = getAttribute(meta, ISchemaRootElement.P_INTERNAL);
+ ((ISchemaRootElement) element).setInternal(Boolean.valueOf(internal).booleanValue());
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ private ISchemaEnumeration processEnumeration(ISchema schema, Node node) {
+ String name = getAttribute(node, "value"); //$NON-NLS-1$
+ return new SchemaEnumeration(schema, name);
+ }
+
+ private int processKind(String name) {
+ if (name != null) {
+ if (name.equals("java")) //$NON-NLS-1$
+ return IMetaAttribute.JAVA;
+ if (name.equals("resource")) //$NON-NLS-1$
+ return IMetaAttribute.RESOURCE;
+ if (name.equals("identifier")) //$NON-NLS-1$
+ return IMetaAttribute.IDENTIFIER;
+ }
+ return IMetaAttribute.STRING;
+ }
+
+ private void processSchemaAnnotation(Node node) {
+ NodeList children = node.getChildNodes();
+ String section = "overview"; //$NON-NLS-1$
+ String sectionName = "Overview"; //$NON-NLS-1$
+ for (int i = 0; i < children.getLength(); i++) {
+ Node child = children.item(i);
+ if (child.getNodeType() == Node.ELEMENT_NODE) {
+ if (child.getNodeName().equals("documentation") && !fAbbreviated) { //$NON-NLS-1$
+ String text = getNormalizedText(child.getFirstChild().getNodeValue());
+ if (section != null) {
+ if (section.equals("overview")) { //$NON-NLS-1$
+ setDescription(text);
+ } else {
+ DocumentSection sec = new DocumentSection(this, section, sectionName);
+ sec.setDescription(text);
+ fDocSections.addElement(sec);
+ }
+ }
+ } else if (child.getNodeName().equals("appInfo") || child.getNodeName().equals("appinfo")) { //$NON-NLS-1$ //$NON-NLS-2$
+ NodeList infos = child.getChildNodes();
+ for (int j = 0; j < infos.getLength(); j++) {
+ Node meta = infos.item(j);
+ if (meta.getNodeType() == Node.ELEMENT_NODE) {
+ if (meta.getNodeName().equals("meta.schema")) { //$NON-NLS-1$
+ section = "overview"; //$NON-NLS-1$
+ setName(getAttribute(meta, "name")); //$NON-NLS-1$
+ fPluginID = getAttribute(meta, "plugin"); //$NON-NLS-1$
+ fPointID = getAttribute(meta, "id"); //$NON-NLS-1$
+ fValid = true;
+ } else if (meta.getNodeName().equals("meta.section")) { //$NON-NLS-1$
+ section = getAttribute(meta, "type"); //$NON-NLS-1$
+ sectionName = getAttribute(meta, "name"); //$NON-NLS-1$
+ if (sectionName == null)
+ sectionName = section;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ private void processInclude(Node node) {
+ String location = getAttribute(node, "schemaLocation"); //$NON-NLS-1$
+ SchemaInclude include = new SchemaInclude(this, location, fAbbreviated);
+ if (fIncludes == null)
+ fIncludes = new Vector();
+ fIncludes.add(include);
+ }
+
+ public void reload() {
+ reload(null);
+ }
+
+ public void reload(InputStream is) {
+ setNotificationEnabled(false);
+ reset();
+ if (is != null)
+ load(is);
+ else
+ load();
+ setNotificationEnabled(true);
+ if (isLoaded())
+ fireModelChanged(new ModelChangedEvent(this, IModelChangedEvent.WORLD_CHANGED, new Object[0], null));
+ }
+
+ public void removeDocumentSection(IDocumentSection docSection) {
+ fDocSections.removeElement(docSection);
+ fireModelChanged(new ModelChangedEvent(this, IModelChangedEvent.REMOVE, new Object[] {docSection}, null));
+ }
+
+ public void moveElementToSibling(ISchemaElement element, ISchemaObject sibling) {
+ if (!isLoaded())
+ load();
+ int index = fElements.indexOf(element);
+ int newIndex;
+ if (sibling != null && fElements.contains(sibling))
+ newIndex = fElements.indexOf(sibling);
+ else
+ newIndex = fElements.size() - 1;
+
+ if (index > newIndex) {
+ for (int i = index; i > newIndex; i--) {
+ fElements.set(i, fElements.elementAt(i - 1));
+ }
+ } else if (index < newIndex) {
+ for (int i = index; i < newIndex; i++) {
+ fElements.set(i, fElements.elementAt(i + 1));
+ }
+ } else
+ // don't need to move
+ return;
+ fElements.set(newIndex, element);
+ fireModelChanged(new ModelChangedEvent(this, IModelChangedEvent.CHANGE, new Object[] {this}, null));
+ }
+
+ public void removeElement(ISchemaElement element) {
+ fElements.removeElement(element);
+ fireModelChanged(new ModelChangedEvent(this, IModelChangedEvent.REMOVE, new Object[] {element}, null));
+ }
+
+ public void removeModelChangedListener(IModelChangedListener listener) {
+ fListeners.remove(listener);
+ }
+
+ private void reset() {
+ fElements = new Vector();
+ fDocSections = new Vector();
+ fIncludes = null;
+ fPointID = null;
+ fPluginID = null;
+ fReferences = null;
+ fDescription = null;
+ fName = null;
+ fValid = false;
+ fLoaded = false;
+ }
+
+ private void resolveElementReference(ISchemaObjectReference reference) {
+ ISchemaElement[] elementList = getResolvedElements();
+ for (int i = 0; i < elementList.length; i++) {
+ ISchemaElement element = elementList[i];
+ if (!(element instanceof ISchemaObjectReference) && element.getName().equals(reference.getName())) {
+ // Link
+ reference.setReferencedObject(element);
+ break;
+ }
+ }
+ }
+
+ private void resolveReference(ISchemaObjectReference reference) {
+ Class clazz = reference.getReferencedObjectClass();
+ if (clazz.equals(ISchemaElement.class)) {
+ resolveElementReference(reference);
+ }
+ }
+
+ private void resolveReferences(Vector references) {
+ for (int i = 0; i < references.size(); i++) {
+ ISchemaObjectReference reference = (ISchemaObjectReference) references.elementAt(i);
+ resolveReference(reference);
+ }
+ }
+
+ private SchemaType resolveTypeReference(String typeName) {
+ // for now, create a simple type
+ return new SchemaSimpleType(this, typeName);
+ }
+
+ public void setDescription(String newDescription) {
+ String oldValue = fDescription;
+ fDescription = newDescription;
+ fireModelObjectChanged(this, P_DESCRIPTION, oldValue, fDescription);
+ }
+
+ public void setName(String newName) {
+ if (newName == null)
+ newName = ""; //$NON-NLS-1$
+ String oldValue = fName;
+ fName = newName;
+ fireModelObjectChanged(this, P_NAME, oldValue, fName);
+ }
+
+ public void setPluginId(String newId) {
+ String oldValue = fPluginID;
+ fPluginID = newId;
+ fireModelObjectChanged(this, P_PLUGIN, oldValue, newId);
+ }
+
+ public void setPointId(String newId) {
+ String oldValue = fPointID;
+ fPointID = newId;
+ fireModelObjectChanged(this, P_POINT, oldValue, newId);
+ }
+
+ public void setNotificationEnabled(boolean newNotificationEnabled) {
+ fNotificationEnabled = newNotificationEnabled;
+ }
+
+ public String toString() {
+ return fName;
+ }
+
+ public void traverseDocumentTree(Node root) {
+ if (root == null)
+ return;
+ NodeList children = root.getChildNodes();
+ fReferences = new Vector();
+ for (int i = 0; i < children.getLength(); i++) {
+ Node child = children.item(i);
+ if (child.getNodeType() == Node.ELEMENT_NODE) {
+ String nodeName = child.getNodeName().toLowerCase(Locale.ENGLISH);
+ if (nodeName.equals("element")) { //$NON-NLS-1$
+ ISchemaElement element = processElement(this, child);
+ if (element == null) {
+ fValid = false;
+ return;
+ }
+ ISchemaAttribute[] attributes = element.getAttributes();
+ for (int j = 0; j < attributes.length; j++)
+ if (attributes[j] == null) {
+ fValid = false;
+ return;
+ }
+ fElements.addElement(element);
+ } else if (nodeName.equals("annotation")) { //$NON-NLS-1$
+ processSchemaAnnotation(child);
+ } else if (nodeName.equals("include")) { //$NON-NLS-1$
+ processInclude(child);
+ }
+ }
+ }
+ addOmittedDocumentSections();
+ fLoaded = true;
+ if (fReferences.size() > 0)
+ resolveReferences(fReferences);
+ fReferences = null;
+ }
+
+ private void addOmittedDocumentSections() {
+ for (int i = 0; i < DocumentSection.DOC_SECTIONS.length; i++) {
+ DocumentSection section = new DocumentSection(this, DocumentSection.DOC_SECTIONS[i], null);
+ if (!fDocSections.contains(section)) {
+ addDocumentSection(section);
+ }
+ }
+ Collections.sort(fDocSections);
+ }
+
+ public void updateReferencesFor(ISchemaElement element) {
+ updateReferencesFor(element, ISchema.REFRESH_RENAME);
+ }
+
+ public void updateReferencesFor(ISchemaElement element, int kind) {
+ for (int i = 0; i < fElements.size(); i++) {
+ ISchemaElement el = (ISchemaElement) fElements.elementAt(i);
+ if (el.equals(element))
+ continue;
+ ISchemaType type = el.getType();
+ if (type instanceof ISchemaComplexType) {
+ SchemaCompositor compositor = (SchemaCompositor) ((ISchemaComplexType) type).getCompositor();
+ if (compositor != null)
+ compositor.updateReferencesFor(element, kind);
+ }
+ }
+ }
+
+ public void write(String indent, PrintWriter writer) {
+ writer.println("<?xml version='1.0' encoding='UTF-8'?>"); //$NON-NLS-1$
+ writer.println("<!-- Schema file written by PDE -->"); //$NON-NLS-1$
+ writer.println("<schema targetNamespace=\"" + fPluginID + "\" xmlns=\"http://www.w3.org/2001/XMLSchema\">"); //$NON-NLS-1$ //$NON-NLS-2$
+ String indent2 = INDENT + INDENT;
+ String indent3 = indent2 + INDENT;
+ writer.println(indent + "<annotation>"); //$NON-NLS-1$
+
+ writer.println(indent2 + (getSchemaVersion() >= 3.4 ? "<appinfo>" : "<appInfo>")); //$NON-NLS-1$ //$NON-NLS-2$
+ writer.print(indent3 + "<meta.schema plugin=\"" + fPluginID + "\""); //$NON-NLS-1$ //$NON-NLS-2$
+ writer.print(" id=\"" + fPointID + "\""); //$NON-NLS-1$ //$NON-NLS-2$
+ writer.println(" name=\"" + getName() + "\"/>"); //$NON-NLS-1$ //$NON-NLS-2$
+ writer.println(indent2 + (getSchemaVersion() >= 3.4 ? "</appinfo>" : "</appInfo>")); //$NON-NLS-1$ //$NON-NLS-2$
+ writer.println(indent2 + "<documentation>"); //$NON-NLS-1$
+ writer.println(indent3 + getWritableDescription());
+ writer.println(indent2 + "</documentation>"); //$NON-NLS-1$
+ writer.println(INDENT + "</annotation>"); //$NON-NLS-1$
+ writer.println();
+ // add includes, if defined
+ if (fIncludes != null) {
+ for (int i = 0; i < fIncludes.size(); i++) {
+ ISchemaInclude include = (ISchemaInclude) fIncludes.get(i);
+ include.write(INDENT, writer);
+ writer.println();
+ }
+ }
+ // add elements
+ for (int i = 0; i < fElements.size(); i++) {
+ ISchemaElement element = (ISchemaElement) fElements.elementAt(i);
+ element.write(INDENT, writer);
+ writer.println();
+ }
+ // add document sections
+ for (int i = 0; i < fDocSections.size(); i++) {
+ IDocumentSection section = (IDocumentSection) fDocSections.elementAt(i);
+ section.write(INDENT, writer);
+ writer.println();
+ }
+ writer.println("</schema>"); //$NON-NLS-1$
+ }
+
+ private String getWritableDescription() {
+ String lineDelimiter = System.getProperty("line.separator"); //$NON-NLS-1$
+ String description = PDEXMLHelper.getWritableString(getDescription());
+ String platformDescription = description.replaceAll("\\r\\n|\\r|\\n", lineDelimiter); //$NON-NLS-1$
+
+ return platformDescription;
+ }
+
+ public boolean isDeperecated() {
+ Iterator it = fElements.iterator();
+ while (it.hasNext()) {
+ Object next = it.next();
+ if (next instanceof SchemaRootElement)
+ return ((SchemaRootElement) next).isDeprecated();
+ }
+ return false;
+ }
+
+ public String getDeprecatedSuggestion() {
+ Iterator it = fElements.iterator();
+ while (it.hasNext()) {
+ Object next = it.next();
+ if (next instanceof SchemaRootElement)
+ return ((SchemaRootElement) next).getDeprecatedSuggestion();
+ }
+ return null;
+ }
+
+ public boolean isInternal() {
+ Iterator it = fElements.iterator();
+ while (it.hasNext()) {
+ Object next = it.next();
+ if (next instanceof SchemaRootElement)
+ return ((SchemaRootElement) next).isInternal();
+ }
+ return false;
+ }
+
+ public double getSchemaVersion() {
+ if (fTargetVersion == 0) {
+ IPluginModelBase model = PDECore.getDefault().getModelManager().findModel(fPluginID);
+ if (model != null) {
+ IPluginBase base = model.getPluginBase();
+ if (base != null) {
+ if (base.getSchemaVersion() != null) {
+ fTargetVersion = Double.parseDouble(base.getSchemaVersion());
+ }
+ }
+ }
+ if (fTargetVersion == 0) {
+ // Use default for target platform
+ fTargetVersion = Double.parseDouble(TargetPlatformHelper.getSchemaVersion());
+ }
+ }
+ return fTargetVersion;
+ }
+}
diff --git a/eclipse/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/util/SchemaUtil.java b/eclipse/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/util/SchemaUtil.java
index 64b1930..8771364 100644
--- a/eclipse/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/util/SchemaUtil.java
+++ b/eclipse/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/util/SchemaUtil.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2008 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
@@ -11,16 +11,11 @@
package org.eclipse.pde.internal.core.util;
-import java.io.BufferedInputStream;
-import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-
+import java.net.*;
import javax.xml.parsers.FactoryConfigurationError;
import javax.xml.parsers.ParserConfigurationException;
-
import org.eclipse.pde.internal.core.PDECore;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
@@ -31,19 +26,38 @@ import org.xml.sax.helpers.DefaultHandler;
*/
public class SchemaUtil {
- public static InputStream getInputStream(URL url) throws IOException {
+ /**
+ * Returns a URL connection that an input stream can be obtained from. The
+ * URL Connection can handle urls of a variety of types including files, jar
+ * files and remote urls.
+ * <p>
+ * NOTE: If the connection is of type {@link JarURLConnection} the zip file
+ * should be independantly closed using {@link JarURLConnection#getJarFile()}.close()
+ * https://bugs.eclipse.org/bugs/show_bug.cgi?id=326263
+ * </p>
+ *
+ * @param url URL to open connection to
+ * @return the url connection
+ * @throws MalformedURLException if the url is null
+ * @throws IOException if there is a problem accessing the resource specified by the url
+ */
+ public static URLConnection getURLConnection(URL url) throws MalformedURLException, IOException {
if (url == null) {
throw new MalformedURLException("URL specified is null"); //$NON-NLS-1$
- } else if ("file".equals(url.getProtocol())) { //$NON-NLS-1$
- return new BufferedInputStream(new FileInputStream(url.getFile()));
}
- return new BufferedInputStream(url.openStream());
+ URLConnection connection = url.openConnection();
+ if (connection instanceof JarURLConnection) {
+ connection.setUseCaches(false);
+ }
+ return connection;
}
public static void parseURL(URL url, DefaultHandler handler) {
InputStream input = null;
+ URLConnection connection = null;
try {
- input = getInputStream(url);
+ connection = getURLConnection(url);
+ input = connection.getInputStream();
SAXParserWrapper parser = new SAXParserWrapper();
parser.parse(input, handler);
} catch (MalformedURLException e) {
@@ -65,9 +79,12 @@ public class SchemaUtil {
try {
if (input != null)
input.close();
+ if (connection instanceof JarURLConnection) {
+ // https://bugs.eclipse.org/bugs/show_bug.cgi?id=326263
+ ((JarURLConnection) connection).getJarFile().close();
+ }
} catch (IOException e1) {
}
}
}
-
}
diff --git a/eclipse/plugins/org.eclipse.pde.doc.user/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.pde.doc.user/META-INF/MANIFEST.MF
index cf2ed23..802a62b 100644
--- a/eclipse/plugins/org.eclipse.pde.doc.user/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.pde.doc.user/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.pde.doc.user; singleton:=true
-Bundle-Version: 3.6.1.qualifier
+Bundle-Version: 3.6.2.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/eclipse/plugins/org.eclipse.pde.doc.user/build.xml b/eclipse/plugins/org.eclipse.pde.doc.user/build.xml
deleted file mode 100644
index a1ff40b..0000000
--- a/eclipse/plugins/org.eclipse.pde.doc.user/build.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
- 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
- -->
-
-<project name="org.eclipse.pde.doc.user" default="build.jars" basedir=".">
-
<path id="path_bootclasspath">
<fileset dir="${java.home}/lib">
<include name="*.jar" />
</fileset>
</path>
<property name="bootclasspath" refid="path_bootclasspath" />
- <target name="init">
- <property name="plugin" value="org.eclipse.pde.doc.user" />
- <property name="version.suffix" value="3.2.0.200606011503" />
- <property name="full.name" value="${plugin}_${version.suffix}" />
- <property name="temp.folder" value="${basedir}/temp.folder" />
- <property name="plugin.destination" value="${basedir}" />
- <property name="build.result.folder" value="${basedir}" />
- <condition property="p2.publish.parts" value="true">
- <istrue value="${p2.gathering}" />
- </condition>
- </target>
-
- <target name="build.update.jar" depends="init">
- <delete dir="${temp.folder}" />
- <mkdir dir="${temp.folder}" />
- <antcall target="build.jars" />
- <antcall target="gather.bin.parts">
- <param name="destination.temp.folder" value="${temp.folder}/" />
- </antcall>
- <zip zipfile="${plugin.destination}/${full.name}.jar" basedir="${temp.folder}/${full.name}" filesonly="false" />
- <delete dir="${temp.folder}" />
- </target>
-
- <target name="gather.bin.parts" depends="init" if="destination.temp.folder">
- <ant antfile="buildDoc.xml" />
- <mkdir dir="${destination.temp.folder}/${full.name}" />
- <copy todir="${destination.temp.folder}/${full.name}">
- <fileset dir="${basedir}" includes="META-INF/,*.properties,*.xml,*.zip,*.html,*.htm,*.png,images/*.png,*.css,index/**,guide/**,concepts/**,tips/**,reference/**,tasks/**,whatsNew/**" excludes="build.properties,build.xml,buildDoc.xml" />
- </copy>
- <eclipse.versionReplacer path="${destination.temp.folder}/${full.name}" version="${version.suffix}" />
- </target>
-
- <target name="publish.bin.parts" depends="init" if="p2.publish.parts">
- <antcall target="gather.bin.parts">
- <param name="destination.temp.folder" value="${build.result.folder}"/>
- </antcall>
- <eclipse.gatherBundle
- metadataRepository="${p2.build.repo}"
- artifactRepository="${p2.build.repo}"
- buildResultFolder="${build.result.folder}"
- targetFolder="${build.result.folder}/${full.name}"
- />
- </target>
-
- <target name="build.jars" depends="init">
- </target>
-
- <target name="gather.sources" depends="init" if="destination.temp.folder">
- </target>
-
- <target name="build.sources" depends="init">
- </target>
-
- <target name="gather.logs" depends="init" if="destination.temp.folder">
- </target>
-
- <target name="clean" depends="init">
- <delete file="${plugin.destination}/${full.name}.jar" />
- <delete file="${plugin.destination}/${full.name}.zip" />
- <delete dir="${temp.folder}" />
- </target>
-
- <target name="refresh" depends="init" if="eclipse.running">
- <eclipse.refreshLocal resource="${plugin}" depth="infinite" />
- </target>
-
- <target name="zip.plugin" depends="init">
- <delete dir="${temp.folder}" />
- <mkdir dir="${temp.folder}" />
- <antcall target="build.jars" />
- <antcall target="build.sources" />
- <antcall target="gather.bin.parts">
- <param name="destination.temp.folder" value="${temp.folder}/" />
- </antcall>
- <antcall target="gather.sources">
- <param name="destination.temp.folder" value="${temp.folder}/" />
- </antcall>
- <delete>
- <fileset dir="${temp.folder}" includes="**/*.bin.log" />
- </delete>
- <zip zipfile="${plugin.destination}/${full.name}.zip" basedir="${temp.folder}" filesonly="true" />
- <delete dir="${temp.folder}" />
- </target>
-
-</project>
\ No newline at end of file
diff --git a/eclipse/plugins/org.eclipse.pde.doc.user/pdeOptions.txt b/eclipse/plugins/org.eclipse.pde.doc.user/pdeOptions.txt
index f6f0f8c..9ab78d0 100644
--- a/eclipse/plugins/org.eclipse.pde.doc.user/pdeOptions.txt
+++ b/eclipse/plugins/org.eclipse.pde.doc.user/pdeOptions.txt
@@ -60,7 +60,7 @@
-doctitle "Eclipse PDE API Specification"
-header "<b>Eclipse PDE</b><br>Release 3.6"
-bottom '<font size="-1"><p><a href="{@docRoot}/../misc/api-usage-rules.html">Guidelines for using Eclipse APIs</a>.</p><p>Copyright (c) 2000, 2010 IBM Corporation and others. All rights reserved.</p></font>'
--link http://java.sun.com/j2se/1.4.2/docs/api
+-link http://download.oracle.com/javase/1.4.2/docs/api
-linkoffline ./../../../org.eclipse.platform.doc.isv/reference/api ../org.eclipse.platform.doc.isv/reference/api
-linkoffline ./../../../org.eclipse.jdt.doc.isv/reference/api ../org.eclipse.jdt.doc.isv/reference/api
-link http://bundles.osgi.org/javadoc/r4
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 bc654c5..5998cf3 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.6.1.qualifier
+Bundle-Version: 3.6.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/platformOptions.txt b/eclipse/plugins/org.eclipse.platform.doc.isv/platformOptions.txt
index 96239de..84e5f77 100644
--- a/eclipse/plugins/org.eclipse.platform.doc.isv/platformOptions.txt
+++ b/eclipse/plugins/org.eclipse.platform.doc.isv/platformOptions.txt
@@ -122,9 +122,9 @@
;../org.apache.lucene.analysis_1.9.1.v20100518-1140.jar
;../org.apache.lucene_1.9.1.v20100518-1140.jar
;../org.eclipse.core.runtime.compatibility.auth/@dot
-;../org.eclipse.ecf.provider.filetransfer_3.1.0.v20100529-0735.jar
-;../org.eclipse.ecf.filetransfer_4.0.0.v20100529-0735.jar
-;../org.eclipse.ecf_3.1.0.v20100529-0735.jar
+;../org.eclipse.ecf.provider.filetransfer_3.1.0.v20100906-1425.jar
+;../org.eclipse.ecf.filetransfer_4.0.0.v20100906-1425.jar
+;../org.eclipse.ecf_3.1.0.v20100906-1425.jar
;../org.eclipse.equinox.frameworkadmin/@dot
;../org.eclipse.equinox.p2.director/@dot
;../org.eclipse.equinox.p2.garbagecollector/@dot
@@ -154,7 +154,7 @@
-doctitle "Eclipse Platform API Specification"
-header "<b>Eclipse Platform</b><br>Release 3.6"
-bottom '<font size="-1"><p><a href="{@docRoot}/../misc/api-usage-rules.html">Guidelines for using Eclipse APIs</a>.</p><p>Copyright (c) Eclipse contributors and others 2000, 2010. All rights reserved.</p></font>'
--link http://java.sun.com/j2se/1.5.0/docs/api/
+-link http://download.oracle.com/javase/1.5.0/docs/api
-link http://www.osgi.org/javadoc/r4v42
../org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java
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 118b78e..a6858de 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.6.1.qualifier
+Bundle-Version: 3.6.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/gettingStarted/qs-36b.htm b/eclipse/plugins/org.eclipse.platform.doc.user/gettingStarted/qs-36b.htm
index 0763ca8..991aa1a 100644
--- a/eclipse/plugins/org.eclipse.platform.doc.user/gettingStarted/qs-36b.htm
+++ b/eclipse/plugins/org.eclipse.platform.doc.user/gettingStarted/qs-36b.htm
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
<head>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2005. 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, 2010. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
@@ -32,7 +32,7 @@
The Search view's popup menu allows you to do this using <b>Remove Selected
Matches</b> which removes any selected file entries (and all matches in them)
from the Search view. Note that this <strong>only</strong> removes the entries
- in the Search view, it does <strong>not</strong> effect the files themselves.
+ in the Search view, it does <strong>not</strong> affect the files themselves.
Select JanesFile.txt and choose <b>Remove Selected Matches</b> from the popup
menu. The Search view now shows only the matches for JanesText.txt
<blockquote><img src="../images/Image51_search_reduced.png" alt="Search view. One match in Workspace." border="0"></blockquote>
diff --git a/eclipse/plugins/org.eclipse.platform.doc.user/images/Image219_pref_cv2.png b/eclipse/plugins/org.eclipse.platform.doc.user/images/Image219_pref_cv2.png
index dae82a1..e4bab41 100644
Binary files a/eclipse/plugins/org.eclipse.platform.doc.user/images/Image219_pref_cv2.png and b/eclipse/plugins/org.eclipse.platform.doc.user/images/Image219_pref_cv2.png differ
diff --git a/eclipse/plugins/org.eclipse.platform.doc.user/reference/ref-11.htm b/eclipse/plugins/org.eclipse.platform.doc.user/reference/ref-11.htm
index fd248b7..4b3909d 100644
--- a/eclipse/plugins/org.eclipse.platform.doc.user/reference/ref-11.htm
+++ b/eclipse/plugins/org.eclipse.platform.doc.user/reference/ref-11.htm
@@ -153,6 +153,13 @@ page.</p>
<td style="vertical-align: top;">On </td>
</tr>
<tr>
+ <td style="vertical-align: top; width: 25%;">Disable capping when comparing
+ large documents</td>
+ <td style="vertical-align: top;">The capping mechanism is used to speed up finding differences in large files. In that case, the result may be inaccurate and contain too many changes.
+ Turn this option on, if you prefer a precise result in favour of possibly longer calculation time.</td>
+ <td style="vertical-align: top;">Off </td>
+ </tr>
+ <tr>
<td style="vertical-align: top; width: 25%;">When the end/beginning is
reached while navigating an element</td>
<td style="vertical-align: top;">Use this option to configure what occurs when
diff --git a/eclipse/plugins/org.eclipse.platform.doc.user/reference/ref-32.htm b/eclipse/plugins/org.eclipse.platform.doc.user/reference/ref-32.htm
index 28a5a86..34a7480 100644
--- a/eclipse/plugins/org.eclipse.platform.doc.user/reference/ref-32.htm
+++ b/eclipse/plugins/org.eclipse.platform.doc.user/reference/ref-32.htm
@@ -2,7 +2,7 @@
<html lang="en">
<head>
-<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." >
+<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2010. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -178,7 +178,7 @@ all projects that were previously mapped to this repository must first be unmapp
<h3>Add to Branch List...</h3>
<p> This command adds the selected project to the list of projects that are displayed
under the specified branch in the repositories view. This command only modifies
- the repositories view and does not effect the repository in any way. If you
+ the repositories view and does not affect the repository in any way. If you
want to add the project to a branch, you can perform a <strong>Tag with Existing</strong>
after performing this operation.</p>
diff --git a/eclipse/plugins/org.eclipse.platform.doc.user/reference/ref-9.htm b/eclipse/plugins/org.eclipse.platform.doc.user/reference/ref-9.htm
index e553f30..b609bc0 100644
--- a/eclipse/plugins/org.eclipse.platform.doc.user/reference/ref-9.htm
+++ b/eclipse/plugins/org.eclipse.platform.doc.user/reference/ref-9.htm
@@ -2,7 +2,7 @@
<html lang="en">
<head>
-<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." >
+<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2010. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<meta http-equiv="Content-Style-Type" content="text/css">
@@ -85,7 +85,7 @@
File line delimiter</P></TD>
<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> Use
this option to specify the line delimiter to use for new text files. <strong>Note:</strong>
- This will generally not effect the file line delimiter for<br>
+ This will generally not affect the file line delimiter for<br>
existing files.</P></TD>
<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para">Default
</P></TD>
diff --git a/eclipse/plugins/org.eclipse.platform.doc.user/reference/ref-cvs-decorations.htm b/eclipse/plugins/org.eclipse.platform.doc.user/reference/ref-cvs-decorations.htm
index f441d27..dd0d645 100644
--- a/eclipse/plugins/org.eclipse.platform.doc.user/reference/ref-cvs-decorations.htm
+++ b/eclipse/plugins/org.eclipse.platform.doc.user/reference/ref-cvs-decorations.htm
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
<HEAD>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2005. 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, 2010. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
@@ -13,7 +13,7 @@
<BODY BGCOLOR="#ffffff">
<H1 CLASS="Head">CVS Label Decorations</H1>
<P CLASS="Para"> Label Decorations are used by CVS to show important synchronization
- information about workspace resources. Decorations can effect the text or the
+ information about workspace resources. Decorations can affect the text or the
icon of the label associated with a resource. The text decorators are configurable
on the <a href="../tasks/tasks-107b.htm">CVS Label Decorations Preference page</a> which can also be used to indicate
which icons are to be enabled. Here is a description of the icons used by CVS.</P>
diff --git a/eclipse/plugins/org.eclipse.platform/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.platform/META-INF/MANIFEST.MF
index e4a880c..54485c6 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.6.1.qualifier
+Bundle-Version: 3.6.2.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 8bf09c1..f1924a0 100644
--- a/eclipse/plugins/org.eclipse.platform/about.properties
+++ b/eclipse/plugins/org.eclipse.platform/about.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2000, 2010 IBM Corporation and others.
+# Copyright (c) 2000, 2011 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, 2010. All rights reserved.\n\
+(c) Copyright Eclipse contributors and others 2000, 2011. 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/plugin.properties b/eclipse/plugins/org.eclipse.platform/plugin.properties
index 2fb8715..5a10b42 100644
--- a/eclipse/plugins/org.eclipse.platform/plugin.properties
+++ b/eclipse/plugins/org.eclipse.platform/plugin.properties
@@ -14,10 +14,10 @@ providerName=Eclipse.org
productName=Eclipse Platform
productBlurb=Eclipse Platform\n\
\n\
-Version: 3.6.1\n\
+Version: 3.6.2\n\
Build id: {0}\n\
\n\
-(c) Copyright Eclipse contributors and others 2000, 2010. All rights reserved.\n\
+(c) Copyright Eclipse contributors and others 2000, 2011. 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 19e44b3..cd72727 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.sdk/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.sdk/META-INF/MANIFEST.MF
index d289436..afe0233 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.6.1.qualifier
+Bundle-Version: 3.6.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/plugin.properties b/eclipse/plugins/org.eclipse.sdk/plugin.properties
index b1d728d..9e5e26a 100644
--- a/eclipse/plugins/org.eclipse.sdk/plugin.properties
+++ b/eclipse/plugins/org.eclipse.sdk/plugin.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2000, 2010 IBM Corporation and others.
+# Copyright (c) 2000, 2011 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 SDK
productBlurb=Eclipse SDK\n\
\n\
-Version: 3.6.1\n\
+Version: 3.6.2\n\
Build id: {0}\n\
\n\
-(c) Copyright Eclipse contributors and others 2000, 2010. All rights reserved.\n\
+(c) Copyright Eclipse contributors and others 2000, 2011. 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.swt.carbon.macosx/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.swt.carbon.macosx/META-INF/MANIFEST.MF
index fa9f6c5..493c638 100644
--- 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.6.1.qualifier
+Bundle-Version: 3.6.2.qualifier
Bundle-ManifestVersion: 2
Bundle-Localization: fragment
Export-Package:
diff --git a/eclipse/plugins/org.eclipse.swt.carbon.macosx/build.xml b/eclipse/plugins/org.eclipse.swt.carbon.macosx/build.xml
index a66a838..e54746f 100644
--- a/eclipse/plugins/org.eclipse.swt.carbon.macosx/build.xml
+++ b/eclipse/plugins/org.eclipse.swt.carbon.macosx/build.xml
@@ -5,7 +5,7 @@
<property name="swt.os" value="macosx" />
<!-- These properties are used by eclipse when exporting as Deployable plugin and fragments -->
- <property name="version.suffix" value="3.6.1" />
+ <property name="version.suffix" value="3.6.2" />
<import file="../org.eclipse.swt/buildFragment.xml"/>
</project>
\ No newline at end of file
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 9f68f85..dcfcf81 100644
--- 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.6.1.qualifier
+Bundle-Version: 3.6.2.qualifier
Bundle-ManifestVersion: 2
Bundle-Localization: fragment
Export-Package:
diff --git a/eclipse/plugins/org.eclipse.swt.cocoa.macosx.x86_64/build.xml b/eclipse/plugins/org.eclipse.swt.cocoa.macosx.x86_64/build.xml
index 131bd94..5ce91de 100644
--- a/eclipse/plugins/org.eclipse.swt.cocoa.macosx.x86_64/build.xml
+++ b/eclipse/plugins/org.eclipse.swt.cocoa.macosx.x86_64/build.xml
@@ -6,7 +6,7 @@
<property name="swt.arch" value="x86_64" />
<!-- These properties are used by eclipse when exporting as Deployable plugin and fragments -->
- <property name="version.suffix" value="3.6.1" />
+ <property name="version.suffix" value="3.6.2" />
<import file="../org.eclipse.swt/buildFragment.xml"/>
</project>
\ No newline at end of file
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 7186906..6eec22f 100644
--- 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.6.1.qualifier
+Bundle-Version: 3.6.2.qualifier
Bundle-ManifestVersion: 2
Bundle-Localization: fragment
Export-Package:
diff --git a/eclipse/plugins/org.eclipse.swt.cocoa.macosx/build.xml b/eclipse/plugins/org.eclipse.swt.cocoa.macosx/build.xml
index 80d17ab..8333be3 100644
--- a/eclipse/plugins/org.eclipse.swt.cocoa.macosx/build.xml
+++ b/eclipse/plugins/org.eclipse.swt.cocoa.macosx/build.xml
@@ -5,7 +5,7 @@
<property name="swt.os" value="macosx" />
<!-- These properties are used by eclipse when exporting as Deployable plugin and fragments -->
- <property name="version.suffix" value="3.6.1" />
+ <property name="version.suffix" value="3.6.2" />
<import file="../org.eclipse.swt/buildFragment.xml"/>
</project>
\ No newline at end of file
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc64/.project b/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc64/.project
new file mode 100644
index 0000000..ea89217
--- /dev/null
+++ b/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc64/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.swt.gtk.aix.ppc64</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc64/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc64/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..eb5cad1
--- /dev/null
+++ b/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc64/META-INF/MANIFEST.MF
@@ -0,0 +1,19 @@
+Manifest-Version: 1.0
+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.aix.ppc64;singleton:=true
+Bundle-Version: 3.6.2.qualifier
+Bundle-ManifestVersion: 2
+Bundle-Localization: fragment
+Export-Package:
+ org.eclipse.swt.internal.accessibility.gtk; x-internal:=true,
+ org.eclipse.swt.internal.cairo; x-internal:=true,
+ org.eclipse.swt.internal.cde; x-internal:=true,
+ org.eclipse.swt.internal.gnome; x-internal:=true,
+ org.eclipse.swt.internal.gtk; x-internal:=true,
+ org.eclipse.swt.internal.mozilla; x-internal:=true,
+ org.eclipse.swt.internal.opengl.glx; x-internal:=true
+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=aix) (osgi.arch=ppc64))
+Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,
+ J2SE-1.3
diff --git a/eclipse/features/org.eclipse.platform/about_files/linux.gtk.x86/about.html b/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc64/about.html
similarity index 100%
copy from eclipse/features/org.eclipse.platform/about_files/linux.gtk.x86/about.html
copy to eclipse/plugins/org.eclipse.swt.gtk.aix.ppc64/about.html
diff --git a/eclipse/features/org.eclipse.platform/about_files/linux.gtk.ppc/about_files/IJG_README b/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc64/about_files/IJG_README
similarity index 100%
copy from eclipse/features/org.eclipse.platform/about_files/linux.gtk.ppc/about_files/IJG_README
copy to eclipse/plugins/org.eclipse.swt.gtk.aix.ppc64/about_files/IJG_README
diff --git a/eclipse/features/org.eclipse.equinox.executable/gtk_root/about_files/about_cairo.html b/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc64/about_files/about_cairo.html
similarity index 100%
copy from eclipse/features/org.eclipse.equinox.executable/gtk_root/about_files/about_cairo.html
copy to eclipse/plugins/org.eclipse.swt.gtk.aix.ppc64/about_files/about_cairo.html
diff --git a/eclipse/features/org.eclipse.platform/about_files/linux.gtk.ppc/about_files/lgpl-v21.txt b/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc64/about_files/lgpl-v21.txt
similarity index 100%
copy from eclipse/features/org.eclipse.platform/about_files/linux.gtk.ppc/about_files/lgpl-v21.txt
copy to eclipse/plugins/org.eclipse.swt.gtk.aix.ppc64/about_files/lgpl-v21.txt
diff --git a/eclipse/features/org.eclipse.equinox.executable/gtk_root/about_files/mpl-v11.txt b/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc64/about_files/mpl-v11.txt
similarity index 100%
copy from eclipse/features/org.eclipse.equinox.executable/gtk_root/about_files/mpl-v11.txt
copy to eclipse/plugins/org.eclipse.swt.gtk.aix.ppc64/about_files/mpl-v11.txt
diff --git a/eclipse/features/org.eclipse.equinox.executable/gtk_root/about_files/pixman-licenses.txt b/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc64/about_files/pixman-licenses.txt
similarity index 100%
copy from eclipse/features/org.eclipse.equinox.executable/gtk_root/about_files/pixman-licenses.txt
copy to eclipse/plugins/org.eclipse.swt.gtk.aix.ppc64/about_files/pixman-licenses.txt
diff --git a/eclipse/features/org.eclipse.platform/about_files/linux.gtk.x86/about_files/webkit-bsd.txt b/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc64/about_files/webkit-bsd.txt
similarity index 100%
copy from eclipse/features/org.eclipse.platform/about_files/linux.gtk.x86/about_files/webkit-bsd.txt
copy to eclipse/plugins/org.eclipse.swt.gtk.aix.ppc64/about_files/webkit-bsd.txt
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.linux.ppc/build.properties b/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc64/build.properties
similarity index 100%
copy from eclipse/plugins/org.eclipse.swt.gtk.linux.ppc/build.properties
copy to eclipse/plugins/org.eclipse.swt.gtk.aix.ppc64/build.properties
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc64/build.xml b/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc64/build.xml
new file mode 100644
index 0000000..3a437a1
--- /dev/null
+++ b/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc64/build.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="org.eclipse.swt.gtk.linux.x86" default="build.jars" basedir=".">
+
+ <property name="swt.ws" value="gtk" />
+ <property name="swt.os" value="aix" />
+ <property name="swt.arch" value="ppc64" />
+
+ <!-- These properties are used by eclipse when exporting as Deployable plugin and fragments -->
+ <property name="version.suffix" value="3.6.2" />
+
+ <import file="../org.eclipse.swt/buildFragment.xml"/>
+</project>
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.linux.ppc/fragment.properties b/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc64/fragment.properties
similarity index 100%
copy from eclipse/plugins/org.eclipse.swt.gtk.linux.ppc/fragment.properties
copy to eclipse/plugins/org.eclipse.swt.gtk.aix.ppc64/fragment.properties
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 40df74e..963de57 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.6.1.qualifier
+Bundle-Version: 3.6.2.qualifier
Bundle-ManifestVersion: 2
Bundle-Localization: fragment
Export-Package:
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.linux.ppc/build.xml b/eclipse/plugins/org.eclipse.swt.gtk.linux.ppc/build.xml
index 6ebb069..3d7d687 100644
--- a/eclipse/plugins/org.eclipse.swt.gtk.linux.ppc/build.xml
+++ b/eclipse/plugins/org.eclipse.swt.gtk.linux.ppc/build.xml
@@ -6,7 +6,7 @@
<property name="swt.arch" value="ppc" />
<!-- These properties are used by eclipse when exporting as Deployable plugin and fragments -->
- <property name="version.suffix" value="3.6.1" />
+ <property name="version.suffix" value="3.6.2" />
<import file="../org.eclipse.swt/buildFragment.xml"/>
</project>
\ No newline at end of file
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.linux.ppc64/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.swt.gtk.linux.ppc64/META-INF/MANIFEST.MF
index f1c5fc6..d4e70d4 100644
--- a/eclipse/plugins/org.eclipse.swt.gtk.linux.ppc64/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.swt.gtk.linux.ppc64/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.ppc64;singleton:=true
-Bundle-Version: 3.6.1.qualifier
+Bundle-Version: 3.6.2.qualifier
Bundle-ManifestVersion: 2
Bundle-Localization: fragment
Export-Package:
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.linux.ppc64/build.xml b/eclipse/plugins/org.eclipse.swt.gtk.linux.ppc64/build.xml
index de529eb..7d061ef 100644
--- a/eclipse/plugins/org.eclipse.swt.gtk.linux.ppc64/build.xml
+++ b/eclipse/plugins/org.eclipse.swt.gtk.linux.ppc64/build.xml
@@ -6,7 +6,7 @@
<property name="swt.arch" value="ppc64" />
<!-- These properties are used by eclipse when exporting as Deployable plugin and fragments -->
- <property name="version.suffix" value="3.6.1" />
+ <property name="version.suffix" value="3.6.2" />
<import file="../org.eclipse.swt/buildFragment.xml"/>
</project>
\ No newline at end of file
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.linux.s390/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.swt.gtk.linux.s390/META-INF/MANIFEST.MF
index 9b572a5..bf836c1 100644
--- a/eclipse/plugins/org.eclipse.swt.gtk.linux.s390/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.swt.gtk.linux.s390/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.s390; singleton:=true
-Bundle-Version: 3.6.1.qualifier
+Bundle-Version: 3.6.2.qualifier
Bundle-ManifestVersion: 2
Bundle-Localization: fragment
Export-Package:
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.linux.s390/build.xml b/eclipse/plugins/org.eclipse.swt.gtk.linux.s390/build.xml
index 2d4b881..8e28e60 100644
--- a/eclipse/plugins/org.eclipse.swt.gtk.linux.s390/build.xml
+++ b/eclipse/plugins/org.eclipse.swt.gtk.linux.s390/build.xml
@@ -6,7 +6,7 @@
<property name="swt.arch" value="s390" />
<!-- These properties are used by eclipse when exporting as Deployable plugin and fragments -->
- <property name="version.suffix" value="3.6.1" />
+ <property name="version.suffix" value="3.6.2" />
<import file="../org.eclipse.swt/buildFragment.xml"/>
</project>
\ No newline at end of file
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.linux.s390x/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.swt.gtk.linux.s390x/META-INF/MANIFEST.MF
index 6e2dc5f..b76d48c 100644
--- a/eclipse/plugins/org.eclipse.swt.gtk.linux.s390x/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.swt.gtk.linux.s390x/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.s390x; singleton:=true
-Bundle-Version: 3.6.1.qualifier
+Bundle-Version: 3.6.2.qualifier
Bundle-ManifestVersion: 2
Bundle-Localization: fragment
Export-Package:
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.linux.s390x/build.xml b/eclipse/plugins/org.eclipse.swt.gtk.linux.s390x/build.xml
index c23bc5b..532c98a 100644
--- a/eclipse/plugins/org.eclipse.swt.gtk.linux.s390x/build.xml
+++ b/eclipse/plugins/org.eclipse.swt.gtk.linux.s390x/build.xml
@@ -6,7 +6,7 @@
<property name="swt.arch" value="s390x" />
<!-- These properties are used by eclipse when exporting as Deployable plugin and fragments -->
- <property name="version.suffix" value="3.6.1" />
+ <property name="version.suffix" value="3.6.2" />
<import file="../org.eclipse.swt/buildFragment.xml"/>
</project>
\ No newline at end of file
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 ac8670d..bf452ce 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.6.1.qualifier
+Bundle-Version: 3.6.2.qualifier
Bundle-ManifestVersion: 2
Bundle-Localization: fragment
Export-Package:
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.linux.x86/build.xml b/eclipse/plugins/org.eclipse.swt.gtk.linux.x86/build.xml
index f573fb5..4e27917 100644
--- a/eclipse/plugins/org.eclipse.swt.gtk.linux.x86/build.xml
+++ b/eclipse/plugins/org.eclipse.swt.gtk.linux.x86/build.xml
@@ -6,7 +6,7 @@
<property name="swt.arch" value="x86" />
<!-- These properties are used by eclipse when exporting as Deployable plugin and fragments -->
- <property name="version.suffix" value="3.6.1" />
+ <property name="version.suffix" value="3.6.2" />
<import file="../org.eclipse.swt/buildFragment.xml"/>
</project>
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 3cccacf..403baa1 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.6.1.qualifier
+Bundle-Version: 3.6.2.qualifier
Bundle-ManifestVersion: 2
Bundle-Localization: fragment
Export-Package:
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.linux.x86_64/build.xml b/eclipse/plugins/org.eclipse.swt.gtk.linux.x86_64/build.xml
index 68f1576..603f376 100644
--- a/eclipse/plugins/org.eclipse.swt.gtk.linux.x86_64/build.xml
+++ b/eclipse/plugins/org.eclipse.swt.gtk.linux.x86_64/build.xml
@@ -6,7 +6,7 @@
<property name="swt.arch" value="x86_64" />
<!-- These properties are used by eclipse when exporting as Deployable plugin and fragments -->
- <property name="version.suffix" value="3.6.1" />
+ <property name="version.suffix" value="3.6.2" />
<import file="../org.eclipse.swt/buildFragment.xml"/>
</project>
\ No newline at end of file
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 259df68..a44ce66 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.6.1.qualifier
+Bundle-Version: 3.6.2.qualifier
Bundle-ManifestVersion: 2
Bundle-Localization: fragment
Export-Package:
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.solaris.sparc/build.xml b/eclipse/plugins/org.eclipse.swt.gtk.solaris.sparc/build.xml
index 4b972b5..3122656 100644
--- a/eclipse/plugins/org.eclipse.swt.gtk.solaris.sparc/build.xml
+++ b/eclipse/plugins/org.eclipse.swt.gtk.solaris.sparc/build.xml
@@ -6,7 +6,7 @@
<property name="swt.arch" value="sparc" />
<!-- These properties are used by eclipse when exporting as Deployable plugin and fragments -->
- <property name="version.suffix" value="3.6.1" />
+ <property name="version.suffix" value="3.6.2" />
<import file="../org.eclipse.swt/buildFragment.xml"/>
</project>
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 8fcd272..d0586a7 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.6.1.qualifier
+Bundle-Version: 3.6.2.qualifier
Bundle-ManifestVersion: 2
Bundle-Localization: fragment
Export-Package:
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.solaris.x86/build.xml b/eclipse/plugins/org.eclipse.swt.gtk.solaris.x86/build.xml
index 75a7724..0a79ee0 100644
--- a/eclipse/plugins/org.eclipse.swt.gtk.solaris.x86/build.xml
+++ b/eclipse/plugins/org.eclipse.swt.gtk.solaris.x86/build.xml
@@ -6,7 +6,7 @@
<property name="swt.arch" value="x86" />
<!-- These properties are used by eclipse when exporting as Deployable plugin and fragments -->
- <property name="version.suffix" value="3.6.1" />
+ <property name="version.suffix" value="3.6.2" />
<import file="../org.eclipse.swt/buildFragment.xml"/>
</project>
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 8198677..ac18d16 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.6.1.qualifier
+Bundle-Version: 3.6.2.qualifier
Bundle-ManifestVersion: 2
Bundle-Localization: fragment
Export-Package:
diff --git a/eclipse/plugins/org.eclipse.swt.motif.aix.ppc/build.xml b/eclipse/plugins/org.eclipse.swt.motif.aix.ppc/build.xml
index ae26425..95642d8 100644
--- a/eclipse/plugins/org.eclipse.swt.motif.aix.ppc/build.xml
+++ b/eclipse/plugins/org.eclipse.swt.motif.aix.ppc/build.xml
@@ -6,7 +6,7 @@
<property name="swt.arch" value="ppc" />
<!-- These properties are used by eclipse when exporting as Deployable plugin and fragments -->
- <property name="version.suffix" value="3.6.1" />
+ <property name="version.suffix" value="3.6.2" />
<import file="../org.eclipse.swt/buildFragment.xml"/>
</project>
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 ace323e..c2fb563 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.6.1.qualifier
+Bundle-Version: 3.6.2.qualifier
Bundle-ManifestVersion: 2
Bundle-Localization: fragment
Export-Package:
diff --git a/eclipse/plugins/org.eclipse.swt.motif.hpux.ia64_32/build.xml b/eclipse/plugins/org.eclipse.swt.motif.hpux.ia64_32/build.xml
index 410fb67..04f5811 100644
--- a/eclipse/plugins/org.eclipse.swt.motif.hpux.ia64_32/build.xml
+++ b/eclipse/plugins/org.eclipse.swt.motif.hpux.ia64_32/build.xml
@@ -6,7 +6,7 @@
<property name="swt.arch" value="ia64_32" />
<!-- These properties are used by eclipse when exporting as Deployable plugin and fragments -->
- <property name="version.suffix" value="3.6.1" />
+ <property name="version.suffix" value="3.6.2" />
<import file="../org.eclipse.swt/buildFragment.xml"/>
</project>
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 9d4da10..cb14ec7 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.6.1.qualifier
+Bundle-Version: 3.6.2.qualifier
Bundle-ManifestVersion: 2
Bundle-Localization: fragment
Export-Package:
diff --git a/eclipse/plugins/org.eclipse.swt.motif.linux.x86/build.xml b/eclipse/plugins/org.eclipse.swt.motif.linux.x86/build.xml
index 520c1cd..136672b 100644
--- a/eclipse/plugins/org.eclipse.swt.motif.linux.x86/build.xml
+++ b/eclipse/plugins/org.eclipse.swt.motif.linux.x86/build.xml
@@ -6,7 +6,7 @@
<property name="swt.arch" value="x86" />
<!-- These properties are used by eclipse when exporting as Deployable plugin and fragments -->
- <property name="version.suffix" value="3.6.1" />
+ <property name="version.suffix" value="3.6.2" />
<import file="../org.eclipse.swt/buildFragment.xml"/>
</project>
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 9f9dfba..16236d0 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.6.1.qualifier
+Bundle-Version: 3.6.2.qualifier
Bundle-ManifestVersion: 2
Bundle-Localization: fragment
Export-Package:
diff --git a/eclipse/plugins/org.eclipse.swt.motif.solaris.sparc/build.xml b/eclipse/plugins/org.eclipse.swt.motif.solaris.sparc/build.xml
index 3b898c9..8f8db4b 100644
--- a/eclipse/plugins/org.eclipse.swt.motif.solaris.sparc/build.xml
+++ b/eclipse/plugins/org.eclipse.swt.motif.solaris.sparc/build.xml
@@ -6,7 +6,7 @@
<property name="swt.arch" value="sparc" />
<!-- These properties are used by eclipse when exporting as Deployable plugin and fragments -->
- <property name="version.suffix" value="3.6.1" />
+ <property name="version.suffix" value="3.6.2" />
<import file="../org.eclipse.swt/buildFragment.xml"/>
</project>
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 58473c3..42f33a4 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.6.1.qualifier
+Bundle-Version: 3.6.2.qualifier
Bundle-ManifestVersion: 2
Bundle-Localization: fragment
Export-Package:
diff --git a/eclipse/plugins/org.eclipse.swt.photon.qnx.x86/build.xml b/eclipse/plugins/org.eclipse.swt.photon.qnx.x86/build.xml
index 22bb4f3..0d50d37 100644
--- a/eclipse/plugins/org.eclipse.swt.photon.qnx.x86/build.xml
+++ b/eclipse/plugins/org.eclipse.swt.photon.qnx.x86/build.xml
@@ -6,7 +6,7 @@
<property name="swt.arch" value="x86" />
<!-- These properties are used by eclipse when exporting as Deployable plugin and fragments -->
- <property name="version.suffix" value="3.6.1" />
+ <property name="version.suffix" value="3.6.2" />
<import file="../org.eclipse.swt/buildFragment.xml"/>
</project>
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 f45b41d..0fcc182 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.6.1.qualifier
+Bundle-Version: 3.6.2.qualifier
Bundle-ManifestVersion: 2
Bundle-Localization: fragment
Export-Package:
diff --git a/eclipse/plugins/org.eclipse.swt.win32.wce_ppc.arm/build.xml b/eclipse/plugins/org.eclipse.swt.win32.wce_ppc.arm/build.xml
index d421acc..fafdbc4 100644
--- a/eclipse/plugins/org.eclipse.swt.win32.wce_ppc.arm/build.xml
+++ b/eclipse/plugins/org.eclipse.swt.win32.wce_ppc.arm/build.xml
@@ -6,7 +6,7 @@
<property name="swt.arch" value="arm" />
<!-- These properties are used by eclipse when exporting as Deployable plugin and fragments -->
- <property name="version.suffix" value="3.6.1" />
+ <property name="version.suffix" value="3.6.2" />
<import file="../org.eclipse.swt/buildFragment.xml"/>
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 5a086d6..ceec371 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.6.1.qualifier
+Bundle-Version: 3.6.2.qualifier
Bundle-ManifestVersion: 2
Bundle-Localization: fragment
Export-Package:
diff --git a/eclipse/plugins/org.eclipse.swt.win32.win32.x86/build.xml b/eclipse/plugins/org.eclipse.swt.win32.win32.x86/build.xml
index 9e83182..fa087fe 100644
--- a/eclipse/plugins/org.eclipse.swt.win32.win32.x86/build.xml
+++ b/eclipse/plugins/org.eclipse.swt.win32.win32.x86/build.xml
@@ -6,7 +6,7 @@
<property name="swt.arch" value="x86" />
<!-- These properties are used by eclipse when exporting as Deployable plugin and fragments -->
- <property name="version.suffix" value="3.6.1" />
+ <property name="version.suffix" value="3.6.2" />
<import file="../org.eclipse.swt/buildFragment.xml"/>
</project>
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 4c9cd78..41e9e9f 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.6.1.qualifier
+Bundle-Version: 3.6.2.qualifier
Bundle-ManifestVersion: 2
Bundle-Localization: fragment
Export-Package:
diff --git a/eclipse/plugins/org.eclipse.swt.win32.win32.x86_64/build.xml b/eclipse/plugins/org.eclipse.swt.win32.win32.x86_64/build.xml
index f81c425..b45aeec 100644
--- a/eclipse/plugins/org.eclipse.swt.win32.win32.x86_64/build.xml
+++ b/eclipse/plugins/org.eclipse.swt.win32.win32.x86_64/build.xml
@@ -6,7 +6,7 @@
<property name="swt.arch" value="x86_64" />
<!-- These properties are used by eclipse when exporting as Deployable plugin and fragments -->
- <property name="version.suffix" value="3.6.1" />
+ <property name="version.suffix" value="3.6.2" />
<import file="../org.eclipse.swt/buildFragment.xml"/>
</project>
\ No newline at end of file
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 07ef376..ec4c646 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
@@ -545,42 +545,42 @@ class AccessibleObject {
attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_LEFT_MARGIN));
attr.value = getStringPtr (String.valueOf(event.leftMargin));
ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
- parentResult = OS.g_list_append(parentResult, attrPtr);
+ parentResult = OS.g_slist_append(parentResult, attrPtr);
}
if (event.rightMargin != -1) {
int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_RIGHT_MARGIN));
attr.value = getStringPtr (String.valueOf(event.rightMargin));
ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
- parentResult = OS.g_list_append(parentResult, attrPtr);
+ parentResult = OS.g_slist_append(parentResult, attrPtr);
}
if (event.topMargin != -1) {
int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
attr.name = getStringPtr ("top-margin"); //$NON-NLS-1$
attr.value = getStringPtr (String.valueOf(event.topMargin));
ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
- parentResult = OS.g_list_append(parentResult, attrPtr);
+ parentResult = OS.g_slist_append(parentResult, attrPtr);
}
if (event.bottomMargin != -1) {
int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
attr.name = getStringPtr ("bottom-margin"); //$NON-NLS-1$
attr.value = getStringPtr (String.valueOf(event.bottomMargin));
ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
- parentResult = OS.g_list_append(parentResult, attrPtr);
+ parentResult = OS.g_slist_append(parentResult, attrPtr);
}
if (event.indent != -1) {
int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_INDENT));
attr.value = getStringPtr (String.valueOf(event.indent));
ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
- parentResult = OS.g_list_append(parentResult, attrPtr);
+ parentResult = OS.g_slist_append(parentResult, attrPtr);
}
if (event.justify) {
int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_JUSTIFICATION));
attr.value = getStringPtr ("fill"); //$NON-NLS-1$
ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
- parentResult = OS.g_list_append(parentResult, attrPtr);
+ parentResult = OS.g_slist_append(parentResult, attrPtr);
} else if (event.alignment != -1) {
int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_JUSTIFICATION));
@@ -592,7 +592,7 @@ class AccessibleObject {
}
attr.value = getStringPtr (str);
ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
- parentResult = OS.g_list_append(parentResult, attrPtr);
+ parentResult = OS.g_slist_append(parentResult, attrPtr);
}
//TODO - tabStops
if (event.attributes != null) {
@@ -602,7 +602,7 @@ class AccessibleObject {
attr.name = getStringPtr (event.attributes[i]);
attr.value = getStringPtr (event.attributes[i + 1]);
ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
- parentResult = OS.g_list_append(parentResult, attrPtr);
+ parentResult = OS.g_slist_append(parentResult, attrPtr);
}
}
}
@@ -1729,7 +1729,7 @@ class AccessibleObject {
attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_RISE));
attr.value = getStringPtr (String.valueOf(style.rise));
ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
- result = OS.g_list_append(result, attrPtr);
+ result = OS.g_slist_append(result, attrPtr);
}
if (style.underline) {
int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
@@ -1743,14 +1743,14 @@ class AccessibleObject {
}
attr.value = getStringPtr (str);
ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
- result = OS.g_list_append(result, attrPtr);
+ result = OS.g_slist_append(result, attrPtr);
}
if (style.strikeout) {
int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_STRIKETHROUGH));
attr.value = getStringPtr ("1");
ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
- result = OS.g_list_append(result, attrPtr);
+ result = OS.g_slist_append(result, attrPtr);
}
Font font = style.font;
if (font != null && !font.isDisposed()) {
@@ -1760,37 +1760,37 @@ class AccessibleObject {
attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_FAMILY_NAME));
attr.value = ATK.g_strdup (OS.pango_font_description_get_family (font.handle));
ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
- result = OS.g_list_append(result, attrPtr);
+ result = OS.g_slist_append(result, attrPtr);
attrPtr = OS.g_malloc(AtkAttribute.sizeof);
attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_SIZE));
attr.value = getStringPtr (String.valueOf (OS.pango_font_description_get_size(font.handle) / OS.PANGO_SCALE));
ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
- result = OS.g_list_append(result, attrPtr);
+ result = OS.g_slist_append(result, attrPtr);
attrPtr = OS.g_malloc(AtkAttribute.sizeof);
attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_STYLE));
attr.value = ATK.g_strdup (ATK.atk_text_attribute_get_value(ATK.ATK_TEXT_ATTR_STYLE, OS.pango_font_description_get_style(font.handle)));
ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
- result = OS.g_list_append(result, attrPtr);
+ result = OS.g_slist_append(result, attrPtr);
attrPtr = OS.g_malloc(AtkAttribute.sizeof);
attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_VARIANT));
attr.value = ATK.g_strdup (ATK.atk_text_attribute_get_value(ATK.ATK_TEXT_ATTR_VARIANT, OS.pango_font_description_get_variant(font.handle)));
ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
- result = OS.g_list_append(result, attrPtr);
+ result = OS.g_slist_append(result, attrPtr);
attrPtr = OS.g_malloc(AtkAttribute.sizeof);
attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_STRETCH));
attr.value = ATK.g_strdup (ATK.atk_text_attribute_get_value(ATK.ATK_TEXT_ATTR_STRETCH, OS.pango_font_description_get_stretch(font.handle)));
ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
- result = OS.g_list_append(result, attrPtr);
+ result = OS.g_slist_append(result, attrPtr);
attrPtr = OS.g_malloc(AtkAttribute.sizeof);
attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_WEIGHT));
attr.value = getStringPtr (String.valueOf (OS.pango_font_description_get_weight(font.handle)));
ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
- result = OS.g_list_append(result, attrPtr);
+ result = OS.g_slist_append(result, attrPtr);
}
Color color = style.foreground;
if (color != null && !color.isDisposed()) {
@@ -1798,7 +1798,7 @@ class AccessibleObject {
attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_FG_COLOR));
attr.value = getStringPtr ((color.handle.red & 0xFFFF) + "," + (color.handle.blue & 0xFFFF) + "," + (color.handle.blue & 0xFFFF)); //$NON-NLS-1$ //$NON-NLS-2$
ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
- result = OS.g_list_append(result, attrPtr);
+ result = OS.g_slist_append(result, attrPtr);
}
color = style.background;
if (color != null && !color.isDisposed()) {
@@ -1806,7 +1806,7 @@ class AccessibleObject {
attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_BG_COLOR));
attr.value = getStringPtr ((color.handle.red & 0xFFFF) + "," + (color.handle.blue & 0xFFFF) + "," + (color.handle.blue & 0xFFFF)); //$NON-NLS-1$ //$NON-NLS-2$
ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
- result = OS.g_list_append(result, attrPtr);
+ result = OS.g_slist_append(result, attrPtr);
}
}
if (event.attributes != null) {
@@ -1816,7 +1816,7 @@ class AccessibleObject {
attr.name = getStringPtr (event.attributes[i]);
attr.value = getStringPtr (event.attributes[i + 1]);
ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
- result = OS.g_list_append(result, attrPtr);
+ result = OS.g_slist_append(result, attrPtr);
}
}
return result;
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 1fb993c..784d157 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
@@ -10,6 +10,7 @@
*******************************************************************************/
package org.eclipse.swt.browser;
+import java.net.*;
import java.util.*;
import org.eclipse.swt.*;
@@ -621,13 +622,22 @@ public boolean create(Composite parent, int style) {
* workaround is to not unload the Acrobat libraries if > MAX_PDF PDF
* files have been opened.
*/
- 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;
+ boolean isPDF = false;
+ String path = null;
+ try {
+ path = new URL(url).getPath();
+ } catch (MalformedURLException e) {
+ }
+ if (path != null) {
+ int extensionIndex = path.lastIndexOf('.');
+ if (extensionIndex != -1) {
+ String extension = path.substring(extensionIndex);
+ if (extension.equalsIgnoreCase(EXTENSION_PDF)) {
+ isPDF = true;
+ PDFCount++;
+ if (PDFCount > MAX_PDF) {
+ COM.FreeUnusedLibraries = false;
+ }
}
}
}
@@ -665,7 +675,9 @@ public boolean create(Composite parent, int style) {
execute (function.functionString);
}
}
- hookDOMListeners(webBrowser, isTop);
+ if (!isPDF) {
+ hookDOMListeners(webBrowser, isTop);
+ }
webBrowser.dispose();
break;
}
@@ -1404,7 +1416,7 @@ public boolean setUrl(String url, String postData, String headers[]) {
* about:blank to work around IE bug http://support.microsoft.com/kb/320153,
* then navigate to the requested url once about:blank has loaded.
*/
- if (_getUrl().length() == 0) {
+ if (_getUrl().length() == 0 && !ABOUT_BLANK.equalsIgnoreCase(url)) {
pendingText = null;
pendingUrl = new Object[] {url, postData, headers};
performingInitialNavigate = true;
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/carbon/org/eclipse/swt/dnd/HTMLTransfer.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/carbon/org/eclipse/swt/dnd/HTMLTransfer.java
index f3e21ff..34b9ccf 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/carbon/org/eclipse/swt/dnd/HTMLTransfer.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/carbon/org/eclipse/swt/dnd/HTMLTransfer.java
@@ -10,6 +10,7 @@
*******************************************************************************/
package org.eclipse.swt.dnd;
+import org.eclipse.swt.internal.carbon.CFRange;
import org.eclipse.swt.internal.carbon.OS;
/**
@@ -58,11 +59,26 @@ public void javaToNative (Object object, TransferData transferData){
DND.error(DND.ERROR_INVALID_DATA);
}
String string = (String)object;
- int count = string.length();
- char[] chars = new char[count];
- string.getChars(0, count, chars, 0);
- byte[] buffer = new byte[chars.length * 2];
- OS.memmove(buffer, chars, buffer.length);
+ char[] chars = new char[string.length()];
+ string.getChars (0, chars.length, chars, 0);
+ transferData.result = -1;
+
+ int encoding = OS.CFStringGetSystemEncoding();
+ int cfstring = OS.CFStringCreateWithCharacters(OS.kCFAllocatorDefault, chars, chars.length);
+ if (cfstring == 0) return;
+ byte[] buffer = null;
+ try {
+ CFRange range = new CFRange();
+ range.length = chars.length;
+ int[] size = new int[1];
+ int numChars = OS.CFStringGetBytes(cfstring, range, encoding, (byte)'?', false, null, 0, size);
+ if (numChars == 0) return;
+ buffer = new byte[size[0]];
+ numChars = OS.CFStringGetBytes(cfstring, range, encoding, (byte)'?', false, buffer, size [0], size);
+ if (numChars == 0) return;
+ } finally {
+ OS.CFRelease(cfstring);
+ }
transferData.data = new byte[1][];
transferData.data[0] = buffer;
transferData.result = OS.noErr;
@@ -82,9 +98,20 @@ public Object nativeToJava(TransferData transferData){
if (!isSupportedType(transferData) || transferData.data == null) return null;
if (transferData.data.length == 0 || transferData.data[0].length == 0) return null;
byte[] buffer = transferData.data[0];
- char[] chars = new char[(buffer.length + 1) / 2];
- OS.memmove(chars, buffer, buffer.length);
- return new String(chars);
+ int encoding = OS.CFStringGetSystemEncoding();
+ int cfstring = OS.CFStringCreateWithBytes(OS.kCFAllocatorDefault, buffer, buffer.length, encoding, false);
+ if (cfstring == 0) return null;
+ try {
+ int length = OS.CFStringGetLength(cfstring);
+ if (length == 0) return null;
+ char[] chars = new char[length];
+ CFRange range = new CFRange();
+ range.length = length;
+ OS.CFStringGetCharacters(cfstring, range, chars);
+ return new String(chars);
+ } finally {
+ OS.CFRelease(cfstring);
+ }
}
protected int[] getTypeIds() {
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/carbon/org/eclipse/swt/browser/MozillaDelegate.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/carbon/org/eclipse/swt/browser/MozillaDelegate.java
index 9b32d7b..16b769d 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/carbon/org/eclipse/swt/browser/MozillaDelegate.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/carbon/org/eclipse/swt/browser/MozillaDelegate.java
@@ -99,9 +99,32 @@ static int eventProc3 (int nextHandler, int theEvent, int userData) {
* DOM listener is handling the event, in case the Browser gets disposed in a
* callback.
*/
+ int result = OS.noErr;
int handle = browser.handle;
OS.CFRetain (handle);
- int result = OS.CallNextEventHandler (nextHandler, theEvent);
+
+ /*
+ * Pressing the OSX shortcut to put focus into the menu bar does not work in
+ * embedded mozilla. If this shortcut is not handled here then it falls through
+ * all of the key handlers for some reason. The workaround is to detect this
+ * shortcut here and put focus into the menu bar.
+ */
+ int [] modifiers = new int [1];
+ OS.GetEventParameter (theEvent, OS.kEventParamKeyModifiers, OS.typeUInt32, null, modifiers.length * 4, null, modifiers);
+ int [] keyCode = new int [1];
+ OS.GetEventParameter (theEvent, OS.kEventParamKeyCode, OS.typeUInt32, null, keyCode.length * 4, null, keyCode);
+ if (keyCode [0] == 120 /* F2 */ && (modifiers[0] & (OS.controlKey | OS.cmdKey | OS.optionKey)) == OS.controlKey) {
+ int[] event = new int[1];
+ OS.CreateEvent (0, OS.kEventClassApplication, OS.kEventAppFocusMenuBar, 0.0, 0, event);
+ if (event [0] != 0) {
+ OS.SetEventParameter (event [0], OS.kEventParamKeyModifiers, OS.typeUInt32, 4, modifiers);
+ result = OS.SendEventToEventTarget (event [0], OS.GetApplicationEventTarget ());
+ OS.ReleaseEvent (event [0]);
+ }
+ } else {
+ result = OS.CallNextEventHandler (nextHandler, theEvent);
+ }
+
OS.CFRelease (handle);
return result;
}
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 30d6b71..af44dda 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
@@ -3719,8 +3719,6 @@ int SetVisibility (int aVisibility) {
visibilityWindowListeners[i].hide (event);
}
}
- } else {
- visible = aVisibility != 0;
}
return XPCOM.NS_OK;
}
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 a54b742..f05b576 100644
--- 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
@@ -230,7 +230,14 @@ public OleClientSite(Composite parent, int style, String progId) {
// Create ole object with storage object
int /*long*/[] address = new int /*long*/[1];
- int result = COM.OleCreate(appClsid, COM.IIDIUnknown, COM.OLERENDER_DRAW, null, iOleClientSite.getAddress(), tempStorage.getAddress(), address);
+ /*
+ * Bug in ICA Client 2.7. The creation of the IOleObject fails if the client
+ * site is provided to OleCreate(). The fix is to detect that the program
+ * id is an ICA Client and do not pass a client site to OleCreate().
+ * IOleObject.SetClientSite() is called later on.
+ */
+ int /*long*/ clientSite = isICAClient() ? 0 : iOleClientSite.getAddress();
+ int result = COM.OleCreate(appClsid, COM.IIDIUnknown, COM.OLERENDER_DRAW, null, clientSite, tempStorage.getAddress(), address);
if (result != COM.S_OK)
OLE.error(OLE.ERROR_CANNOT_CREATE_OBJECT, result);
@@ -821,6 +828,9 @@ private int GetWindowContext(int /*long*/ ppFrame, int /*long*/ ppDoc, int /*lon
return COM.S_OK;
}
+boolean isICAClient() {
+ return getProgramID().startsWith("Citrix.ICAClient"); //$NON-NLS-1$
+}
/**
* Returns whether ole document is dirty by checking whether the content
* of the file representing the document is dirty.
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 1995dc9..b5dda3f 100644
--- 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
@@ -137,7 +137,14 @@ public OleControlSite(Composite parent, int style, String progId) {
// Create ole object with storage object
int /*long*/[] address = new int /*long*/[1];
- int result = COM.OleCreate(appClsid, COM.IIDIUnknown, COM.OLERENDER_DRAW, null, iOleClientSite.getAddress(), tempStorage.getAddress(), address);
+ /*
+ * Bug in ICA Client 2.7. The creation of the IOleObject fails if the client
+ * site is provided to OleCreate(). The fix is to detect that the program
+ * id is an ICA Client and do not pass a client site to OleCreate().
+ * IOleObject.SetClientSite() is called later on.
+ */
+ int /*long*/ clientSite = isICAClient() ? 0 : iOleClientSite.getAddress();
+ int result = COM.OleCreate(appClsid, COM.IIDIUnknown, COM.OLERENDER_DRAW, null, clientSite, tempStorage.getAddress(), address);
if (result != COM.S_OK)
OLE.error(OLE.ERROR_CANNOT_CREATE_OBJECT, result);
@@ -684,6 +691,13 @@ void onFocusOut(Event e) {
super.onFocusOut(e);
return;
}
+
+ /*
+ * FocusOut is received when focus is reassigned between handles within
+ * our site. In such cases the site should not be UIDeactivated.
+ */
+ if (isFocusControl()) return;
+
/*
* Bug in Windows. When IE7 loses focus and UIDeactivate()
* is called, IE destroys the caret even though it is
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 0cc4de1..cbc6210 100644
--- 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
@@ -220,7 +220,10 @@ static int /*long*/ getMsgProc(int /*long*/ code, int /*long*/ wParam, int /*lon
frame.setData(CONSUME_KEY, null);
display.setData(ACCEL_KEY_HIT, Boolean.TRUE);
consumed = frame.translateOleAccelerator(msg);
+ /* translateOleAccelerator() may send client events, ensure that the frame and display are still valid */
+ if (display.isDisposed()) return 0;
display.setData(ACCEL_KEY_HIT, Boolean.FALSE);
+ if (frame.isDisposed()) return 0;
String value = (String)frame.getData(CONSUME_KEY);
if (value != null) consumed = value.equals("true"); //$NON-NLS-1$
frame.setData(CONSUME_KEY, null);
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_custom.h b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_custom.h
index 9d0ae8d..44c5e55 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_custom.h
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_custom.h
@@ -20,7 +20,15 @@
* ***** END LICENSE BLOCK ***** */
/* Libraries for dynamic loaded functions */
-#define cairo_pdf_surface_set_size_LIB "libcairo.so.2"
-#define cairo_ps_surface_set_size_LIB "libcairo.so.2"
-#define cairo_surface_set_fallback_resolution_LIB "libcairo.so.2"
-#define cairo_surface_get_type_LIB "libcairo.so.2"
+#ifdef AIX
+#define LIB_CAIRO "libcairo.a(libcairo.so.2)"
+#elif HPUX
+#define LIB_CAIRO "libcairo.so"
+#else
+#define LIB_CAIRO "libcairo.so.2"
+#endif
+
+#define cairo_pdf_surface_set_size_LIB LIB_CAIRO
+#define cairo_ps_surface_set_size_LIB LIB_CAIRO
+#define cairo_surface_set_fallback_resolution_LIB LIB_CAIRO
+#define cairo_surface_get_type_LIB LIB_CAIRO
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/OS.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/OS.java
index 26624cb..95f92d1 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/OS.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/OS.java
@@ -375,6 +375,7 @@ public class OS extends C {
public static final int kEventAppleEvent = 1;
public static final int kEventAppDeactivated = 2;
public static final int kEventAppAvailableWindowBoundsChanged = 110;
+ public static final int kEventAppFocusMenuBar = 8;
public static final int kEventAttributeUserEvent = 1 << 0;
public static final int kEventClassAppleEvent = ('e'<<24) + ('p'<<16) + ('p'<<8) + 'c';
public static final int kEventClassApplication = ('a'<<24) + ('p'<<16) + ('p'<<8) + 'l';
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.c b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.c
index f35ec12..4cb1a6e 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.c
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.c
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 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
@@ -8927,6 +8927,29 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(objc_1msgSend_1bool__JJJJJ)(JNIEnv *env, jc
}
#endif
+#if (!defined(NO_objc_1msgSend_1bool__IIIIII) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1bool__JJJJJJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jboolean JNICALL OS_NATIVE(objc_1msgSend_1bool__IIIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5)
+#else
+JNIEXPORT jboolean JNICALL OS_NATIVE(objc_1msgSend_1bool__JJJJJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5)
+#endif
+{
+ jboolean rc = 0;
+#ifndef JNI64
+ OS_NATIVE_ENTER(env, that, objc_1msgSend_1bool__IIIIII_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, objc_1msgSend_1bool__JJJJJJ_FUNC);
+#endif
+ rc = (jboolean)((BOOL (*)(jintLong, jintLong, jintLong, jintLong, jintLong, jintLong))objc_msgSend_bool)(arg0, arg1, arg2, arg3, arg4, arg5);
+#ifndef JNI64
+ OS_NATIVE_EXIT(env, that, objc_1msgSend_1bool__IIIIII_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, objc_1msgSend_1bool__JJJJJJ_FUNC);
+#endif
+ return rc;
+}
+#endif
+
#if (!defined(NO_objc_1msgSend_1bool__IIIIIII) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1bool__JJJJJJJ) && defined(JNI64))
#ifndef JNI64
JNIEXPORT jboolean JNICALL OS_NATIVE(objc_1msgSend_1bool__IIIIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5, jintLong arg6)
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.c b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.c
index 85afa05..85eddf1 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.c
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.c
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 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,8 +14,8 @@
#ifdef NATIVE_STATS
-int OS_nativeFunctionCount = 587;
-int OS_nativeFunctionCallCount[587];
+int OS_nativeFunctionCount = 588;
+int OS_nativeFunctionCallCount[588];
char * OS_nativeFunctionNames[] = {
"ATSFontActivateFromFileReference",
"AcquireRootMenu",
@@ -1028,6 +1028,11 @@ char * OS_nativeFunctionNames[] = {
"objc_1msgSend_1bool__JJJJJ",
#endif
#ifndef JNI64
+ "objc_1msgSend_1bool__IIIIII",
+#else
+ "objc_1msgSend_1bool__JJJJJJ",
+#endif
+#ifndef JNI64
"objc_1msgSend_1bool__IIIIIII",
#else
"objc_1msgSend_1bool__JJJJJJJ",
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.h b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.h
index 92409cd..abc2f51 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.h
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.h
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 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
@@ -1036,6 +1036,11 @@ typedef enum {
objc_1msgSend_1bool__JJJJJ_FUNC,
#endif
#ifndef JNI64
+ objc_1msgSend_1bool__IIIIII_FUNC,
+#else
+ objc_1msgSend_1bool__JJJJJJ_FUNC,
+#endif
+#ifndef JNI64
objc_1msgSend_1bool__IIIIIII_FUNC,
#else
objc_1msgSend_1bool__JJJJJJJ_FUNC,
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras
index 8d93784..7d60f9c 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras
@@ -1949,6 +1949,30 @@
<method selector="draggingSourceOperationMask" swt_gen="true">
<retval swt_gen="true"></retval>
</method>
+ <method selector="outlineView:shouldSelectItem:" swt_gen="true">
+ <arg swt_gen="true"></arg>
+ <arg swt_gen="true"></arg>
+ <retval swt_gen="true"></retval>
+ </method>
+ <method selector="outlineView:shouldTrackCell:forTableColumn:item:" swt_gen="true">
+ <arg swt_gen="true"></arg>
+ <arg swt_gen="true"></arg>
+ <arg swt_gen="true"></arg>
+ <arg swt_gen="true"></arg>
+ <retval swt_gen="true"></retval>
+ </method>
+ <method selector="tableView:shouldSelectRow:" swt_gen="true">
+ <arg swt_gen="true"></arg>
+ <arg swt_gen="true"></arg>
+ <retval swt_gen="true"></retval>
+ </method>
+ <method selector="tableView:shouldTrackCell:forTableColumn:row:" swt_gen="true">
+ <arg swt_gen="true"></arg>
+ <arg swt_gen="true"></arg>
+ <arg swt_gen="true"></arg>
+ <arg swt_gen="true"></arg>
+ <retval swt_gen="true"></retval>
+ </method>
</class>
<class name="NSObjectController" swt_superclass="NSController">
</class>
@@ -3012,10 +3036,6 @@
<method selector="clickedRow" swt_gen="true">
<retval swt_gen="true"></retval>
</method>
- <method selector="columnAtPoint:" swt_gen="true">
- <arg swt_gen="true"></arg>
- <retval swt_gen="true"></retval>
- </method>
<method selector="columnIndexesInRect:" swt_gen="true">
<arg swt_gen="true"></arg>
<retval swt_gen="true"></retval>
@@ -3079,6 +3099,11 @@
<method selector="numberOfSelectedRows" swt_gen="true">
<retval swt_gen="true"></retval>
</method>
+ <method selector="preparedCellAtColumn:row:" swt_gen="true">
+ <arg swt_gen="true"></arg>
+ <arg swt_gen="true"></arg>
+ <retval swt_gen="true"></retval>
+ </method>
<method selector="rectOfColumn:" swt_gen="true">
<arg swt_gen="true"></arg>
<retval swt_gen="true"></retval>
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSObject.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSObject.java
index 828584c..2fcca8e 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSObject.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSObject.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 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,22 @@ public int /*long*/ draggingSourceOperationMask() {
return OS.objc_msgSend(this.id, OS.sel_draggingSourceOperationMask);
}
+public boolean outlineView(NSOutlineView outlineView, id item) {
+ return OS.objc_msgSend_bool(this.id, OS.sel_outlineView_shouldSelectItem_, outlineView != null ? outlineView.id : 0, item != null ? item.id : 0);
+}
+
+public boolean outlineView(NSOutlineView outlineView, NSCell cell, NSTableColumn tableColumn, id item) {
+ return OS.objc_msgSend_bool(this.id, OS.sel_outlineView_shouldTrackCell_forTableColumn_item_, outlineView != null ? outlineView.id : 0, cell != null ? cell.id : 0, tableColumn != null ? tableColumn.id : 0, item != null ? item.id : 0);
+}
+
+public boolean tableView(NSTableView tableView, int /*long*/ row) {
+ return OS.objc_msgSend_bool(this.id, OS.sel_tableView_shouldSelectRow_, tableView != null ? tableView.id : 0, row);
+}
+
+public boolean tableView(NSTableView tableView, NSCell cell, NSTableColumn tableColumn, int /*long*/ row) {
+ return OS.objc_msgSend_bool(this.id, OS.sel_tableView_shouldTrackCell_forTableColumn_row_, tableView != null ? tableView.id : 0, cell != null ? cell.id : 0, tableColumn != null ? tableColumn.id : 0, row);
+}
+
public NSObject autorelease() {
int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_autorelease);
return result == this.id ? this : (result != 0 ? new NSObject(result) : null);
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableView.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableView.java
index 0a17e83..d81fc2b 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableView.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableView.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 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
@@ -44,10 +44,6 @@ public int /*long*/ clickedRow() {
return OS.objc_msgSend(this.id, OS.sel_clickedRow);
}
-public int /*long*/ columnAtPoint(NSPoint point) {
- return OS.objc_msgSend(this.id, OS.sel_columnAtPoint_, point);
-}
-
public NSIndexSet columnIndexesInRect(NSRect rect) {
int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_columnIndexesInRect_, rect);
return result != 0 ? new NSIndexSet(result) : null;
@@ -119,6 +115,11 @@ public int /*long*/ numberOfSelectedRows() {
return OS.objc_msgSend(this.id, OS.sel_numberOfSelectedRows);
}
+public NSCell preparedCellAtColumn(int /*long*/ column, int /*long*/ row) {
+ int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_preparedCellAtColumn_row_, column, row);
+ return result != 0 ? new NSCell(result) : null;
+}
+
public NSRect rectOfColumn(int /*long*/ column) {
NSRect result = new NSRect();
OS.objc_msgSend_stret(result, this.id, OS.sel_rectOfColumn_, column);
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 336b760..425dc72 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
@@ -1385,6 +1385,8 @@ public static final int /*long*/ sel_outlineView_objectValueForTableColumn_byIte
public static final int /*long*/ sel_outlineView_setObjectValue_forTableColumn_byItem_ = sel_registerName("outlineView:setObjectValue:forTableColumn:byItem:");
public static final int /*long*/ sel_outlineView_shouldCollapseItem_ = sel_registerName("outlineView:shouldCollapseItem:");
public static final int /*long*/ sel_outlineView_shouldExpandItem_ = sel_registerName("outlineView:shouldExpandItem:");
+public static final int /*long*/ sel_outlineView_shouldSelectItem_ = sel_registerName("outlineView:shouldSelectItem:");
+public static final int /*long*/ sel_outlineView_shouldTrackCell_forTableColumn_item_ = sel_registerName("outlineView:shouldTrackCell:forTableColumn:item:");
public static final int /*long*/ sel_outlineView_validateDrop_proposedItem_proposedChildIndex_ = sel_registerName("outlineView:validateDrop:proposedItem:proposedChildIndex:");
public static final int /*long*/ sel_outlineView_willDisplayCell_forTableColumn_item_ = sel_registerName("outlineView:willDisplayCell:forTableColumn:item:");
public static final int /*long*/ sel_outlineView_writeItems_toPasteboard_ = sel_registerName("outlineView:writeItems:toPasteboard:");
@@ -1422,6 +1424,7 @@ public static final int /*long*/ sel_popUpContextMenu_withEvent_forView_ = sel_r
public static final int /*long*/ sel_popUpStatusItemMenu_ = sel_registerName("popUpStatusItemMenu:");
public static final int /*long*/ sel_port = sel_registerName("port");
public static final int /*long*/ sel_postEvent_atStart_ = sel_registerName("postEvent:atStart:");
+public static final int /*long*/ sel_preparedCellAtColumn_row_ = sel_registerName("preparedCellAtColumn:row:");
public static final int /*long*/ sel_prependTransform_ = sel_registerName("prependTransform:");
public static final int /*long*/ sel_preventDefault = sel_registerName("preventDefault");
public static final int /*long*/ sel_previousFailureCount = sel_registerName("previousFailureCount");
@@ -1868,6 +1871,8 @@ public static final int /*long*/ sel_tableView_didClickTableColumn_ = sel_regist
public static final int /*long*/ sel_tableView_objectValueForTableColumn_row_ = sel_registerName("tableView:objectValueForTableColumn:row:");
public static final int /*long*/ sel_tableView_setObjectValue_forTableColumn_row_ = sel_registerName("tableView:setObjectValue:forTableColumn:row:");
public static final int /*long*/ sel_tableView_shouldEditTableColumn_row_ = sel_registerName("tableView:shouldEditTableColumn:row:");
+public static final int /*long*/ sel_tableView_shouldSelectRow_ = sel_registerName("tableView:shouldSelectRow:");
+public static final int /*long*/ sel_tableView_shouldTrackCell_forTableColumn_row_ = sel_registerName("tableView:shouldTrackCell:forTableColumn:row:");
public static final int /*long*/ sel_tableView_validateDrop_proposedRow_proposedDropOperation_ = sel_registerName("tableView:validateDrop:proposedRow:proposedDropOperation:");
public static final int /*long*/ sel_tableView_willDisplayCell_forTableColumn_row_ = sel_registerName("tableView:willDisplayCell:forTableColumn:row:");
public static final int /*long*/ sel_tableView_writeRowsWithIndexes_toPasteboard_ = sel_registerName("tableView:writeRowsWithIndexes:toPasteboard:");
@@ -3431,6 +3436,8 @@ public static final native boolean objc_msgSend_bool(int /*long*/ id, int /*long
/** @method flags=cast */
public static final native boolean objc_msgSend_bool(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2);
/** @method flags=cast */
+public static final native boolean objc_msgSend_bool(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3);
+/** @method flags=cast */
public static final native boolean objc_msgSend_bool(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ arg4);
/** @method flags=cast */
public static final native boolean objc_msgSend_bool(int /*long*/ id, int /*long*/ sel, short arg0);
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 028e659..dde42cd 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 = 655;
+ static int MINOR_VERSION = 659;
/**
* 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 b1586d6..87d1355 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 = 655;
+ static int MINOR_VERSION = 659;
/**
* SWT revision number (must be >= 0)
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
index 032587e..55f98da 100755
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
@@ -29,12 +29,22 @@ if [ "${OS}" = "" ]; then
OS=`uname -s`
fi
case $OS in
+ "AIX")
+ SWT_OS=aix
+ MAKEFILE=make_aix.mak
+ ;;
+ "HP-UX")
+ SWT_OS=hpux
+ MAKEFILE=make_hpux.mak
+ ;;
"SunOS")
SWT_OS=solaris
PROC=`uname -i`
MAKEFILE=make_solaris.mak
- if uname -p > /dev/null 2>&1; then
- MODEL=`uname -p`
+ if [ "${MODEL}" = "" ]; then
+ if uname -p > /dev/null 2>&1; then
+ MODEL=`uname -p`
+ fi
fi
if [ ${MODEL} = 'i386' ]; then
MAKEFILE=make_solaris_x86.mak
@@ -67,6 +77,10 @@ case $MODEL in
SWT_ARCH=x86_64
AWT_ARCH=amd64
;;
+ "sparc64")
+ SWT_ARCH=$MODEL
+ AWT_ARCH=sparcv9
+ ;;
i?86)
SWT_ARCH=x86
AWT_ARCH=i386
@@ -78,17 +92,36 @@ case $MODEL in
esac
echo "Model is ${MODEL}"
# For 64-bit CPUs, we have a switch
-if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' ]; then
+if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 'sparc64' -o ${MODEL} = 's390x' ]; then
SWT_PTR_CFLAGS=-DJNI64
if [ -d /lib64 ]; then
XLIB64=-L/usr/X11R6/lib64
export XLIB64
fi
if [ ${MODEL} = 'ppc64' ]; then
- SWT_PTR_CFLAGS="${SWT_PTR_CFLAGS} -m64"
- XLIB64="${XLIB64} -L/usr/lib64"
- SWT_LFLAGS=-m64
- export SWT_LFLAGS
+ if [ ${OS} = 'AIX' ]; then
+ SWT_PTR_CFLAGS="${SWT_PTR_CFLAGS} -maix64"
+ SWT_LFLAGS=-maix64
+ export SWT_LFLAGS
+ else
+ SWT_PTR_CFLAGS="${SWT_PTR_CFLAGS} -m64"
+ XLIB64="${XLIB64} -L/usr/lib64"
+ SWT_LFLAGS=-m64
+ export SWT_LFLAGS
+ fi
+ fi
+ if [ ${MODEL} = 'ia64' ]; then
+ if [ ${OS} = 'HP-UX' ]; then
+ SWT_PTR_CFLAGS="${SWT_PTR_CFLAGS} -mlp64"
+ SWT_LFLAGS=-mlp64
+ export SWT_LFLAGS
+ fi
+ fi
+ if [ ${MODEL} = 'sparc64' ]; then
+ SWT_PTR_CFLAGS="${SWT_PTR_CFLAGS} -xarch=v9"
+ SWT_LFLAGS="-xarch=v9"
+ SWT_CDE_64SUFFIX="/64"
+ export SWT_LFLAGS SWT_CDE_64SUFFIX
fi
export SWT_PTR_CFLAGS
fi
@@ -98,7 +131,7 @@ if [ ${MODEL} = 's390' ]; then
export SWT_LFLAGS SWT_PTR_CFLAGS
fi
-if [ x`pkg-config --exists gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0 && echo YES` = "xYES" ]; then
+if [ x`pkg-config --exists gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0 && echo YES` = "xYES" -a ${MODEL} != "sparc64" ]; then
echo "libgnomeui-2.0 found, compiling SWT program support using GNOME"
MAKE_GNOME=make_gnome
else
@@ -114,7 +147,7 @@ else
echo " *** Advanced graphics support using cairo will not be compiled."
fi
-if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" ]; then
+if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" -a ${MODEL} != 'sparc64' ]; then
if [ x`pkg-config --exists mozilla-xpcom && echo YES` = "xYES" ]; then
MOZILLA_INCLUDES=`pkg-config --cflags mozilla-xpcom`
MOZILLA_LIBS=`pkg-config --libs mozilla-xpcom`
@@ -149,7 +182,7 @@ fi
# Find AWT if available
if [ -z "${AWT_LIB_PATH}" ]; then
- if [ -f ${JAVA_HOME}/jre/lib/${AWT_ARCH}/libjawt.so ]; then
+ if [ -f ${JAVA_HOME}/jre/lib/${AWT_ARCH}/libjawt.* ]; then
AWT_LIB_PATH=${JAVA_HOME}/jre/lib/${AWT_ARCH}
export AWT_LIB_PATH
else
@@ -158,7 +191,7 @@ if [ -z "${AWT_LIB_PATH}" ]; then
fi
fi
-if [ -f ${AWT_LIB_PATH}/libjawt.so ]; then
+if [ -f ${AWT_LIB_PATH}/libjawt.* ]; then
echo "libjawt.so found, the SWT/AWT integration library will be compiled."
MAKE_AWT=make_awt
else
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_aix.mak b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_aix.mak
new file mode 100644
index 0000000..a951b1b
--- /dev/null
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_aix.mak
@@ -0,0 +1,198 @@
+#*******************************************************************************
+# 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
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+#*******************************************************************************
+
+# Makefile for creating SWT libraries for Linux GTK
+
+include make_common.mak
+
+SWT_VERSION=$(maj_ver)$(min_ver)
+
+# Define the various shared libraries to be build.
+WS_PREFIX = gtk
+SWT_PREFIX = swt
+CDE_PREFIX = swt-cde
+AWT_PREFIX = swt-awt
+SWTPI_PREFIX = swt-pi
+CAIRO_PREFIX = swt-cairo
+ATK_PREFIX = swt-atk
+GNOME_PREFIX = swt-gnome
+GLX_PREFIX = swt-glx
+
+SWT_LIB = lib$(SWT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).a
+CDE_LIB = lib$(CDE_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).a
+AWT_LIB = lib$(AWT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).a
+SWTPI_LIB = lib$(SWTPI_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).a
+CAIRO_LIB = lib$(CAIRO_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).a
+ATK_LIB = lib$(ATK_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).a
+GNOME_LIB = lib$(GNOME_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).a
+GLX_LIB = lib$(GLX_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).a
+
+CAIROCFLAGS = `pkg-config --cflags cairo`
+CAIROLIBS = `pkg-config --libs cairo` -lcairo
+
+GTKCFLAGS = `pkg-config --cflags gtk+-2.0`
+GTKLIBS = `pkg-config --libs gtk+-2.0 gthread-2.0` $(XLIB64) -L/usr/X11R6/lib -lXtst -lX11
+
+CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc
+
+AWT_LFLAGS = -shared -s ${SWT_LFLAGS}
+AWT_LIBS = -L$(AWT_LIB_PATH) -ljawt -lX11
+
+ATKCFLAGS = `pkg-config --cflags atk gtk+-2.0`
+ATKLIBS = `pkg-config --libs atk gtk+-2.0`
+
+GNOMECFLAGS = `pkg-config --cflags gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0`
+GNOMELIBS = `pkg-config --libs-only-L gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` -lgnomevfs-2 -lgnome-2 -lgnomeui-2
+
+GLXLIBS = -L/usr/X11R6/lib -lGL -lGLU -lm
+
+# Uncomment for Native Stats tool
+#NATIVE_STATS = -DNATIVE_STATS
+
+SWT_OBJECTS = swt.o c.o c_stats.o callback.o
+CDE_OBJECTS = swt.o cde.o cde_structs.o cde_stats.o
+AWT_OBJECTS = swt_awt.o
+SWTPI_OBJECTS = swt.o os.o os_structs.o os_custom.o os_stats.o
+CAIRO_OBJECTS = swt.o cairo.o cairo_structs.o cairo_stats.o
+ATK_OBJECTS = swt.o atk.o atk_structs.o atk_custom.o atk_stats.o
+GNOME_OBJECTS = swt.o gnome.o gnome_structs.o gnome_stats.o
+GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
+
+CFLAGS = -O -Wall \
+ -DSWT_VERSION=$(SWT_VERSION) \
+ $(NATIVE_STATS) \
+ -DAIX -DGTK \
+ -I$(JAVA_HOME)/include \
+ ${SWT_PTR_CFLAGS}
+LFLAGS = -shared -s ${SWT_LFLAGS}
+
+
+all: make_swt make_atk #make_glx
+
+#
+# SWT libs
+#
+make_swt: $(SWT_LIB) $(SWTPI_LIB)
+
+$(SWT_LIB): $(SWT_OBJECTS)
+ $(CC) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS)
+
+callback.o: callback.c callback.h
+ $(CC) $(CFLAGS) -DUSE_ASSEMBLER -c callback.c
+
+$(SWTPI_LIB): $(SWTPI_OBJECTS)
+ $(CC) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS)
+
+swt.o: swt.c swt.h
+ $(CC) $(CFLAGS) -c swt.c
+os.o: os.c os.h swt.h os_custom.h
+ $(CC) $(CFLAGS) $(GTKCFLAGS) -c os.c
+os_structs.o: os_structs.c os_structs.h os.h swt.h
+ $(CC) $(CFLAGS) $(GTKCFLAGS) -c os_structs.c
+os_custom.o: os_custom.c os_structs.h os.h swt.h
+ $(CC) $(CFLAGS) $(GTKCFLAGS) -c os_custom.c
+os_stats.o: os_stats.c os_structs.h os.h os_stats.h swt.h
+ $(CC) $(CFLAGS) $(GTKCFLAGS) -c os_stats.c
+
+#
+# CAIRO libs
+#
+make_cairo: $(CAIRO_LIB)
+
+$(CAIRO_LIB): $(CAIRO_OBJECTS)
+ $(CC) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS)
+
+cairo.o: cairo.c cairo.h swt.h
+ $(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c
+cairo_structs.o: cairo_structs.c cairo_structs.h cairo.h swt.h
+ $(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo_structs.c
+cairo_stats.o: cairo_stats.c cairo_structs.h cairo.h cairo_stats.h swt.h
+ $(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo_stats.c
+
+#
+# CDE lib
+#
+
+make_cde: $(CDE_LIB)
+
+$(CDE_LIB): $(CDE_OBJECTS)
+ $(CC) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS)
+
+#
+# AWT lib
+#
+make_awt:$(AWT_LIB)
+
+$(AWT_LIB): $(AWT_OBJECTS)
+ $(CC) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS)
+
+#
+# Atk lib
+#
+make_atk: $(ATK_LIB)
+
+$(ATK_LIB): $(ATK_OBJECTS)
+ $(CC) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS)
+
+atk.o: atk.c atk.h
+ $(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c
+atk_structs.o: atk_structs.c atk_structs.h atk.h
+ $(CC) $(CFLAGS) $(ATKCFLAGS) -c atk_structs.c
+atk_custom.o: atk_custom.c atk_structs.h atk.h
+ $(CC) $(CFLAGS) $(ATKCFLAGS) -c atk_custom.c
+atk_stats.o: atk_stats.c atk_structs.h atk_stats.h atk.h
+ $(CC) $(CFLAGS) $(ATKCFLAGS) -c atk_stats.c
+
+#
+# Gnome lib
+#
+make_gnome: $(GNOME_LIB)
+
+$(GNOME_LIB): $(GNOME_OBJECTS)
+ $(CC) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS)
+
+gnome.o: gnome.c
+ $(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome.c
+
+gnome_structs.o: gnome_structs.c
+ $(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome_structs.c
+
+gnome_stats.o: gnome_stats.c gnome_stats.h
+ $(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome_stats.c
+
+#
+# GLX lib
+#
+make_glx: $(GLX_LIB)
+
+$(GLX_LIB): $(GLX_OBJECTS)
+ $(CC) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS)
+
+glx.o: glx.c
+ $(CC) $(CFLAGS) $(GLXCFLAGS) -c glx.c
+
+glx_structs.o: glx_structs.c
+ $(CC) $(CFLAGS) $(GLXCFLAGS) -c glx_structs.c
+
+glx_stats.o: glx_stats.c glx_stats.h
+ $(CC) $(CFLAGS) $(GLXCFLAGS) -c glx_stats.c
+
+#
+# Install
+#
+install: all
+ cp *.a $(OUTPUT_DIR)
+
+#
+# Clean
+#
+clean:
+ rm -f *.o *.a
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 90076c4..04527a3 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
@@ -1107,6 +1107,42 @@ JNIEXPORT jint JNICALL OS_NATIVE(PangoRectangle_1sizeof)
}
#endif
+#ifndef NO_RTLD_1GLOBAL
+JNIEXPORT jint JNICALL OS_NATIVE(RTLD_1GLOBAL)
+ (JNIEnv *env, jclass that)
+{
+ jint rc = 0;
+ OS_NATIVE_ENTER(env, that, RTLD_1GLOBAL_FUNC);
+ rc = (jint)RTLD_GLOBAL;
+ OS_NATIVE_EXIT(env, that, RTLD_1GLOBAL_FUNC);
+ return rc;
+}
+#endif
+
+#ifndef NO_RTLD_1LAZY
+JNIEXPORT jint JNICALL OS_NATIVE(RTLD_1LAZY)
+ (JNIEnv *env, jclass that)
+{
+ jint rc = 0;
+ OS_NATIVE_ENTER(env, that, RTLD_1LAZY_FUNC);
+ rc = (jint)RTLD_LAZY;
+ OS_NATIVE_EXIT(env, that, RTLD_1LAZY_FUNC);
+ return rc;
+}
+#endif
+
+#ifndef NO_RTLD_1NOW
+JNIEXPORT jint JNICALL OS_NATIVE(RTLD_1NOW)
+ (JNIEnv *env, jclass that)
+{
+ jint rc = 0;
+ OS_NATIVE_ENTER(env, that, RTLD_1NOW_FUNC);
+ rc = (jint)RTLD_NOW;
+ OS_NATIVE_EXIT(env, that, RTLD_1NOW_FUNC);
+ return rc;
+}
+#endif
+
#ifndef NO_XAnyEvent_1sizeof
JNIEXPORT jint JNICALL OS_NATIVE(XAnyEvent_1sizeof)
(JNIEnv *env, jclass that)
@@ -4207,6 +4243,18 @@ fail:
}
#endif
+#ifndef NO__1g_1slist_1append
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1slist_1append)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+{
+ jintLong rc = 0;
+ OS_NATIVE_ENTER(env, that, _1g_1slist_1append_FUNC);
+ rc = (jintLong)g_slist_append((GSList *)arg0, (gpointer)arg1);
+ OS_NATIVE_EXIT(env, that, _1g_1slist_1append_FUNC);
+ return rc;
+}
+#endif
+
#ifndef NO__1g_1slist_1data
JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1slist_1data)
(JNIEnv *env, jclass that, jintLong arg0)
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.c b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.c
index 5d757b0..704af6c 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.c
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.c
@@ -66,8 +66,6 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1chooser_1dialog_1new)
rc = (jintLong)gtk_file_chooser_dialog_new(lparg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
/*
* On AMD64, it is critical that functions which have a variable number of
* arguments, indicated by '...', include the '...' in their prototype. This
@@ -76,17 +74,10 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1chooser_1dialog_1new)
* For some reason, we must also explicitly declare all of the arguments we
* are passing in, otherwise it crashes.
*/
-/* typedef jintLong (*FPTR)(jbyte *, jintLong, jint, jintLong, ...); */
- typedef jintLong (*FPTR)(jbyte *, jintLong, jint, jintLong, jint, jintLong, jint, jintLong, ...);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_file_chooser_dialog_new_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_file_chooser_dialog_new");
- initialized = 1;
- }
- if (fptr) {
- rc = (jintLong)(*fptr)(lparg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+ typedef jintLong (CALLING_CONVENTION* FPTR)(jbyte *, jintLong, jint, jintLong, jint, jintLong, jint, jintLong, ...);
+ LOAD_FUNCTION(fp, gtk_file_chooser_dialog_new)
+ if (fp) {
+ rc = (jintLong)((FPTR) fp)(lparg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
}
}
fail:
@@ -107,8 +98,6 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1cell_1layout_1set_1attributes)
gtk_cell_layout_set_attributes(arg0, arg1, lparg2, arg3, arg4);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
/*
* On AMD64, it is critical that functions which have a variable number of
* arguments, indicated by '...', include the '...' in their prototype. This
@@ -117,16 +106,10 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1cell_1layout_1set_1attributes)
* For some reason, we must also explicitly declare all of the arguments we
* are passing in, otherwise it crashes.
*/
-/* typedef void (*FPTR)(jintLong, jintLong, ...); */
typedef void (*FPTR)(jintLong, jintLong, jbyte *, jint, jintLong, ...);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_cell_layout_set_attributes_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_cell_layout_set_attributes");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0, arg1, lparg2, arg3, arg4);
+ LOAD_FUNCTION(fp, gtk_cell_layout_set_attributes)
+ if (fp) {
+ ((FPTR)fp)(arg0, arg1, lparg2, arg3, arg4);
}
}
fail:
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 90533e5..1f2b7de 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
@@ -25,229 +25,258 @@
#define GtkTextIter_sizeof() sizeof(GtkTextIter)
#define GtkTreeIter_sizeof() sizeof(GtkTreeIter)
+#ifdef AIX
+#define LIB_XRENDER "libXrender.a(libXrender.so)"
+#define LIB_GTK "libgtk-x11-2.0.a(libgtk-x11-2.0.so.0)"
+#define LIB_GDK "libgdk-x11-2.0.a(libgdk-x11-2.0.so.0)"
+#define LIB_ATK "libatk-1.0.a(libatk-1.0.so.0)"
+#define LIB_PANGO "libpango-1.0.a(libpango-1.0.so.0"
+#define LIB_PANGOCAIRO "libpangocairo-1.0.a(libpangocairo-1.0.so.0)"
+#define LIB_GIO "libgio-2.0.a(libgio-2.0.so.0)"
+#define LIB_FONTCONFIG "libfontconfig.a(libfontconfig.so.1)"
+#elif HPUX
+#define LIB_XRENDER "libXrender.so"
+#define LIB_GTK "libgtk-x11-2.0.so"
+#define LIB_GDK "libgdk-x11-2.0.so"
+#define LIB_ATK "libatk-1.0.so"
+#define LIB_PANGO "libpango-1.0.so"
+#define LIB_PANGOCAIRO "libpangocairo-1.0.so"
+#define LIB_GIO "libgio-2.0.so"
+#define LIB_FONTCONFIG "libfontconfig.so"
+#else
+#define LIB_XRENDER "libXrender.so"
+#define LIB_GTK "libgtk-x11-2.0.so.0"
+#define LIB_GDK "libgdk-x11-2.0.so.0"
+#define LIB_ATK "libatk-1.0.so.0"
+#define LIB_PANGO "libpango-1.0.so.0"
+#define LIB_PANGOCAIRO "libpangocairo-1.0.so.0"
+#define LIB_GIO "libgio-2.0.so.0"
+#define LIB_FONTCONFIG "libfontconfig.so.1"
+#endif
+
/* Libraries for dynamic loaded functions */
-#define XRenderQueryExtension_LIB "libXrender.so"
-#define XRenderQueryVersion_LIB "libXrender.so"
-#define XRenderFindStandardFormat_LIB "libXrender.so"
-#define XRenderFindVisualFormat_LIB "libXrender.so"
-#define XRenderComposite_LIB "libXrender.so"
-#define XRenderCreatePicture_LIB "libXrender.so"
-#define XRenderFreePicture_LIB "libXrender.so"
-#define XRenderSetPictureClipRectangles_LIB "libXrender.so"
-#define XRenderSetPictureTransform_LIB "libXrender.so"
-#define gtk_calendar_display_options_LIB "libgtk-x11-2.0.so.0"
-#define gtk_calendar_get_date_LIB "libgtk-x11-2.0.so.0"
-#define gtk_calendar_new_LIB "libgtk-x11-2.0.so.0"
-#define gtk_calendar_select_day_LIB "libgtk-x11-2.0.so.0"
-#define gtk_calendar_select_month_LIB "libgtk-x11-2.0.so.0"
-#define gtk_calendar_set_display_options_LIB "libgtk-x11-2.0.so.0"
-#define gtk_cell_layout_set_attributes_LIB "libgtk-x11-2.0.so.0"
-#define gtk_cell_layout_clear_LIB "libgtk-x11-2.0.so.0"
-#define gtk_cell_layout_pack_start_LIB "libgtk-x11-2.0.so.0"
-#define gtk_combo_box_entry_new_text_LIB "libgtk-x11-2.0.so.0"
-#define gtk_combo_box_new_text_LIB "libgtk-x11-2.0.so.0"
-#define gtk_combo_box_insert_text_LIB "libgtk-x11-2.0.so.0"
-#define gtk_combo_box_remove_text_LIB "libgtk-x11-2.0.so.0"
-#define gtk_combo_box_get_active_LIB "libgtk-x11-2.0.so.0"
-#define gtk_combo_box_get_model_LIB "libgtk-x11-2.0.so.0"
-#define gtk_combo_box_set_active_LIB "libgtk-x11-2.0.so.0"
-#define gtk_combo_box_set_focus_on_click_LIB "libgtk-x11-2.0.so.0"
-#define gtk_combo_box_popup_LIB "libgtk-x11-2.0.so.0"
-#define gtk_combo_box_popdown_LIB "libgtk-x11-2.0.so.0"
-#define gtk_entry_text_index_to_layout_index_LIB "libgtk-x11-2.0.so.0"
-#define gtk_entry_get_inner_border_LIB "libgtk-x11-2.0.so.0"
-#define gtk_file_chooser_add_filter_LIB "libgtk-x11-2.0.so.0"
-#define gtk_file_chooser_dialog_new_LIB "libgtk-x11-2.0.so.0"
-#define gtk_file_chooser_get_current_folder_LIB "libgtk-x11-2.0.so.0"
-#define gtk_file_chooser_get_filename_LIB "libgtk-x11-2.0.so.0"
-#define gtk_file_chooser_get_filenames_LIB "libgtk-x11-2.0.so.0"
-#define gtk_file_chooser_get_filter_LIB "libgtk-x11-2.0.so.0"
-#define gtk_file_chooser_get_uri_LIB "libgtk-x11-2.0.so.0"
-#define gtk_file_chooser_get_uris_LIB "libgtk-x11-2.0.so.0"
-#define gtk_file_chooser_set_current_folder_LIB "libgtk-x11-2.0.so.0"
-#define gtk_file_chooser_set_current_folder_uri_LIB "libgtk-x11-2.0.so.0"
-#define gtk_file_chooser_set_current_name_LIB "libgtk-x11-2.0.so.0"
-#define gtk_file_chooser_set_do_overwrite_confirmation_LIB "libgtk-x11-2.0.so.0"
-#define gtk_file_chooser_set_extra_widget_LIB "libgtk-x11-2.0.so.0"
-#define gtk_file_chooser_set_filename_LIB "libgtk-x11-2.0.so.0"
-#define gtk_file_chooser_set_filter_LIB "libgtk-x11-2.0.so.0"
-#define gtk_file_chooser_set_local_only_LIB "libgtk-x11-2.0.so.0"
-#define gtk_file_chooser_set_uri_LIB "libgtk-x11-2.0.so.0"
-#define gtk_file_chooser_set_select_multiple_LIB "libgtk-x11-2.0.so.0"
-#define gtk_file_filter_add_pattern_LIB "libgtk-x11-2.0.so.0"
-#define gtk_file_filter_new_LIB "libgtk-x11-2.0.so.0"
-#define gtk_file_filter_get_name_LIB "libgtk-x11-2.0.so.0"
-#define gtk_file_filter_set_name_LIB "libgtk-x11-2.0.so.0"
-#define gtk_expander_get_expanded_LIB "libgtk-x11-2.0.so.0"
-#define gtk_expander_get_label_widget_LIB "libgtk-x11-2.0.so.0"
-#define gtk_expander_new_LIB "libgtk-x11-2.0.so.0"
-#define gtk_expander_set_expanded_LIB "libgtk-x11-2.0.so.0"
-#define gtk_expander_set_label_LIB "libgtk-x11-2.0.so.0"
-#define gtk_expander_set_label_widget_LIB "libgtk-x11-2.0.so.0"
-#define gtk_label_set_line_wrap_mode_LIB "libgtk-x11-2.0.so.0"
-#define gtk_icon_info_load_icon_LIB "libgtk-x11-2.0.so.0"
-#define gtk_icon_info_free_LIB "libgtk-x11-2.0.so.0"
-#define gtk_icon_theme_lookup_by_gicon_LIB "libgtk-x11-2.0.so.0"
-#define gtk_icon_theme_get_default_LIB "libgtk-x11-2.0.so.0"
-#define gtk_menu_shell_set_take_focus_LIB "libgtk-x11-2.0.so.0"
-#define gtk_window_set_keep_below_LIB "libgtk-x11-2.0.so.0"
-#define gtk_tooltip_trigger_tooltip_query_LIB "libgtk-x11-2.0.so.0"
-#define gtk_tree_selection_count_selected_rows_LIB "libgtk-x11-2.0.so.0"
-#define gtk_tree_selection_get_selected_rows_LIB "libgtk-x11-2.0.so.0"
-#define gtk_tree_view_column_cell_get_position_LIB "libgtk-x11-2.0.so.0"
-#define gtk_tree_view_set_grid_lines_LIB "libgtk-x11-2.0.so.0"
-#define gtk_entry_set_alignment_LIB "libgtk-x11-2.0.so.0"
-#define gtk_entry_set_icon_from_stock_LIB "libgtk-x11-2.0.so.0"
-#define gtk_entry_set_icon_sensitive_LIB "libgtk-x11-2.0.so.0"
-#define gdk_cursor_new_from_pixbuf_LIB "libgdk-x11-2.0.so.0"
-#define gdk_display_get_default_LIB "libgdk-x11-2.0.so.0"
-#define gdk_display_supports_cursor_color_LIB "libgdk-x11-2.0.so.0"
-#define gdk_draw_pixbuf_LIB "libgdk-x11-2.0.so.0"
-#define gdk_pixbuf_save_to_bufferv_LIB "libgdk-x11-2.0.so.0"
-#define gdk_screen_get_default_LIB "libgdk-x11-2.0.so.0"
-#define gdk_screen_get_monitor_at_point_LIB "libgdk-x11-2.0.so.0"
-#define gdk_screen_get_monitor_at_window_LIB "libgdk-x11-2.0.so.0"
-#define gdk_screen_get_monitor_geometry_LIB "libgdk-x11-2.0.so.0"
-#define gdk_screen_get_n_monitors_LIB "libgdk-x11-2.0.so.0"
-#define gdk_screen_get_number_LIB "libgdk-x11-2.0.so.0"
-#define gtk_status_icon_get_geometry_LIB "libgtk-x11-2.0.so.0"
-#define gtk_status_icon_get_visible_LIB "libgtk-x11-2.0.so.0"
-#define gtk_status_icon_new_LIB "libgtk-x11-2.0.so.0"
-#define gtk_status_icon_set_from_pixbuf_LIB "libgtk-x11-2.0.so.0"
-#define gtk_status_icon_set_visible_LIB "libgtk-x11-2.0.so.0"
-#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"
-#define gtk_window_set_skip_taskbar_hint_LIB "libgtk-x11-2.0.so.0"
-#define gtk_widget_is_composited_LIB "libgtk-x11-2.0.so.0"
-#define gtk_widget_set_tooltip_text_LIB "libgtk-x11-2.0.so.0"
-#define gdk_x11_screen_get_window_manager_name_LIB "libgdk-x11-2.0.so.0"
-#define gdk_x11_screen_lookup_visual_LIB "libgdk-x11-2.0.so.0"
+#define XRenderQueryExtension_LIB LIB_XRENDER
+#define XRenderQueryVersion_LIB LIB_XRENDER
+#define XRenderFindStandardFormat_LIB LIB_XRENDER
+#define XRenderFindVisualFormat_LIB LIB_XRENDER
+#define XRenderComposite_LIB LIB_XRENDER
+#define XRenderCreatePicture_LIB LIB_XRENDER
+#define XRenderFreePicture_LIB LIB_XRENDER
+#define XRenderSetPictureClipRectangles_LIB LIB_XRENDER
+#define XRenderSetPictureTransform_LIB LIB_XRENDER
+#define gtk_calendar_display_options_LIB LIB_GTK
+#define gtk_calendar_get_date_LIB LIB_GTK
+#define gtk_calendar_new_LIB LIB_GTK
+#define gtk_calendar_select_day_LIB LIB_GTK
+#define gtk_calendar_select_month_LIB LIB_GTK
+#define gtk_calendar_set_display_options_LIB LIB_GTK
+#define gtk_cell_layout_set_attributes_LIB LIB_GTK
+#define gtk_cell_layout_clear_LIB LIB_GTK
+#define gtk_cell_layout_pack_start_LIB LIB_GTK
+#define gtk_combo_box_entry_new_text_LIB LIB_GTK
+#define gtk_combo_box_new_text_LIB LIB_GTK
+#define gtk_combo_box_insert_text_LIB LIB_GTK
+#define gtk_combo_box_remove_text_LIB LIB_GTK
+#define gtk_combo_box_get_active_LIB LIB_GTK
+#define gtk_combo_box_get_model_LIB LIB_GTK
+#define gtk_combo_box_set_active_LIB LIB_GTK
+#define gtk_combo_box_set_focus_on_click_LIB LIB_GTK
+#define gtk_combo_box_popup_LIB LIB_GTK
+#define gtk_combo_box_popdown_LIB LIB_GTK
+#define gtk_entry_text_index_to_layout_index_LIB LIB_GTK
+#define gtk_entry_get_inner_border_LIB LIB_GTK
+#define gtk_file_chooser_add_filter_LIB LIB_GTK
+#define gtk_file_chooser_dialog_new_LIB LIB_GTK
+#define gtk_file_chooser_get_current_folder_LIB LIB_GTK
+#define gtk_file_chooser_get_filename_LIB LIB_GTK
+#define gtk_file_chooser_get_filenames_LIB LIB_GTK
+#define gtk_file_chooser_get_filter_LIB LIB_GTK
+#define gtk_file_chooser_get_uri_LIB LIB_GTK
+#define gtk_file_chooser_get_uris_LIB LIB_GTK
+#define gtk_file_chooser_set_current_folder_LIB LIB_GTK
+#define gtk_file_chooser_set_current_folder_uri_LIB LIB_GTK
+#define gtk_file_chooser_set_current_name_LIB LIB_GTK
+#define gtk_file_chooser_set_do_overwrite_confirmation_LIB LIB_GTK
+#define gtk_file_chooser_set_extra_widget_LIB LIB_GTK
+#define gtk_file_chooser_set_filename_LIB LIB_GTK
+#define gtk_file_chooser_set_filter_LIB LIB_GTK
+#define gtk_file_chooser_set_local_only_LIB LIB_GTK
+#define gtk_file_chooser_set_uri_LIB LIB_GTK
+#define gtk_file_chooser_set_select_multiple_LIB LIB_GTK
+#define gtk_file_filter_add_pattern_LIB LIB_GTK
+#define gtk_file_filter_new_LIB LIB_GTK
+#define gtk_file_filter_get_name_LIB LIB_GTK
+#define gtk_file_filter_set_name_LIB LIB_GTK
+#define gtk_expander_get_expanded_LIB LIB_GTK
+#define gtk_expander_get_label_widget_LIB LIB_GTK
+#define gtk_expander_new_LIB LIB_GTK
+#define gtk_expander_set_expanded_LIB LIB_GTK
+#define gtk_expander_set_label_LIB LIB_GTK
+#define gtk_expander_set_label_widget_LIB LIB_GTK
+#define gtk_label_set_line_wrap_mode_LIB LIB_GTK
+#define gtk_icon_info_load_icon_LIB LIB_GTK
+#define gtk_icon_info_free_LIB LIB_GTK
+#define gtk_icon_theme_lookup_by_gicon_LIB LIB_GTK
+#define gtk_icon_theme_get_default_LIB LIB_GTK
+#define gtk_menu_shell_set_take_focus_LIB LIB_GTK
+#define gtk_window_set_keep_below_LIB LIB_GTK
+#define gtk_tooltip_trigger_tooltip_query_LIB LIB_GTK
+#define gtk_tree_selection_count_selected_rows_LIB LIB_GTK
+#define gtk_tree_selection_get_selected_rows_LIB LIB_GTK
+#define gtk_tree_view_column_cell_get_position_LIB LIB_GTK
+#define gtk_tree_view_set_grid_lines_LIB LIB_GTK
+#define gtk_entry_set_alignment_LIB LIB_GTK
+#define gtk_entry_set_icon_from_stock_LIB LIB_GTK
+#define gtk_entry_set_icon_sensitive_LIB LIB_GTK
+#define gdk_cursor_new_from_pixbuf_LIB LIB_GDK
+#define gdk_display_get_default_LIB LIB_GDK
+#define gdk_display_supports_cursor_color_LIB LIB_GDK
+#define gdk_draw_pixbuf_LIB LIB_GDK
+#define gdk_pixbuf_save_to_bufferv_LIB LIB_GDK
+#define gdk_screen_get_default_LIB LIB_GDK
+#define gdk_screen_get_monitor_at_point_LIB LIB_GDK
+#define gdk_screen_get_monitor_at_window_LIB LIB_GDK
+#define gdk_screen_get_monitor_geometry_LIB LIB_GDK
+#define gdk_screen_get_n_monitors_LIB LIB_GDK
+#define gdk_screen_get_number_LIB LIB_GDK
+#define gtk_status_icon_get_geometry_LIB LIB_GTK
+#define gtk_status_icon_get_visible_LIB LIB_GTK
+#define gtk_status_icon_new_LIB LIB_GTK
+#define gtk_status_icon_set_from_pixbuf_LIB LIB_GTK
+#define gtk_status_icon_set_visible_LIB LIB_GTK
+#define gtk_status_icon_set_tooltip_LIB LIB_GTK
+#define gtk_window_get_group_LIB LIB_GTK
+#define gtk_window_get_opacity_LIB LIB_GTK
+#define gdk_window_restack_LIB LIB_GDK
+#define gdk_window_set_keep_above_LIB LIB_GDK
+#define gdk_window_set_accept_focus_LIB LIB_GDK
+#define gtk_window_set_opacity_LIB LIB_GTK
+#define gtk_window_set_skip_taskbar_hint_LIB LIB_GTK
+#define gtk_widget_is_composited_LIB LIB_GTK
+#define gtk_widget_set_tooltip_text_LIB LIB_GTK
+#define gdk_x11_screen_get_window_manager_name_LIB LIB_GDK
+#define gdk_x11_screen_lookup_visual_LIB LIB_GDK
-#define atk_object_add_relationship_LIB "libatk-1.0.so.0"
-#define atk_object_remove_relationship_LIB "libatk-1.0.so.0"
-#define pango_attr_underline_color_new_LIB "libpango-1.0.so.0"
-#define pango_attr_strikethrough_color_new_LIB "libpango-1.0.so.0"
-#define pango_font_metrics_get_underline_thickness_LIB "libpango-1.0.so.0"
-#define pango_font_metrics_get_underline_position_LIB "libpango-1.0.so.0"
-#define pango_font_metrics_get_strikethrough_thickness_LIB "libpango-1.0.so.0"
-#define pango_font_metrics_get_strikethrough_position_LIB "libpango-1.0.so.0"
-#define pango_layout_set_auto_dir_LIB "libpango-1.0.so.0"
-#define pango_cairo_create_layout_LIB "libpangocairo-1.0.so.0"
-#define pango_cairo_context_set_font_options_LIB "libpangocairo-1.0.so.0"
-#define pango_cairo_context_get_font_options_LIB "libpangocairo-1.0.so.0"
-#define pango_cairo_layout_path_LIB "libpangocairo-1.0.so.0"
-#define pango_cairo_show_layout_LIB "libpangocairo-1.0.so.0"
-#define pango_cairo_font_map_create_context_LIB "libpangocairo-1.0.so.0"
-#define pango_cairo_font_map_new_LIB "libpangocairo-1.0.so.0"
-#define pango_cairo_font_map_get_default_LIB "libpangocairo-1.0.so.0"
-#define pango_cairo_font_map_set_resolution_LIB "libpangocairo-1.0.so.0"
-#define gdk_cairo_set_source_color_LIB "libgdk-x11-2.0.so.0"
-#define gdk_cairo_region_LIB "libgdk-x11-2.0.so.0"
-#define gdk_cairo_create_LIB "libgdk-x11-2.0.so.0"
-#define gtk_enumerate_printers_LIB "libgtk-x11-2.0.so.0"
-#define gtk_page_setup_get_bottom_margin_LIB "libgtk-x11-2.0.so.0"
-#define gtk_page_setup_get_left_margin_LIB "libgtk-x11-2.0.so.0"
-#define gtk_page_setup_get_orientation_LIB "libgtk-x11-2.0.so.0"
-#define gtk_page_setup_get_page_height_LIB "libgtk-x11-2.0.so.0"
-#define gtk_page_setup_get_page_width_LIB "libgtk-x11-2.0.so.0"
-#define gtk_page_setup_get_paper_height_LIB "libgtk-x11-2.0.so.0"
-#define gtk_page_setup_get_paper_size_LIB "libgtk-x11-2.0.so.0"
-#define gtk_page_setup_get_paper_width_LIB "libgtk-x11-2.0.so.0"
-#define gtk_page_setup_get_right_margin_LIB "libgtk-x11-2.0.so.0"
-#define gtk_page_setup_get_top_margin_LIB "libgtk-x11-2.0.so.0"
-#define gtk_page_setup_new_LIB "libgtk-x11-2.0.so.0"
-#define gtk_page_setup_set_bottom_margin_LIB "libgtk-x11-2.0.so.0"
-#define gtk_page_setup_set_left_margin_LIB "libgtk-x11-2.0.so.0"
-#define gtk_page_setup_set_orientation_LIB "libgtk-x11-2.0.so.0"
-#define gtk_page_setup_set_paper_size_LIB "libgtk-x11-2.0.so.0"
-#define gtk_page_setup_set_right_margin_LIB "libgtk-x11-2.0.so.0"
-#define gtk_page_setup_set_top_margin_LIB "libgtk-x11-2.0.so.0"
-#define gtk_paper_size_free_LIB "libgtk-x11-2.0.so.0"
-#define gtk_paper_size_get_display_name_LIB "libgtk-x11-2.0.so.0"
-#define gtk_paper_size_get_name_LIB "libgtk-x11-2.0.so.0"
-#define gtk_paper_size_get_ppd_name_LIB "libgtk-x11-2.0.so.0"
-#define gtk_paper_size_get_height_LIB "libgtk-x11-2.0.so.0"
-#define gtk_paper_size_get_width_LIB "libgtk-x11-2.0.so.0"
-#define gtk_paper_size_is_custom_LIB "libgtk-x11-2.0.so.0"
-#define gtk_paper_size_new_LIB "libgtk-x11-2.0.so.0"
-#define gtk_paper_size_new_custom_LIB "libgtk-x11-2.0.so.0"
-#define gtk_paper_size_new_from_ppd_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_job_get_printer_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_job_get_settings_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_job_get_status_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_job_get_surface_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_job_get_title_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_job_new_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_job_send_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_job_set_source_file_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_settings_foreach_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_settings_get_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_settings_get_collate_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_settings_get_n_copies_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_settings_get_orientation_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_settings_get_page_ranges_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_settings_get_paper_height_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_settings_get_paper_width_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_settings_get_print_pages_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_settings_get_printer_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_settings_get_resolution_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_settings_new_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_settings_set_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_settings_set_collate_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_settings_set_n_copies_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_settings_set_orientation_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_settings_set_page_ranges_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_settings_set_print_pages_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_settings_set_printer_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_unix_dialog_get_current_page_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_unix_dialog_get_page_setup_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_unix_dialog_get_selected_printer_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_unix_dialog_get_settings_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_unix_dialog_new_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_unix_dialog_set_current_page_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_unix_dialog_set_manual_capabilities_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_unix_dialog_set_page_setup_LIB "libgtk-x11-2.0.so.0"
-#define gtk_print_unix_dialog_set_settings_LIB "libgtk-x11-2.0.so.0"
-#define gtk_printer_get_backend_LIB "libgtk-x11-2.0.so.0"
-#define gtk_printer_get_name_LIB "libgtk-x11-2.0.so.0"
-#define gtk_printer_is_default_LIB "libgtk-x11-2.0.so.0"
-#define FcConfigAppFontAddFile_LIB "libfontconfig.so.1"
+#define atk_object_add_relationship_LIB LIB_ATK
+#define atk_object_remove_relationship_LIB LIB_ATK
+#define pango_attr_underline_color_new_LIB LIB_PANGO
+#define pango_attr_strikethrough_color_new_LIB LIB_PANGO
+#define pango_font_metrics_get_underline_thickness_LIB LIB_PANGO
+#define pango_font_metrics_get_underline_position_LIB LIB_PANGO
+#define pango_font_metrics_get_strikethrough_thickness_LIB LIB_PANGO
+#define pango_font_metrics_get_strikethrough_position_LIB LIB_PANGO
+#define pango_layout_set_auto_dir_LIB LIB_PANGO
+#define pango_cairo_create_layout_LIB LIB_PANGOCAIRO
+#define pango_cairo_context_set_font_options_LIB LIB_PANGOCAIRO
+#define pango_cairo_context_get_font_options_LIB LIB_PANGOCAIRO
+#define pango_cairo_layout_path_LIB LIB_PANGOCAIRO
+#define pango_cairo_show_layout_LIB LIB_PANGOCAIRO
+#define pango_cairo_font_map_create_context_LIB LIB_PANGOCAIRO
+#define pango_cairo_font_map_new_LIB LIB_PANGOCAIRO
+#define pango_cairo_font_map_get_default_LIB LIB_PANGOCAIRO
+#define pango_cairo_font_map_set_resolution_LIB LIB_PANGOCAIRO
+#define gdk_cairo_set_source_color_LIB LIB_GDK
+#define gdk_cairo_region_LIB LIB_GDK
+#define gdk_cairo_create_LIB LIB_GDK
+#define gtk_enumerate_printers_LIB LIB_GTK
+#define gtk_page_setup_get_bottom_margin_LIB LIB_GTK
+#define gtk_page_setup_get_left_margin_LIB LIB_GTK
+#define gtk_page_setup_get_orientation_LIB LIB_GTK
+#define gtk_page_setup_get_page_height_LIB LIB_GTK
+#define gtk_page_setup_get_page_width_LIB LIB_GTK
+#define gtk_page_setup_get_paper_height_LIB LIB_GTK
+#define gtk_page_setup_get_paper_size_LIB LIB_GTK
+#define gtk_page_setup_get_paper_width_LIB LIB_GTK
+#define gtk_page_setup_get_right_margin_LIB LIB_GTK
+#define gtk_page_setup_get_top_margin_LIB LIB_GTK
+#define gtk_page_setup_new_LIB LIB_GTK
+#define gtk_page_setup_set_bottom_margin_LIB LIB_GTK
+#define gtk_page_setup_set_left_margin_LIB LIB_GTK
+#define gtk_page_setup_set_orientation_LIB LIB_GTK
+#define gtk_page_setup_set_paper_size_LIB LIB_GTK
+#define gtk_page_setup_set_right_margin_LIB LIB_GTK
+#define gtk_page_setup_set_top_margin_LIB LIB_GTK
+#define gtk_paper_size_free_LIB LIB_GTK
+#define gtk_paper_size_get_display_name_LIB LIB_GTK
+#define gtk_paper_size_get_name_LIB LIB_GTK
+#define gtk_paper_size_get_ppd_name_LIB LIB_GTK
+#define gtk_paper_size_get_height_LIB LIB_GTK
+#define gtk_paper_size_get_width_LIB LIB_GTK
+#define gtk_paper_size_is_custom_LIB LIB_GTK
+#define gtk_paper_size_new_LIB LIB_GTK
+#define gtk_paper_size_new_custom_LIB LIB_GTK
+#define gtk_paper_size_new_from_ppd_LIB LIB_GTK
+#define gtk_print_job_get_printer_LIB LIB_GTK
+#define gtk_print_job_get_settings_LIB LIB_GTK
+#define gtk_print_job_get_status_LIB LIB_GTK
+#define gtk_print_job_get_surface_LIB LIB_GTK
+#define gtk_print_job_get_title_LIB LIB_GTK
+#define gtk_print_job_new_LIB LIB_GTK
+#define gtk_print_job_send_LIB LIB_GTK
+#define gtk_print_job_set_source_file_LIB LIB_GTK
+#define gtk_print_settings_foreach_LIB LIB_GTK
+#define gtk_print_settings_get_LIB LIB_GTK
+#define gtk_print_settings_get_collate_LIB LIB_GTK
+#define gtk_print_settings_get_n_copies_LIB LIB_GTK
+#define gtk_print_settings_get_orientation_LIB LIB_GTK
+#define gtk_print_settings_get_page_ranges_LIB LIB_GTK
+#define gtk_print_settings_get_paper_height_LIB LIB_GTK
+#define gtk_print_settings_get_paper_width_LIB LIB_GTK
+#define gtk_print_settings_get_print_pages_LIB LIB_GTK
+#define gtk_print_settings_get_printer_LIB LIB_GTK
+#define gtk_print_settings_get_resolution_LIB LIB_GTK
+#define gtk_print_settings_new_LIB LIB_GTK
+#define gtk_print_settings_set_LIB LIB_GTK
+#define gtk_print_settings_set_collate_LIB LIB_GTK
+#define gtk_print_settings_set_n_copies_LIB LIB_GTK
+#define gtk_print_settings_set_orientation_LIB LIB_GTK
+#define gtk_print_settings_set_page_ranges_LIB LIB_GTK
+#define gtk_print_settings_set_print_pages_LIB LIB_GTK
+#define gtk_print_settings_set_printer_LIB LIB_GTK
+#define gtk_print_unix_dialog_get_current_page_LIB LIB_GTK
+#define gtk_print_unix_dialog_get_page_setup_LIB LIB_GTK
+#define gtk_print_unix_dialog_get_selected_printer_LIB LIB_GTK
+#define gtk_print_unix_dialog_get_settings_LIB LIB_GTK
+#define gtk_print_unix_dialog_new_LIB LIB_GTK
+#define gtk_print_unix_dialog_set_current_page_LIB LIB_GTK
+#define gtk_print_unix_dialog_set_manual_capabilities_LIB LIB_GTK
+#define gtk_print_unix_dialog_set_page_setup_LIB LIB_GTK
+#define gtk_print_unix_dialog_set_settings_LIB LIB_GTK
+#define gtk_printer_get_backend_LIB LIB_GTK
+#define gtk_printer_get_name_LIB LIB_GTK
+#define gtk_printer_is_default_LIB LIB_GTK
+#define FcConfigAppFontAddFile_LIB LIB_FONTCONFIG
-#define g_app_info_create_from_commandline_LIB "libgio-2.0.so.0"
-#define g_app_info_get_all_LIB "libgio-2.0.so.0"
-#define g_app_info_get_executable_LIB "libgio-2.0.so.0"
-#define g_app_info_get_icon_LIB "libgio-2.0.so.0"
-#define g_app_info_get_id_LIB "libgio-2.0.so.0"
-#define g_app_info_get_name_LIB "libgio-2.0.so.0"
-#define g_app_info_launch_LIB "libgio-2.0.so.0"
-#define g_app_info_get_default_for_type_LIB "libgio-2.0.so.0"
-#define g_app_info_launch_default_for_uri_LIB "libgio-2.0.so.0"
-#define g_app_info_supports_uris_LIB "libgio-2.0.so.0"
-#define g_app_info_should_show_LIB "libgio-2.0.so.0"
-#define g_data_input_stream_new_LIB "libgio-2.0.so.0"
-#define g_data_input_stream_read_line_LIB "libgio-2.0.so.0"
-#define g_content_type_equals_LIB "libgio-2.0.so.0"
-#define g_content_type_get_mime_type_LIB "libgio-2.0.so.0"
-#define g_content_type_is_a_LIB "libgio-2.0.so.0"
-#define g_content_types_get_registered_LIB "libgio-2.0.so.0"
-#define g_desktop_app_info_new_from_filename_LIB "libgio-2.0.so.0"
-#define g_file_get_path_LIB "libgio-2.0.so.0"
-#define g_file_get_uri_LIB "libgio-2.0.so.0"
-#define g_file_icon_get_file_LIB "libgio-2.0.so.0"
-#define g_file_info_get_content_type_LIB "libgio-2.0.so.0"
-#define g_file_info_get_modification_time_LIB "libgio-2.0.so.0"
-#define g_file_new_for_path_LIB "libgio-2.0.so.0"
-#define g_file_new_for_uri_LIB "libgio-2.0.so.0"
-#define g_file_read_LIB "libgio-2.0.so.0"
-#define g_file_test_LIB "libgio-2.0.so.0"
-#define g_icon_to_string_LIB "libgio-2.0.so.0"
-#define g_icon_new_for_string_LIB "libgio-2.0.so.0"
-#define g_file_query_info_LIB "libgio-2.0.so.0"
+#define g_app_info_create_from_commandline_LIB LIB_GIO
+#define g_app_info_get_all_LIB LIB_GIO
+#define g_app_info_get_executable_LIB LIB_GIO
+#define g_app_info_get_icon_LIB LIB_GIO
+#define g_app_info_get_id_LIB LIB_GIO
+#define g_app_info_get_name_LIB LIB_GIO
+#define g_app_info_launch_LIB LIB_GIO
+#define g_app_info_get_default_for_type_LIB LIB_GIO
+#define g_app_info_launch_default_for_uri_LIB LIB_GIO
+#define g_app_info_supports_uris_LIB LIB_GIO
+#define g_app_info_should_show_LIB LIB_GIO
+#define g_data_input_stream_new_LIB LIB_GIO
+#define g_data_input_stream_read_line_LIB LIB_GIO
+#define g_content_type_equals_LIB LIB_GIO
+#define g_content_type_get_mime_type_LIB LIB_GIO
+#define g_content_type_is_a_LIB LIB_GIO
+#define g_content_types_get_registered_LIB LIB_GIO
+#define g_desktop_app_info_new_from_filename_LIB LIB_GIO
+#define g_file_get_path_LIB LIB_GIO
+#define g_file_get_uri_LIB LIB_GIO
+#define g_file_icon_get_file_LIB LIB_GIO
+#define g_file_info_get_content_type_LIB LIB_GIO
+#define g_file_info_get_modification_time_LIB LIB_GIO
+#define g_file_new_for_path_LIB LIB_GIO
+#define g_file_new_for_uri_LIB LIB_GIO
+#define g_file_read_LIB LIB_GIO
+#define g_file_test_LIB LIB_GIO
+#define g_icon_to_string_LIB LIB_GIO
+#define g_icon_new_for_string_LIB LIB_GIO
+#define g_file_query_info_LIB LIB_GIO
/* Field accessors */
#define G_OBJECT_CLASS_CONSTRUCTOR(arg0) (arg0)->constructor
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 7f522de..9e17829 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 = 1366;
-int OS_nativeFunctionCallCount[1366];
+int OS_nativeFunctionCount = 1370;
+int OS_nativeFunctionCallCount[1370];
char * OS_nativeFunctionNames[] = {
#ifndef JNI64
"Call__IIII",
@@ -120,6 +120,9 @@ char * OS_nativeFunctionNames[] = {
"PangoLayoutRun_1sizeof",
"PangoLogAttr_1sizeof",
"PangoRectangle_1sizeof",
+ "RTLD_1GLOBAL",
+ "RTLD_1LAZY",
+ "RTLD_1NOW",
"XAnyEvent_1sizeof",
"XClientMessageEvent_1sizeof",
"XCrossingEvent_1sizeof",
@@ -364,6 +367,7 @@ char * OS_nativeFunctionNames[] = {
"_1g_1signal_1lookup",
"_1g_1signal_1remove_1emission_1hook",
"_1g_1signal_1stop_1emission_1by_1name",
+ "_1g_1slist_1append",
"_1g_1slist_1data",
"_1g_1slist_1free",
"_1g_1slist_1length",
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 aa4c4d3..6901aa2 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
@@ -128,6 +128,9 @@ typedef enum {
PangoLayoutRun_1sizeof_FUNC,
PangoLogAttr_1sizeof_FUNC,
PangoRectangle_1sizeof_FUNC,
+ RTLD_1GLOBAL_FUNC,
+ RTLD_1LAZY_FUNC,
+ RTLD_1NOW_FUNC,
XAnyEvent_1sizeof_FUNC,
XClientMessageEvent_1sizeof_FUNC,
XCrossingEvent_1sizeof_FUNC,
@@ -372,6 +375,7 @@ typedef enum {
_1g_1signal_1lookup_FUNC,
_1g_1signal_1remove_1emission_1hook_FUNC,
_1g_1signal_1stop_1emission_1by_1name_FUNC,
+ _1g_1slist_1append_FUNC,
_1g_1slist_1data_FUNC,
_1g_1slist_1free_FUNC,
_1g_1slist_1length_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 7bdd8a6..41ed3fa 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
@@ -422,9 +422,10 @@ public class OS extends C {
public static final int PANGO_WEIGHT_NORMAL = 0x190;
public static final int PANGO_WRAP_WORD = 0;
public static final int PANGO_WRAP_WORD_CHAR = 2;
- public static final int RTLD_GLOBAL = 0x100;
- public static final int RTLD_LAZY = 1;
- public static final int RTLD_NOW = 2;
+ public static final int RTLD_GLOBAL = OS.RTLD_GLOBAL();
+ public static final int RTLD_LAZY = OS.RTLD_LAZY();
+ public static final int RTLD_MEMBER = 0x00040000;
+ public static final int RTLD_NOW = OS.RTLD_NOW();
public static final int X_OK = 0x01;
public static final int XA_CARDINAL = 6;
public static final int XA_WINDOW = 33;
@@ -1286,6 +1287,13 @@ public static final native void memmove(XFocusChangeEvent dest, int /*long*/ src
*/
public static final native void memmove(XVisibilityEvent dest, int /*long*/ src, int /*long*/ size);
+/** @method flags=const*/
+public static final native int RTLD_GLOBAL();
+/** @method flags=const */
+public static final native int RTLD_NOW();
+/** @method flags=const */
+public static final native int RTLD_LAZY();
+
/** X render natives and constants */
public static final int PictStandardARGB32 = 0;
public static final int PictStandardRGB24 = 1;
@@ -3046,6 +3054,19 @@ public static final boolean /*long*/ g_source_remove (int /*long*/ tag) {
lock.unlock();
}
}
+/**
+ * @param list cast=(GSList *)
+ * @param data cast=(gpointer)
+ */
+public static final native int /*long*/ _g_slist_append(int /*long*/ list, int /*long*/ data);
+public static final int /*long*/ g_slist_append(int /*long*/ list, int /*long*/ data) {
+ lock.lock();
+ try {
+ return _g_slist_append(list, data);
+ } finally {
+ lock.unlock();
+ }
+}
/** @param list cast=(GSList *) */
public static final native int /*long*/ _g_slist_data (int /*long*/ list);
public static final int /*long*/ g_slist_data (int /*long*/ list) {
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 5554ff5..1b9c11b 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
@@ -884,7 +884,7 @@ public static final int IA2_EVENT_DOCUMENT_LOAD_STOPPED = 0x00000106;
public static final int IA2_EVENT_DOCUMENT_RELOAD = 0x00000107;
public static final int IA2_EVENT_PAGE_CHANGED = 0x00000111;
public static final int IA2_EVENT_SECTION_CHANGED = 0x00000112;
-public static final int IA2_EVENT_ACTION_CHANGED = 0x00000100;
+public static final int IA2_EVENT_ACTION_CHANGED = 0x00000101;
public static final int IA2_EVENT_HYPERLINK_START_INDEX_CHANGED = 0x0000010d;
public static final int IA2_EVENT_HYPERLINK_END_INDEX_CHANGED = 0x00000108;
public static final int IA2_EVENT_HYPERLINK_ANCHOR_COUNT_CHANGED = 0x00000109;
@@ -892,19 +892,19 @@ public static final int IA2_EVENT_HYPERLINK_SELECTED_LINK_CHANGED = 0x0000010a;
public static final int IA2_EVENT_HYPERLINK_ACTIVATED = 0x0000010b;
public static final int IA2_EVENT_HYPERTEXT_LINK_SELECTED = 0x0000010c;
public static final int IA2_EVENT_HYPERTEXT_LINK_COUNT_CHANGED = 0x0000010f;
-public static final int IA2_EVENT_ATTRIBUTE_CHANGED = 0x00000200;
-public static final int IA2_EVENT_TABLE_CAPTION_CHANGED = 0x00000203;
-public static final int IA2_EVENT_TABLE_COLUMN_DESCRIPTION_CHANGED = 0x00000204;
-public static final int IA2_EVENT_TABLE_COLUMN_HEADER_CHANGED = 0x00000205;
-public static final int IA2_EVENT_TABLE_CHANGED = 0x00000206;
-public static final int IA2_EVENT_TABLE_ROW_DESCRIPTION_CHANGED = 0x00000207;
-public static final int IA2_EVENT_TABLE_ROW_HEADER_CHANGED = 0x00000208;
-public static final int IA2_EVENT_TABLE_SUMMARY_CHANGED = 0x00000209;
-public static final int IA2_EVENT_TEXT_ATTRIBUTE_CHANGED = 0x0000020a;
+public static final int IA2_EVENT_ATTRIBUTE_CHANGED = 0x00000110;
+public static final int IA2_EVENT_TABLE_CAPTION_CHANGED = 0x00000113;
+public static final int IA2_EVENT_TABLE_COLUMN_DESCRIPTION_CHANGED = 0x00000114;
+public static final int IA2_EVENT_TABLE_COLUMN_HEADER_CHANGED = 0x00000115;
+public static final int IA2_EVENT_TABLE_CHANGED = 0x00000116;
+public static final int IA2_EVENT_TABLE_ROW_DESCRIPTION_CHANGED = 0x00000117;
+public static final int IA2_EVENT_TABLE_ROW_HEADER_CHANGED = 0x00000118;
+public static final int IA2_EVENT_TABLE_SUMMARY_CHANGED = 0x00000119;
+public static final int IA2_EVENT_TEXT_ATTRIBUTE_CHANGED = 0x0000011a;
public static final int IA2_EVENT_TEXT_CARET_MOVED = 0x0000011b;
public static final int IA2_EVENT_TEXT_COLUMN_CHANGED = 0x0000011d;
-public static final int IA2_EVENT_TEXT_INSERTED = 0x0000020e;
-public static final int IA2_EVENT_TEXT_REMOVED = 0x0000020f;
+public static final int IA2_EVENT_TEXT_INSERTED = 0x0000011e;
+public static final int IA2_EVENT_TEXT_REMOVED = 0x0000011f;
public static final int IA2_TEXT_BOUNDARY_CHAR = 0;
public static final int IA2_TEXT_BOUNDARY_WORD = 1;
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Program/gnome/library/gnome.h b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Program/gnome/library/gnome.h
index 6caca74..4cebd6d 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Program/gnome/library/gnome.h
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Program/gnome/library/gnome.h
@@ -28,8 +28,16 @@
#include <libgnomevfs/gnome-vfs-mime-handlers.h>
#include <libgnomevfs/gnome-vfs-mime-info.h>
-#define gnome_vfs_url_show_LIB "libgnomevfs-2.so.0"
-#define gnome_vfs_make_uri_from_input_with_dirs_LIB "libgnomevfs-2.so.0"
-#define gnome_vfs_mime_application_launch_LIB "libgnomevfs-2.so.0"
+#ifdef AIX
+#define LIB_VFS "libgnomevfs-2.a(libgnomevfs-2.so.0)"
+#elif HPUX
+#define LIB_VFS "libgnomevfs-2.so"
+#else
+#define LIB_VFS "libgnomevfs-2.so.0"
+#endif
+
+#define gnome_vfs_url_show_LIB LIB_VFS
+#define gnome_vfs_make_uri_from_input_with_dirs_LIB LIB_VFS
+#define gnome_vfs_mime_application_launch_LIB LIB_VFS
#endif
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Program/gtk/org/eclipse/swt/program/Program.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Program/gtk/org/eclipse/swt/program/Program.java
index 6f78ce2..9d4d4fe 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Program/gtk/org/eclipse/swt/program/Program.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Program/gtk/org/eclipse/swt/program/Program.java
@@ -115,8 +115,17 @@ static int getDesktop(final Display display) {
}
});
/* Check for the existence of libgio libraries */
- byte[] buffer = Converter.wcsToMbcs(null, "libgio-2.0.so.0", true);
- int /*long*/ libgio = OS.dlopen(buffer, OS.RTLD_LAZY);
+ byte[] buffer ;
+ int flags = OS.RTLD_LAZY;
+ if (OS.IsAIX) {
+ buffer = Converter.wcsToMbcs(null, "libgio-2.0.a(libgio-2.0.so.0)", true);
+ flags |= OS.RTLD_MEMBER;
+ } else if (OS.IsHPUX) {
+ buffer = Converter.wcsToMbcs(null, "libgio-2.0.so", true);
+ } else {
+ buffer = Converter.wcsToMbcs(null, "libgio-2.0.so.0", true);
+ }
+ int /*long*/ libgio = OS.dlopen(buffer, flags);
if (libgio != 0) {
buffer = Converter.wcsToMbcs(null, "g_app_info_launch_default_for_uri", true);
int /*long*/ g_app_info_launch_default_for_uri = OS.dlsym(libgio, buffer);
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.c b/eclipse/plugins/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.c
index 1d6037a..3ce68d9 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.c
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.c
@@ -526,12 +526,12 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1get_1cookies)
#endif
#ifndef NO__1soup_1cookie_1jar_1get_1type
-JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1get_1type)
+JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1get_1type)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
WebKitGTK_NATIVE_ENTER(env, that, _1soup_1cookie_1jar_1get_1type_FUNC);
- rc = (jint)soup_cookie_jar_get_type();
+ rc = (jintLong)soup_cookie_jar_get_type();
WebKitGTK_NATIVE_EXIT(env, that, _1soup_1cookie_1jar_1get_1type_FUNC);
return rc;
}
@@ -604,7 +604,7 @@ fail:
#ifndef NO__1soup_1session_1add_1feature_1by_1type
JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1session_1add_1feature_1by_1type)
- (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
WebKitGTK_NATIVE_ENTER(env, that, _1soup_1session_1add_1feature_1by_1type_FUNC);
soup_session_add_feature_by_type((SoupSession *)arg0, (GType)arg1);
@@ -634,7 +634,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1session_1feature_1detach)
#ifndef NO__1soup_1session_1get_1feature
JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1session_1get_1feature)
- (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
jintLong rc = 0;
WebKitGTK_NATIVE_ENTER(env, that, _1soup_1session_1get_1feature_FUNC);
@@ -855,12 +855,12 @@ fail:
#endif
#ifndef NO__1webkit_1soup_1auth_1dialog_1get_1type
-JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1soup_1auth_1dialog_1get_1type)
+JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1soup_1auth_1dialog_1get_1type)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1soup_1auth_1dialog_1get_1type_FUNC);
- rc = (jint)webkit_soup_auth_dialog_get_type();
+ rc = (jintLong)webkit_soup_auth_dialog_get_type();
WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1soup_1auth_1dialog_1get_1type_FUNC);
return rc;
}
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java
index 1244c84..fa8840b 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java
@@ -116,7 +116,7 @@ public class WebKit extends WebBrowser {
public void run () {
if (!LibraryLoaded) return;
int /*long*/ session = WebKitGTK.webkit_get_default_session ();
- int type = WebKitGTK.soup_cookie_jar_get_type ();
+ int /*long*/ type = WebKitGTK.soup_cookie_jar_get_type ();
int /*long*/ jar = WebKitGTK.soup_session_get_feature (session, type);
if (jar == 0) return;
int /*long*/ cookies = WebKitGTK.soup_cookie_jar_all_cookies (jar);
@@ -139,7 +139,7 @@ public class WebKit extends WebBrowser {
public void run () {
if (!LibraryLoaded) return;
int /*long*/ session = WebKitGTK.webkit_get_default_session ();
- int type = WebKitGTK.soup_cookie_jar_get_type ();
+ int /*long*/ type = WebKitGTK.soup_cookie_jar_get_type ();
int /*long*/ jar = WebKitGTK.soup_session_get_feature (session, type);
if (jar == 0) return;
byte[] bytes = Converter.wcsToMbcs (null, CookieUrl, true);
@@ -173,7 +173,7 @@ public class WebKit extends WebBrowser {
public void run () {
if (!LibraryLoaded) return;
int /*long*/ session = WebKitGTK.webkit_get_default_session ();
- int type = WebKitGTK.soup_cookie_jar_get_type ();
+ int /*long*/ type = WebKitGTK.soup_cookie_jar_get_type ();
int /*long*/ jar = WebKitGTK.soup_session_get_feature (session, type);
if (jar == 0) {
/* this happens if a navigation has not occurred yet */
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java
index a564b4d..0b1717e 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java
@@ -537,8 +537,8 @@ public static final int /*long*/ soup_cookie_jar_get_cookies (int /*long*/ jar,
}
}
-public static final native int _soup_cookie_jar_get_type ();
-public static final int soup_cookie_jar_get_type () {
+public static final native int /*long*/ _soup_cookie_jar_get_type ();
+public static final int /*long*/ soup_cookie_jar_get_type () {
lock.lock();
try {
return _soup_cookie_jar_get_type ();
@@ -689,8 +689,8 @@ public static final void soup_message_headers_append (int /*long*/ headers, byte
* @param session cast=(SoupSession *)
* @param type cast=(GType)
*/
-public static final native void _soup_session_add_feature_by_type (int /*long*/ session, int type);
-public static final void soup_session_add_feature_by_type (int /*long*/ session, int type) {
+public static final native void _soup_session_add_feature_by_type (int /*long*/ session, int /*long*/ type);
+public static final void soup_session_add_feature_by_type (int /*long*/ session, int /*long*/ type) {
lock.lock();
try {
_soup_session_add_feature_by_type (session, type);
@@ -703,8 +703,8 @@ public static final void soup_session_add_feature_by_type (int /*long*/ session,
* @param session cast=(SoupSession *)
* @param feature_type cast=(GType)
*/
-public static final native int /*long*/ _soup_session_get_feature (int /*long*/ session, int feature_type);
-public static final int /*long*/ soup_session_get_feature (int /*long*/ session, int feature_type) {
+public static final native int /*long*/ _soup_session_get_feature (int /*long*/ session, int /*long*/ feature_type);
+public static final int /*long*/ soup_session_get_feature (int /*long*/ session, int /*long*/ feature_type) {
lock.lock();
try {
return _soup_session_get_feature (session, feature_type);
@@ -963,8 +963,8 @@ public static final int /*long*/ webkit_network_request_new (byte[] uri) {
}
}
-public static final native int _webkit_soup_auth_dialog_get_type ();
-public static final int webkit_soup_auth_dialog_get_type () {
+public static final native int /*long*/ _webkit_soup_auth_dialog_get_type ();
+public static final int /*long*/ webkit_soup_auth_dialog_get_type () {
lock.lock();
try {
return _webkit_soup_auth_dialog_get_type ();
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Combo.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Combo.java
index 574b9b0..3b8ea96 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Combo.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Combo.java
@@ -1268,13 +1268,20 @@ void releaseHandle () {
/*
* Bug in the Macintosh. Carbon segments fault if the combo box has
* keyboard focus and it is disposed or its parent is disposed because
- * there is an outstanding timer that runs after the widget is dispoed.
+ * there is an outstanding timer that runs after the widget is disposed.
* The fix is to remove the combo box from its parent and dispose it when
* the display is idle.
*
* NOTE: The problem does not happen when the window is disposed.
+ *
+ * NOTE: Pixel corruption happens on the parent window when the
+ * a drop down combo is not in focus and the contents is scrolled
+ * to the left. This is avoided by setting to combo size to zero.
*/
if ((getShell ().state & DISPOSE_SENT) == 0) {
+ if ((style & SWT.DROP_DOWN) != 0) {
+ OS.HIViewSetFrame (handle, new CGRect ());
+ }
display.addToDisposeWindow (handle);
}
super.releaseHandle ();
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Control.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Control.java
index 09b794a..b186978 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Control.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Control.java
@@ -1485,6 +1485,17 @@ boolean hasFocus () {
int helpProc (int inControl, int inGlobalMouse, int inRequest, int outContentProvided, int ioHelpContent) {
switch (inRequest) {
case OS.kHMSupplyContent: {
+ org.eclipse.swt.internal.carbon.Point pt = new org.eclipse.swt.internal.carbon.Point ();
+ OS.memmove(pt, new int[] {inGlobalMouse}, 4);
+ /*
+ * If a control doesn't have a tooltip text, then helpProc gets
+ * called on the controls in its parent hierarchy and their
+ * tooltip text is used. Note that returning OS.eventNotHandledErr
+ * prevents the window help content callback from being called. The
+ * is to only handle the message when the cursor is directly over this
+ * control.
+ */
+ if (display.getCursorControl (pt) != this) break;
short [] contentProvided = {OS.kHMContentNotProvidedDontPropagate};
if (toolTipText != null && toolTipText.length () != 0) {
char [] buffer = new char [toolTipText.length ()];
@@ -1509,8 +1520,6 @@ int helpProc (int inControl, int inGlobalMouse, int inRequest, int outContentPro
*/
int cursorHeight = 16;
helpContent.tagSide = (short) OS.kHMAbsoluteCenterAligned;
- org.eclipse.swt.internal.carbon.Point pt = new org.eclipse.swt.internal.carbon.Point ();
- OS.memmove(pt, new int[] {inGlobalMouse}, 4);
int x = pt.h;
int y = pt.v;
if (display.helpWidget != this) {
@@ -1536,19 +1545,11 @@ int helpProc (int inControl, int inGlobalMouse, int inRequest, int outContentPro
helpContent.content1_tagCFString = display.helpString;
OS.memmove (ioHelpContent, helpContent, HMHelpContentRec.sizeof);
contentProvided [0] = OS.kHMContentProvided;
- OS.memmove (outContentProvided, contentProvided, 2);
- break;
} else {
OS.HMHideTag();
- OS.memmove (outContentProvided, contentProvided, 2);
- /*
- * If a control doesn't have a tooltiptext, then helpProc gets
- * called on the controls in its parent hierarchy and their
- * tooltiptext is used. Return OS.eventNotHandledErr to prevent
- * the calls on the parent control.
- */
- return OS.eventNotHandledErr;
}
+ OS.memmove (outContentProvided, contentProvided, 2);
+ break;
}
case OS.kHMDisposeContent: {
if (display.helpString != 0) OS.CFRelease (display.helpString);
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 6a92ef5..d5dd483 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
@@ -1462,6 +1462,10 @@ public Control getCursorControl () {
checkDevice ();
org.eclipse.swt.internal.carbon.Point where = new org.eclipse.swt.internal.carbon.Point ();
OS.GetGlobalMouse (where);
+ return getCursorControl (where);
+}
+
+Control getCursorControl(org.eclipse.swt.internal.carbon.Point where) {
int [] theWindow = new int [1];
if (OS.FindWindow (where, theWindow) != OS.inContent) return null;
if (theWindow [0] == 0) return null;
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Shell.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Shell.java
index 49bff9f..e4eaacb 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Shell.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Shell.java
@@ -122,7 +122,7 @@ import org.eclipse.swt.graphics.*;
public class Shell extends Decorations {
int shellHandle, windowGroup;
boolean resized, moved, drawing, reshape, update, deferDispose, active, disposed, opened, fullScreen, center;
- boolean showWithParent, ignoreBounds;
+ boolean showWithParent, ignoreBounds, isActivating;
int invalRgn;
Control lastActive;
Rect rgnRect;
@@ -1080,6 +1080,7 @@ int kEventWindowActivated (int nextHandler, int theEvent, int userData) {
deferDispose = true;
Display display = this.display;
display.activeShell = this;
+ isActivating = true;
display.setMenuBar (menuBar);
if (menuBar != null) OS.DrawMenuBar ();
sendEvent (SWT.Activate);
@@ -1087,6 +1088,7 @@ int kEventWindowActivated (int nextHandler, int theEvent, int userData) {
if (!restoreFocus () && !traverseGroup (true)) setFocus ();
if (isDisposed ()) return result;
display.activeShell = null;
+ isActivating = false;
Shell parentShell = this;
while (parentShell.parent != null) {
parentShell = (Shell) parentShell.parent;
@@ -1166,7 +1168,14 @@ int kEventWindowDeactivated (int nextHandler, int theEvent, int userData) {
}
void kEventWindowDeactivated () {
- if (active) {
+ /*
+ * Bug in Mac OS X. When calling SelectWindow on a window with kWindowModalityWindowModal during
+ * kEventWindowGetClickModality, multiple activation events are sent to the window even though the
+ * window is already active. This will cause flicker as windows activate and deactivate.
+ * a deactivate is sent during activation. Fix is to watch for a deactivation event
+ * are sent to the window.
+ */
+ if (active && !isActivating) {
active = false;
deferDispose = true;
Display display = this.display;
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Text.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Text.java
index 0a1f282..1fef22f 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Text.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Text.java
@@ -670,6 +670,7 @@ void createWidget () {
public void cut () {
checkWidget();
if ((style & SWT.READ_ONLY) != 0) return;
+ if ((style & SWT.PASSWORD) != 0 || echoCharacter != '\0') return;
boolean cut = true;
char [] oldText = null;
Point oldSelection = getSelection ();
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Tracker.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Tracker.java
index 850e729..2ab6afa 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Tracker.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Tracker.java
@@ -795,6 +795,10 @@ public boolean open () {
if (!isDisposed()) {
drawRectangles (window, rectangles, true);
}
+
+ if (resizeCursor != null) resizeCursor.dispose();
+ resizeCursor = null;
+
OS.DisposeWindow (window);
tracking = false;
window = 0;
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GC.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GC.java
index 602f680..71699fd 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GC.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GC.java
@@ -1147,6 +1147,10 @@ void drawImage(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight,
*/
public void drawLine(int x1, int y1, int x2, int y2) {
if (handle == null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+ if (x1 == x2 && y1 == y2 && data.lineWidth <= 1) {
+ drawPoint(x1, y1);
+ return;
+ }
NSAutoreleasePool pool = checkGC(DRAW);
try {
NSBezierPath path = data.path;
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Button.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Button.java
index 40d56b0..d47c681 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Button.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Button.java
@@ -265,6 +265,10 @@ boolean dragDetect(int x, int y, boolean filter, boolean[] consume) {
return dragging;
}
+boolean drawsBackground() {
+ return background != null || backgroundImage != null;
+}
+
void drawImageWithFrameInView (int /*long*/ id, int /*long*/ sel, int /*long*/ image, NSRect rect, int /*long*/ view) {
/*
* Feature in Cocoa. Images touch the edge of rounded buttons
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 cd1f019..728c3ec 100644
--- 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
@@ -1154,11 +1154,16 @@ NSView eventView () {
return view;
}
+boolean drawsBackground() {
+ return true;
+}
+
void fillBackground (NSView view, NSGraphicsContext context, NSRect rect, int imgHeight) {
fillBackground(view, context, rect, imgHeight, null, 0, 0);
}
void fillBackground (NSView view, NSGraphicsContext context, NSRect rect, int imgHeight, NSView gcView, int tx, int ty) {
+ if (!drawsBackground()) return;
Control control = findBackgroundControl();
if (control == null) control = this;
Image image = control.backgroundImage;
@@ -1213,7 +1218,7 @@ Cursor findCursor () {
Control findBackgroundControl () {
if (backgroundImage != null || background != null) return this;
- return (state & PARENT_BACKGROUND) != 0 ? parent.findBackgroundControl () : null;
+ return (!isTransparent() && (state & PARENT_BACKGROUND) != 0) ? parent.findBackgroundControl () : null;
}
Menu [] findMenus (Control control) {
@@ -3038,6 +3043,7 @@ boolean sendMouseEvent (NSEvent nsEvent, int type, boolean send) {
}
void setBackground () {
+ if (!drawsBackground()) return;
Control control = findBackgroundControl ();
if (control == null) control = this;
if (control.backgroundImage != null) {
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java
index 8daac5c..eae5cba 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java
@@ -147,6 +147,9 @@ public class Display extends Device {
Control focusControl, currentFocusControl;
int focusEvent;
+ /* Table/Tree click tracking */
+ int /*long*/ trackedButtonRow = -1;
+
NSWindow screenWindow, keyWindow;
NSAutoreleasePool[] pools;
@@ -2312,6 +2315,8 @@ void initClasses () {
OS.class_addMethod(cls, OS.sel_outlineView_numberOfChildrenOfItem_, proc4, "@:@@");
OS.class_addMethod(cls, OS.sel_outlineView_objectValueForTableColumn_byItem_, proc5, "@:@@@");
OS.class_addMethod(cls, OS.sel_outlineView_willDisplayCell_forTableColumn_item_, proc6, "@:@@@@");
+ OS.class_addMethod(cls, OS.sel_outlineView_shouldSelectItem_, proc4, "@:@@");
+ OS.class_addMethod(cls, OS.sel_outlineView_shouldTrackCell_forTableColumn_item_, proc6, "@:@@@i");
OS.class_addMethod(cls, OS.sel_outlineView_setObjectValue_forTableColumn_byItem_, proc6, "@:@@@@");
OS.class_addMethod(cls, OS.sel_outlineViewColumnDidMove_, proc3, "@:@");
OS.class_addMethod(cls, OS.sel_outlineViewColumnDidResize_, proc3, "@:@");
@@ -2480,6 +2485,8 @@ void initClasses () {
OS.class_addMethod(cls, OS.sel_tableViewSelectionIsChanging_, proc3, "@:@");
OS.class_addMethod(cls, OS.sel_tableViewSelectionDidChange_, proc3, "@:@");
OS.class_addMethod(cls, OS.sel_tableView_willDisplayCell_forTableColumn_row_, proc6, "@:@@@i");
+ OS.class_addMethod(cls, OS.sel_tableView_shouldSelectRow_, proc4, "@:@i");
+ OS.class_addMethod(cls, OS.sel_tableView_shouldTrackCell_forTableColumn_row_, proc6, "@:@@@i");
OS.class_addMethod(cls, OS.sel_tableView_setObjectValue_forTableColumn_row_, proc6, "@:@@@i");
OS.class_addMethod(cls, OS.sel_tableViewColumnDidMove_, proc3, "@:@");
OS.class_addMethod(cls, OS.sel_tableViewColumnDidResize_, proc3, "@:@");
@@ -5173,8 +5180,12 @@ static int /*long*/ windowProc(int /*long*/ id, int /*long*/ sel, int /*long*/ a
return widget.accessibilityAttributeValue_forParameter(id, sel, arg0, arg1);
} else if (sel == OS.sel_tableView_didClickTableColumn_) {
widget.tableView_didClickTableColumn (id, sel, arg0, arg1);
+ } else if (sel == OS.sel_tableView_shouldSelectRow_) {
+ return (widget.tableView_shouldSelectRow(id, sel, arg0, arg1) ? 1 : 0);
} else if (sel == OS.sel_outlineView_didClickTableColumn_) {
widget.outlineView_didClickTableColumn (id, sel, arg0, arg1);
+ } else if (sel == OS.sel_outlineView_shouldSelectItem_) {
+ return (widget.outlineView_shouldSelectItem(id, sel, arg0, arg1) ? 1 : 0);
} else if (sel == OS.sel_shouldChangeTextInRange_replacementString_) {
return widget.shouldChangeTextInRange_replacementString(id, sel, arg0, arg1) ? 1 : 0;
} else if (sel == OS.sel_canDragRowsWithIndexes_atPoint_) {
@@ -5257,6 +5268,10 @@ static int /*long*/ windowProc(int /*long*/ id, int /*long*/ sel, int /*long*/ a
widget.tableView_setObjectValue_forTableColumn_row(id, sel, arg0, arg1, arg2, arg3);
} else if (sel == OS.sel_view_stringForToolTip_point_userData_) {
return widget.view_stringForToolTip_point_userData(id, sel, arg0, arg1, arg2, arg3);
+ } else if (sel == OS.sel_tableView_shouldTrackCell_forTableColumn_row_) {
+ return (widget.tableView_shouldTrackCell_forTableColumn_row(id, sel, arg0, arg1, arg2, arg3) ? 1 : 0);
+ } else if (sel == OS.sel_outlineView_shouldTrackCell_forTableColumn_item_) {
+ return (widget.outlineView_shouldTrackCell_forTableColumn_item(id, sel, arg0, arg1, arg2, arg3) ? 1 : 0);
}
return 0;
}
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Label.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Label.java
index cb1947c..c98066a 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Label.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Label.java
@@ -287,6 +287,10 @@ void drawBackground (int /*long*/ id, NSGraphicsContext context, NSRect rect) {
fillBackground(view, context, rect, -1);
}
+boolean drawsBackground() {
+ return background != null || backgroundImage != null;
+}
+
NSView eventView () {
return ((NSBox)view).contentView();
}
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 8fa25d5..a7ed6d3 100644
--- 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
@@ -1932,6 +1932,7 @@ void mouseDownSuper(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
}
}
}
+ display.trackedButtonRow = -1;
didSelect = false;
super.mouseDownSuper(id, sel, theEvent);
didSelect = false;
@@ -1945,7 +1946,8 @@ void mouseDownSuper(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
*/
int /*long*/ nextState (int /*long*/ id, int /*long*/ sel) {
NSTableView tableView = (NSTableView)view;
- int index = (int)/*64*/tableView.selectedRow ();
+ int index = (int)/*64*/tableView.clickedRow();
+ if (index == -1) index = (int)/*64*/tableView.selectedRow ();
TableItem item = items[index];
if (item.grayed) {
return item.checked ? OS.NSOffState : OS.NSMixedState;
@@ -3132,6 +3134,64 @@ int /*long*/ tableView_objectValueForTableColumn_row (int /*long*/ id, int /*lon
return item.createString (0).id;
}
+boolean tableView_shouldSelectRow(int /*long*/ id, int /*long*/ sel, int /*long*/ aTableView, int /*long*/ rowIndex) {
+ boolean result = true;
+
+ if ((style & SWT.SINGLE) != 0) {
+ /*
+ * Feature in Cocoa. Calling setAllowsEmptySelection will automatically select the first row of the list.
+ * And, single-selection NSTable/OutlineViews allow the user to de-select the selected item via command-click.
+ * This is normal platform behavior, but for compatibility with other platforms, if the SINGLE style is in use,
+ * force a selection by seeing if the proposed selection set is empty, and if so, put back the currently selected row.
+ */
+ NSTableView table = new NSTableView(aTableView);
+ NSIndexSet indexes = table.selectedRowIndexes();
+ if (indexes.count() != 1 && table.selectedRow() != -1) {
+ return false;
+ }
+ }
+
+ // If a checkbox is being tracked don't select the row.
+ if (display.trackedButtonRow != -1) return false;
+ NSTableView tableView = (NSTableView)view;
+ int /*long*/ clickedCol = tableView.clickedColumn();
+ int /*long*/ clickedRow = tableView.clickedRow();
+ if (clickedRow >= 0 && clickedCol >= 0) {
+ NSCell cell = tableView.preparedCellAtColumn(clickedCol, clickedRow);
+ if (cell.isKindOfClass(OS.class_NSButtonCell) && cell.isEnabled()) {
+ NSRect cellFrame = tableView.frameOfCellAtColumn(clickedCol, clickedRow);
+ NSRect imageFrame = cell.imageRectForBounds(cellFrame);
+ NSPoint hitPoint = tableView.convertPoint_fromView_(NSApplication.sharedApplication().currentEvent().locationInWindow(), null);
+ result = ! OS.NSPointInRect(hitPoint, imageFrame) || didSelect;
+ }
+ }
+ return result;
+}
+
+boolean tableView_shouldTrackCell_forTableColumn_row(int /*long*/ id, int /*long*/ sel,
+ int /*long*/ table, int /*long*/ cell, /*long*/ int /*long*/ tableColumn, int /*long*/ rowIndex) {
+ NSCell theCell = new NSCell(cell);
+ NSTableView tableView = (NSTableView)view;
+ if (theCell.isKindOfClass(OS.class_NSButtonCell)) {
+ // Allow tracking of the checkbox area of the button, not the text itself.
+ int columnIndex = 0;
+ for (int i=0; i<columnCount; i++) {
+ if (columns [i].nsColumn.id == tableColumn) {
+ columnIndex = i;
+ break;
+ }
+ }
+ NSRect cellFrame = tableView.frameOfCellAtColumn(columnIndex, rowIndex);
+ NSRect imageFrame = theCell.imageRectForBounds(cellFrame);
+ NSPoint hitPoint = tableView.convertPoint_fromView_(NSApplication.sharedApplication().currentEvent().locationInWindow(), null);
+ boolean shouldTrack = OS.NSPointInRect(hitPoint, imageFrame) && (display.trackedButtonRow == -1 || display.trackedButtonRow == rowIndex) && !didSelect;
+ if (OS.NSPointInRect(hitPoint, imageFrame) && display.trackedButtonRow == -1 && !didSelect) display.trackedButtonRow = rowIndex;
+ return shouldTrack;
+ } else {
+ return tableView.isRowSelected(rowIndex);
+ }
+}
+
void tableView_setObjectValue_forTableColumn_row (int /*long*/ id, int /*long*/ sel, int /*long*/ aTableView, int /*long*/ anObject, int /*long*/ aTableColumn, int /*long*/ rowIndex) {
if (checkColumn != null && aTableColumn == checkColumn.id) {
TableItem item = items [(int)/*64*/rowIndex];
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Text.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Text.java
index 2081a00..75d8045 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Text.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Text.java
@@ -437,6 +437,7 @@ public Rectangle computeTrim (int x, int y, int width, int height) {
*/
public void copy () {
checkWidget ();
+ if ((style & SWT.PASSWORD) != 0 || echoCharacter != '\0') return;
if ((style & SWT.SINGLE) != 0) {
Point selection = getSelection ();
if (selection.x == selection.y) return;
@@ -551,6 +552,7 @@ void createWidget () {
public void cut () {
checkWidget ();
if ((style & SWT.READ_ONLY) != 0) return;
+ if ((style & SWT.PASSWORD) != 0 || echoCharacter != '\0') return;
boolean cut = true;
char [] oldText = null;
Point oldSelection = getSelection ();
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tracker.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tracker.java
index d40c7c4..86e8213 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tracker.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tracker.java
@@ -848,6 +848,14 @@ public boolean open () {
display.removePool();
}
}
+
+ /*
+ * Cleanup: If this tracker was resizing then the last cursor that it created
+ * needs to be destroyed.
+ */
+ if (resizeCursor != null) resizeCursor.dispose();
+ resizeCursor = null;
+
if (oldTrackingControl != null && !oldTrackingControl.isDisposed()) {
display.trackingControl = oldTrackingControl;
}
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tree.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tree.java
index b361cce..671b95a 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tree.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tree.java
@@ -1970,6 +1970,7 @@ void mouseDownSuper(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
}
}
}
+ display.trackedButtonRow = -1;
didSelect = false;
super.mouseDownSuper(id, sel, theEvent);
didSelect = false;
@@ -1983,7 +1984,8 @@ void mouseDownSuper(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
*/
int /*long*/ nextState (int /*long*/ id, int /*long*/ sel) {
NSOutlineView outlineView = (NSOutlineView)view;
- int index = (int)/*64*/outlineView.selectedRow ();
+ int index = (int)/*64*/outlineView.clickedRow();
+ if (index == -1) index = (int)/*64*/outlineView.selectedRow ();
TreeItem item = (TreeItem)display.getWidget (outlineView.itemAtRow (index).id);
if (item.grayed) {
return item.checked ? OS.NSOffState : OS.NSMixedState;
@@ -2033,6 +2035,63 @@ int /*long*/ outlineView_numberOfChildrenOfItem (int /*long*/ id, int /*long*/ s
return ((TreeItem) display.getWidget (item)).itemCount;
}
+boolean outlineView_shouldSelectItem(int /*long*/ id, int /*long*/ sel, int /*long*/ aTableView, int /*long*/ item) {
+ boolean result = true;
+ NSOutlineView tree = new NSOutlineView(aTableView);
+
+ if ((style & SWT.SINGLE) != 0) {
+ /*
+ * Feature in Cocoa. Calling setAllowsEmptySelection will automatically select the first row of the list.
+ * This is normal platform behavior, but for compatibility with other platforms, if the SINGLE style is in use,
+ * force a selection by seeing if the proposed selection set is empty, and if so, put back the currently selected row.
+ */
+ NSIndexSet indexes = tree.selectedRowIndexes();
+ if (indexes.count() != 1 && tree.selectedRow() != -1) {
+ return false;
+ }
+ }
+
+ // If a checkbox is being tracked don't select the row.
+ if (display.trackedButtonRow != -1) return false;
+ int /*long*/ clickedCol = tree.clickedColumn();
+ int /*long*/ clickedRow = tree.clickedRow();
+ if (clickedRow >= 0 && clickedCol >= 0) {
+ NSCell cell = tree.preparedCellAtColumn(clickedCol, clickedRow);
+ if (cell.isKindOfClass(OS.class_NSButtonCell) && cell.isEnabled()) {
+ NSRect cellFrame = tree.frameOfCellAtColumn(clickedCol, clickedRow);
+ NSRect imageFrame = cell.imageRectForBounds(cellFrame);
+ NSPoint hitPoint = tree.convertPoint_fromView_(NSApplication.sharedApplication().currentEvent().locationInWindow(), null);
+ result = ! OS.NSPointInRect(hitPoint, imageFrame) || didSelect;
+ }
+ }
+ return result;
+}
+
+boolean outlineView_shouldTrackCell_forTableColumn_item(int /*long*/ id, int /*long*/ sel,
+ int /*long*/ table, int /*long*/ cell, /*long*/ int /*long*/ tableColumn, int /*long*/ item) {
+ NSCell theCell = new NSCell(cell);
+ NSOutlineView tableView = (NSOutlineView)view;
+ int /*long*/ rowIndex = tableView.rowForItem(new id(item));
+ if (theCell.isKindOfClass(OS.class_NSButtonCell)) {
+ // Allow tracking of the checkbox area of the button, not the text itself.
+ int columnIndex = 0;
+ for (int i=0; i<columnCount; i++) {
+ if (columns [i].nsColumn.id == tableColumn) {
+ columnIndex = i;
+ break;
+ }
+ }
+ NSRect cellFrame = tableView.frameOfCellAtColumn(columnIndex, rowIndex);
+ NSRect imageFrame = theCell.imageRectForBounds(cellFrame);
+ NSPoint hitPoint = tableView.convertPoint_fromView_(NSApplication.sharedApplication().currentEvent().locationInWindow(), null);
+ boolean shouldTrack = OS.NSPointInRect(hitPoint, imageFrame) && (display.trackedButtonRow == -1 || display.trackedButtonRow == rowIndex) && !didSelect;
+ if (OS.NSPointInRect(hitPoint, imageFrame) && display.trackedButtonRow == -1 && !didSelect) display.trackedButtonRow = rowIndex;
+ return shouldTrack;
+ } else {
+ return tableView.isRowSelected(rowIndex);
+ }
+}
+
void outlineView_willDisplayCell_forTableColumn_item (int /*long*/ id, int /*long*/ sel, int /*long*/ outlineView, int /*long*/ cell, int /*long*/ tableColumn, int /*long*/ itemID) {
if (checkColumn != null && tableColumn == checkColumn.id) return;
TreeItem item = (TreeItem) display.getWidget(itemID);
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Widget.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Widget.java
index b5f2dc7..9f13e55 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Widget.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Widget.java
@@ -1156,6 +1156,14 @@ void outlineViewSelectionIsChanging(int /*long*/ id, int /*long*/ sel, int /*lon
void outlineView_setObjectValue_forTableColumn_byItem(int /*long*/ id, int /*long*/ sel, int /*long*/ outlineView, int /*long*/ object, int /*long*/ tableColumn, int /*long*/ item) {
}
+boolean outlineView_shouldTrackCell_forTableColumn_item(int /*long*/ id, int /*long*/ sel, int /*long*/ table, int /*long*/ cell, /*long*/ int /*long*/ tableColumn, int /*long*/ item) {
+ return true;
+}
+
+boolean outlineView_shouldSelectItem(int /*long*/ id, int /*long*/ sel, int /*long*/ tableView, int /*long*/ index) {
+ return true;
+}
+
boolean outlineView_writeItems_toPasteboard(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2) {
return false;
}
@@ -1839,6 +1847,14 @@ int /*long*/ tableView_objectValueForTableColumn_row(int /*long*/ id, int /*long
return 0;
}
+boolean tableView_shouldTrackCell_forTableColumn_row(int /*long*/ id, int /*long*/ sel, int /*long*/ table, int /*long*/ cell, /*long*/ int /*long*/ tableColumn, int /*long*/ rowIndex) {
+ return true;
+}
+
+boolean tableView_shouldSelectRow(int /*long*/ id, int /*long*/ sel, int /*long*/ tableView, int /*long*/ index) {
+ return true;
+}
+
void tableView_setObjectValue_forTableColumn_row(int /*long*/ id, int /*long*/ sel, int /*long*/ aTableView, int /*long*/ anObject, int /*long*/ aTableColumn, int /*long*/ rowIndex) {
}
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 af8082b..7182563 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=655
-comma_ver=3,6,5,5
+min_ver=659
+comma_ver=3,6,5,9
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/library/swt.h b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/library/swt.h
index b955471..55756a6 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/library/swt.h
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/library/swt.h
@@ -119,11 +119,16 @@ extern int IS_JNI_1_2;
}
#else
#define CALLING_CONVENTION
+#ifdef AIX
+#define LOAD_FLAGS RTLD_LAZY | RTLD_MEMBER
+#else
+#define LOAD_FLAGS RTLD_LAZY
+#endif
#define LOAD_FUNCTION(var, name) \
static int initialized = 0; \
static void *var = NULL; \
if (!initialized) { \
- void* handle = dlopen(name##_LIB, RTLD_LAZY); \
+ void* handle = dlopen(name##_LIB, LOAD_FLAGS); \
if (handle) var = dlsym(handle, #name); \
initialized = 1; \
}
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 5a7cbe9..2e1a874 100644
--- 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.655
\ No newline at end of file
+version 3.659
\ No newline at end of file
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Device.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Device.java
index 7393351..32e16e8 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Device.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Device.java
@@ -161,8 +161,17 @@ void checkCairo() {
if (CAIRO_LOADED) return;
try {
/* Check if cairo is available on the system */
- byte[] buffer = Converter.wcsToMbcs(null, "libcairo.so.2", true);
- int /*long*/ libcairo = OS.dlopen(buffer, OS.RTLD_LAZY);
+ byte[] buffer ;
+ int flags = OS.RTLD_LAZY;
+ if (OS.IsAIX) {
+ buffer = Converter.wcsToMbcs(null, "libcairo.a(libcairo.so.2)", true);
+ flags |= OS.RTLD_MEMBER;
+ } else if (OS.IsHPUX) {
+ buffer = Converter.wcsToMbcs(null, "libcairo.so", true);
+ } else {
+ buffer = Converter.wcsToMbcs(null, "libcairo.so.2", true);
+ }
+ int /*long*/ libcairo = OS.dlopen(buffer, flags);
if (libcairo != 0) {
OS.dlclose(libcairo);
} else {
@@ -567,8 +576,10 @@ protected void init () {
useXRender = major_versionp[0] > 0 || (major_versionp[0] == 0 && minor_versionp[0] >= 8);
}
}
-
- if (debug) {
+ //TODO: Remove; temporary code only
+ boolean fixAIX = OS.IsAIX && OS.PTR_SIZEOF == 8;
+
+ if (debug || fixAIX) {
if (xDisplay != 0) {
/* Create the warning and error callbacks */
Class clazz = getClass ();
@@ -589,7 +600,7 @@ protected void init () {
XIOErrorProc = OS.XSetIOErrorHandler (XNullIOErrorProc);
}
}
- OS.XSynchronize (xDisplay, true);
+ if (debug) OS.XSynchronize (xDisplay, true);
}
}
@@ -883,7 +894,9 @@ static int /*long*/ XErrorProc (int /*long*/ xDisplay, int /*long*/ xErrorEvent)
if (DEBUG || device.debug) {
new SWTError ().printStackTrace ();
}
- OS.Call (XErrorProc, xDisplay, xErrorEvent);
+ //TODO: Remove; temporary code only
+ boolean fixAIX = OS.IsAIX && OS.PTR_SIZEOF == 8;
+ if (!fixAIX) OS.Call (XErrorProc, xDisplay, xErrorEvent);
}
} else {
if (DEBUG) new SWTError ().printStackTrace ();
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Control.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Control.java
index f14b8b2..9ec0de7 100644
--- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Control.java
+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Control.java
@@ -3562,7 +3562,9 @@ boolean translateTraversal (MSG msg) {
int /*long*/ hwnd = msg.hwnd;
int key = (int)/*64*/msg.wParam;
if (key == OS.VK_MENU) {
- OS.SendMessage (hwnd, OS.WM_CHANGEUISTATE, OS.UIS_INITIALIZE, 0);
+ if ((msg.lParam & 0x40000000) == 0) {
+ OS.SendMessage (hwnd, OS.WM_CHANGEUISTATE, OS.UIS_INITIALIZE, 0);
+ }
return false;
}
int detail = SWT.TRAVERSE_NONE;
diff --git a/eclipse/plugins/org.eclipse.swt/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.swt/META-INF/MANIFEST.MF
index afcbc9f..0da2e45 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.6.1.qualifier
+Bundle-Version: 3.6.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/build.xml b/eclipse/plugins/org.eclipse.swt/build.xml
index ccd2830..0a49386 100644
--- a/eclipse/plugins/org.eclipse.swt/build.xml
+++ b/eclipse/plugins/org.eclipse.swt/build.xml
@@ -15,7 +15,7 @@
<target name="init">
<property name="plugin" value="org.eclipse.swt" />
- <property name="version.suffix" value="3.6.1" />
+ <property name="version.suffix" value="3.6.2" />
<property name="full.name" value="${plugin}_${version.suffix}" />
<property name="temp.folder" value="${basedir}/temp.folder" />
<property name="plugin.destination" value="${basedir}" />
diff --git a/eclipse/plugins/org.eclipse.swt/buildnotes_swt.html b/eclipse/plugins/org.eclipse.swt/buildnotes_swt.html
index 075ead2..3f75030 100644
--- a/eclipse/plugins/org.eclipse.swt/buildnotes_swt.html
+++ b/eclipse/plugins/org.eclipse.swt/buildnotes_swt.html
@@ -11,6 +11,66 @@
Eclipse Platform Build Notes<br>
SWT</h1>
+<h2>SWT Build 3659b - Saturday February 05, 2011</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.6.2;chfieldfrom=2011-02-01+22%3A26%3A19+%2B0000;chfieldto=2011-02-04+15%3A10%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 3659a - Wednesday February 02, 2011</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.6.2;chfieldfrom=2011-01-19+00%3A04%3A38+%2B0000;chfieldto=2011-02-01+22%3A19%3A51+%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 3659 - Wednesday January 19, 2011</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.6.2;chfieldfrom=2011-01-04+23%3A03%3A21+%2B0000;chfieldto=2011-01-18+23%3A58%3A17+%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 3657d - Wednesday January 05, 2011</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.6.2;chfieldfrom=2010-11-30+22%3A56%3A44+%2B0000;chfieldto=2011-01-04+22%3A57%3A10+%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 3657c - Wednesday December 01, 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.6.2;chfieldfrom=2010-11-23+23%3A42%3A51+%2B0000;chfieldto=2010-11-30+22%3A50%3A42+%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 3657b - Wednesday November 24, 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.6.2;chfieldfrom=2010-11-09+22%3A38%3A25+%2B0000;chfieldto=2010-11-23+23%3A36%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 3657a - Wednesday November 10, 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.6.2;chfieldfrom=2010-11-02+22%3A40%3A44+%2B0000;chfieldto=2010-11-09+22%3A32%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 3657 - Wednesday November 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.6.2;chfieldfrom=2010-10-12+21%3A32%3A08+%2B0000;chfieldto=2010-11-02+22%3A34%3A55+%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 3656a - Wednesday October 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.6.2;chfieldfrom=2010-10-05+21%3A33%3A30+%2B0000;chfieldto=2010-10-12+21%3A26%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 3656 - Wednesday October 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.6.2;chfieldfrom=2010-08-31+22%3A06%3A57+%2B0000;chfieldto=2010-10-05+21%3A27%3A52+%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 3655c - Wednesday September 01, 2010</h2>
<blockquote>
diff --git a/eclipse/plugins/org.eclipse.swt/tasks/build.xml b/eclipse/plugins/org.eclipse.swt/tasks/build.xml
index 0ff9f83..ba8a7dd 100644
--- a/eclipse/plugins/org.eclipse.swt/tasks/build.xml
+++ b/eclipse/plugins/org.eclipse.swt/tasks/build.xml
@@ -310,6 +310,21 @@
</antcall>
</target>
+ <target name="build_gtk_aix_ppc64" depends="init_build">
+ <property name="clean" value="clean"/>
+ <property name="targets" value="install"/>
+ <exec dir="${basedir}/${builddir}" executable="sh" failonerror="true">
+ <arg value="build.sh"/>
+ <env key="MODEL" value="ppc64"/>
+ <env key="JAVA_HOME" value="/bluebird/teamswt/swt-builddir/JDKs/AIX/PPC64/j564/sdk"/>
+ <arg line="${targets}"/>
+ <arg line="${clean}"/>
+ </exec>
+ <antcall target="refresh_fragment">
+ <param name="fragment" value="org.eclipse.swt.gtk.aix.ppc64"/>
+ </antcall>
+ </target>
+
<target name="build_motif_linux" depends="init_build">
<property name="clean" value="clean"/>
<property name="targets" value="make_mozilla make_xulrunner make_xpcominit make_cairo install"/>
@@ -464,7 +479,7 @@
<param name="fragment" value="org.eclipse.swt.cocoa.macosx.x86_64"/>
</antcall>
<antcall target="check_fragment_libraries">
- <param name="library_count" value="10"/>
+ <param name="library_count" value="11"/>
<param name="fragment" value="org.eclipse.swt.gtk.linux.ppc"/>
</antcall>
<antcall target="check_fragment_libraries">
@@ -496,6 +511,10 @@
<param name="fragment" value="org.eclipse.swt.gtk.linux.s390x"/>
</antcall>
<antcall target="check_fragment_libraries">
+ <param name="library_count" value="5"/>
+ <param name="fragment" value="org.eclipse.swt.gtk.aix.ppc64"/>
+ </antcall>
+ <antcall target="check_fragment_libraries">
<param name="library_count" value="9"/>
<param name="fragment" value="org.eclipse.swt.motif.linux.x86"/>
</antcall>
@@ -516,10 +535,10 @@
<target name="check_fragment_libraries" depends="get_version">
<property name="checkdir" value="~/build/check_libraries"/>
<!-- WPF is not being built
- <property name="library_count" value="130"/>
+ <property name="library_count" value="131"/>
-->
- <property name="library_count" value="128"/>
- <property name="fragment" value="org.eclipse.swt.win32.win32.x86 org.eclipse.swt.win32.win32.x86_64 org.eclipse.swt.win32.win32.ia64 org.eclipse.swt.win32.wce_ppc.arm org.eclipse.swt.wpf.win32.x86 org.eclipse.swt.photon.qnx.x86 org.eclipse.swt.carbon.macosx org.eclipse.swt.cocoa.macosx org.eclipse.swt.cocoa.macosx.x86_64 org.eclipse.swt.gtk.linux.ppc org.eclipse.swt.gtk.linux.ppc64 org.eclipse.swt.gtk.linux.x86 org.eclipse.swt.gtk.linux.x86_64 org.eclipse.swt.gtk.linux.s390 org.eclipse.swt.gtk.linux.s390x org.eclipse.swt.gtk.solaris.sparc org.eclipse.swt.gtk.solaris.x86 org.eclipse.swt.motif.linux.x86 org.eclipse.swt.motif.aix.ppc org.eclipse.swt.motif.hpux.ia64_32 org.eclipse.swt.motif.solaris.sparc"/>
+ <property name="library_count" value="134"/>
+ <property name="fragment" value="org.eclipse.swt.win32.win32.x86 org.eclipse.swt.win32.win32.x86_64 org.eclipse.swt.win32.win32.ia64 org.eclipse.swt.win32.wce_ppc.arm org.eclipse.swt.wpf.win32.x86 org.eclipse.swt.photon.qnx.x86 org.eclipse.swt.carbon.macosx org.eclipse.swt.cocoa.macosx org.eclipse.swt.cocoa.macosx.x86_64 org.eclipse.swt.gtk.linux.ppc org.eclipse.swt.gtk.linux.ppc64 org.eclipse.swt.gtk.linux.x86 org.eclipse.swt.gtk.linux.x86_64 org.eclipse.swt.gtk.linux.s390 org.eclipse.swt.gtk.linux.s390x org.eclipse.swt.gtk.aix.ppc64 org.eclipse.swt.gtk.solaris.sparc org.eclipse.swt.gtk.solaris.x86 org.eclipse.swt.motif.linux.x86 org.eclipse.swt.motif.aix.ppc org.eclipse.swt.motif.hpux.ia64_32 org.eclipse.swt.motif.solaris.sparc"/>
<sshexec host="${m_linux_x86}"
username="swtbuild"
keyfile="${keyfile}"
@@ -679,7 +698,7 @@
<!-- common build tasks -->
<target name="increment_version">
- <property name="tmpdir" value="${tmphome}/inc"/>
+ <property name="tmpdir" value="${tmphome}/inc${TAG}"/>
<delete dir="${tmpdir}" quiet="true"/>
<mkdir dir="${tmpdir}"/>
<antcall target="increment_version_imp"/>
@@ -975,7 +994,7 @@
<!-- depends on 'get_new_tag' to define swt_new_tag, swt_version, maj_ver and min_ver -->
<target name="tag_projects">
- <property name="tmpdir" value="${tmphome}/tag"/>
+ <property name="tmpdir" value="${tmphome}/tag${TAG}"/>
<delete dir="${tmpdir}" quiet="true"/>
<mkdir dir="${tmpdir}"/>
<antcall target="tag_projects_imp"/>
@@ -1091,7 +1110,7 @@
<!-- Params: cp, fragment, build_target -->
<target name="build_local">
<property name="cvsRsh" value="plink"/>
- <property name="tmpdir" value="${tmphome}/${fragment}"/>
+ <property name="tmpdir" value="${tmphome}/${fragment}${TAG}"/>
<property name="build_version" value=""/>
<delete dir="${tmpdir}" quiet="true"/>
<mkdir dir="${tmpdir}"/>
@@ -1115,7 +1134,7 @@
</target>
<target name="build_s390">
- <property name="zipname" value="${fragment}"/>
+ <property name="zipname" value="${fragment}${TAG}"/>
<property name="remotetmpdir" value="~/build/${zipname}"/>
<condition property="remotemachine" value="${m_linux_s390}" else="${m_linux_s390x}">
<or>
@@ -1141,7 +1160,7 @@
<!-- Params: machine, pre_commands, cp, fragment, build_target -->
<target name="build_ssh" depends="set_natives_changed">
- <property name="tmpdir" value="~/build/${fragment}"/>
+ <property name="tmpdir" value="~/build/${fragment}${TAG}"/>
<property name="pre_commands" value=""/>
<property name="pre_commands1" value=""/>
<property name="build_version" value=""/>
@@ -1265,7 +1284,7 @@
<param name="cp" value="${cp_gtk}"/>
<param name="fragment" value="${thefragment}"/>
<param name="build_target" value="build_gtk_linux_s390"/>
- <param name="pre_commands1" value="cp ~/build/fixed_tasks/* ~/build/${thefragment}/${tasks}; "/>
+ <param name="pre_commands1" value="cp ~/build/fixed_tasks/* ~/build/${thefragment}${TAG}/${tasks}; "/>
<param name="pre_commands" value="export JAVA_HOME=~/build/JRE/x32/jdk1.6.0_14; export PATH=${ant_home}/bin:$PATH; "/>
</antcall>
</target>
@@ -1277,11 +1296,21 @@
<param name="cp" value="${cp_gtk}"/>
<param name="fragment" value="${thefragment}"/>
<param name="build_target" value="build_gtk_linux_s390x"/>
- <param name="pre_commands1" value="cp ~/build/fixed_tasks/* ~/build/${thefragment}/${tasks}; "/>
+ <param name="pre_commands1" value="cp ~/build/fixed_tasks/* ~/build/${thefragment}${TAG}/${tasks}; "/>
<param name="pre_commands" value="export JAVA_HOME=~/build/JRE/x32/jdk1.6.0_14; export PATH=${ant_home}/bin:$PATH; "/>
</antcall>
</target>
+ <target name="gtk_aix_ppc64">
+ <antcall target="build_ssh">
+ <param name="machine" value="${m_aix}"/>
+ <param name="cp" value="${cp_gtk}"/>
+ <param name="fragment" value="org.eclipse.swt.gtk.aix.ppc64"/>
+ <param name="build_target" value="build_gtk_aix_ppc64"/>
+ <param name="pre_commands" value="export JAVA_HOME=~/build/JRE/AIX/sdk; export PATH=${ant_home}/bin:~/build/cvs_bin/AIX:$PATH;"/>
+ </antcall>
+ </target>
+
<target name="gtk_solaris_x86">
<antcall target="build_ssh">
<param name="machine" value="${m_solaris_x86}"/>
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 ec82b81..b4ff2c5 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.100.qualifier
+Bundle-Version: 3.5.101.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 2420a4d..15879cb 100644
--- a/eclipse/plugins/org.eclipse.team.core/buildnotes_team.html
+++ b/eclipse/plugins/org.eclipse.team.core/buildnotes_team.html
@@ -12,6 +12,32 @@
<h1>Eclipse Platform Build Notes (3.5)<br>
Team, Compare and CVS</h1>
+<p>Integration Build (lutego 03, 2011, 4:36 p.m.)</p>
+ <p>Problem reports updated</p>
+ <p>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=336234">Bug 336234</a>. Plug-in versions needs to be updated for 3.6.2 (ASSIGNED)<br>
+ </p>
+
+<p>Integration Build (stycznia 19, 2011, 2:17 p.m.)</p>
+ <p>Problem reports updated</p>
+ <p>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=332640">Bug 332640</a>. [backport] Team > Merge operation for project contains logical model always show no changes between two branches (ASSIGNED)<br>
+ </p>
+
+<p>Integration Build (stycznia 05, 2011, 12:12 p.m.)</p>
+ <p>Problem reports updated</p>
+ <p>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=332639">Bug 332639</a>. [backport] There are no changes for models showing in the Synchronize view with Team > Merge operation. (FIXED)<br>
+ </p>
+
+<p>Integration Build (August 25, 2010, 12:44 p.m.)</p>
+ <p>Problem reports updated</p>
+ <p>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=311704">Bug 311704</a>. please tag these resources/team bundles so they include source references for the 3.6 release (FIXED)<br>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=316875">Bug 316875</a>. [backport] Commit, Apply Patch and Synchronize no longer take keybindings (FIXED)<br>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=318557">Bug 318557</a>. [backport] Exception when trying to commit a lot of projects (FIXED)<br>
+ </p>
+
<p>Integration Build (May 27, 2010, 1:46 p.m.)</p>
<p>Problem reports updated</p>
<p>
diff --git a/eclipse/plugins/org.eclipse.team.core/src/org/eclipse/team/core/variants/ResourceVariantTreeSubscriber.java b/eclipse/plugins/org.eclipse.team.core/src/org/eclipse/team/core/variants/ResourceVariantTreeSubscriber.java
index e4ab9d0..d4823e6 100644
--- a/eclipse/plugins/org.eclipse.team.core/src/org/eclipse/team/core/variants/ResourceVariantTreeSubscriber.java
+++ b/eclipse/plugins/org.eclipse.team.core/src/org/eclipse/team/core/variants/ResourceVariantTreeSubscriber.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 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
@@ -101,7 +101,7 @@ public abstract class ResourceVariantTreeSubscriber extends Subscriber {
if(!member.exists() && !getRemoteTree().hasResourceVariant(member)) {
// Remove deletion conflicts
iterator.remove();
- } else if (!isSupervised(resource)) {
+ } else if (!isSupervised(member)) {
// Remove unsupervised resources
iterator.remove();
}
diff --git a/eclipse/plugins/org.eclipse.team.cvs.core/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.team.cvs.core/META-INF/MANIFEST.MF
index 72bd6dd..b5a8a15 100644
--- a/eclipse/plugins/org.eclipse.team.cvs.core/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.team.cvs.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.team.cvs.core; singleton:=true
-Bundle-Version: 3.3.300.qualifier
+Bundle-Version: 3.3.301.qualifier
Bundle-Activator: org.eclipse.team.internal.ccvs.core.CVSProviderPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/eclipse/plugins/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSubscriber.java b/eclipse/plugins/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSubscriber.java
index ca52687..a937fff 100644
--- a/eclipse/plugins/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSubscriber.java
+++ b/eclipse/plugins/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSubscriber.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 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,9 +10,7 @@
*******************************************************************************/
package org.eclipse.team.internal.ccvs.core;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
import org.eclipse.core.resources.*;
import org.eclipse.core.runtime.*;
@@ -119,9 +117,11 @@ public class CVSMergeSubscriber extends CVSSyncTreeSubscriber implements IResour
private List roots;
private CVSResourceVariantTree remoteTree;
private MergeBaseTree baseTree;
-
- public CVSMergeSubscriber(IResource[] roots, CVSTag start, CVSTag end) {
+ private boolean isModelSync;
+
+ public CVSMergeSubscriber(IResource[] roots, CVSTag start, CVSTag end, boolean isModelSync) {
this(getUniqueId(), roots, start, end);
+ this.isModelSync = isModelSync;
}
private static QualifiedName getUniqueId() {
@@ -214,6 +214,10 @@ public class CVSMergeSubscriber extends CVSSyncTreeSubscriber implements IResour
return end;
}
+ boolean isModelSync() {
+ return isModelSync;
+ }
+
/*
* What to do when a root resource for this merge changes?
* Deleted, Move, Copied
diff --git a/eclipse/plugins/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSyncInfo.java b/eclipse/plugins/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSyncInfo.java
index 1662c2e..9b16287 100644
--- a/eclipse/plugins/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSyncInfo.java
+++ b/eclipse/plugins/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSyncInfo.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 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,9 @@ package org.eclipse.team.internal.ccvs.core;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.*;
import org.eclipse.team.core.TeamException;
-import org.eclipse.team.core.subscribers.*;
-import org.eclipse.team.core.synchronize.*;
-import org.eclipse.team.core.variants.*;
+import org.eclipse.team.core.subscribers.Subscriber;
+import org.eclipse.team.core.synchronize.SyncInfo;
+import org.eclipse.team.core.variants.IResourceVariant;
public class CVSMergeSyncInfo extends CVSSyncInfo {
@@ -35,15 +35,15 @@ public class CVSMergeSyncInfo extends CVSSyncInfo {
}
protected int calculateKind() throws TeamException {
+ int kind = super.calculateKind();
+
// Report merged resources as in-sync
- if (((CVSMergeSubscriber)getSubscriber()).isMerged(getLocal())) {
+ if ((kind & DIRECTION_MASK) == INCOMING && ((CVSMergeSubscriber)getSubscriber()).isMerged(getLocal())) {
return IN_SYNC;
}
- int kind = super.calculateKind();
-
- // Report outgoing resources as in-sync
- if((kind & DIRECTION_MASK) == OUTGOING) {
+ // Report outgoing resources as in-sync when models are not shown
+ if((kind & DIRECTION_MASK) == OUTGOING && !((CVSMergeSubscriber)getSubscriber()).isModelSync()) {
return IN_SYNC;
}
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 035b23d..b682348 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.301.qualifier
+Bundle-Version: 3.3.302.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/wizards/MergeWizard.java b/eclipse/plugins/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/MergeWizard.java
index 13bdf0d..8e8b9a0 100644
--- a/eclipse/plugins/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/MergeWizard.java
+++ b/eclipse/plugins/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/MergeWizard.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 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
@@ -11,10 +11,7 @@
package org.eclipse.team.internal.ccvs.ui.wizards;
import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.mapping.ResourceMapping;
@@ -76,7 +73,7 @@ public class MergeWizard extends Wizard {
if (isShowModelSync()) {
ModelMergeParticipant participant = ModelMergeParticipant.getMatchingParticipant(mappings, startTag, endTag);
if(participant == null) {
- CVSMergeSubscriber s = new CVSMergeSubscriber(getProjects(resources), startTag, endTag);
+ CVSMergeSubscriber s = new CVSMergeSubscriber(getProjects(resources), startTag, endTag, true);
try {
new ModelMergeOperation(getPart(), mappings, s, page.isOnlyPreviewConflicts()).run();
} catch (InvocationTargetException e) {
@@ -97,7 +94,7 @@ public class MergeWizard extends Wizard {
}
MergeSynchronizeParticipant participant = MergeSynchronizeParticipant.getMatchingParticipant(resources, startTag, endTag);
if(participant == null) {
- CVSMergeSubscriber s = new CVSMergeSubscriber(resources, startTag, endTag);
+ CVSMergeSubscriber s = new CVSMergeSubscriber(resources, startTag, endTag, false);
participant = new MergeSynchronizeParticipant(s);
TeamUI.getSynchronizeManager().addSynchronizeParticipants(new ISynchronizeParticipant[] {participant});
}
@@ -112,7 +109,7 @@ public class MergeWizard extends Wizard {
// Only do the extra work if the model is a logical model (i.e. not IResource)
if (!WorkspaceTraversalAction.isLogicalModel(mappings))
return resources;
- CVSMergeSubscriber s = new CVSMergeSubscriber(WorkspaceTraversalAction.getProjects(resources), startTag, endTag);
+ CVSMergeSubscriber s = new CVSMergeSubscriber(WorkspaceTraversalAction.getProjects(resources), startTag, endTag, false);
IResource[] allResources = WorkspaceTraversalAction.getResourcesToCompare(mappings, s);
s.cancel();
return allResources;
diff --git a/eclipse/plugins/org.eclipse.team.ui/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.team.ui/META-INF/MANIFEST.MF
index d533263..eff5a91 100644
--- a/eclipse/plugins/org.eclipse.team.ui/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.team.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.team.ui; singleton:=true
-Bundle-Version: 3.5.101.qualifier
+Bundle-Version: 3.5.102.qualifier
Bundle-Activator: org.eclipse.team.internal.ui.TeamUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/eclipse/plugins/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/StatusLineContributionGroup.java b/eclipse/plugins/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/StatusLineContributionGroup.java
index c9a17ae..b2fa407 100644
--- a/eclipse/plugins/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/StatusLineContributionGroup.java
+++ b/eclipse/plugins/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/StatusLineContributionGroup.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 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,7 @@ import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.*;
import org.eclipse.team.core.synchronize.SyncInfo;
import org.eclipse.team.internal.ui.*;
-import org.eclipse.team.ui.synchronize.*;
+import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration;
import org.eclipse.ui.IActionBars;
import org.eclipse.ui.actions.ActionGroup;
@@ -78,9 +78,11 @@ public abstract class StatusLineContributionGroup extends ActionGroup {
protected void updateCounts() {
final int total = getChangeCount();
- final int workspaceConflicting = countFor(SyncInfo.CONFLICTING);
- final int workspaceOutgoing = countFor(SyncInfo.OUTGOING);
- final int workspaceIncoming = countFor(SyncInfo.INCOMING);
+ int supportedModes = configuration.getSupportedModes();
+ // count changes only if the given mode is supported
+ final int workspaceConflicting = ((supportedModes & ISynchronizePageConfiguration.CONFLICTING_MODE) != 0) ? countFor(SyncInfo.CONFLICTING) : 0;
+ final int workspaceOutgoing = ((supportedModes & ISynchronizePageConfiguration.OUTGOING_MODE) != 0) ? countFor(SyncInfo.OUTGOING) : 0;
+ final int workspaceIncoming = ((supportedModes & ISynchronizePageConfiguration.INCOMING_MODE) != 0) ? countFor(SyncInfo.INCOMING) : 0;
TeamUIPlugin.getStandardDisplay().asyncExec(new Runnable() {
public void run() {
@@ -89,9 +91,9 @@ public abstract class StatusLineContributionGroup extends ActionGroup {
incoming.setText(new Integer(workspaceIncoming).toString());
outgoing.setText(new Integer(workspaceOutgoing).toString());
- conflicting.setTooltip(NLS.bind(TeamUIMessages.StatisticsPanel_numbersTooltip, new String[] { TeamUIMessages.StatisticsPanel_conflicting })); //
- outgoing.setTooltip(NLS.bind(TeamUIMessages.StatisticsPanel_numbersTooltip, new String[] { TeamUIMessages.StatisticsPanel_outgoing })); //
- incoming.setTooltip(NLS.bind(TeamUIMessages.StatisticsPanel_numbersTooltip, new String[] { TeamUIMessages.StatisticsPanel_incoming })); //
+ conflicting.setTooltip(NLS.bind(TeamUIMessages.StatisticsPanel_numbersTooltip, new String[] { TeamUIMessages.StatisticsPanel_conflicting }));
+ outgoing.setTooltip(NLS.bind(TeamUIMessages.StatisticsPanel_numbersTooltip, new String[] { TeamUIMessages.StatisticsPanel_outgoing }));
+ incoming.setTooltip(NLS.bind(TeamUIMessages.StatisticsPanel_numbersTooltip, new String[] { TeamUIMessages.StatisticsPanel_incoming }));
} else {
if (total == 1) {
totalChanges.setText(NLS.bind(TeamUIMessages.StatisticsPanel_numberTotalSingular, new String[] { Integer.toString(total) }));
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 90cce12..657e037 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.3.0.qualifier
+Bundle-Version: 3.3.1.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 cb73929..b1f6b57 100644
--- a/eclipse/plugins/org.eclipse.ui.browser/plugin.xml
+++ b/eclipse/plugins/org.eclipse.ui.browser/plugin.xml
@@ -109,6 +109,9 @@
os="linux,aix,hpux,solaris"
executable="firefox"
factoryclass="org.eclipse.ui.internal.browser.browsers.MozillaFactory">
+ <location>
+ usr/bin/firefox
+ </location>
</browser>
<browser
id="org.eclipse.ui.browser.konqueror"
@@ -256,4 +259,4 @@
id="org.eclipse.ui.browser.elementFactory">
</factory>
</extension>
-</plugin>
\ No newline at end of file
+</plugin>
diff --git a/eclipse/plugins/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/WebBrowserPreferencePage.java b/eclipse/plugins/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/WebBrowserPreferencePage.java
index 6f07fea..75f9727 100644
--- a/eclipse/plugins/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/WebBrowserPreferencePage.java
+++ b/eclipse/plugins/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/WebBrowserPreferencePage.java
@@ -7,17 +7,20 @@
*
* Contributors:
* IBM Corporation - Initial API and implementation
+ * Martin Oberhuber (Wind River) - [293159] cyclic link when searching browser
*******************************************************************************/
package org.eclipse.ui.internal.browser;
import java.io.File;
+import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
+import java.util.Set;
import org.eclipse.core.runtime.IProgressMonitor;
-
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.ProgressMonitorDialog;
import org.eclipse.jface.operation.IRunnableWithProgress;
@@ -418,7 +421,7 @@ public class WebBrowserPreferencePage extends PreferencePage implements
public void run(IProgressMonitor monitor) {
monitor.beginTask(Messages.searchingTaskName,
IProgressMonitor.UNKNOWN);
- search(rootDir, existingPaths, foundBrowsers, monitor);
+ search(rootDir, existingPaths, foundBrowsers, new HashSet(), monitor);
monitor.done();
}
};
@@ -530,9 +533,19 @@ public class WebBrowserPreferencePage extends PreferencePage implements
}
protected static void search(File directory, List existingPaths,
- List foundBrowsers, IProgressMonitor monitor) {
+ List foundBrowsers, Set directoriesVisited, IProgressMonitor monitor) {
if (monitor.isCanceled())
return;
+ try {
+ //bug 293159: protect against recursion due to cyclic symbolic link
+ String canonicalPath = directory.getCanonicalPath();
+ if (!directoriesVisited.add(canonicalPath)) {
+ //already been here
+ return;
+ }
+ } catch(IOException ioe) {
+ /*ignore*/
+ }
monitor.subTask(NLS.bind(Messages.searching,
new String[] { Integer.toString(foundBrowsers.size()), directory.getAbsolutePath()}));
@@ -562,7 +575,7 @@ public class WebBrowserPreferencePage extends PreferencePage implements
}
while (!subDirs.isEmpty()) {
File subDir = (File) subDirs.remove(0);
- search(subDir, existingPaths, foundBrowsers, monitor);
+ search(subDir, existingPaths, foundBrowsers, directoriesVisited, monitor);
if (monitor.isCanceled()) {
return;
}
diff --git a/eclipse/plugins/org.eclipse.ui.carbon/src/org/eclipse/ui/internal/carbon/CloseDialogHandler.java b/eclipse/plugins/org.eclipse.ui.carbon/src/org/eclipse/ui/internal/carbon/CloseDialogHandler.java
index 46096a9..6adf911 100644
--- a/eclipse/plugins/org.eclipse.ui.carbon/src/org/eclipse/ui/internal/carbon/CloseDialogHandler.java
+++ b/eclipse/plugins/org.eclipse.ui.carbon/src/org/eclipse/ui/internal/carbon/CloseDialogHandler.java
@@ -19,20 +19,18 @@ import org.eclipse.swt.widgets.Shell;
/**
*
- * @author Prakash G.R. (grprakash at gmail.com)
* @since 3.6
*
*/
public class CloseDialogHandler extends AbstractHandler implements IHandler {
public Object execute(ExecutionEvent event) {
-
+
Shell activeShell = Display.getDefault().getActiveShell();
- // perform only if close is enabled
- if((activeShell.getStyle() & SWT.CLOSE) != 0) {
+ // perform only if shell is available & close is enabled
+ if (activeShell != null && (activeShell.getStyle() & SWT.CLOSE) != 0) {
activeShell.close();
}
-
return null;
}
diff --git a/eclipse/plugins/org.eclipse.ui.cocoa/src/org/eclipse/ui/internal/cocoa/CloseDialogHandler.java b/eclipse/plugins/org.eclipse.ui.cocoa/src/org/eclipse/ui/internal/cocoa/CloseDialogHandler.java
index 754c420..c206a6a 100644
--- a/eclipse/plugins/org.eclipse.ui.cocoa/src/org/eclipse/ui/internal/cocoa/CloseDialogHandler.java
+++ b/eclipse/plugins/org.eclipse.ui.cocoa/src/org/eclipse/ui/internal/cocoa/CloseDialogHandler.java
@@ -12,7 +12,6 @@ package org.eclipse.ui.internal.cocoa;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.commands.IHandler;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Display;
@@ -20,21 +19,19 @@ import org.eclipse.swt.widgets.Shell;
/**
*
- * @author Prakash G.R. (grprakash at gmail.com)
* @since 3.6
*
*/
public class CloseDialogHandler extends AbstractHandler implements IHandler {
- public Object execute(ExecutionEvent event) throws ExecutionException {
+ public Object execute(ExecutionEvent event) {
Shell activeShell = Display.getDefault().getActiveShell();
- // perform only if close is enabled
- if((activeShell.getStyle() & SWT.CLOSE) != 0) {
+ // perform only if shell is available & close is enabled
+ if (activeShell != null && (activeShell.getStyle() & SWT.CLOSE) != 0) {
activeShell.close();
}
- activeShell.close();
return null;
}
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 051b022..4ee49d0 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.6.1.qualifier
+Bundle-Version: 3.6.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/dialogs/WizardExportResourcesPage.java b/eclipse/plugins/org.eclipse.ui.ide/extensions/org/eclipse/ui/dialogs/WizardExportResourcesPage.java
index ed93697..2d56ef1 100644
--- a/eclipse/plugins/org.eclipse.ui.ide/extensions/org/eclipse/ui/dialogs/WizardExportResourcesPage.java
+++ b/eclipse/plugins/org.eclipse.ui.ide/extensions/org/eclipse/ui/dialogs/WizardExportResourcesPage.java
@@ -198,6 +198,7 @@ public abstract class WizardExportResourcesPage extends WizardDataTransferPage {
listener = new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
resourceGroup.setAllSelections(true);
+ updateWidgetEnablements();
}
};
selectButton.addSelectionListener(listener);
@@ -210,6 +211,7 @@ public abstract class WizardExportResourcesPage extends WizardDataTransferPage {
listener = new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
resourceGroup.setAllSelections(false);
+ updateWidgetEnablements();
}
};
deselectButton.addSelectionListener(listener);
diff --git a/eclipse/plugins/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/ContentTypeDecorator.java b/eclipse/plugins/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/ContentTypeDecorator.java
index 9c8fe2a..10b4aaf 100644
--- a/eclipse/plugins/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/ContentTypeDecorator.java
+++ b/eclipse/plugins/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/ContentTypeDecorator.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
@@ -14,6 +14,7 @@ import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.content.IContentDescription;
import org.eclipse.core.runtime.content.IContentType;
+import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.IDecoration;
import org.eclipse.jface.viewers.ILabelProviderListener;
@@ -42,10 +43,13 @@ public class ContentTypeDecorator implements ILightweightLabelDecorator {
ImageDescriptor image = null;
IContentDescription contentDescription = null;
try {
+ Job.getJobManager().beginRule(file, null);
contentDescription = file.getContentDescription();
} catch (CoreException e) {
// We already have some kind of icon for this file so it's OK to not
// find a better icon.
+ } finally {
+ Job.getJobManager().endRule(file);
}
if (contentDescription != null) {
IContentType contentType = contentDescription.getContentType();
diff --git a/eclipse/plugins/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/actions/BuildUtilities.java b/eclipse/plugins/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/actions/BuildUtilities.java
index d948eb9..122d7d3 100644
--- a/eclipse/plugins/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/actions/BuildUtilities.java
+++ b/eclipse/plugins/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/actions/BuildUtilities.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2006 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
@@ -75,15 +75,25 @@ public class BuildUtilities {
if (window == null) {
return new IProject[0];
}
- ISelection selection = window.getSelectionService().getSelection();
+
+ IWorkbenchPage activePage= window.getActivePage();
+ if (activePage == null) {
+ return new IProject[0];
+ }
+
+ IWorkbenchPart activePart= activePage.getActivePart();
+ if (activePart == null) {
+ return new IProject[0];
+ }
+
+ ISelection selection= window.getSelectionService().getSelection(activePart.getSite().getId());
IProject[] selected = null;
if (selection != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {
selected = extractProjects(((IStructuredSelection) selection).toArray());
} else {
//see if we can extract a selected project from the active editor
- IWorkbenchPart part = window.getPartService().getActivePart();
- if (part instanceof IEditorPart) {
- IEditorPart editor = (IEditorPart) part;
+ if (activePart instanceof IEditorPart) {
+ IEditorPart editor= (IEditorPart)activePart;
IFile file = ResourceUtil.getFile(editor.getEditorInput());
if (file != null) {
selected = new IProject[] {file.getProject()};
diff --git a/eclipse/plugins/org.eclipse.ui.ide/src/org/eclipse/ui/internal/wizards/datatransfer/WizardFileSystemResourceImportPage1.java b/eclipse/plugins/org.eclipse.ui.ide/src/org/eclipse/ui/internal/wizards/datatransfer/WizardFileSystemResourceImportPage1.java
index ba45e95..126cf8e 100644
--- a/eclipse/plugins/org.eclipse.ui.ide/src/org/eclipse/ui/internal/wizards/datatransfer/WizardFileSystemResourceImportPage1.java
+++ b/eclipse/plugins/org.eclipse.ui.ide/src/org/eclipse/ui/internal/wizards/datatransfer/WizardFileSystemResourceImportPage1.java
@@ -80,9 +80,7 @@ public class WizardFileSystemResourceImportPage1 extends WizardResourceImportPag
protected Button overwriteExistingResourcesCheckbox;
- protected Button createContainerStructureButton;
-
- protected Button createOnlySelectedButton;
+ protected Button createTopLevelFolderCheckbox;
protected Button createVirtualFoldersButton;
@@ -286,25 +284,12 @@ public class WizardFileSystemResourceImportPage1 extends WizardResourceImportPag
overwriteExistingResourcesCheckbox.setFont(optionsGroup.getFont());
overwriteExistingResourcesCheckbox.setText(DataTransferMessages.FileImport_overwriteExisting);
- // create containers radio
- createContainerStructureButton = new Button(optionsGroup, SWT.RADIO);
- createContainerStructureButton.setFont(optionsGroup.getFont());
- createContainerStructureButton.setText(DataTransferMessages.FileImport_createComplete);
- createContainerStructureButton.setSelection(false);
-
- createContainerStructureButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- updateWidgetEnablements();
- }
- });
-
- // create selection only radio
- createOnlySelectedButton = new Button(optionsGroup, SWT.RADIO);
- createOnlySelectedButton.setFont(optionsGroup.getFont());
- createOnlySelectedButton.setText(DataTransferMessages.FileImport_createSelectedFolders);
- createOnlySelectedButton.setSelection(true);
-
- createOnlySelectedButton.addSelectionListener(new SelectionAdapter() {
+ // create top-level folder check box
+ createTopLevelFolderCheckbox= new Button(optionsGroup, SWT.CHECK);
+ createTopLevelFolderCheckbox.setFont(optionsGroup.getFont());
+ createTopLevelFolderCheckbox.setText(DataTransferMessages.FileImport_createComplete);
+ createTopLevelFolderCheckbox.setSelection(false);
+ createTopLevelFolderCheckbox.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
updateWidgetEnablements();
}
@@ -831,17 +816,21 @@ public class WizardFileSystemResourceImportPage1 extends WizardResourceImportPag
ImportOperation operation;
boolean shouldImportTopLevelFoldersRecursively = selectionGroup.isEveryItemChecked() &&
- createOnlySelectedButton.getSelection() &&
+ !createTopLevelFolderCheckbox.getSelection() &&
(createLinksInWorkspaceButton != null && createLinksInWorkspaceButton.getSelection()) &&
(createVirtualFoldersButton != null && createVirtualFoldersButton.getSelection() == false);
+ File sourceDirectory = getSourceDirectory();
+ if (createTopLevelFolderCheckbox.getSelection() && sourceDirectory.getParentFile() != null)
+ sourceDirectory = sourceDirectory.getParentFile();
+
if (shouldImportTopLevelFoldersRecursively)
operation = new ImportOperation(getContainerFullPath(),
- getSourceDirectory(), fileSystemStructureProvider,
+ sourceDirectory, fileSystemStructureProvider,
this, Arrays.asList(new File[] {getSourceDirectory()}));
else
operation = new ImportOperation(getContainerFullPath(),
- getSourceDirectory(), fileSystemStructureProvider,
+ sourceDirectory, fileSystemStructureProvider,
this, fileSystemObjects);
operation.setContext(getShell());
@@ -868,8 +857,7 @@ public class WizardFileSystemResourceImportPage1 extends WizardResourceImportPag
* Initializes the specified operation appropriately.
*/
protected void initializeOperation(ImportOperation op) {
- op.setCreateContainerStructure(createContainerStructureButton
- .getSelection());
+ op.setCreateContainerStructure(false);
op.setOverwriteResources(overwriteExistingResourcesCheckbox
.getSelection());
if (createLinksInWorkspaceButton != null && createLinksInWorkspaceButton.getSelection()) {
@@ -950,8 +938,7 @@ public class WizardFileSystemResourceImportPage1 extends WizardResourceImportPag
boolean createStructure = settings
.getBoolean(STORE_CREATE_CONTAINER_STRUCTURE_ID);
- createContainerStructureButton.setSelection(createStructure);
- createOnlySelectedButton.setSelection(!createStructure);
+ createTopLevelFolderCheckbox.setSelection(createStructure);
if (createVirtualFoldersButton != null) {
boolean createVirtualFolders = settings
@@ -995,7 +982,7 @@ public class WizardFileSystemResourceImportPage1 extends WizardResourceImportPag
overwriteExistingResourcesCheckbox.getSelection());
settings.put(STORE_CREATE_CONTAINER_STRUCTURE_ID,
- createContainerStructureButton.getSelection());
+ createTopLevelFolderCheckbox.getSelection());
if (createVirtualFoldersButton != null) {
settings.put(STORE_CREATE_VIRTUAL_FOLDERS_ID,
@@ -1198,7 +1185,7 @@ public class WizardFileSystemResourceImportPage1 extends WizardResourceImportPag
createVirtualFoldersButton.setEnabled(createLinksInWorkspaceButton.getSelection());
if (!selectionGroup.isEveryItemChecked() ||
- (createOnlySelectedButton.getSelection() == false)) {
+ (createTopLevelFolderCheckbox.getSelection())) {
createVirtualFoldersButton.setSelection(true);
}
}
diff --git a/eclipse/plugins/org.eclipse.ui.navigator.resources/.settings/.api_filters b/eclipse/plugins/org.eclipse.ui.navigator.resources/.settings/.api_filters
index bcfb5f8..813ebc0 100644
--- a/eclipse/plugins/org.eclipse.ui.navigator.resources/.settings/.api_filters
+++ b/eclipse/plugins/org.eclipse.ui.navigator.resources/.settings/.api_filters
@@ -1,38 +1,33 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.ui.navigator.resources" version="2">
- <resource path="src/org/eclipse/ui/navigator/resources/ProjectExplorer.java" type="org.eclipse.ui.navigator.resources.ProjectExplorer">
- <filter id="642777099">
+ <resource path="src/org/eclipse/ui/internal/navigator/resources/actions/WorkingSetActionProvider.java" type="org.eclipse.ui.internal.navigator.resources.actions.WorkingSetActionProvider">
+ <filter id="640712815">
<message_arguments>
<message_argument value="CommonNavigator"/>
- <message_argument value="ProjectExplorer"/>
+ <message_argument value="WorkingSetActionProvider"/>
<message_argument value="setWorkingSetLabel(String)"/>
</message_arguments>
</filter>
- <filter id="642777099">
- <message_arguments>
- <message_argument value="CommonNavigator"/>
- <message_argument value="ProjectExplorer"/>
- <message_argument value="getWorkingSetLabel()"/>
- </message_arguments>
- </filter>
- <filter id="642777099">
+ <filter id="640712815">
<message_arguments>
- <message_argument value="CommonNavigator"/>
- <message_argument value="ProjectExplorer"/>
- <message_argument value="getRootMode()"/>
+ <message_argument value="CommonViewer"/>
+ <message_argument value="WorkingSetActionProvider"/>
+ <message_argument value="getFrameList()"/>
</message_arguments>
</filter>
- <filter id="642777099">
+ </resource>
+ <resource path="src/org/eclipse/ui/internal/navigator/resources/actions/WorkingSetActionProvider.java" type="org.eclipse.ui.internal.navigator.resources.actions.WorkingSetActionProvider$WorkingSetManagerListener">
+ <filter id="640712815">
<message_arguments>
<message_argument value="CommonNavigator"/>
- <message_argument value="ProjectExplorer"/>
- <message_argument value="setRootMode(int)"/>
+ <message_argument value="WorkingSetManagerListener"/>
+ <message_argument value="setWorkingSetLabel(String)"/>
</message_arguments>
</filter>
<filter id="640712815">
<message_arguments>
<message_argument value="CommonViewer"/>
- <message_argument value="ProjectExplorer"/>
+ <message_argument value="WorkingSetManagerListener"/>
<message_argument value="getFrameList()"/>
</message_arguments>
</filter>
@@ -61,36 +56,49 @@
</message_arguments>
</filter>
</resource>
- <resource path="src/org/eclipse/ui/internal/navigator/resources/actions/WorkingSetActionProvider.java" type="org.eclipse.ui.internal.navigator.resources.actions.WorkingSetActionProvider$WorkingSetManagerListener">
+ <resource path="src/org/eclipse/ui/navigator/resources/GoIntoActionProvider.java" type="org.eclipse.ui.navigator.resources.GoIntoActionProvider">
<filter id="640712815">
<message_arguments>
<message_argument value="CommonViewer"/>
- <message_argument value="WorkingSetManagerListener"/>
+ <message_argument value="GoIntoActionProvider"/>
<message_argument value="getFrameList()"/>
</message_arguments>
</filter>
+ </resource>
+ <resource path="src/org/eclipse/ui/navigator/resources/ProjectExplorer.java" type="org.eclipse.ui.navigator.resources.ProjectExplorer">
<filter id="640712815">
<message_arguments>
+ <message_argument value="CommonViewer"/>
+ <message_argument value="ProjectExplorer"/>
+ <message_argument value="getFrameList()"/>
+ </message_arguments>
+ </filter>
+ <filter id="642777099">
+ <message_arguments>
<message_argument value="CommonNavigator"/>
- <message_argument value="WorkingSetManagerListener"/>
- <message_argument value="setWorkingSetLabel(String)"/>
+ <message_argument value="ProjectExplorer"/>
+ <message_argument value="getRootMode()"/>
</message_arguments>
</filter>
- </resource>
- <resource path="src/org/eclipse/ui/internal/navigator/resources/actions/TextActionHandler.java" type="org.eclipse.ui.internal.navigator.resources.actions.TextActionHandler">
- <filter id="571473929">
+ <filter id="642777099">
+ <message_arguments>
+ <message_argument value="CommonNavigator"/>
+ <message_argument value="ProjectExplorer"/>
+ <message_argument value="getWorkingSetLabel()"/>
+ </message_arguments>
+ </filter>
+ <filter id="642777099">
<message_arguments>
- <message_argument value="TextActionHandler"/>
- <message_argument value="TextActionHandler"/>
+ <message_argument value="CommonNavigator"/>
+ <message_argument value="ProjectExplorer"/>
+ <message_argument value="setRootMode(int)"/>
</message_arguments>
</filter>
- </resource>
- <resource path="src/org/eclipse/ui/navigator/resources/GoIntoActionProvider.java" type="org.eclipse.ui.navigator.resources.GoIntoActionProvider">
- <filter id="640712815">
+ <filter id="642777099">
<message_arguments>
- <message_argument value="CommonViewer"/>
- <message_argument value="GoIntoActionProvider"/>
- <message_argument value="getFrameList()"/>
+ <message_argument value="CommonNavigator"/>
+ <message_argument value="ProjectExplorer"/>
+ <message_argument value="setWorkingSetLabel(String)"/>
</message_arguments>
</filter>
</resource>
diff --git a/eclipse/plugins/org.eclipse.ui.navigator.resources/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.ui.navigator.resources/META-INF/MANIFEST.MF
index 06ff1e3..d6ba6e7 100644
--- a/eclipse/plugins/org.eclipse.ui.navigator.resources/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.ui.navigator.resources/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.resources; singleton:=true
-Bundle-Version: 3.4.201.qualifier
+Bundle-Version: 3.4.202.qualifier
Bundle-Activator: org.eclipse.ui.internal.navigator.resources.plugin.WorkbenchNavigatorPlugin
Bundle-Vendor: %Plugin.providerName
Bundle-Localization: plugin
diff --git a/eclipse/plugins/org.eclipse.ui.views/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.ui.views/META-INF/MANIFEST.MF
index f1d3b4a..00ebf9c 100644
--- a/eclipse/plugins/org.eclipse.ui.views/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.ui.views/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.ui.views; singleton:=true
-Bundle-Version: 3.5.0.qualifier
+Bundle-Version: 3.5.1.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.ui.internal.views.ViewsPlugin
Bundle-ActivationPolicy: lazy
diff --git a/eclipse/plugins/org.eclipse.ui.views/src/org/eclipse/ui/views/properties/PropertySheet.java b/eclipse/plugins/org.eclipse.ui.views/src/org/eclipse/ui/views/properties/PropertySheet.java
index 306709d..bf5a83b 100644
--- a/eclipse/plugins/org.eclipse.ui.views/src/org/eclipse/ui/views/properties/PropertySheet.java
+++ b/eclipse/plugins/org.eclipse.ui.views/src/org/eclipse/ui/views/properties/PropertySheet.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 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
@@ -185,7 +185,7 @@ public class PropertySheet extends PageBookView implements ISelectionListener, I
super.dispose();
// remove ourselves as a selection and registry listener
- getSite().getPage().removeSelectionListener(this);
+ getSite().getPage().removePostSelectionListener(this);
RegistryFactory.getRegistry().removeListener(this);
currentPart = null;
@@ -244,7 +244,7 @@ public class PropertySheet extends PageBookView implements ISelectionListener, I
* Method declared on IViewPart.
*/
public void init(IViewSite site) throws PartInitException {
- site.getPage().addSelectionListener(this);
+ site.getPage().addPostSelectionListener(this);
super.init(site);
}
diff --git a/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ProductProperties.java b/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ProductProperties.java
index f728401..c326e10 100644
--- a/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ProductProperties.java
+++ b/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ProductProperties.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
+ * Copyright (c) 2004, 2011 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,7 @@
*******************************************************************************/
package org.eclipse.ui.internal;
+import com.ibm.icu.text.MessageFormat;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
@@ -17,7 +18,6 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.MissingResourceException;
import java.util.PropertyResourceBundle;
-
import org.eclipse.core.runtime.IProduct;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
@@ -25,8 +25,6 @@ import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.ui.branding.IProductConstants;
import org.osgi.framework.Bundle;
-import com.ibm.icu.text.MessageFormat;
-
/**
* A class that converts the strings returned by
* <code>org.eclipse.core.runtime.IProduct.getProperty</code> to the
@@ -264,12 +262,19 @@ public class ProductProperties extends BrandingProperties implements
if (property.indexOf('{') == -1) {
return property;
}
- String[] tempMappings = getMappings(product.getDefiningBundle());
- /*
- * Check if the mapping value is a system property, specified
- * by '$' at the beginning and end of the string. If so, update
- * the mappings array with the system property value.
- */
+
+ /*
+ * Check if the mapping value is a system property, specified by '$' at
+ * the beginning and end of the string. If so, update the temp mappings
+ * array with the system property value. Note that we use a clone (copy)
+ * of the mappings so that the cached system property value is not
+ * stored in the per-bundle mappings for this class. This allows changes
+ * in system property values to be reflected each time this method is
+ * called. See https://bugs.eclipse.org/bugs/show_bug.cgi?id=302184
+ */
+
+ String[] tempMappings = (String[]) getMappings(product.getDefiningBundle()).clone();
+
for (int i=0; i<tempMappings.length; i++) {
String nextString = tempMappings[i];
int length = nextString.length();
diff --git a/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WWinPartService.java b/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WWinPartService.java
index fd9121a..98a495f 100644
--- a/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WWinPartService.java
+++ b/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WWinPartService.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
@@ -131,8 +131,8 @@ public class WWinPartService implements IPartService {
activeRef = activePage.getActivePartReference();
}
- selectionService.setActivePart(activePart);
- partService.setActivePart(activeRef);
+ partService.setActivePart(activeRef);
+ selectionService.setActivePart(activePart);
}
/*
diff --git a/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/Workbench.java b/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/Workbench.java
index 9d0ea76..d81199e 100644
--- a/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/Workbench.java
+++ b/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/Workbench.java
@@ -3237,8 +3237,9 @@ public final class Workbench extends EventManager implements IWorkbench {
private void updateActiveWorkbenchWindowMenuManager(boolean textOnly) {
if (activeWorkbenchWindow != null) {
- activeWorkbenchWindow
- .removeActionSetsListener(actionSetSourceProvider);
+ if (actionSetSourceProvider != null) {
+ activeWorkbenchWindow.removeActionSetsListener(actionSetSourceProvider);
+ }
activeWorkbenchWindow = null;
}
boolean actionSetsUpdated = false;
@@ -3255,17 +3256,14 @@ public final class Workbench extends EventManager implements IWorkbench {
final Shell windowShell = activeWorkbenchWindow.getShell();
final Shell activeShell = getDisplay().getActiveShell();
final IContextService service = (IContextService) getService(IContextService.class);
- if (Util.equals(windowShell, activeShell)
- || service.getShellType(activeShell) == IContextService.TYPE_WINDOW) {
- activeWorkbenchWindow
- .addActionSetsListener(actionSetSourceProvider);
- final WorkbenchPage page = activeWorkbenchWindow
- .getActiveWorkbenchPage();
+ if ((Util.equals(windowShell, activeShell) || service.getShellType(activeShell) == IContextService.TYPE_WINDOW)
+ && actionSetSourceProvider != null) {
+ activeWorkbenchWindow.addActionSetsListener(actionSetSourceProvider);
+ final WorkbenchPage page = activeWorkbenchWindow.getActiveWorkbenchPage();
final IActionSetDescriptor[] newActionSets;
if (page != null) {
newActionSets = page.getActionSets();
- final ActionSetsEvent event = new ActionSetsEvent(
- newActionSets);
+ final ActionSetsEvent event = new ActionSetsEvent(newActionSets);
actionSetSourceProvider.actionSetsChanged(event);
actionSetsUpdated = true;
}
@@ -3281,7 +3279,7 @@ public final class Workbench extends EventManager implements IWorkbench {
}
}
- if (!actionSetsUpdated) {
+ if (!actionSetsUpdated && actionSetSourceProvider != null) {
final ActionSetsEvent event = new ActionSetsEvent(null);
actionSetSourceProvider.actionSetsChanged(event);
}
diff --git a/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchMessages.java b/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchMessages.java
index 076b00b..1c3e947 100644
--- a/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchMessages.java
+++ b/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchMessages.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2010 IBM Corporation and others.
+ * Copyright (c) 2005, 2011 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
diff --git a/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java b/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java
index d2dfaa1..115bbde 100644
--- a/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java
+++ b/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java
@@ -811,6 +811,12 @@ public class WorkbenchWindow extends ApplicationWindow implements
if (!super.canHandleShellCloseEvent()) {
return false;
}
+
+ // Ensure that any pending 'Close' event are flushed
+ // before opening any dialogs
+ while (Display.getCurrent().readAndDispatch())
+ ;
+
// let the advisor or other interested parties
// veto the user's explicit request to close the window
return fireWindowShellClosing();
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 bfe2f3c..6886913 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, 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
@@ -167,7 +167,6 @@ public class WorkingSetManager extends AbstractWorkingSetManager implements
message, exp);
StatusAdapter sa = new StatusAdapter(status);
sa.setProperty(IStatusAdapterConstants.TITLE_PROPERTY, title);
- StatusManager.getManager().handle(sa,
- StatusManager.SHOW | StatusManager.LOG);
+ StatusManager.getManager().handle(sa, StatusManager.LOG);
}
}
diff --git a/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/FilteredPreferenceDialog.java b/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/FilteredPreferenceDialog.java
index 123d300..4139071 100644
--- a/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/FilteredPreferenceDialog.java
+++ b/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/FilteredPreferenceDialog.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2010 IBM Corporation and others.
+ * Copyright (c) 2003, 2011 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
@@ -573,6 +573,7 @@ public abstract class FilteredPreferenceDialog extends PreferenceDialog
menu.setVisible(true);
}
};
+ popupMenuAction.setToolTipText(WorkbenchMessages.FilteredItemsSelectionDialog_menu);
historyManager.add(popupMenuAction);
IHandlerService service = (IHandlerService) PlatformUI.getWorkbench()
.getService(IHandlerService.class);
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 dd71efc..f582148 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
@@ -523,7 +523,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/messages.properties b/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/messages.properties
index 997fe6c..be5099f 100644
--- a/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/messages.properties
+++ b/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/messages.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2000, 2010 IBM Corporation and others.
+# Copyright (c) 2000, 2011 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
diff --git a/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/UIExtensionTracker.java b/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/UIExtensionTracker.java
index 5154f71..6bf7569 100644
--- a/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/UIExtensionTracker.java
+++ b/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/UIExtensionTracker.java
@@ -39,7 +39,10 @@ public class UIExtensionTracker extends ExtensionTracker {
}
protected void applyRemove(final IExtensionChangeHandler handler, final IExtension removedExtension, final Object[] objects) {
- display.syncExec(new Runnable() {
+ if (display.isDisposed())
+ return;
+
+ display.syncExec(new Runnable() {
public void run() {
try {
@@ -52,6 +55,9 @@ public class UIExtensionTracker extends ExtensionTracker {
}
protected void applyAdd(final IExtensionChangeHandler handler, final IExtension addedExtension) {
+ if (display.isDisposed())
+ return;
+
display.syncExec(new Runnable() {
public void run() {
try {
diff --git a/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/PageBookView.java b/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/PageBookView.java
index 2c83875..562ab56 100644
--- a/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/PageBookView.java
+++ b/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/PageBookView.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 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
@@ -962,6 +962,8 @@ public abstract class PageBookView extends ViewPart implements IPartListener {
if (provider instanceof IPostSelectionProvider) {
((IPostSelectionProvider) provider)
.removePostSelectionChangedListener(postSelectionListener);
+ } else {
+ provider.removeSelectionChangedListener(postSelectionListener);
}
}
}
@@ -988,6 +990,8 @@ public abstract class PageBookView extends ViewPart implements IPartListener {
if (provider instanceof IPostSelectionProvider) {
((IPostSelectionProvider) provider)
.addPostSelectionChangedListener(postSelectionListener);
+ } else {
+ provider.addSelectionChangedListener(postSelectionListener);
}
}
// Update action bars.
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 50db1fe..24576cf 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.6.1.qualifier
+Bundle-Version: 3.6.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 e4491ca..06e4e68 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.6.1.qualifier
+Bundle-Version: 3.6.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 c434128..2947b5f 100644
--- a/eclipse/plugins/org.eclipse.ui/buildnotes_workbench.html
+++ b/eclipse/plugins/org.eclipse.ui/buildnotes_workbench.html
@@ -12,6 +12,60 @@
<h1>Eclipse Platform Build Notes (3.5)<br>
JFace and Workbench</h1>
+<p>Integration Build (February 03, 2011, 10:58 a.m.)</p>
+ <p>Problem reports updated</p>
+ <p>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=336110">Bug 336110</a>. Plug-in version of org.eclipse.jface needs to be 3.6.2 (FIXED)<br>
+ </p>
+
+<p>Integration Build (February 01, 2011, 7:49 a.m.)</p>
+ <p>Problem reports updated</p>
+ <p>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=162079">Bug 162079</a>. [PropertiesView] Properties view should be a post selection listener (FIXED)<br>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=332041">Bug 332041</a>. Backport bug 162079: [PropertiesView] Properties view should be a post selection listener (FIXED)<br>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=333898">Bug 333898</a>. [Preferences] [accessibility] Preferences Dialog menu button needs a tooltip (FIXED)<br>
+ </p>
+
+<p>Integration Build (January 11, 2011, 3:26 p.m.)</p>
+ <p>Problem reports updated</p>
+ <p>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=162079">Bug 162079</a>. [PropertiesView] Properties view should be a post selection listener (FIXED)<br>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=302184">Bug 302184</a>. [About] About dialog text - needs to not cache system property values (FIXED)<br>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=319337">Bug 319337</a>. [Win32] WindowXP command "Close Group" can not close all the Eclipse window that in one group (FIXED)<br>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=332041">Bug 332041</a>. Backport bug 162079: [PropertiesView] Properties view should be a post selection listener (FIXED)<br>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=333898">Bug 333898</a>. [Preferences] [accessibility] Preferences Dialog menu button needs a tooltip (FIXED)<br>
+ </p>
+
+<p>Integration Build (November 30, 2010, 3:27 p.m.)</p>
+ <p>Problem reports updated</p>
+ <p>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=111525">Bug 111525</a>. [Import/Export] Import file system doesn't include the top folder you select (FIXED)<br>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=309746">Bug 309746</a>. [CommonNavigator] intermittent test failure in org.eclipse.ui.tests.navigator.SorterTest.testSorterContentOverride (REOPENED)<br>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=331303">Bug 331303</a>. [backport] Regression: Convert line delimiter action enablement is broken (FIXED)<br>
+ </p>
+
+<p>Integration Build (November 23, 2010, 3:12 p.m.)</p>
+ <p>Problem reports updated</p>
+ <p>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=327138">Bug 327138</a>. [Import/Export] WizardExportResourcesPage's Finish button isn't sensitive to Select/Deselect All (FIXED)<br>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=329129">Bug 329129</a>. [Mac] Unhandled event loop exception when closing Error Log Event Details (FIXED)<br>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=330549">Bug 330549</a>. [Wizards] cancelable parameter does not disable Wizard progress bar cancel button (FIXED)<br>
+ </p>
+
+<p>Integration Build (November 16, 2010, 4:26 p.m.)</p>
+ <p>Problem reports updated</p>
+ <p>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=329333">Bug 329333</a>. [Backport] Concurrent access to file while decorating (FIXED)<br>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=329838">Bug 329838</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=330285">Bug 330285</a>. [Commands] Stackoverflow in BindingSystem (FIXED)<br>
+ </p>
+
+<p>Integration Build (November 02, 2010, 3:48 p.m.)</p>
+ <p>Problem reports updated</p>
+ <p>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=321155">Bug 321155</a>. [DynamicGUI] UIExtensionTracker calling Display.syncExec() on disposed Display (FIXED)<br>
+ </p>
+
<p>Integration Build (August 26, 2010, 1:46 p.m.)</p>
<p>Problem reports updated</p>
<p>
diff --git a/eclipse/sourceReferences.properties b/eclipse/sourceReferences.properties
index 22ef6b0..ab03411 100644
--- a/eclipse/sourceReferences.properties
+++ b/eclipse/sourceReferences.properties
@@ -1,23 +1,24 @@
-#Fri Oct 01 11:18:00 EDT 2010
+#Tue Mar 08 14:12:31 EST 2011
org.eclipse.help.appserver,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.help.appserver;tag\=v20100427
org.eclipse.ui.forms,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.ui.forms;tag\=r36_v20100702
-org.eclipse.swt.gtk.linux.s390x,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt.gtk.linux.s390x;tag\=v3655c
-org.eclipse.jdt.debug.ui,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.jdt.debug.ui;tag\=v20100602-0830
+org.eclipse.swt.gtk.linux.s390x,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt.gtk.linux.s390x;tag\=v3659b
+org.eclipse.jdt.debug.ui,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.jdt.debug.ui;tag\=v20100928a_r362
org.eclipse.jdt.launching.macosx,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.jdt.launching.macosx;tag\=v20100505
org.eclipse.equinox.jmx.server.xmlrpc,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.server.xmlrpc;tag\=v20100503
-org.eclipse.equinox.launcher.motif.solaris.sparc,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.solaris.sparc;tag\=R36x_v20100810
+org.eclipse.equinox.launcher.motif.solaris.sparc,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.solaris.sparc;tag\=R36x_v20101019_1345
+org.eclipse.equinox.launcher.gtk.aix.ppc64,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.aix.ppc64;tag\=R36x_v20101102
org.eclipse.core.boot,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.core.boot;tag\=v20100505
org.eclipse.ui.net,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.ui.net;tag\=I20100505-1245
-org.eclipse.equinox.launcher.gtk.solaris.x86,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.solaris.x86;tag\=R36x_v20100810
+org.eclipse.equinox.launcher.gtk.solaris.x86,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.solaris.x86;tag\=R36x_v20101019_1345
org.eclipse.jdt.apt.pluggable.core,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.jdt.apt.pluggable.core;tag\=R36_v20100727-0110
-org.eclipse.swt.examples.paint,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt.examples.paint;tag\=v3655c
+org.eclipse.swt.examples.paint,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt.examples.paint;tag\=v3659b
org.eclipse.core.net.win32.x86,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86;tag\=I20100511-0800
org.eclipse.core.filesystem.macosx,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.core.filesystem.macosx;tag\=v20100505
-org.eclipse.equinox.launcher.motif.linux.x86,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.linux.x86;tag\=R36x_v20100810
-org.eclipse.ui.navigator.resources,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.ui.navigator.resources;tag\=M20100707-0800
+org.eclipse.equinox.launcher.motif.linux.x86,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.linux.x86;tag\=R36x_v20101019_1345
+org.eclipse.ui.navigator.resources,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.ui.navigator.resources;tag\=M20101124-0800
org.eclipse.equinox.p2.metadata.repository,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata.repository;tag\=v20100513
-org.eclipse.swt,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt;tag\=v3655c
-org.eclipse.swt.win32.win32.x86,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt.win32.win32.x86;tag\=v3655c
+org.eclipse.swt,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt;tag\=v3659c
+org.eclipse.swt.win32.win32.x86,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt.win32.win32.x86;tag\=v3659c
org.eclipse.update.ui,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.update.ui;tag\=v20100512
org.eclipse.core.filesystem,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.core.filesystem;tag\=R36x_v20100727-0745
org.eclipse.core.externaltools,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.core.externaltools;tag\=v20100831_r361
@@ -28,43 +29,43 @@ org.eclipse.pde.api.tools.ui,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/
org.eclipse.jdt.debug,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.jdt.debug;tag\=v20100715_r361
org.eclipse.sdk.examples,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.sdk.examples;tag\=v20100527
org.eclipse.pde,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:pde/ui/org.eclipse.pde;tag\=v20100625_r361
-org.eclipse.compare.core,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.compare/plugins/org.eclipse.compare.core;tag\=I20100526-0800
-org.eclipse.equinox.p2.engine,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.engine;tag\=v20100606
-org.eclipse.equinox.launcher.motif.hpux.ia64_32,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.hpux.ia64_32;tag\=R36x_v20100810
+org.eclipse.compare.core,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.compare/plugins/org.eclipse.compare.core;tag\=R36x_v20100929-0800
+org.eclipse.equinox.p2.engine,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.engine;tag\=R36x_v20110201
+org.eclipse.equinox.launcher.motif.hpux.ia64_32,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.hpux.ia64_32;tag\=R36x_v20101019_1345
org.eclipse.equinox.http,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.http;tag\=v20100503
-org.eclipse.swt.gtk.linux.x86_64,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt.gtk.linux.x86_64;tag\=v3655c
-org.eclipse.swt.photon.qnx.x86,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt.photon.qnx.x86;tag\=v3655c
+org.eclipse.swt.gtk.linux.x86_64,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt.gtk.linux.x86_64;tag\=v3659b
+org.eclipse.swt.photon.qnx.x86,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt.photon.qnx.x86;tag\=v3659b
org.eclipse.equinox.p2.ui.admin,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui.admin;tag\=v20100503
org.eclipse.equinox.weaving.caching.j9,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/weaving/bundles/org.eclipse.equinox.weaving.caching.j9;tag\=v20100503
org.eclipse.equinox.transforms.xslt,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/components/bundles/org.eclipse.equinox.transforms.xslt;tag\=v20100503
org.eclipse.jface.databinding,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.jface.databinding;tag\=I20100601-0800
-org.eclipse.equinox.p2.touchpoint.eclipse,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.touchpoint.eclipse;tag\=R36x_v20100823
-org.eclipse.help.base,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.help.base;tag\=r36_r20100816
+org.eclipse.equinox.p2.touchpoint.eclipse,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.touchpoint.eclipse;tag\=R36x_v20101202
+org.eclipse.help.base,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.help.base;tag\=r36_20101123
org.eclipse.ui.presentations.r21,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.ui.presentations.r21;tag\=I20100517-1500
org.eclipse.equinox.frameworkadmin,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/p2/bundles/org.eclipse.equinox.frameworkadmin;tag\=v20100503
org.eclipse.pde.launching,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:pde/ui/org.eclipse.pde.launching;tag\=v20100601
org.eclipse.ui.intro,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.ui.intro;tag\=v20100427
org.eclipse.ltk.ui.refactoring,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.ltk.ui.refactoring;tag\=v20100526-0800
-org.eclipse.swt.examples.ole.win32,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt.examples.ole.win32;tag\=v3655c
+org.eclipse.swt.examples.ole.win32,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt.examples.ole.win32;tag\=v3659b
org.eclipse.ui.workbench.texteditor,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.ui.workbench.texteditor;tag\=r361_v20100714-0800
org.eclipse.ui.examples.multipageeditor,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.ui.examples.multipageeditor;tag\=I20100509-0800
org.eclipse.core.filesystem.linux.x86,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.core.filesystem.linux.x86;tag\=v20100505-1235
org.eclipse.equinox.p2.ui.discovery,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui.discovery;tag\=v20100519
org.eclipse.ui.examples.javaeditor,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.ui.examples.javaeditor;tag\=v20100520-0800
-org.eclipse.ant.core,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.ant.core;tag\=v20100427
+org.eclipse.ant.core,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.ant.core;tag\=v20110203_r362
org.eclipse.equinox.p2.ui.admin.rcp,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui.admin.rcp;tag\=R36x_v20100823
org.eclipse.equinox.p2.updatechecker,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.updatechecker;tag\=R36x_v20100823
org.eclipse.debug.core,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.debug.core;tag\=v20100519
org.eclipse.ui.examples.views.properties.tabbed.article,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.article;tag\=I20100517-1500
org.eclipse.core.databinding,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.core.databinding;tag\=I20100601-0800
org.eclipse.equinox.transforms.hook,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/components/bundles/org.eclipse.equinox.transforms.hook;tag\=v20100503
-org.eclipse.ui.carbon,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.ui.carbon;tag\=M20100825-0800
+org.eclipse.ui.carbon,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.ui.carbon;tag\=M20101124-0800
org.eclipse.core.contenttype,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.core.contenttype;tag\=v20100505-1235
org.eclipse.text,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.text;tag\=v20100601-1300
-org.eclipse.help.ui,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.help.ui;tag\=r36_v20100702
+org.eclipse.help.ui,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.help.ui;tag\=r36_20101116
org.eclipse.equinox.servletbridge,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/server-side/bundles/org.eclipse.equinox.servletbridge;tag\=v20100503
-org.eclipse.jdt.apt.core,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.jdt.apt.core;tag\=R36_v20100727-0110
-org.eclipse.swt.win32.win32.x86_64,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt.win32.win32.x86_64;tag\=v3655c
+org.eclipse.jdt.apt.core,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.jdt.apt.core;tag\=R36_v20110120-1000
+org.eclipse.swt.win32.win32.x86_64,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt.win32.win32.x86_64;tag\=v3659c
org.eclipse.equinox.metatype,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.metatype;tag\=v20100503
org.eclipse.pde.ua.ui,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:pde/ua/org.eclipse.pde.ua.ui;tag\=v20100504
org.eclipse.equinox.initializer,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/incubator/framework/bundles/org.eclipse.equinox.initializer;tag\=v20100503
@@ -72,134 +73,134 @@ org.eclipse.jsch.core,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse
org.eclipse.equinox.frameworkadmin.equinox,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/p2/bundles/org.eclipse.equinox.frameworkadmin.equinox;tag\=v20100505
org.eclipse.osgi.util,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/compendium/bundles/org.eclipse.osgi.util;tag\=v20100503
org.eclipse.search,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.search;tag\=v20100520-0800
-org.eclipse.ui.views,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.ui.views;tag\=I20100527-0800
+org.eclipse.ui.views,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.ui.views;tag\=M20110202-0800
org.eclipse.equinox.simpleconfigurator,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/p2/bundles/org.eclipse.equinox.simpleconfigurator;tag\=v20100503
-org.eclipse.team.ui,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.team.ui;tag\=R36x_v20100825-0800
-org.eclipse.equinox.p2.metadata,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata;tag\=v20100601
-org.eclipse.swt.cocoa.macosx.x86_64,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt.cocoa.macosx.x86_64;tag\=v3655c
-org.eclipse.swt.gtk.linux.ppc64,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt.gtk.linux.ppc64;tag\=v3655c
-org.eclipse.jdt.compiler.tool,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.jdt.compiler.tool;tag\=v_A68_R36x
-org.eclipse.platform,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.platform;tag\=r361_v20100714-0800
+org.eclipse.team.ui,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.team.ui;tag\=R36x_v20110203-1036
+org.eclipse.equinox.p2.metadata,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata;tag\=R36x_v20101202
+org.eclipse.swt.cocoa.macosx.x86_64,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt.cocoa.macosx.x86_64;tag\=v3659b
+org.eclipse.swt.gtk.linux.ppc64,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt.gtk.linux.ppc64;tag\=v3659b
+org.eclipse.jdt.compiler.tool,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.jdt.compiler.tool;tag\=v_A76_R36x
+org.eclipse.platform,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.platform;tag\=r362_v20110120
org.eclipse.core.databinding.observable,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.core.databinding.observable;tag\=I20100601-0800
org.eclipse.equinox.weaving.aspectj,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/weaving/bundles/org.eclipse.equinox.weaving.aspectj;tag\=v20100503
org.eclipse.team.examples.filesystem,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.team.examples.filesystem;tag\=I20100526-0800
-org.eclipse.pde.core,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:pde/ui/org.eclipse.pde.core;tag\=v20100902_r361
-org.eclipse.ui.workbench,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.ui.workbench;tag\=M20100826-1330
+org.eclipse.pde.core,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:pde/ui/org.eclipse.pde.core;tag\=v20110210_r362
+org.eclipse.ui.workbench,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.ui.workbench;tag\=M20110210-1200
org.eclipse.core.runtime,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.core.runtime;tag\=v20100505
org.eclipse.core.resources.win32.x86,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.core.resources.win32.x86;tag\=v20100505-1345
-org.eclipse.equinox.launcher.gtk.linux.x86_64,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.x86_64;tag\=R36x_v20100810
+org.eclipse.equinox.launcher.gtk.linux.x86_64,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.x86_64;tag\=R36x_v20101019_1345
org.eclipse.help,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.help;tag\=v20100524
org.eclipse.pde.api.tools.ee.j2se15,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:pde/apitools/org.eclipse.pde.api.tools.ee.j2se15;tag\=v20100506-0900
org.junit4,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.junit4;tag\=v20100525
org.eclipse.update.scheduler,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.update.scheduler;tag\=v20100512
-org.eclipse.equinox.launcher.gtk.linux.s390,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.linux.s390;tag\=R36x_v20100823
+org.eclipse.equinox.launcher.gtk.linux.s390,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.linux.s390;tag\=R36x_v20110125
org.eclipse.pde.junit.runtime,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:pde/ui/org.eclipse.pde.junit.runtime;tag\=v20100601
org.eclipse.osgi.services,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/compendium/bundles/org.eclipse.osgi.services;tag\=v20100503
-org.eclipse.swt.examples.layouts,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt.examples.layouts;tag\=v3655c
-org.eclipse.jface,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.jface;tag\=M20100825-0800
+org.eclipse.swt.examples.layouts,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt.examples.layouts;tag\=v3659b
+org.eclipse.jface,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.jface;tag\=M20110210-1200
org.eclipse.equinox.p2.discovery,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.discovery;tag\=v20100503
org.eclipse.pde.api.tools.ee.osgiminimum10,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:pde/apitools/org.eclipse.pde.api.tools.ee.osgiminimum10;tag\=v20100506-0900
org.eclipse.equinox.jmx.server,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.server;tag\=v20100503
org.eclipse.equinox.jmx.server.rmi,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.server.rmi;tag\=v20100503
-org.eclipse.jdt.ui,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.jdt.ui;tag\=r361_v20100825-0800
+org.eclipse.jdt.ui,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.jdt.ui;tag\=r362_v20110203
org.eclipse.equinox.security,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/security/bundles/org.eclipse.equinox.security;tag\=v20100503
-org.eclipse.equinox.launcher,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher;tag\=v20100507
+org.eclipse.equinox.launcher,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher;tag\=R36x_v20101122_1400
org.eclipse.core.runtime.compatibility.registry,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.core.runtime.compatibility.registry;tag\=v20100520
org.eclipse.jdt.junit.core,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.jdt.junit.core;tag\=r361_v20100825-0800
org.eclipse.equinox.http.jetty,2.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.http.jetty6;project\="org.eclipse.equinox.http.jetty";tag\=v20100503
-org.eclipse.jdt.launching,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.jdt.launching;tag\=v20100526
+org.eclipse.jdt.launching,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.jdt.launching;tag\=v20110105_r362
org.eclipse.equinox.p2.ql,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ql;tag\=v20100503a
org.eclipse.ui.console,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.ui.console;tag\=v20100526
org.eclipse.equinox.weaving.caching,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/weaving/bundles/org.eclipse.equinox.weaving.caching;tag\=v20100503
-org.eclipse.swt.gtk.linux.s390,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt.gtk.linux.s390;tag\=v3655c
+org.eclipse.swt.gtk.linux.s390,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt.gtk.linux.s390;tag\=v3659b
org.eclipse.jdt.apt.ui,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.jdt.apt.ui;tag\=v20100513-0845
-org.eclipse.equinox.p2.discovery.compatibility,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.discovery.compatibility;tag\=v20100518
+org.eclipse.equinox.p2.discovery.compatibility,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.discovery.compatibility;tag\=v20110204-1323
org.eclipse.ui.examples.fieldassist,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.ui.examples.fieldassist;tag\=I20100601-0800
org.eclipse.ui.ide.application,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.ui.ide.application;tag\=M20100707-0800
-org.eclipse.equinox.launcher.gtk.linux.ppc,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.ppc;tag\=R36x_v20100810
-org.eclipse.equinox.launcher.carbon.macosx,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.carbon.macosx;tag\=R36x_v20100810
+org.eclipse.equinox.launcher.gtk.linux.ppc,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.ppc;tag\=R36x_v20101019_1345
+org.eclipse.equinox.launcher.carbon.macosx,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.carbon.macosx;tag\=R36x_v20101019_1345
org.eclipse.jdt.junit,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.jdt.junit;tag\=r361_v20100825-0800
org.eclipse.pde.api.tools,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:pde/apitools/org.eclipse.pde.api.tools;tag\=v20100820_r361
org.eclipse.core.runtime.compatibility,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.core.runtime.compatibility;tag\=v20100505
-org.eclipse.equinox.p2.directorywatcher,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.directorywatcher;tag\=R36x_v20100727
-org.eclipse.equinox.launcher.gtk.solaris.sparc,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.solaris.sparc;tag\=R36x_v20100810
+org.eclipse.equinox.p2.directorywatcher,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.directorywatcher;tag\=R36x_v20101220
+org.eclipse.equinox.launcher.gtk.solaris.sparc,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.solaris.sparc;tag\=R36x_v20101019_1345
org.eclipse.core.filesystem.hpux.ia64_32,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.core.filesystem.hpux.ia64_32;tag\=v20100505
-org.eclipse.swt.motif.aix.ppc,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt.motif.aix.ppc;tag\=v3655c
+org.eclipse.swt.motif.aix.ppc,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt.motif.aix.ppc;tag\=v3659b
org.eclipse.ui.examples.undo,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.ui.examples.undo;tag\=I20100509-0800
-org.eclipse.ui.cocoa,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.ui.cocoa;tag\=M20100825-0800
-org.eclipse.equinox.http.registry,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/server-side/bundles/org.eclipse.equinox.http.registry;tag\=v20100503
+org.eclipse.ui.cocoa,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.ui.cocoa;tag\=M20101124-0800
+org.eclipse.equinox.http.registry,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/server-side/bundles/org.eclipse.equinox.http.registry;tag\=R36x_v20101103
org.eclipse.pde.api.tools.ee.jre11,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:pde/apitools/org.eclipse.pde.api.tools.ee.jre11;tag\=v20100506-0900
org.eclipse.core.net.linux.x86_64,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64;tag\=I20100505-1245
-org.eclipse.equinox.jsp.jasper,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/server-side/bundles/org.eclipse.equinox.jsp.jasper;tag\=v20100421
+org.eclipse.equinox.jsp.jasper,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/server-side/bundles/org.eclipse.equinox.jsp.jasper;tag\=R36x_v20101103
org.eclipse.pde.api.tools.ee.j2se14,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:pde/apitools/org.eclipse.pde.api.tools.ee.j2se14;tag\=v20100506-0900
org.eclipse.equinox.p2.ui,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui;tag\=v20100518
org.eclipse.jdt.launching.ui.macosx,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.jdt.launching.ui.macosx;tag\=v20100505
org.eclipse.equinox.p2.ui.sdk,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui.sdk;tag\=v20100513
org.eclipse.compare.examples,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.compare.examples;tag\=I20100505-1245
org.eclipse.pde.ua.core,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:pde/ua/org.eclipse.pde.ua.core;tag\=v20100504
-org.eclipse.platform.doc.isv,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.platform.doc.isv;tag\=r361_v20100713
-org.eclipse.ant.launching,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.ant.launching;tag\=v20100427
+org.eclipse.platform.doc.isv,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.platform.doc.isv;tag\=r362_v20110111
+org.eclipse.ant.launching,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.ant.launching;tag\=v20101020_r362
org.eclipse.equinox.p2.operations,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.operations;tag\=v20100510
-org.eclipse.compare,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.compare/plugins/org.eclipse.compare;tag\=I20100526-0800
+org.eclipse.compare,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.compare/plugins/org.eclipse.compare;tag\=R36x_v20100929-0800
org.eclipse.equinox.http.servletbridge,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/server-side/bundles/org.eclipse.equinox.http.servletbridge;tag\=v20100503
org.eclipse.jdt.compiler.apt,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.jdt.compiler.apt;tag\=v20100513-0845
-org.eclipse.help.webapp,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.help.webapp;tag\=r36_r20100816
+org.eclipse.help.webapp,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.help.webapp;tag\=r36_20101130
org.eclipse.pde.ui.templates,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:pde/ui/org.eclipse.pde.ui.templates;tag\=v20100601
-org.eclipse.equinox.p2.repository,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.repository;tag\=R36x_v20100823
-org.eclipse.equinox.p2.metadata.generator,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata.generator;tag\=v20100503a
+org.eclipse.equinox.p2.repository,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.repository;tag\=R36x_v20110111-1500
+org.eclipse.equinox.p2.metadata.generator,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata.generator;tag\=R36x_v20101208-1400
org.eclipse.equinox.p2.director.app,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director.app;tag\=R36x_v20100823
-org.eclipse.equinox.launcher.motif.aix.ppc,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.aix.ppc;tag\=R36x_v20100810
+org.eclipse.equinox.launcher.motif.aix.ppc,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.aix.ppc;tag\=R36x_v20101019_1345
org.eclipse.equinox.app,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.app;tag\=R36x_v20100803
-org.eclipse.swt.motif.hpux.ia64_32,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt.motif.hpux.ia64_32;tag\=v3655c
-org.eclipse.swt.gtk.solaris.x86,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt.gtk.solaris.x86;tag\=v3655c
+org.eclipse.swt.motif.hpux.ia64_32,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt.motif.hpux.ia64_32;tag\=v3659b
+org.eclipse.swt.gtk.solaris.x86,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt.gtk.solaris.x86;tag\=v3659b
org.eclipse.pde.ds.ui,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:pde/ds/org.eclipse.pde.ds.ui;tag\=v20100601
org.eclipse.core.net.linux.x86,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86;tag\=R36x_v20100825-0800
org.eclipse.equinox.p2.console,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.console;tag\=v20100601
org.eclipse.equinox.http.jetty,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.http.jetty6;project\="org.eclipse.equinox.http.jetty";tag\=v20100503
-org.eclipse.swt.examples.browser.demos,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt.examples.browser.demos;tag\=v3655c
-org.eclipse.equinox.launcher.cocoa.macosx.x86_64,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.cocoa.macosx.x86_64;tag\=R36x_v20100810
+org.eclipse.swt.examples.browser.demos,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt.examples.browser.demos;tag\=v3659b
+org.eclipse.equinox.launcher.cocoa.macosx.x86_64,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.cocoa.macosx.x86_64;tag\=R36x_v20101019_1345
org.eclipse.releng.tools,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.releng.tools;tag\=v20100531
-org.eclipse.pde.doc.user,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:pde/doc/org.eclipse.pde.doc.user;tag\=v20100727_r361
-org.eclipse.swt.motif.linux.x86,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt.motif.linux.x86;tag\=v3655c
+org.eclipse.pde.doc.user,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:pde/doc/org.eclipse.pde.doc.user;tag\=v20101118_r362
+org.eclipse.swt.motif.linux.x86,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt.motif.linux.x86;tag\=v3659b
org.eclipse.jface.examples.databinding,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.jface.examples.databinding;tag\=I20100601-0800
org.eclipse.equinox.jmx.client.rmi,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.client.rmi;tag\=v20100503
org.eclipse.equinox.weaving.hook,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/weaving/bundles/org.eclipse.equinox.weaving.hook;tag\=v20100503
-org.eclipse.debug.ui,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.debug.ui;tag\=v20100901_r361
+org.eclipse.debug.ui,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.debug.ui;tag\=v20101201_r362
org.eclipse.core.net,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.core.net;tag\=I20100511-0800
org.eclipse.core.filesystem.solaris.sparc,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.core.filesystem.solaris.sparc;tag\=v20100505-1235
-org.eclipse.equinox.p2.touchpoint.natives,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.touchpoint.natives;tag\=v20100503a
+org.eclipse.equinox.p2.touchpoint.natives,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.touchpoint.natives;tag\=R36x_v20110111
org.eclipse.pde.api.tools.ee.cdcfoundation11,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:pde/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation11;tag\=v20100506-0900
-org.eclipse.equinox.launcher.win32.win32.ia64,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.ia64;tag\=R36x_v20100810
-org.eclipse.swt.examples.browser,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt.examples.browser;tag\=v3655c
+org.eclipse.equinox.launcher.win32.win32.ia64,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.ia64;tag\=R36x_v20101222
+org.eclipse.swt.examples.browser,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt.examples.browser;tag\=v3659b
org.eclipse.core.filesystem.linux.x86_64,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.core.filesystem.linux.x86_64;tag\=v20100505-1235
org.eclipse.equinox.event,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.event;tag\=v20100503
-org.eclipse.ui.ide,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.ui.ide;tag\=M20100825-0800
-org.eclipse.ui.views.log,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:pde/ui/org.eclipse.ui.views.log;tag\=v20100423
+org.eclipse.ui.ide,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.ui.ide;tag\=M20101201-0800
+org.eclipse.ui.views.log,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:pde/ui/org.eclipse.ui.views.log;tag\=v20110210_r362
org.eclipse.equinox.p2.jarprocessor,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.jarprocessor;tag\=v20100503a
-org.eclipse.ui.browser,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.ui.browser;tag\=v20100517
+org.eclipse.ui.browser,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.ui.browser;tag\=r36_20101216
org.eclipse.core.expressions,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.core.expressions;tag\=v20100505
org.eclipse.core.databinding.beans,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.core.databinding.beans;tag\=I20100601-0800
org.eclipse.equinox.ds,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.ds;tag\=R36x_v20100803
-org.eclipse.equinox.launcher.win32.win32.x86_64,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.x86_64;tag\=R36x_v20100810
-org.eclipse.equinox.launcher.gtk.linux.x86,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.x86;tag\=R36x_v20100810
+org.eclipse.equinox.launcher.win32.win32.x86_64,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.x86_64;tag\=R36x_v20101222
+org.eclipse.equinox.launcher.gtk.linux.x86,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.x86;tag\=R36x_v20101019_1345
org.eclipse.update.core.linux,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.update.core.linux;tag\=v20100512
org.eclipse.core.databinding.property,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.core.databinding.property;tag\=I20100601-0800
org.eclipse.ui.examples.propertysheet,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.ui.examples.propertysheet;tag\=I20100509-0800
org.eclipse.core.jobs,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.core.jobs;tag\=R36x_v20100824
-org.eclipse.swt.gtk.linux.ppc,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt.gtk.linux.ppc;tag\=v3655c
-org.eclipse.swt.carbon.macosx,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt.carbon.macosx;tag\=v3655c
+org.eclipse.swt.gtk.linux.ppc,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt.gtk.linux.ppc;tag\=v3659b
+org.eclipse.swt.carbon.macosx,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt.carbon.macosx;tag\=v3659b
org.eclipse.pde.runtime,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:pde/ui/org.eclipse.pde.runtime;tag\=v20100601
-org.eclipse.pde.build,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:pde/build/org.eclipse.pde.build;tag\=R36x_v20100823
-org.eclipse.equinox.p2.reconciler.dropins,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.reconciler.dropins;tag\=v20100525
+org.eclipse.pde.build,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:pde/build/org.eclipse.pde.build;tag\=R36x_20110203
+org.eclipse.equinox.p2.reconciler.dropins,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.reconciler.dropins;tag\=R36x_v20110114
org.eclipse.equinox.device,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.device;tag\=v20100503
org.eclipse.core.commands,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.core.commands;tag\=I20100512-1500
org.eclipse.equinox.p2.repository.tools,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.repository.tools;tag\=R36x_v20100823
-org.eclipse.equinox.launcher.gtk.linux.s390x,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.linux.s390x;tag\=R36x_v20100823
+org.eclipse.equinox.launcher.gtk.linux.s390x,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/contributed/org.eclipse.equinox.launcher.gtk.linux.s390x;tag\=R36x_v20110125
org.eclipse.update.core,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.update.core;tag\=R36x_v20100629
-org.eclipse.team.core,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.team.core;tag\=R36x_v20100825-0800
+org.eclipse.team.core,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.team.core;tag\=R36x_v20110203-1036
org.eclipse.debug.examples.ui,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.debug.examples.ui;tag\=v20100526
org.eclipse.pde.api.tools.ee.javase16,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:pde/apitools/org.eclipse.pde.api.tools.ee.javase16;tag\=v20100506-0900
-org.eclipse.compare.win32,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.compare/plugins/org.eclipse.compare.win32;tag\=I20100505-1245
+org.eclipse.compare.win32,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.compare/plugins/org.eclipse.compare.win32;tag\=R36x_v20101103-0618
org.eclipse.equinox.p2.installer,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.installer;tag\=v20100503a
org.eclipse.debug.examples.core,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.debug.examples.core;tag\=v20100505
org.eclipse.rcp,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.sdk-feature/plugins/org.eclipse.rcp;tag\=v20100527-0800
@@ -208,71 +209,71 @@ org.eclipse.equinox.registry,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/
org.eclipse.ui.examples.readmetool,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.ui.examples.readmetool;tag\=I20100509-0800
org.eclipse.jdt.core.manipulation,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.jdt.core.manipulation;tag\=v20100520-0800
org.eclipse.equinox.http.servlet,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.http.servlet;tag\=v20100503
-org.eclipse.equinox.launcher.win32.win32.x86,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.x86;tag\=R36x_v20100810
+org.eclipse.equinox.launcher.win32.win32.x86,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.win32.win32.x86;tag\=R36x_v20101222
org.eclipse.jdt.junit.runtime,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.jdt.junit.runtime;tag\=v20100526-0800
-org.eclipse.swt.examples.controls,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt.examples.controls;tag\=v3655c
+org.eclipse.swt.examples.controls,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt.examples.controls;tag\=v3659b
org.eclipse.core.filesystem.linux.ppc,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.core.filesystem.linux.ppc;tag\=v20100505-1235
org.eclipse.osgi.jmx,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.osgi.jmx;tag\=v20100503
org.eclipse.ui.workbench.compatibility,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.ui.workbench.compatibility;tag\=I20100511-0800
org.eclipse.core.filesystem.aix.ppc,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.aix.ppc;tag\=v20100505-1235
-org.eclipse.swt.cocoa.macosx,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt.cocoa.macosx;tag\=v3655c
-org.eclipse.ui,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.ui;tag\=M20100826-1330
+org.eclipse.swt.cocoa.macosx,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt.cocoa.macosx;tag\=v3659b
+org.eclipse.ui,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.ui;tag\=M20110203-1100
org.eclipse.equinox.jmx.client.xmlrpc,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.client.xmlrpc;tag\=v20100503
-org.eclipse.swt.win32.wce_ppc.arm,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt.win32.wce_ppc.arm;tag\=v3655c
+org.eclipse.swt.win32.wce_ppc.arm,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt.win32.wce_ppc.arm;tag\=v3659c
org.eclipse.compare.examples.xml,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.compare.examples.xml;tag\=I20100505-1245
org.eclipse.equinox.jsp.jasper.registry,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/server-side/bundles/org.eclipse.equinox.jsp.jasper.registry;tag\=v20100503
-org.eclipse.core.resources,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.core.resources;tag\=R36x_v20100825-0600
+org.eclipse.core.resources,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.core.resources;tag\=R36x_v20110131-1630
org.eclipse.team.cvs.ssh2,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.team.cvs.ssh2;tag\=I20100526-0800
org.eclipse.equinox.wireadmin,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.wireadmin;tag\=v20100503
org.eclipse.ant.ui,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.ant.ui;tag\=v20100427
-org.eclipse.swt.gtk.solaris.sparc,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt.gtk.solaris.sparc;tag\=v3655c
+org.eclipse.swt.gtk.solaris.sparc,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt.gtk.solaris.sparc;tag\=v3659b
org.eclipse.core.net.win32.x86_64,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64;tag\=I20100505-1245
-org.eclipse.swt.examples.launcher,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt.examples.launcher;tag\=v3655c
+org.eclipse.swt.examples.launcher,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt.examples.launcher;tag\=v3659b
org.eclipse.equinox.preferences.jmx,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.preferences.jmx;tag\=v20100503
org.eclipse.equinox.p2.garbagecollector,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.garbagecollector;tag\=v20100503
org.eclipse.equinox.cm,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.cm;tag\=v20100520
org.eclipse.equinox.common,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/components/bundles/org.eclipse.equinox.common;tag\=v20100503
-org.eclipse.equinox.p2.director,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director;tag\=R36x_v20100823
+org.eclipse.equinox.p2.director,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director;tag\=R36x_v20101117-1018
org.eclipse.equinox.p2.publisher,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.publisher;tag\=v20100824-2220
-org.eclipse.jdt.doc.isv,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.jdt.doc.isv;tag\=r361_v20100714-0800
-org.eclipse.ltk.core.refactoring,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.ltk.core.refactoring;tag\=v20100526-0800
-org.eclipse.jdt.core,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.jdt.core;tag\=v_A68_R36x
+org.eclipse.jdt.doc.isv,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.jdt.doc.isv;tag\=r362_v20101117-0800
+org.eclipse.ltk.core.refactoring,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.ltk.core.refactoring;tag\=r362_v20101117-0800
+org.eclipse.jdt.core,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.jdt.core;tag\=v_A76_R36x
org.eclipse.equinox.p2.updatesite,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.updatesite;tag\=R36x_v20100823
org.eclipse.update.configurator,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.update.configurator;tag\=v20100512
org.eclipse.core.filesystem.win32.x86,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.core.filesystem.win32.x86;tag\=R36x_v20100727-0745
-org.eclipse.equinox.p2.core,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.core;tag\=R36x_v20100804
-org.eclipse.swt.examples,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt.examples;tag\=v3655c
+org.eclipse.equinox.p2.core,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.core;tag\=R36x_v20110111
+org.eclipse.swt.examples,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt.examples;tag\=v3659b
org.eclipse.cvs,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.sdk-feature/plugins/org.eclipse.cvs;tag\=v20100414
-org.eclipse.swt.gtk.linux.x86,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt.gtk.linux.x86;tag\=v3655c
+org.eclipse.swt.gtk.linux.x86,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt.gtk.linux.x86;tag\=v3659b
org.eclipse.equinox.log,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.log;tag\=v20100503
org.eclipse.equinox.jmx.client,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.client;tag\=v20100503
org.eclipse.ui.win32,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.ui.win32;tag\=I20100509-0800
org.eclipse.ui.views.properties.tabbed,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.ui.views.properties.tabbed;tag\=I20100509-0800
org.eclipse.equinox.security.ui,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/security/bundles/org.eclipse.equinox.security.ui;tag\=v20100503
org.eclipse.pde.api.tools.ee.j2se13,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:pde/apitools/org.eclipse.pde.api.tools.ee.j2se13;tag\=v20100506-0900
-org.eclipse.swt.motif.solaris.sparc,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt.motif.solaris.sparc;tag\=v3655c
+org.eclipse.swt.motif.solaris.sparc,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt.motif.solaris.sparc;tag\=v3659b
org.eclipse.equinox.util,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.util;tag\=v20100503
org.eclipse.equinox.p2.extensionlocation,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.extensionlocation;tag\=v20100518
org.eclipse.pde.api.tools.ee.osgiminimum12,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:pde/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12;tag\=v20100506-0900
org.eclipse.equinox.concurrent,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/components/bundles/org.eclipse.equinox.concurrent;tag\=v20100503
-org.eclipse.platform.doc.user,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.platform.doc.user;tag\=r361_v20100825-0800
+org.eclipse.platform.doc.user,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.platform.doc.user;tag\=r362_v20101117-0800
org.eclipse.equinox.security.macosx,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/security/bundles/org.eclipse.equinox.security.macosx;tag\=v20100503
-org.eclipse.equinox.supplement,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/framework/bundles/org.eclipse.osgi/supplement;project\="org.eclipse.equinox.supplement";tag\=v20100503
-org.eclipse.sdk,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.sdk;tag\=r361_v20100714-0800
-org.eclipse.equinox.launcher.gtk.linux.ppc64,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.ppc64;tag\=R36x_v20100810
+org.eclipse.equinox.supplement,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/framework/bundles/org.eclipse.osgi/supplement;project\="org.eclipse.equinox.supplement";tag\=R36x_v20101021
+org.eclipse.sdk,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.sdk;tag\=r362_v20110202
+org.eclipse.equinox.launcher.gtk.linux.ppc64,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.ppc64;tag\=R36x_v20101019_1345
org.eclipse.jsch.ui,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.jsch.ui;tag\=I20100505-1245
org.eclipse.core.filesystem.win32.x86_64,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.core.filesystem.win32.x86_64;tag\=R36x_v20100727-0745
org.eclipse.equinox.security.win32.x86,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/security/bundles/org.eclipse.equinox.security.win32.x86;tag\=v20100503
org.eclipse.core.variables,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.core.variables;tag\=v20100505
-org.eclipse.pde.ui,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:pde/ui/org.eclipse.pde.ui;tag\=v20100810_r361
+org.eclipse.pde.ui,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:pde/ui/org.eclipse.pde.ui;tag\=v20110210_r362
org.eclipse.equinox.p2.artifact.repository,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.artifact.repository;tag\=R36x_v20100901
org.eclipse.core.runtime.compatibility.auth,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.core.runtime.compatibility.auth;tag\=v20100517
-org.eclipse.osgi,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/framework/bundles/org.eclipse.osgi;tag\=R36x_v20100806
+org.eclipse.osgi,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/framework/bundles/org.eclipse.osgi;tag\=R36x_v20110210
org.eclipse.ui.intro.universal,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.ui.intro.universal;tag\=r36_v20100702
org.eclipse.swt.jmx,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.swt.jmx;tag\=v20100503
-org.eclipse.equinox.launcher.cocoa.macosx,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.cocoa.macosx;tag\=R36x_v20100810
+org.eclipse.equinox.launcher.cocoa.macosx,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.cocoa.macosx;tag\=R36x_v20101019_1345
org.eclipse.ui.examples.contributions,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.ui.examples.contributions;tag\=I20100509-0800
-org.eclipse.team.cvs.ui,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.team.cvs.ui;tag\=R36x_v20100825-0800
+org.eclipse.team.cvs.ui,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.team.cvs.ui;tag\=R36x_v20110203-1036
org.eclipse.ui.cheatsheets,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.ui.cheatsheets;tag\=v20100427
org.eclipse.jdt.doc.user,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.jdt.doc.user;tag\=r361_v20100721-0800
org.eclipse.equinox.useradmin,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.useradmin;tag\=v20100503
@@ -282,16 +283,17 @@ org.eclipse.update.core.win32,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot
org.eclipse.ui.externaltools,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.ui.externaltools;tag\=v20100427
org.eclipse.jdt.junit4.runtime,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.jdt.junit4.runtime;tag\=v20100526-0800
org.eclipse.pde.api.tools.ee.j2se12,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:pde/apitools/org.eclipse.pde.api.tools.ee.j2se12;tag\=v20100506-0900
+org.eclipse.equinox.http.jetty,1.1.100=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.http.jetty5;project\="org.eclipse.equinox.http.jetty";tag\=v20100519
org.eclipse.pde.api.tools.ee.osgiminimum11,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:pde/apitools/org.eclipse.pde.api.tools.ee.osgiminimum11;tag\=v20100506-0900
org.eclipse.ui.navigator,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.ui.navigator;tag\=I20100601-0800
-org.eclipse.equinox.http.jetty,1.1.100=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.http.jetty5;project\="org.eclipse.equinox.http.jetty";tag\=v20100519
-org.eclipse.team.cvs.core,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.team.cvs.core;tag\=I20100526-0800
+org.eclipse.team.cvs.core,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.team.cvs.core;tag\=R36x_v20110119-0815
org.eclipse.pde.api.tools.ee.cdcfoundation10,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:pde/apitools/org.eclipse.pde.api.tools.ee.cdcfoundation10;tag\=v20100506-0900
-org.eclipse.equinox.launcher.wpf.win32.x86,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.wpf.win32.x86;tag\=R36x_v20100810
+org.eclipse.equinox.launcher.wpf.win32.x86,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/framework/bundles/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.wpf.win32.x86;tag\=R36x_v20101222
org.eclipse.equinox.preferences,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.preferences;tag\=v20100503
org.eclipse.equinox.jmx.common,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.common;tag\=v20100503
org.eclipse.equinox.p2.ui.sdk.scheduler,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler;tag\=v20100507-1815
org.eclipse.equinox.jmx.vm,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/incubator/monitoring/bundles/org.eclipse.equinox.jmx.vm;tag\=v20100503
+org.eclipse.swt.gtk.aix.ppc64,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.swt.gtk.aix.ppc64;tag\=v3659b
org.eclipse.ui.editors,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.ui.editors;tag\=r361_v20100825-0800
org.eclipse.equinox.servletbridge.extensionbundle,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/rt\:org.eclipse.equinox/server-side/bundles/org.eclipse.equinox.servletbridge.extensionbundle;tag\=v20100503
org.eclipse.core.filebuffers,0.0.0=scm\:cvs\:pserver\:dev.eclipse.org\:/cvsroot/eclipse\:org.eclipse.core.filebuffers;tag\=v20100520-0800
diff --git a/patches/donotstorebuildlogsinfiles.patch b/patches/donotstorebuildlogsinfiles.patch
index 4ffd1a3..d1cdd71 100644
--- a/patches/donotstorebuildlogsinfiles.patch
+++ b/patches/donotstorebuildlogsinfiles.patch
@@ -53,7 +53,7 @@
--- a/plugins/org.eclipse.swt/tasks/build.xml 2010-08-06 19:35:21.199817105 +0200
+++ b/plugins/org.eclipse.swt/tasks/build.xml 2010-08-06 19:36:32.704372712 +0200
-@@ -1097,7 +1097,7 @@
+@@ -1121,7 +1121,7 @@
<argument value="${tasks}"/>
</commandline>
</cvs>
diff --git a/patches/eclipse-add-archs-executable.patch b/patches/eclipse-add-archs-executable.patch
index 7ae0129..10b2c99 100644
--- a/patches/eclipse-add-archs-executable.patch
+++ b/patches/eclipse-add-archs-executable.patch
@@ -174,7 +174,7 @@
<plugin
id="org.eclipse.equinox.launcher.gtk.linux.ppc64"
os="linux"
-@@ -198,25 +308,4 @@
+@@ -208,25 +318,4 @@
version="0.0.0"
fragment="true"/>
diff --git a/patches/eclipse-add-archs-swt.patch b/patches/eclipse-add-archs-swt.patch
index ab54b9f..93f3afb 100644
--- a/patches/eclipse-add-archs-swt.patch
+++ b/patches/eclipse-add-archs-swt.patch
@@ -1,6 +1,6 @@
--- a/features/org.eclipse.rcp/feature.xml
+++ b/features/org.eclipse.rcp/feature.xml
-@@ -206,10 +206,87 @@
+@@ -205,10 +205,87 @@
unpack="false"/>
<plugin
@@ -90,7 +90,7 @@
download-size="0"
install-size="0"
version="0.0.0"
-@@ -239,8 +316,8 @@
+@@ -238,8 +315,8 @@
unpack="false"/>
<plugin
@@ -101,7 +101,7 @@
ws="gtk"
arch="sparc"
download-size="0"
-@@ -248,12 +325,12 @@
+@@ -247,12 +324,12 @@
version="0.0.0"
fragment="true"
unpack="false"/>
@@ -118,7 +118,7 @@
download-size="0"
install-size="0"
version="0.0.0"
-@@ -261,10 +338,10 @@
+@@ -260,10 +337,10 @@
unpack="false"/>
<plugin
@@ -131,7 +131,7 @@
download-size="0"
install-size="0"
version="0.0.0"
-@@ -294,6 +371,28 @@
+@@ -293,6 +370,28 @@
unpack="false"/>
<plugin
diff --git a/patches/eclipse-addArchesAnd64bitSWT.patch b/patches/eclipse-addArchesAnd64bitSWT.patch
index e89334b..f9506b9 100644
--- a/patches/eclipse-addArchesAnd64bitSWT.patch
+++ b/patches/eclipse-addArchesAnd64bitSWT.patch
@@ -1,6 +1,6 @@
--- a/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh.orig 2009-12-08 09:00:12.000000000 +0200
+++ b/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh 2010-04-13 17:24:11.418047380 +0300
-@@ -63,6 +63,18 @@ if [ "${MODEL}" = "" ]; then
+@@ -73,6 +73,18 @@ if [ "${MODEL}" = "" ]; then
fi
fi
case $MODEL in
@@ -19,12 +19,4 @@
"x86_64")
SWT_ARCH=x86_64
AWT_ARCH=amd64
-@@ -78,7 +90,7 @@ case $MODEL in
- esac
- echo "Model is ${MODEL}"
- # For 64-bit CPUs, we have a switch
--if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' ]; then
-+if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' -o ${MODEL} = 'alpha' ]; then
- SWT_PTR_CFLAGS=-DJNI64
- if [ -d /lib64 ]; then
- XLIB64=-L/usr/X11R6/lib64
+
diff --git a/patches/eclipse-buildswtnatives.patch b/patches/eclipse-buildswtnatives.patch
index 759776e..19a4fdf 100644
--- a/patches/eclipse-buildswtnatives.patch
+++ b/patches/eclipse-buildswtnatives.patch
@@ -1,6 +1,6 @@
--- a/plugins/org.eclipse.swt/buildFragment.xml
+++ b/plugins/org.eclipse.swt/buildFragment.xml
-@@ -558,4 +558,28 @@
+@@ -560,4 +560,28 @@
extraManifests="${extraManifests}"
extraSourceLocations="${extraSourceLocations}"/>
</target>
diff --git a/patches/eclipse-help-webapps-xss-BZ329582.patch b/patches/eclipse-help-webapps-xss-BZ329582.patch
deleted file mode 100644
index 7ce0752..0000000
--- a/patches/eclipse-help-webapps-xss-BZ329582.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-# Backport patch for upstream Eclipse BZ: 329582 (XSS attack)
---- plugins/org.eclipse.help.webapp/advanced/content.jsp.orig 2010-04-21 14:00:16.000000000 -0400
-+++ plugins/org.eclipse.help.webapp/advanced/content.jsp 2010-12-10 09:41:14.642196217 -0500
-@@ -45,7 +45,7 @@
-
- </head>
- <frameset id="contentFrameset" rows="<%=frameData.getContentAreaFrameSizes()%>" frameborder=0" framespacing="0" border="0" spacing="0">
-- <frame name="ContentToolbarFrame" title="<%=ServletResources.getString("topicViewToolbar", request)%>" src='<%="contentToolbar.jsp"+data.getQuery()%>' marginwidth="0" marginheight="0" scrolling="no" frameborder="0" >
-+ <frame name="ContentToolbarFrame" title="<%=ServletResources.getString("topicViewToolbar", request)%>" src='<%="contentToolbar.jsp"+UrlUtil.htmlEncode(data.getQuery())%>' marginwidth="0" marginheight="0" scrolling="no" frameborder="0" >
- <frame ACCESSKEY="K" name="ContentViewFrame" title="<%=ServletResources.getString("topicView", request)%>" src='<%=UrlUtil.htmlEncode(data.getContentURL())%>' marginwidth="10"<%=(data.isIE() && "6.0".compareTo(data.getIEVersion()) <=0)?"scrolling=\"yes\"":""%> marginheight="0" frameborder="0" >
- <%
- AbstractFrame[] frames = frameData.getFrames(AbstractFrame.BELOW_CONTENT);
---- plugins/org.eclipse.help.webapp/basic/index.jsp.orig 2010-04-21 14:00:17.000000000 -0400
-+++ plugins/org.eclipse.help.webapp/basic/index.jsp 2010-12-10 09:42:58.516317455 -0500
-@@ -29,8 +29,8 @@
- <%
- }
- %>
-- <frame name="TabsFrame" title="<%=ServletResources.getString("helpToolbarFrame", request)%>" src='<%="basic/tabs.jsp"+data.getQuery()%>' marginwidth="5" marginheight="5" scrolling="no">
-- <frame name="HelpFrame" title="<%=ServletResources.getString("ignore", "HelpFrame", request)%>" src='<%="basic/help.jsp"+data.getQuery()%>' frameborder="no" marginwidth="0" marginheight="0" scrolling="no">
-+ <frame name="TabsFrame" title="<%=ServletResources.getString("helpToolbarFrame", request)%>" src='<%="basic/tabs.jsp"+UrlUtil.htmlEncode(data.getQuery())%>' marginwidth="5" marginheight="5" scrolling="no">
-+ <frame name="HelpFrame" title="<%=ServletResources.getString("ignore", "HelpFrame", request)%>" src='<%="basic/help.jsp"+UrlUtil.htmlEncode(data.getQuery())%>' frameborder="no" marginwidth="0" marginheight="0" scrolling="no">
- <%
- if(!("0".equals(data.getFooterHeight()))){
- %>
diff --git a/patches/eclipse-swt-buildagainstxulrunner.patch b/patches/eclipse-swt-buildagainstxulrunner.patch
index 9d3a5ea..b519883 100644
--- a/patches/eclipse-swt-buildagainstxulrunner.patch
+++ b/patches/eclipse-swt-buildagainstxulrunner.patch
@@ -7,7 +7,7 @@ retrieving revision 1.54
diff -u -r1.54 build.sh
--- a/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh 29 May 2009 21:30:14 -0000 1.54
+++ b/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh 1 Jun 2009 18:44:43 -0000
-@@ -120,19 +120,19 @@
+@@ -153,19 +153,19 @@
MOZILLA_LIBS=`pkg-config --libs mozilla-xpcom`
export MOZILLA_INCLUDES
export MOZILLA_LIBS
diff --git a/patches/java-home.patch b/patches/java-home.patch
index 9ca4cb3..a9abc1e 100644
--- a/patches/java-home.patch
+++ b/patches/java-home.patch
@@ -4,7 +4,7 @@ Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=317634
--- eclipse-3.6.0.orig/eclipse/features/org.eclipse.equinox.executable/library/gtk/build.sh
+++ eclipse-3.6.0/eclipse/features/org.eclipse.equinox.executable/library/gtk/build.sh
-@@ -155,7 +155,7 @@ DEFAULT_OS_ARCH="$defaultOSArch"
+@@ -161,7 +161,7 @@ DEFAULT_OS_ARCH="$defaultOSArch"
DEFAULT_WS="$defaultWS"
DEFAULT_JAVA=$defaultJava
diff --git a/patches/no-gnome-vfs.patch b/patches/no-gnome-vfs.patch
new file mode 100644
index 0000000..4d0517d
--- /dev/null
+++ b/patches/no-gnome-vfs.patch
@@ -0,0 +1,96 @@
+--- plugins/org.eclipse.swt/Eclipse SWT Program/gtk/org/eclipse/swt/program/Program.java 2 Nov 2010 21:53:56 -0000 1.81.2.1
++++ plugins/org.eclipse.swt/Eclipse SWT Program/gtk/org/eclipse/swt/program/Program.java 25 Mar 2011 14:53:53 -0000
+@@ -94,34 +94,21 @@
+ * The workaround is to simply check that the window manager is a
+ * compliant one (property _NET_SUPPORTING_WM_CHECK) and to attempt to load
+ * our native library that depends on gnome-vfs.
++ *
++ * Note: GIO is used when available instead of gnome-vfs.
+ */
+ if (desktop == DESKTOP_UNKNOWN) {
+ byte[] gnomeName = Converter.wcsToMbcs(null, "_NET_SUPPORTING_WM_CHECK", true);
+ int /*long*/ gnome = OS.XInternAtom(xDisplay, gnomeName, true);
+- if (gnome != OS.None && (OS.GTK_VERSION >= OS.VERSION (2, 2, 0)) && gnome_init()) {
+- desktop = DESKTOP_GNOME;
+- int /*long*/ icon_theme = GNOME.gnome_icon_theme_new();
+- display.setData(ICON_THEME_DATA, new LONG(icon_theme));
+- display.addListener(SWT.Dispose, new Listener() {
+- public void handleEvent(Event event) {
+- LONG gnomeIconTheme = (LONG)display.getData(ICON_THEME_DATA);
+- if (gnomeIconTheme == null) return;
+- display.setData(ICON_THEME_DATA, null);
+- /*
+- * Note. gnome_icon_theme_new uses g_object_new to allocate the
+- * data it returns. Use g_object_unref to free the pointer it returns.
+- */
+- if (gnomeIconTheme.value != 0) OS.g_object_unref(gnomeIconTheme.value);
+- }
+- });
+- /* Check for the existence of libgio libraries */
+- byte[] buffer ;
++ if (gnome != OS.None) {
++ /* Check for the existence of libgio libraries first */
++ byte[] buffer;
+ int flags = OS.RTLD_LAZY;
+ if (OS.IsAIX) {
+- buffer = Converter.wcsToMbcs(null, "libgio-2.0.a(libgio-2.0.so.0)", true);
+- flags |= OS.RTLD_MEMBER;
++ buffer = Converter.wcsToMbcs(null, "libgio-2.0.a(libgio-2.0.so.0)", true);
++ flags |= OS.RTLD_MEMBER;
+ } else if (OS.IsHPUX) {
+- buffer = Converter.wcsToMbcs(null, "libgio-2.0.so", true);
++ buffer = Converter.wcsToMbcs(null, "libgio-2.0.so", true);
+ } else {
+ buffer = Converter.wcsToMbcs(null, "libgio-2.0.so.0", true);
+ }
+@@ -133,7 +120,24 @@
+ desktop = DESKTOP_GIO;
+ }
+ OS.dlclose(libgio);
+- } else {
++ }
++
++ if (desktop == DESKTOP_UNKNOWN && (OS.GTK_VERSION >= OS.VERSION (2, 2, 0)) && gnome_init()) {
++ desktop = DESKTOP_GNOME;
++ int /*long*/ icon_theme = GNOME.gnome_icon_theme_new();
++ display.setData(ICON_THEME_DATA, new LONG(icon_theme));
++ display.addListener(SWT.Dispose, new Listener() {
++ public void handleEvent(Event event) {
++ LONG gnomeIconTheme = (LONG)display.getData(ICON_THEME_DATA);
++ if (gnomeIconTheme == null) return;
++ display.setData(ICON_THEME_DATA, null);
++ /*
++ * Note. gnome_icon_theme_new uses g_object_new to allocate the
++ * data it returns. Use g_object_unref to free the pointer it returns.
++ */
++ if (gnomeIconTheme.value != 0) OS.g_object_unref(gnomeIconTheme.value);
++ }
++ });
+ /* Check for libgnomevfs-2 version 2.4 */
+ buffer = Converter.wcsToMbcs(null, "libgnomevfs-2.so.0", true);
+ int /*long*/ libgnomevfs = OS.dlopen(buffer, OS.RTLD_LAZY);
+@@ -974,14 +978,17 @@
+ if (application != 0) {
+ byte[] fileNameBuffer = Converter.wcsToMbcs (null, fileName, true);
+ int /*long*/ file = 0;
+- if (OS.g_app_info_supports_uris (application)) {
+- file = OS.g_file_new_for_uri (fileNameBuffer);
+- } else {
+- file = OS.g_file_new_for_path (fileNameBuffer);
++ if (fileName.length() > 0) {
++ if (OS.g_app_info_supports_uris (application)) {
++ file = OS.g_file_new_for_uri (fileNameBuffer);
++ } else {
++ file = OS.g_file_new_for_path (fileNameBuffer);
++ }
+ }
+- if (file != 0) {
+- int /*long*/ list = OS.g_list_append (0, file);
+- result = OS.g_app_info_launch (application, list, 0, 0);
++ int /*long*/ list = 0;
++ if (file != 0) list = OS.g_list_append (0, file);
++ result = OS.g_app_info_launch (application, list, 0, 0);
++ if (list != 0) {
+ OS.g_list_free (list);
+ OS.g_object_unref (file);
+ }
diff --git a/patches/webkitgtk.patch b/patches/webkitgtk.patch
new file mode 100644
index 0000000..460ad0c
--- /dev/null
+++ b/patches/webkitgtk.patch
@@ -0,0 +1,11 @@
+--- plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak.sav 2011-03-07 23:32:06.523294166 +0200
++++ plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak 2011-03-07 23:32:41.850888713 +0200
+@@ -92,7 +92,7 @@ MOZILLAEXCLUDES = -DNO__1XPCOMGlueShutdo
+ XULRUNNEREXCLUDES = -DNO__1NS_1InitXPCOM2
+
+ WEBKITCFLAGS = `pkg-config --cflags gtk+-2.0` -I/usr/include/webkit-1.0 -I/usr/include/libsoup-2.4
+-WEBKITLIBS = -lwebkit-1.0
++WEBKITLIBS = `pkg-config --libs webkit-1.0`
+
+ SWT_OBJECTS = swt.o c.o c_stats.o callback.o
+ CDE_OBJECTS = swt.o cde.o cde_structs.o cde_stats.o
diff --git a/pdebuild.properties b/pdebuild.properties
index f44dd5c..b6d8fd7 100644
--- a/pdebuild.properties
+++ b/pdebuild.properties
@@ -2,10 +2,10 @@ buildArch=x86
ws=gtk
os=linux
-buildId=M20100909-0800
-buildTag=M20100909-0800
-label=3.6.1
-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
+buildId=M20110210-1200
+buildTag=M20110210-1200
+label=3.6.2
+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:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
#build.compiler=org.eclipse.jdt.core.JDTCompilerAdapter
javacFailOnError=true
@@ -29,21 +29,21 @@ CDC-1.0/PersonalJava-1.0=${bootclasspath}
CDC-1.1/PersonalBasis-1.1=${bootclasspath}
CDC-1.1/PersonalJava-1.1=${bootclasspath}
# Somehow bootclasspath isn't expanded when used by antRunner
-JavaSE-1.6=/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
-CDC-1.0/Foundation-1.0=/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
-CDC-1.1/Foundation-1.1=/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
-OSGi/Minimum-1.0=/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
-OSGi/Minimum-1.1=/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
-OSGi/Minimum-1.2=/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
-JRE-1.1=/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
-J2SE-1.2=/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
-J2SE-1.3=/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
-J2SE-1.4=/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
-J2SE-1.5=/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
-JavaSE-1.6=/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
-PersonalJava-1.1=/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
-PersonalJava-1.2=/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
-CDC-1.0/PersonalBasis-1.0=/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
-CDC-1.0/PersonalJava-1.0=/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
-CDC-1.1/PersonalBasis-1.1=/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
-CDC-1.1/PersonalJava-1.1=/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
\ No newline at end of file
+JavaSE-1.6=/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:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+CDC-1.0/Foundation-1.0=/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:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+CDC-1.1/Foundation-1.1=/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:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+OSGi/Minimum-1.0=/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:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+OSGi/Minimum-1.1=/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:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+OSGi/Minimum-1.2=/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:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+JRE-1.1=/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:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+J2SE-1.2=/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:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+J2SE-1.3=/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:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+J2SE-1.4=/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:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+J2SE-1.5=/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:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+JavaSE-1.6=/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:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+PersonalJava-1.1=/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:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+PersonalJava-1.2=/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:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+CDC-1.0/PersonalBasis-1.0=/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:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+CDC-1.0/PersonalJava-1.0=/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:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+CDC-1.1/PersonalBasis-1.1=/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:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
+CDC-1.1/PersonalJava-1.1=/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:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
hooks/post-receive
--
eclipse - Powerful IDE written in java - Debian package.
More information about the pkg-java-commits
mailing list