Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'org.eclipse.help.base/src/org/eclipse')
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/base/AbstractHelpDisplay.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/base/AbstractHelpScope.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/base/IHelpScopeProducer.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/base/IScopeHandle.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/browser/IBrowser.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/browser/IBrowserFactory.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/base/BaseHelpSystem.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/base/BookmarkManager.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/base/DisplayUtils.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpApplication.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBasePlugin.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBasePreferenceInitializer.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBaseResources.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBaseResources.properties9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpDisplay.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpEvaluationContext.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpProvider.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/base/IHelpActivitySupport.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/base/IHelpBaseConstants.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/base/IndexToolApplication.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/base/MissingContentManager.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/DefaultPreferenceFileHandler.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/HttpsUtility.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/PreferenceFileHandler.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteContentLocator.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteContextProvider.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteExtensionProvider.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteHelp.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteHelpInputStream.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteIC.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteIndexParser.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteIndexProvider.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteSearchManager.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteSearchParser.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteStatusData.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteTocParser.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteTocProvider.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/CriteriaHelpScope.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/EnablementScope.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/FilterScope.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/IntersectionScope.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/ScopeHandle.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/ScopeRegistry.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/ScopeUtils.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/SearchScopeScope.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/UnionScope.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/UniversalScope.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/WorkingSetScope.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/base/util/CriteriaUtilities.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/base/util/HelpProperties.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/base/util/IErrorUtil.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/base/util/IndexUtils.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/base/util/LinkUtil.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/base/util/ProxyUtil.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/base/util/TString.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/base/util/TestConnectionUtility.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserDescriptor.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserLog.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserManager.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/browser/CurrentBrowser.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/browser/CustomBrowser.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/browser/CustomBrowserFactory.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/browser/MozillaBrowserAdapter.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/browser/MozillaFactory.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/browser/StreamConsumer.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/browser/macosx/DefaultBrowserAdapter.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/browser/macosx/DefaultBrowserFactory.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/protocols/HelpURLConnection.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/protocols/HelpURLStreamHandler.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/search/ASCIIReader.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/search/AnalyzerDescriptor.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/search/AnalyzerFactory.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/search/Analyzer_en.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/search/DefaultAnalyzer.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/search/HTMLDocParser.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/search/HTMLSearchParticipant.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/search/ISearchHitCollector.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/search/ISearchQuery.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/search/IndexingOperation.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/search/InfoCenter.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/search/LazyProgressMonitor.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/search/LimitedSizeCharArrayWriter.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/search/LocalSearchManager.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/search/LowerCaseAndDigitsTokenizer.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/search/LuceneSearchDocument.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/search/PluginIndex.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/search/PluginVersionInfo.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/search/PrebuiltIndexes.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/search/ProgressDistributor.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryBuilder.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryTooComplexException.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryWordsExactPhrase.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryWordsPhrase.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryWordsToken.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchHit.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndex.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndexWithIndexingProgress.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchManager.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchProgressMonitor.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchQuery.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchResult.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchResults.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/search/SmartAnalyzer.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/search/WebSearch.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/search/XHTMLSearchParticipant.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/search/federated/FederatedSearchEntry.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/search/federated/FederatedSearchJob.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/search/federated/IndexerJob.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/search/federated/LocalHelp.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/search/federated/LocalHelpScope.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/server/JettyHelpServer.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/server/WebappManager.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/standalone/Eclipse.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/standalone/EclipseConnection.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/standalone/EclipseController.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/standalone/EclipseLifeCycleListener.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/standalone/Options.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/standalone/StandaloneHelp.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/standalone/StandaloneInfocenter.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/validation/TocValidator.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/workingset/AdaptableHelpResource.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/workingset/AdaptableSelectedToc.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/workingset/AdaptableSelectedTopic.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/workingset/AdaptableToc.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/workingset/AdaptableTocsArray.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/workingset/AdaptableTopic.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/workingset/IHelpWorkingSetManager.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/workingset/WorkingSet.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/workingset/WorkingSetComparator.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/workingset/WorkingSetManager.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/xhtml/DynamicXHTMLProcessor.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/xhtml/XHTMLCharsetHandler.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/xhtml/XHTMLContentDescriber.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/search/AbstractSearchProcessor.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/search/HelpIndexBuilder.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/search/IHelpSearchIndex.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/search/ISearchDocument.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/search/ISearchEngine.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/search/ISearchEngine2.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/search/ISearchEngineResult.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/search/ISearchEngineResult2.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/search/ISearchEngineResultCollector.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/search/ISearchResult.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/search/ISearchScope.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/search/SearchParticipant.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/search/SearchParticipantXML.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/search/SearchProcessorInfo.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/server/HelpServer.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/standalone/Help.java9
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/standalone/Infocenter.java9
150 files changed, 900 insertions, 450 deletions
diff --git a/org.eclipse.help.base/src/org/eclipse/help/base/AbstractHelpDisplay.java b/org.eclipse.help.base/src/org/eclipse/help/base/AbstractHelpDisplay.java
index a46603172..2b55f855e 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/base/AbstractHelpDisplay.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/base/AbstractHelpDisplay.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2010, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/base/AbstractHelpScope.java b/org.eclipse.help.base/src/org/eclipse/help/base/AbstractHelpScope.java
index c68a5bf18..4bb925b0b 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/base/AbstractHelpScope.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/base/AbstractHelpScope.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2010, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/base/IHelpScopeProducer.java b/org.eclipse.help.base/src/org/eclipse/help/base/IHelpScopeProducer.java
index 7139b28d9..9de3aa009 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/base/IHelpScopeProducer.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/base/IHelpScopeProducer.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2010, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/base/IScopeHandle.java b/org.eclipse.help.base/src/org/eclipse/help/base/IScopeHandle.java
index 81097a5fa..cdd186ac5 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/base/IScopeHandle.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/base/IScopeHandle.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2010, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/browser/IBrowser.java b/org.eclipse.help.base/src/org/eclipse/help/browser/IBrowser.java
index e610d0d0c..d9c5cfb50 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/browser/IBrowser.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/browser/IBrowser.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/browser/IBrowserFactory.java b/org.eclipse.help.base/src/org/eclipse/help/browser/IBrowserFactory.java
index 6627b751a..c635966bd 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/browser/IBrowserFactory.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/browser/IBrowserFactory.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/BaseHelpSystem.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/BaseHelpSystem.java
index dd8b3fb3e..2ea5bf807 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/BaseHelpSystem.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/BaseHelpSystem.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2018 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/BookmarkManager.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/BookmarkManager.java
index 24c438932..8ee39938f 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/BookmarkManager.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/BookmarkManager.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/DisplayUtils.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/DisplayUtils.java
index 0e9ae76b5..5e1c71963 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/DisplayUtils.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/DisplayUtils.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpApplication.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpApplication.java
index 2ad11ca81..10689fd4a 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpApplication.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpApplication.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2016 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBasePlugin.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBasePlugin.java
index a125a0915..86274f4fb 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBasePlugin.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBasePlugin.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBasePreferenceInitializer.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBasePreferenceInitializer.java
index 8a8a504c6..da8666c89 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBasePreferenceInitializer.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBasePreferenceInitializer.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBaseResources.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBaseResources.java
index 67accefe3..d0291560f 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBaseResources.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBaseResources.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBaseResources.properties b/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBaseResources.properties
index 84e770399..d5be06538 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBaseResources.properties
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBaseResources.properties
@@ -1,9 +1,12 @@
###############################################################################
# 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
+#
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpDisplay.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpDisplay.java
index 113d1bdf5..28ebfd10d 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpDisplay.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpDisplay.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpEvaluationContext.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpEvaluationContext.java
index 4e3d62d13..fc84188f1 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpEvaluationContext.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpEvaluationContext.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2006, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpProvider.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpProvider.java
index b3fd36820..98df3bdf6 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpProvider.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpProvider.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2011, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/IHelpActivitySupport.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/IHelpActivitySupport.java
index dfc16515d..d67dbce43 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/IHelpActivitySupport.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/IHelpActivitySupport.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/IHelpBaseConstants.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/IHelpBaseConstants.java
index 92a34e4db..ca8f01418 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/IHelpBaseConstants.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/IHelpBaseConstants.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/IndexToolApplication.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/IndexToolApplication.java
index d050bf870..ec86aa0c6 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/IndexToolApplication.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/IndexToolApplication.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2016 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/MissingContentManager.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/MissingContentManager.java
index 2382f3064..ff79d288e 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/MissingContentManager.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/MissingContentManager.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2011, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/DefaultPreferenceFileHandler.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/DefaultPreferenceFileHandler.java
index 2a10b31a8..7bf0fe09a 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/DefaultPreferenceFileHandler.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/DefaultPreferenceFileHandler.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2009, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/HttpsUtility.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/HttpsUtility.java
index 4e1df585c..2b7f61cd8 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/HttpsUtility.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/HttpsUtility.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2010, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/PreferenceFileHandler.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/PreferenceFileHandler.java
index c83b282b8..e20ac63f2 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/PreferenceFileHandler.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/PreferenceFileHandler.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2008, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteContentLocator.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteContentLocator.java
index 85a3ade71..ce303f274 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteContentLocator.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteContentLocator.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2008, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteContextProvider.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteContextProvider.java
index de4c31eea..36a99de46 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteContextProvider.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteContextProvider.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2006, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteExtensionProvider.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteExtensionProvider.java
index 5140f023e..22ead73e5 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteExtensionProvider.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteExtensionProvider.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2006, 2016 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteHelp.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteHelp.java
index 8cec64750..4adc6d936 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteHelp.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteHelp.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2006, 2016 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteHelpInputStream.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteHelpInputStream.java
index 288d164f2..f17b72927 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteHelpInputStream.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteHelpInputStream.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2011, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteIC.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteIC.java
index e4b6868c0..c0e1aef52 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteIC.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteIC.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2008, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteIndexParser.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteIndexParser.java
index 8643cf157..a44a6489f 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteIndexParser.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteIndexParser.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2006, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteIndexProvider.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteIndexProvider.java
index beb90e4e4..c9c202291 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteIndexProvider.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteIndexProvider.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2006, 2016 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteSearchManager.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteSearchManager.java
index 3792797ed..0df5716f9 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteSearchManager.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteSearchManager.java
@@ -1,9 +1,12 @@
/***************************************************************************************************
* Copyright (c) 2006, 2016 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
+ *
+ * This program and the
+ * accompanying materials are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors: IBM Corporation - initial API and implementation
**************************************************************************************************/
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteSearchParser.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteSearchParser.java
index 02ece3c44..468c46e5d 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteSearchParser.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteSearchParser.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2006, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteStatusData.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteStatusData.java
index 4a9d33260..4c5123149 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteStatusData.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteStatusData.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2009, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteTocParser.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteTocParser.java
index 6568cc1d4..63936b2af 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteTocParser.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteTocParser.java
@@ -1,9 +1,12 @@
/***************************************************************************************************
* Copyright (c) 2006, 2015 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
+ *
+ * This program and the
+ * accompanying materials are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors: IBM Corporation - initial API and implementation
**************************************************************************************************/
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteTocProvider.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteTocProvider.java
index b5322c607..8b53f0e1f 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteTocProvider.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteTocProvider.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2006, 2016 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/CriteriaHelpScope.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/CriteriaHelpScope.java
index a47720a8a..2eb418478 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/CriteriaHelpScope.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/CriteriaHelpScope.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2010, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/EnablementScope.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/EnablementScope.java
index dd77314a1..1b7be1a51 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/EnablementScope.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/EnablementScope.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2010, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/FilterScope.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/FilterScope.java
index 8d3c6b581..02bcf0639 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/FilterScope.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/FilterScope.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2010, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/IntersectionScope.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/IntersectionScope.java
index 36cb9bacf..700f84d90 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/IntersectionScope.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/IntersectionScope.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2010, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/ScopeHandle.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/ScopeHandle.java
index 57ecb8718..88ac3933b 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/ScopeHandle.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/ScopeHandle.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2010, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/ScopeRegistry.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/ScopeRegistry.java
index 14d94ee9e..3414a407e 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/ScopeRegistry.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/ScopeRegistry.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2010, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/ScopeUtils.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/ScopeUtils.java
index abb79770c..36b81372a 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/ScopeUtils.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/ScopeUtils.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2010, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/SearchScopeScope.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/SearchScopeScope.java
index 361d2594a..d805ad6f4 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/SearchScopeScope.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/SearchScopeScope.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2010, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/UnionScope.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/UnionScope.java
index 4de4c7660..4837daa2a 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/UnionScope.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/UnionScope.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2010, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/UniversalScope.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/UniversalScope.java
index a6b3ffa2c..c7c10906e 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/UniversalScope.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/UniversalScope.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2010, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/WorkingSetScope.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/WorkingSetScope.java
index b52343dab..7e0e47488 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/WorkingSetScope.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/WorkingSetScope.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2010, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/util/CriteriaUtilities.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/util/CriteriaUtilities.java
index 387b28b3c..f9d0ab20f 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/util/CriteriaUtilities.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/util/CriteriaUtilities.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2010, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/util/HelpProperties.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/util/HelpProperties.java
index a678759fd..f8efb0b35 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/util/HelpProperties.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/util/HelpProperties.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2016 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/util/IErrorUtil.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/util/IErrorUtil.java
index c0c88f389..f6af4b531 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/util/IErrorUtil.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/util/IErrorUtil.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2007 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/util/IndexUtils.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/util/IndexUtils.java
index 515a93847..8996fea14 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/util/IndexUtils.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/util/IndexUtils.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2009, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/util/LinkUtil.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/util/LinkUtil.java
index a86f814ae..72d82e40a 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/util/LinkUtil.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/util/LinkUtil.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2007, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/util/ProxyUtil.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/util/ProxyUtil.java
index 9ac5f8124..dfad67405 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/util/ProxyUtil.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/util/ProxyUtil.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2014, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/util/TString.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/util/TString.java
index 5d2d945e6..63c681ba9 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/util/TString.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/util/TString.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2007 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/util/TestConnectionUtility.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/util/TestConnectionUtility.java
index bd6b33ab0..f4b6f0a66 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/util/TestConnectionUtility.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/util/TestConnectionUtility.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2008, 2016 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserDescriptor.java b/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserDescriptor.java
index c4372910f..741626dee 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserDescriptor.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserDescriptor.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2007 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserLog.java b/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserLog.java
index a62c5e85c..d14074ccd 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserLog.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserLog.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2016 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserManager.java b/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserManager.java
index faa3bab3b..3d90b586d 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserManager.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserManager.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/browser/CurrentBrowser.java b/org.eclipse.help.base/src/org/eclipse/help/internal/browser/CurrentBrowser.java
index 55e9c8a88..a2f3cc884 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/browser/CurrentBrowser.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/browser/CurrentBrowser.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/browser/CustomBrowser.java b/org.eclipse.help.base/src/org/eclipse/help/internal/browser/CustomBrowser.java
index d0d515dd1..3889fecf9 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/browser/CustomBrowser.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/browser/CustomBrowser.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/browser/CustomBrowserFactory.java b/org.eclipse.help.base/src/org/eclipse/help/internal/browser/CustomBrowserFactory.java
index 7851b66ed..ba87f7ff2 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/browser/CustomBrowserFactory.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/browser/CustomBrowserFactory.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/browser/MozillaBrowserAdapter.java b/org.eclipse.help.base/src/org/eclipse/help/internal/browser/MozillaBrowserAdapter.java
index 912c24f48..05c31c4b6 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/browser/MozillaBrowserAdapter.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/browser/MozillaBrowserAdapter.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2016 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/browser/MozillaFactory.java b/org.eclipse.help.base/src/org/eclipse/help/internal/browser/MozillaFactory.java
index 06257e4de..9ba3b1d69 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/browser/MozillaFactory.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/browser/MozillaFactory.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/browser/StreamConsumer.java b/org.eclipse.help.base/src/org/eclipse/help/internal/browser/StreamConsumer.java
index bc647f477..7fec5ca4a 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/browser/StreamConsumer.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/browser/StreamConsumer.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/browser/macosx/DefaultBrowserAdapter.java b/org.eclipse.help.base/src/org/eclipse/help/internal/browser/macosx/DefaultBrowserAdapter.java
index a2b04a851..9afe4cc76 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/browser/macosx/DefaultBrowserAdapter.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/browser/macosx/DefaultBrowserAdapter.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/browser/macosx/DefaultBrowserFactory.java b/org.eclipse.help.base/src/org/eclipse/help/internal/browser/macosx/DefaultBrowserFactory.java
index 8aa3e0804..9aa29af02 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/browser/macosx/DefaultBrowserFactory.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/browser/macosx/DefaultBrowserFactory.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/protocols/HelpURLConnection.java b/org.eclipse.help.base/src/org/eclipse/help/internal/protocols/HelpURLConnection.java
index 1100661d5..c24f3967e 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/protocols/HelpURLConnection.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/protocols/HelpURLConnection.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2016 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/protocols/HelpURLStreamHandler.java b/org.eclipse.help.base/src/org/eclipse/help/internal/protocols/HelpURLStreamHandler.java
index 16fb14f8a..4e7db14af 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/protocols/HelpURLStreamHandler.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/protocols/HelpURLStreamHandler.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/ASCIIReader.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/ASCIIReader.java
index 275793229..1081a95e5 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/ASCIIReader.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/ASCIIReader.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/AnalyzerDescriptor.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/AnalyzerDescriptor.java
index e666d0da4..f0a7f535d 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/AnalyzerDescriptor.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/AnalyzerDescriptor.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2015 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
+ *
+ * This program and the
+ * accompanying materials are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors: IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/AnalyzerFactory.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/AnalyzerFactory.java
index 9bd03f938..8ba94a155 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/AnalyzerFactory.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/AnalyzerFactory.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2012, 2016 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/Analyzer_en.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/Analyzer_en.java
index b94e0c584..b4f21e056 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/Analyzer_en.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/Analyzer_en.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2016 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/DefaultAnalyzer.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/DefaultAnalyzer.java
index 012954a16..68fcc5afd 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/DefaultAnalyzer.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/DefaultAnalyzer.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2016 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
+ *
+ * This program and the
+ * accompanying materials are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/HTMLDocParser.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/HTMLDocParser.java
index 50fd16b09..82eb8adc5 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/HTMLDocParser.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/HTMLDocParser.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/HTMLSearchParticipant.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/HTMLSearchParticipant.java
index 468c5454c..1ae2ce85b 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/HTMLSearchParticipant.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/HTMLSearchParticipant.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2005, 2016 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/ISearchHitCollector.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/ISearchHitCollector.java
index 4f6b9ccd4..319462c47 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/ISearchHitCollector.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/ISearchHitCollector.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/ISearchQuery.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/ISearchQuery.java
index 22fd673a1..d3ae58117 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/ISearchQuery.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/ISearchQuery.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/IndexingOperation.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/IndexingOperation.java
index 87bac9c9b..68ca696c6 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/IndexingOperation.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/IndexingOperation.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2016 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/InfoCenter.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/InfoCenter.java
index b541a87f9..93556c062 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/InfoCenter.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/InfoCenter.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2016 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/LazyProgressMonitor.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/LazyProgressMonitor.java
index fd1d7ef52..4bab286e9 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/LazyProgressMonitor.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/LazyProgressMonitor.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/LimitedSizeCharArrayWriter.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/LimitedSizeCharArrayWriter.java
index 66a15da7b..deca309ce 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/LimitedSizeCharArrayWriter.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/LimitedSizeCharArrayWriter.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2009, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/LocalSearchManager.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/LocalSearchManager.java
index c2b02af4f..a46cf4b8e 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/LocalSearchManager.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/LocalSearchManager.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/LowerCaseAndDigitsTokenizer.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/LowerCaseAndDigitsTokenizer.java
index 4fb3de814..7053a108e 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/LowerCaseAndDigitsTokenizer.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/LowerCaseAndDigitsTokenizer.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2016 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/LuceneSearchDocument.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/LuceneSearchDocument.java
index 620b189d6..0f77edb1e 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/LuceneSearchDocument.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/LuceneSearchDocument.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2010, 2016 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/PluginIndex.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/PluginIndex.java
index 6aac98619..8b737f336 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/PluginIndex.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/PluginIndex.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2005, 2016 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/PluginVersionInfo.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/PluginVersionInfo.java
index 4f17d0c2a..8c9765139 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/PluginVersionInfo.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/PluginVersionInfo.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/PrebuiltIndexes.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/PrebuiltIndexes.java
index 3821d409d..cc2e973f5 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/PrebuiltIndexes.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/PrebuiltIndexes.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2005, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/ProgressDistributor.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/ProgressDistributor.java
index e3e387273..df98f4b93 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/ProgressDistributor.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/ProgressDistributor.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryBuilder.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryBuilder.java
index b8bfdb869..b90bc3fae 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryBuilder.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryBuilder.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2016 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryTooComplexException.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryTooComplexException.java
index 1f9e6a2fd..21be07cd3 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryTooComplexException.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryTooComplexException.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2003, 2007 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryWordsExactPhrase.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryWordsExactPhrase.java
index ca5ac27e8..a91c494cd 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryWordsExactPhrase.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryWordsExactPhrase.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryWordsPhrase.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryWordsPhrase.java
index e499f8bef..944d969ac 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryWordsPhrase.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryWordsPhrase.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryWordsToken.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryWordsToken.java
index ce0014a44..8c937d1b4 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryWordsToken.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryWordsToken.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2016 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchHit.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchHit.java
index b218b9860..e63945fa1 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchHit.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchHit.java
@@ -1,9 +1,12 @@
/***************************************************************************************************
* Copyright (c) 2000, 2015 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
+ *
+ * This program and the
+ * accompanying materials are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors: IBM Corporation - initial API and implementation
**************************************************************************************************/
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndex.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndex.java
index 13321a1cb..27e820f8f 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndex.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndex.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2017 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndexWithIndexingProgress.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndexWithIndexingProgress.java
index 2211e3a59..7da701eb1 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndexWithIndexingProgress.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndexWithIndexingProgress.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2007 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchManager.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchManager.java
index 9c0eabbe2..3f5c960ee 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchManager.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchManager.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2016 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchProgressMonitor.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchProgressMonitor.java
index 2b66088e5..7f4635e66 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchProgressMonitor.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchProgressMonitor.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2016 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchQuery.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchQuery.java
index 7bc3bd179..e0190bb36 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchQuery.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchQuery.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchResult.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchResult.java
index ebe0389d8..c4724c60d 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchResult.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchResult.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2011, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchResults.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchResults.java
index c9e04d8a1..0e14759cc 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchResults.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchResults.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/SmartAnalyzer.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/SmartAnalyzer.java
index bfb5a46b9..02400f2e1 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/SmartAnalyzer.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/SmartAnalyzer.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2016 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/WebSearch.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/WebSearch.java
index 04c8f71c5..8b5f889d7 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/WebSearch.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/WebSearch.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/XHTMLSearchParticipant.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/XHTMLSearchParticipant.java
index 00234365b..4469c4853 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/XHTMLSearchParticipant.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/XHTMLSearchParticipant.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2005, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/federated/FederatedSearchEntry.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/federated/FederatedSearchEntry.java
index 8a8505dd6..de619f645 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/federated/FederatedSearchEntry.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/federated/FederatedSearchEntry.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/federated/FederatedSearchJob.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/federated/FederatedSearchJob.java
index 3ad21cd83..50082d1b5 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/federated/FederatedSearchJob.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/federated/FederatedSearchJob.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/federated/IndexerJob.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/federated/IndexerJob.java
index 2a48f7be4..432b8f41e 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/federated/IndexerJob.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/federated/IndexerJob.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/federated/LocalHelp.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/federated/LocalHelp.java
index 01e7cb1c0..d7b8edc27 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/federated/LocalHelp.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/federated/LocalHelp.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/federated/LocalHelpScope.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/federated/LocalHelpScope.java
index e8b0c7805..d9e0d0895 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/federated/LocalHelpScope.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/federated/LocalHelpScope.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/server/JettyHelpServer.java b/org.eclipse.help.base/src/org/eclipse/help/internal/server/JettyHelpServer.java
index 4f1035cea..c492a3bbe 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/server/JettyHelpServer.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/server/JettyHelpServer.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2008, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/server/WebappManager.java b/org.eclipse.help.base/src/org/eclipse/help/internal/server/WebappManager.java
index 7715e946f..9b4e9b8ad 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/server/WebappManager.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/server/WebappManager.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2007, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/Eclipse.java b/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/Eclipse.java
index 4416ecaf3..ad58f406f 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/Eclipse.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/Eclipse.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/EclipseConnection.java b/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/EclipseConnection.java
index beac476e4..82d850468 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/EclipseConnection.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/EclipseConnection.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2016 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/EclipseController.java b/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/EclipseController.java
index fcb46175f..516deb29e 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/EclipseController.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/EclipseController.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2016 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/EclipseLifeCycleListener.java b/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/EclipseLifeCycleListener.java
index 03c263e7f..ce359c979 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/EclipseLifeCycleListener.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/EclipseLifeCycleListener.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2003, 2007 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/Options.java b/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/Options.java
index cca799ccc..14d821662 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/Options.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/Options.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/StandaloneHelp.java b/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/StandaloneHelp.java
index 9951cbdf0..7694aa6c0 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/StandaloneHelp.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/StandaloneHelp.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/StandaloneInfocenter.java b/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/StandaloneInfocenter.java
index fe11febe1..9947defc3 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/StandaloneInfocenter.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/StandaloneInfocenter.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/validation/TocValidator.java b/org.eclipse.help.base/src/org/eclipse/help/internal/validation/TocValidator.java
index ee68312b9..8569c365e 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/validation/TocValidator.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/validation/TocValidator.java
@@ -21,10 +21,13 @@ import org.xml.sax.SAXException;
/*******************************************************************************
* Copyright (c) 2007, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/AdaptableHelpResource.java b/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/AdaptableHelpResource.java
index 642b4ba48..60390c07b 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/AdaptableHelpResource.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/AdaptableHelpResource.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/AdaptableSelectedToc.java b/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/AdaptableSelectedToc.java
index 965aa7d38..f25a42b03 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/AdaptableSelectedToc.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/AdaptableSelectedToc.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2009, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/AdaptableSelectedTopic.java b/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/AdaptableSelectedTopic.java
index cf75c9882..cc899537e 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/AdaptableSelectedTopic.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/AdaptableSelectedTopic.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2009, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/AdaptableToc.java b/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/AdaptableToc.java
index 988605686..bf2a0a528 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/AdaptableToc.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/AdaptableToc.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/AdaptableTocsArray.java b/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/AdaptableTocsArray.java
index e7dfb8567..6a7b0ec6c 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/AdaptableTocsArray.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/AdaptableTocsArray.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/AdaptableTopic.java b/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/AdaptableTopic.java
index b3dfd9a51..c1ef793b4 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/AdaptableTopic.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/AdaptableTopic.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2016 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/IHelpWorkingSetManager.java b/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/IHelpWorkingSetManager.java
index d743edbca..f331b34d0 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/IHelpWorkingSetManager.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/IHelpWorkingSetManager.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/WorkingSet.java b/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/WorkingSet.java
index c1c0f9178..05dd28cef 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/WorkingSet.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/WorkingSet.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/WorkingSetComparator.java b/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/WorkingSetComparator.java
index 43db8893e..6cafb158a 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/WorkingSetComparator.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/WorkingSetComparator.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/WorkingSetManager.java b/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/WorkingSetManager.java
index 604006023..4fe49702c 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/WorkingSetManager.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/WorkingSetManager.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2016 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/xhtml/DynamicXHTMLProcessor.java b/org.eclipse.help.base/src/org/eclipse/help/internal/xhtml/DynamicXHTMLProcessor.java
index d55b3b039..c4cbc75e3 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/xhtml/DynamicXHTMLProcessor.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/xhtml/DynamicXHTMLProcessor.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2006, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/xhtml/XHTMLCharsetHandler.java b/org.eclipse.help.base/src/org/eclipse/help/internal/xhtml/XHTMLCharsetHandler.java
index 201a679b8..e8c35dbc0 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/xhtml/XHTMLCharsetHandler.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/xhtml/XHTMLCharsetHandler.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2006, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/xhtml/XHTMLContentDescriber.java b/org.eclipse.help.base/src/org/eclipse/help/internal/xhtml/XHTMLContentDescriber.java
index 74b7d369e..1127f73ef 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/xhtml/XHTMLContentDescriber.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/xhtml/XHTMLContentDescriber.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2006, 2016 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/search/AbstractSearchProcessor.java b/org.eclipse.help.base/src/org/eclipse/help/search/AbstractSearchProcessor.java
index 172153b37..a300d8eaa 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/search/AbstractSearchProcessor.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/search/AbstractSearchProcessor.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2011, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/search/HelpIndexBuilder.java b/org.eclipse.help.base/src/org/eclipse/help/search/HelpIndexBuilder.java
index 0ab6701a2..54c6c5227 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/search/HelpIndexBuilder.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/search/HelpIndexBuilder.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2004, 2016 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/search/IHelpSearchIndex.java b/org.eclipse.help.base/src/org/eclipse/help/search/IHelpSearchIndex.java
index 5aee3e6e5..32a30b71e 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/search/IHelpSearchIndex.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/search/IHelpSearchIndex.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2010, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/search/ISearchDocument.java b/org.eclipse.help.base/src/org/eclipse/help/search/ISearchDocument.java
index 86ad046a5..cde0bd77e 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/search/ISearchDocument.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/search/ISearchDocument.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2010, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/search/ISearchEngine.java b/org.eclipse.help.base/src/org/eclipse/help/search/ISearchEngine.java
index 062ae68ad..f2342f094 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/search/ISearchEngine.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/search/ISearchEngine.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/search/ISearchEngine2.java b/org.eclipse.help.base/src/org/eclipse/help/search/ISearchEngine2.java
index cf9ff1c10..1adf8ee21 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/search/ISearchEngine2.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/search/ISearchEngine2.java
@@ -1,9 +1,12 @@
/***************************************************************************************************
* Copyright (c) 2005, 2015 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
+ *
+ * This program and the
+ * accompanying materials are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors: IBM Corporation - initial API and implementation
**************************************************************************************************/
diff --git a/org.eclipse.help.base/src/org/eclipse/help/search/ISearchEngineResult.java b/org.eclipse.help.base/src/org/eclipse/help/search/ISearchEngineResult.java
index ac2e25cf9..8a0ea8617 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/search/ISearchEngineResult.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/search/ISearchEngineResult.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/search/ISearchEngineResult2.java b/org.eclipse.help.base/src/org/eclipse/help/search/ISearchEngineResult2.java
index 679ea1c47..eb4f01f0f 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/search/ISearchEngineResult2.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/search/ISearchEngineResult2.java
@@ -1,9 +1,12 @@
/***************************************************************************************************
* Copyright (c) 2005, 2015 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
+ *
+ * This program and the
+ * accompanying materials are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors: IBM Corporation - initial API and implementation
**************************************************************************************************/
diff --git a/org.eclipse.help.base/src/org/eclipse/help/search/ISearchEngineResultCollector.java b/org.eclipse.help.base/src/org/eclipse/help/search/ISearchEngineResultCollector.java
index 5c3df8643..163eae566 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/search/ISearchEngineResultCollector.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/search/ISearchEngineResultCollector.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/search/ISearchResult.java b/org.eclipse.help.base/src/org/eclipse/help/search/ISearchResult.java
index 98b8c51dd..64ae1d486 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/search/ISearchResult.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/search/ISearchResult.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2011, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/search/ISearchScope.java b/org.eclipse.help.base/src/org/eclipse/help/search/ISearchScope.java
index 2675f0755..982708553 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/search/ISearchScope.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/search/ISearchScope.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/search/SearchParticipant.java b/org.eclipse.help.base/src/org/eclipse/help/search/SearchParticipant.java
index 800502cd5..2f18e40ef 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/search/SearchParticipant.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/search/SearchParticipant.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2010, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/search/SearchParticipantXML.java b/org.eclipse.help.base/src/org/eclipse/help/search/SearchParticipantXML.java
index cec046496..3a171da1f 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/search/SearchParticipantXML.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/search/SearchParticipantXML.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2010, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/search/SearchProcessorInfo.java b/org.eclipse.help.base/src/org/eclipse/help/search/SearchProcessorInfo.java
index e818f3462..55eca0efc 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/search/SearchProcessorInfo.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/search/SearchProcessorInfo.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2011, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/server/HelpServer.java b/org.eclipse.help.base/src/org/eclipse/help/server/HelpServer.java
index a28f9a774..bbafe28bf 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/server/HelpServer.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/server/HelpServer.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2008, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/standalone/Help.java b/org.eclipse.help.base/src/org/eclipse/help/standalone/Help.java
index df2540459..0e8acbf6d 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/standalone/Help.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/standalone/Help.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/org.eclipse.help.base/src/org/eclipse/help/standalone/Infocenter.java b/org.eclipse.help.base/src/org/eclipse/help/standalone/Infocenter.java
index f566148a7..5666b088f 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/standalone/Infocenter.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/standalone/Infocenter.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2000, 2015 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
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation

Back to the top