November 30, 2017
++ The Eclipse Foundation makes available all content in this plug-in + ("Content"). Unless otherwise indicated below, the Content + is provided to you under the terms and conditions of the Eclipse + Public License Version 2.0 ("EPL"). A copy of the EPL is + available at http://www.eclipse.org/legal/epl-2.0. + For purposes of the EPL, "Program" will mean the Content. +
+ ++ If you did not receive this Content directly from the Eclipse + Foundation, the Content is being redistributed by another party + ("Redistributor") and different terms and conditions may + apply to your use of any object code in the Content. Check the + Redistributor's license that was provided with the Content. If no such + license exists, contact the Redistributor. Unless otherwise indicated + below, the terms and conditions of the EPL still apply to any source + code in the Content and such source code may be obtained at http://www.eclipse.org. +
+ +The Content includes items that have been sourced from third parties as set out below. If you +did not receive this Content directly from the Eclipse Foundation, the following is provided +for informational purposes only, and you should look to the Redistributor’s license for +terms and conditions of use.
+ +The plug-in includes software developed by The Apache Software Foundation as part of the Jakarta Commons Collections project.
+ +The Jakarta Commons Collections binary code can be found in the plug-in JAR in the following files:
+ +The Jakarta Commons Collections source code can be found in src.zip in the following files:
+ +Your use of the Jakarta Commons Collections code is subject to the terms and conditions of the Apache License, Version 2.0. A copy of the license is contained +in the file LICENSE-2.0.txt and is also available at http://www.apache.org/licenses/LICENSE-2.0.html.
+ +The Apache attribution notice file NOTICE.txt is included with the Content in accordance with 4d of the Apache License, Version 2.0 + +
The names "Jakarta" and "Apache Software Foundation" must not be used to endorse or promote products derived from this +software without prior written permission. For written permission, please contact apache@apache.org.
+ +Java and all Java-based trademarks and logos are trademarks or registered trademarks of Sun Microsystems, Inc. in the United States and other countries. + + + diff --git a/bundles/org.eclipse.equinox.api/about_files/LICENSE-2.0.txt b/bundles/org.eclipse.equinox.api/about_files/LICENSE-2.0.txt new file mode 100644 index 00000000000..d6456956733 --- /dev/null +++ b/bundles/org.eclipse.equinox.api/about_files/LICENSE-2.0.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/bundles/org.eclipse.equinox.api/about_files/NOTICE.txt b/bundles/org.eclipse.equinox.api/about_files/NOTICE.txt new file mode 100644 index 00000000000..3f59805ce43 --- /dev/null +++ b/bundles/org.eclipse.equinox.api/about_files/NOTICE.txt @@ -0,0 +1,2 @@ +This product includes software developed by +The Apache Software Foundation (http://www.apache.org/). diff --git a/bundles/org.eclipse.equinox.api/build.properties b/bundles/org.eclipse.equinox.api/build.properties new file mode 100644 index 00000000000..70877deb46f --- /dev/null +++ b/bundles/org.eclipse.equinox.api/build.properties @@ -0,0 +1,6 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + plugin.properties +pom.model.property.tycho.baseline.skip=false \ No newline at end of file diff --git a/bundles/org.eclipse.equinox.api/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.api/forceQualifierUpdate.txt new file mode 100644 index 00000000000..2bf05bb79e9 --- /dev/null +++ b/bundles/org.eclipse.equinox.api/forceQualifierUpdate.txt @@ -0,0 +1,8 @@ +# To force a version qualifier update add the bug here +Bug 403352 - Update all parent versions to match our build stream +Bug 462431 - New certificate conflict +Bug 531640 - New certificate conflict +Bug 527899 [9] Implement JEP 280: Indify String Concatenation #1139 +https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1659 +https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1923 +https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/2044 \ No newline at end of file diff --git a/bundles/org.eclipse.equinox.api/plugin.properties b/bundles/org.eclipse.equinox.api/plugin.properties new file mode 100644 index 00000000000..d65cd0bae06 --- /dev/null +++ b/bundles/org.eclipse.equinox.api/plugin.properties @@ -0,0 +1,15 @@ +############################################################################### +# Copyright (c) 2005, 2009 IBM Corporation and others. +# +# 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 +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +# +# Contributors: +# IBM Corporation - initial API and implementation +############################################################################### +pluginName = Equinox API +providerName = Eclipse.org - Equinox diff --git a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/AdapterTypes.java b/bundles/org.eclipse.equinox.api/src/org/eclipse/core/runtime/AdapterTypes.java similarity index 100% rename from bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/AdapterTypes.java rename to bundles/org.eclipse.equinox.api/src/org/eclipse/core/runtime/AdapterTypes.java diff --git a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/Adapters.java b/bundles/org.eclipse.equinox.api/src/org/eclipse/core/runtime/Adapters.java similarity index 93% rename from bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/Adapters.java rename to bundles/org.eclipse.equinox.api/src/org/eclipse/core/runtime/Adapters.java index 9bccf2e021f..3bc1afc8fc5 100644 --- a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/Adapters.java +++ b/bundles/org.eclipse.equinox.api/src/org/eclipse/core/runtime/Adapters.java @@ -17,7 +17,9 @@ import java.util.Objects; import java.util.Optional; -import org.eclipse.core.internal.runtime.*; + +import org.eclipse.equinox.api.internal.APISupport; +import org.eclipse.equinox.api.internal.LocalizationUtils; import org.eclipse.osgi.util.NLS; /** @@ -136,8 +138,8 @@ public staticIAdaptable interface.
@@ -70,6 +70,6 @@ public PlatformObject() {
*/
@Override
public
@@ -1184,7 +1185,7 @@ private static void logProblem(String message) {
return;
}
}
- RuntimeLog.log(new Status(IStatus.WARNING, "org.eclipse.core.runtime", message, new Throwable())); //$NON-NLS-1$
+ APISupport.log(new Status(IStatus.WARNING, "org.eclipse.core.runtime", message, new Throwable())); //$NON-NLS-1$
}
@Override
diff --git a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/SubProgressMonitor.java b/bundles/org.eclipse.equinox.api/src/org/eclipse/core/runtime/SubProgressMonitor.java
similarity index 100%
rename from bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/SubProgressMonitor.java
rename to bundles/org.eclipse.equinox.api/src/org/eclipse/core/runtime/SubProgressMonitor.java
diff --git a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/URIUtil.java b/bundles/org.eclipse.equinox.api/src/org/eclipse/core/runtime/URIUtil.java
similarity index 100%
rename from bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/URIUtil.java
rename to bundles/org.eclipse.equinox.api/src/org/eclipse/core/runtime/URIUtil.java
diff --git a/bundles/org.eclipse.equinox.api/src/org/eclipse/equinox/api/internal/APISupport.java b/bundles/org.eclipse.equinox.api/src/org/eclipse/equinox/api/internal/APISupport.java
new file mode 100644
index 00000000000..6c932652c79
--- /dev/null
+++ b/bundles/org.eclipse.equinox.api/src/org/eclipse/equinox/api/internal/APISupport.java
@@ -0,0 +1,186 @@
+/*******************************************************************************
+ * Copyright (c) 2024 Christoph Läubrich and others.
+ *
+ * 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
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Christoph Läubrich - initial API and implementation
+ * Methods migrated from org.eclipse.core.internal.runtime.Activator contributed by:
+ * IBM Corporation - initial API and implementation
+ * Sergey Prigogin (Google) - use parameterized types (bug 442021)
+ * Christoph Laeubrich - Bug 567344 - Support registration of IAdapterFactory as OSGi Service
+ *******************************************************************************/
+package org.eclipse.equinox.api.internal;
+
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+import org.eclipse.core.runtime.IAdapterManager;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.osgi.service.debug.DebugOptions;
+import org.eclipse.osgi.service.debug.DebugOptionsListener;
+import org.eclipse.osgi.service.urlconversion.URLConverter;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Filter;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.service.packageadmin.PackageAdmin;
+import org.osgi.util.tracker.ServiceTracker;
+
+/**
+ * API Bundle activator that is used to provide API service support and backward
+ * compatibility
+ */
+public class APISupport implements BundleActivator {
+
+ static final String PI_RUNTIME = "org.eclipse.core.runtime"; //$NON-NLS-1$
+ public static final String PI_COMMON = "org.eclipse.equinox.common"; //$NON-NLS-1$
+ public static final int PLUGIN_ERROR = 2;
+
+ private static volatile ServiceTrackernull if the bundle could not be determined.
+ */
+ public static String getBundleId(Object object) {
+ if (object == null)
+ return null;
+ Bundle source = FrameworkUtil.getBundle(object.getClass());
+ if (source != null && source.getSymbolicName() != null)
+ return source.getSymbolicName();
+ return null;
+ }
+
+}
diff --git a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/internal/runtime/FindSupport.java b/bundles/org.eclipse.equinox.api/src/org/eclipse/equinox/api/internal/FindSupport.java
similarity index 87%
rename from bundles/org.eclipse.equinox.common/src/org/eclipse/core/internal/runtime/FindSupport.java
rename to bundles/org.eclipse.equinox.api/src/org/eclipse/equinox/api/internal/FindSupport.java
index b8d4290ca33..0a1c81adaac 100644
--- a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/internal/runtime/FindSupport.java
+++ b/bundles/org.eclipse.equinox.api/src/org/eclipse/equinox/api/internal/FindSupport.java
@@ -12,14 +12,19 @@
* IBM Corporation - initial API and implementation
* Sergey Prigogin (Google) - use parameterized types (bug 442021)
*******************************************************************************/
-package org.eclipse.core.internal.runtime;
+package org.eclipse.equinox.api.internal;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.reflect.Method;
import java.net.URL;
import java.util.ArrayList;
import java.util.Map;
-import org.eclipse.core.runtime.*;
+
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
import org.osgi.framework.Bundle;
// This class provides implements the find* methods exposed on Platform.
@@ -32,8 +37,7 @@ public class FindSupport {
public static final String PROP_WS = "osgi.ws"; //$NON-NLS-1$
public static final String PROP_ARCH = "osgi.arch"; //$NON-NLS-1$
- private static String[] NL_JAR_VARIANTS = buildNLVariants(
- Activator.getContext() == null ? System.getProperty(PROP_NL) : Activator.getContext().getProperty(PROP_NL));
+ private static final String[] NL_JAR_VARIANTS = buildNLVariants(APISupport.getProperty(PROP_NL));
private static String[] buildNLVariants(String nl) {
ArrayList