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. -
- - - \ No newline at end of file diff --git a/org.eclipse.jdt.launching.macosx/build.properties b/org.eclipse.jdt.launching.macosx/build.properties deleted file mode 100644 index 22757b5ea9..0000000000 --- a/org.eclipse.jdt.launching.macosx/build.properties +++ /dev/null @@ -1,22 +0,0 @@ -############################################################################### -# Copyright (c) 2000, 2012 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 -############################################################################### -bin.includes = plugin.xml,\ - about.html,\ - plugin.properties,\ - .,\ - META-INF/ -source.. = macosx/ -src.includes = about.html -javacWarnings..=-unavoidableGenericProblems -output.. = bin/ \ No newline at end of file diff --git a/org.eclipse.jdt.launching.macosx/forceQualifierUpdate.txt b/org.eclipse.jdt.launching.macosx/forceQualifierUpdate.txt deleted file mode 100644 index 5fbc92d273..0000000000 --- a/org.eclipse.jdt.launching.macosx/forceQualifierUpdate.txt +++ /dev/null @@ -1,4 +0,0 @@ -# To force a version qualifier update add the bug here -https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1184 -https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1659 -https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1923 \ No newline at end of file diff --git a/org.eclipse.jdt.launching.macosx/plugin.properties b/org.eclipse.jdt.launching.macosx/plugin.properties deleted file mode 100644 index a0b65c9acb..0000000000 --- a/org.eclipse.jdt.launching.macosx/plugin.properties +++ /dev/null @@ -1,16 +0,0 @@ -############################################################################### -# Copyright (c) 2000, 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 = Mac OS X Launcher -providerName=Eclipse.org diff --git a/org.eclipse.jdt.launching.macosx/plugin.xml b/org.eclipse.jdt.launching.macosx/plugin.xml deleted file mode 100644 index 7d9667b32e..0000000000 --- a/org.eclipse.jdt.launching.macosx/plugin.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - -* /System/Library/Frameworks/JavaVM.framework/Versions/ * 1.3.1/ @@ -56,7 +56,7 @@ ** * The directory structure for developer VMs is: - * + * *
* /Library/Java/JavaVirtualMachines/ * 1.7.0.jdk/ @@ -69,7 +69,7 @@ ** * The directory structure for Snow Leopard and Lion VMs is: - * + * *
* /System/Library/Java/JavaVirtualMachines/
* 1.6.0.jdk/
@@ -126,6 +126,13 @@ public class MacOSXVMInstallType extends StandardVMType {
*/
static final String JVM_VERSIONS = "Versions"; //$NON-NLS-1$
+ public static final String ID_MACOSX_VM_TYPE = "org.eclipse.jdt.internal.launching.macosx.MacOSXType"; //$NON-NLS-1$
+
+ @Override
+ public String getId() {
+ return ID_MACOSX_VM_TYPE;
+ }
+
@Override
public String getName() {
return Messages.MacOSXVMInstallType_0;
diff --git a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXVMRunner.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/macosx/MacOSXVMRunner.java
similarity index 100%
rename from org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXVMRunner.java
rename to org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/macosx/MacOSXVMRunner.java
diff --git a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/Messages.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/macosx/Messages.java
similarity index 100%
rename from org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/Messages.java
rename to org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/macosx/Messages.java
diff --git a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/messages.properties b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/macosx/messages.properties
similarity index 100%
rename from org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/messages.properties
rename to org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/macosx/messages.properties
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaRuntime.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaRuntime.java
index a2662c20f9..aecda37a38 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaRuntime.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaRuntime.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2025 IBM Corporation and others.
+ * Copyright (c) 2000, 2026 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -105,6 +105,7 @@
import org.eclipse.jdt.internal.launching.VMListener;
import org.eclipse.jdt.internal.launching.VariableClasspathEntry;
import org.eclipse.jdt.internal.launching.environments.EnvironmentsManager;
+import org.eclipse.jdt.internal.launching.macosx.MacOSXVMInstallType;
import org.eclipse.jdt.launching.environments.ExecutionEnvironmentDescription;
import org.eclipse.jdt.launching.environments.IExecutionEnvironment;
import org.eclipse.jdt.launching.environments.IExecutionEnvironmentsManager;
@@ -342,7 +343,7 @@ public final class JavaRuntime {
private static final Object fgVMLock = new Object();
private static boolean fgInitializingVMs = false;
- private static Set