diff options
| author | Pascal Rapicault (Ericsson) | 2012-09-13 16:06:50 +0000 |
|---|---|---|
| committer | Pascal Rapicault | 2012-11-17 03:46:10 +0000 |
| commit | 10425ac3c219d20bc9cf7ab0d8a71ab60b6900e5 (patch) | |
| tree | f12bd3a7da1faff8c252daf350a3d5aaa0c4c0cf /bundles/org.eclipse.equinox.p2.core | |
| parent | 74e7bfd3f06c6a8dc1501a60a244babbcc6af73c (diff) | |
| download | rt.equinox.p2-10425ac3c219d20bc9cf7ab0d8a71ab60b6900e5.tar.gz rt.equinox.p2-10425ac3c219d20bc9cf7ab0d8a71ab60b6900e5.tar.xz rt.equinox.p2-10425ac3c219d20bc9cf7ab0d8a71ab60b6900e5.zip | |
Rename constant and update copyright headersv20121117-034610
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.core')
3 files changed, 9 insertions, 7 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 239237849..25510729b 100644 --- a/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.equinox.p2.core;singleton:=true -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-ClassPath: . Bundle-Activator: org.eclipse.equinox.internal.p2.core.Activator Bundle-Vendor: %providerName diff --git a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/Activator.java b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/Activator.java index 52c10df48..4ee7e8649 100644 --- a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/Activator.java +++ b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/Activator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 IBM Corporation and others. + * Copyright (c) 2007, 2012 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * IBM Corporation - initial API and implementation + * Ericsson AB (Pascal Rapicault) - reading preferences from base in shared install *******************************************************************************/ package org.eclipse.equinox.internal.p2.core; @@ -222,7 +223,7 @@ public class Activator implements BundleActivator { IProvisioningAgent sharedAgent; try { sharedAgent = provider.createAgent(location); - currentAgent.registerService(IProvisioningAgent.SHARED_INSTALL_AGENT, sharedAgent); + currentAgent.registerService(IProvisioningAgent.SHARED_BASE_AGENT, sharedAgent); sharedAgent.registerService(IProvisioningAgent.SHARED_CURRENT_AGENT, currentAgent); } catch (ProvisionException e) { final String msg = "Unable to instantiate p2 agent for shared location " + location; //$NON-NLS-1$ diff --git a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/IProvisioningAgent.java b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/IProvisioningAgent.java index a603db7cf..53abedc3c 100644 --- a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/IProvisioningAgent.java +++ b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/IProvisioningAgent.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2010 IBM Corporation and others. + * Copyright (c) 2009, 2012 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * IBM Corporation - initial API and implementation + * Ericsson AB (Pascal Rapicault) - reading preferences from base in shared install *******************************************************************************/ package org.eclipse.equinox.p2.core; @@ -40,12 +41,12 @@ public interface IProvisioningAgent { public static final String INSTALLER_PROFILEID = "org.eclipse.equinox.p2.installer.profile.id"; //$NON-NLS-1$ /** - * When running in "shared mode", this allows to retrieve from the IProvisioningAgent the agent representing what is in the shared location + * When running in "shared mode", this allows to retrieve from the IProvisioningAgent the agent representing what is in the shared location aka the base */ - public static final String SHARED_INSTALL_AGENT = "org.eclipse.equinox.shared.install.agent"; //$NON-NLS-1$ + public static final String SHARED_BASE_AGENT = "org.eclipse.equinox.shared.base.agent"; //$NON-NLS-1$ /** - * When running in "shared mode", this allows to retrieve from the IProvisioningAgent identified by {@link #SHARED_INSTALL_AGENT} the current agent + * When running in "shared mode", this allows to retrieve from the IProvisioningAgent identified by {@link #SHARED_BASE_AGENT} the current agent */ public static final String SHARED_CURRENT_AGENT = "org.eclipse.equinox.shared.current.agent"; //$NON-NLS-1$ /** |