Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rapicault2015-04-24 10:29:54 -0400
committerPascal Rapicault2015-04-24 10:29:54 -0400
commitb281b11e5526f46c6890975d07e8ca7d8ee9f35e (patch)
tree0d65fcd2e77aa5ca682a603de5d2c4e439febea0
parentc2595d75a8a591bcae06c4e5efb6aa30dde3952d (diff)
downloadrt.equinox.p2-b281b11e5526f46c6890975d07e8ca7d8ee9f35e.tar.gz
rt.equinox.p2-b281b11e5526f46c6890975d07e8ca7d8ee9f35e.tar.xz
rt.equinox.p2-b281b11e5526f46c6890975d07e8ca7d8ee9f35e.zip
Revert "Bug 462282 - Prevent (automatic) update to new Mac layout"
-rw-r--r--bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.equinox.p2.core/META-INF/p2.inf7
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.natives/META-INF/MANIFEST.MF4
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.natives/META-INF/p2.inf8
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.natives/plugin.xml11
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/Messages.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/actions/BlockMacUpdate.java78
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/messages.properties2
8 files changed, 2 insertions, 112 deletions
diff --git a/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF
index 3fd4ab2d8..394b34494 100644
--- a/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF
@@ -64,7 +64,7 @@ Export-Package: org.eclipse.equinox.internal.p2.core;x-friends:="org.eclipse.equ
org.eclipse.equinox.p2.updatesite,
org.eclipse.equinox.p2.director.app,
org.eclipse.equinox.p2.transport.ecf",
- org.eclipse.equinox.p2.core;version="2.1.0",
+ org.eclipse.equinox.p2.core;version="2.0.0",
org.eclipse.equinox.p2.core.spi;version="2.1.0"
Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.5.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/bundles/org.eclipse.equinox.p2.core/META-INF/p2.inf b/bundles/org.eclipse.equinox.p2.core/META-INF/p2.inf
deleted file mode 100644
index 5ea2c4acd..000000000
--- a/bundles/org.eclipse.equinox.p2.core/META-INF/p2.inf
+++ /dev/null
@@ -1,7 +0,0 @@
-provides.1.namespace=org.eclipse.equinox.p2.iu
-provides.1.name=org.eclipse.equinox.p2.core
-provides.1.version=2.3.0.v20131211-1531
-
-provides.0.namespace=org.eclipse.equinox.p2.iu
-provides.0.name=org.eclipse.equinox.p2.core
-provides.0.version=2.4.0.$qualifier$
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.natives/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.touchpoint.natives/META-INF/MANIFEST.MF
index 898e2bf1d..3ecd5aacf 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.natives/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.natives/META-INF/MANIFEST.MF
@@ -22,7 +22,5 @@ Import-Package: org.eclipse.equinox.internal.p2.core.helpers,
org.eclipse.equinox.p2.query;version="2.0.0";resolution:=optional,
org.eclipse.equinox.p2.repository;version="[2.0.0,3.0.0)",
org.eclipse.equinox.p2.repository.artifact;version="[2.0.0,3.0.0)",
- org.eclipse.osgi.service.environment;version="1.3.0",
org.eclipse.osgi.util;version="1.0.0",
- org.osgi.framework;version="1.3.0",
- org.osgi.service.packageadmin;version="1.2.0"
+ org.osgi.framework;version="1.3.0"
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.natives/META-INF/p2.inf b/bundles/org.eclipse.equinox.p2.touchpoint.natives/META-INF/p2.inf
deleted file mode 100644
index c7908b7a1..000000000
--- a/bundles/org.eclipse.equinox.p2.touchpoint.natives/META-INF/p2.inf
+++ /dev/null
@@ -1,8 +0,0 @@
-provides.0.namespace=org.eclipse.equinox.p2.iu
-provides.0.name=org.eclipse.equinox.p2.touchpoint.natives
-provides.0.version=1.1.100.v20140523-0116
-
-provides.1.namespace=org.eclipse.equinox.p2.iu
-provides.1.name=org.eclipse.equinox.p2.touchpoint.natives
-provides.1.version=1.2.0.$qualifier$
-
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.natives/plugin.xml b/bundles/org.eclipse.equinox.p2.touchpoint.natives/plugin.xml
index 26f6da746..067b2d715 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.natives/plugin.xml
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.natives/plugin.xml
@@ -132,17 +132,6 @@
version="1.0.0">
</action>
</extension>
- <extension
- point="org.eclipse.equinox.p2.engine.actions">
- <action
- class="org.eclipse.equinox.internal.p2.touchpoint.natives.actions.BlockMacUpdate"
- description="blockMacUpdate()"
- name="blockMacUpdate"
- touchpointType="org.eclipse.equinox.p2.native"
- touchpointVersion="1.0.0"
- version="1.0.0">
- </action>
- </extension>
<extension
id="nativePackageExtractor"
point="org.eclipse.core.runtime.applications">
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/Messages.java b/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/Messages.java
index b0a3a9eff..fd251a3b6 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/Messages.java
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/Messages.java
@@ -40,8 +40,6 @@ public class Messages extends NLS {
public static String BackupStore_missing_backup_directory;
public static String BackupStore_not_a_directory;
public static String BackupStore_restore_closed_store;
- public static String BlockMacUpdate_0;
- public static String BlockMacUpdate_1;
public static String action_0_failed_file_1_doesNotExist;
public static String artifact_not_available;
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/actions/BlockMacUpdate.java b/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/actions/BlockMacUpdate.java
deleted file mode 100644
index 6279982ae..000000000
--- a/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/actions/BlockMacUpdate.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Rapicorp, inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.internal.p2.touchpoint.natives.actions;
-
-import java.util.Map;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.equinox.internal.p2.touchpoint.natives.Activator;
-import org.eclipse.equinox.internal.p2.touchpoint.natives.Messages;
-import org.eclipse.equinox.p2.engine.spi.ProvisioningAction;
-import org.eclipse.osgi.service.environment.EnvironmentInfo;
-import org.osgi.framework.*;
-import org.osgi.service.packageadmin.PackageAdmin;
-
-public class BlockMacUpdate extends ProvisioningAction {
-
- @Override
- public IStatus execute(Map<String, Object> parameters) {
- if (!runningOldMacLayout())
- return Status.OK_STATUS;
- return new Status(IStatus.ERROR, Activator.ID, Messages.BlockMacUpdate_1);
- }
-
- private boolean runningOldMacLayout() {
- if (!org.eclipse.osgi.service.environment.Constants.OS_MACOSX.equals(getOS()))
- return false;
- Version fwkAdminVersion = getFrameworkAdminVersion();
- if (fwkAdminVersion == null)
- return false;
- if (fwkAdminVersion.compareTo(new Version("1.0.500.v201523")) < 0) //$NON-NLS-1$
- return true;
- return false;
- }
-
- private Version getFrameworkAdminVersion() {
- ServiceReference<PackageAdmin> sr = Activator.getContext().getServiceReference(PackageAdmin.class);
- if (sr == null)
- return null;
- PackageAdmin packageAdmin = Activator.getContext().getService(sr);
- if (packageAdmin == null)
- return null;
- Activator.getContext().ungetService(sr);
- Bundle[] bundles = packageAdmin.getBundles("org.eclipse.equinox.frameworkadmin.equinox", null); //$NON-NLS-1$
- if (bundles == null)
- return null;
- //Return the first bundle that is not installed or uninstalled
- for (int i = 0; i < bundles.length; i++) {
- if ((bundles[i].getState() & (Bundle.INSTALLED | Bundle.UNINSTALLED)) == 0) {
- return bundles[i].getVersion();
- }
- }
- return null;
- }
-
- private String getOS() {
- ServiceReference<EnvironmentInfo> sr = Activator.getContext().getServiceReference(EnvironmentInfo.class);
- if (sr == null)
- return null;
- String value = Activator.getContext().getService(sr).getOS();
- Activator.getContext().ungetService(sr);
- return value;
- }
-
- @Override
- public IStatus undo(Map<String, Object> parameters) {
- // TODO Auto-generated method stub
- return null;
- }
-
-}
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/messages.properties b/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/messages.properties
index 304d40114..2df1df727 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/messages.properties
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/messages.properties
@@ -29,8 +29,6 @@ BackupStore_manual_restore_needed=Manual restore of backup needed for: {0}
BackupStore_missing_backup_directory=Missing backup directory - can not restore: {0}
BackupStore_not_a_directory=File is not a directory: {0}
BackupStore_restore_closed_store=Can not perform restore on closed backup store
-BlockMacUpdate_0=Installation impossible
-BlockMacUpdate_1=The installation/update you are trying to perform can not completed because of structural changes to Eclipse. The installation/update will fail and will leave your existing eclipse installation intact. You need to retrieve a new version of Eclipse from http://download.eclipse.org/.
action_0_failed_file_1_doesNotExist=The action {0} failed - file {1} does not exist
artifact_not_available=The artifact for {0} is not available.

Back to the top