diff --git a/releng/org.eclipse.rse.updatesite/category.xml b/releng/org.eclipse.rse.updatesite/category.xml index b357f22053f..b8a5d55958a 100644 --- a/releng/org.eclipse.rse.updatesite/category.xml +++ b/releng/org.eclipse.rse.updatesite/category.xml @@ -1,9 +1,9 @@ - + - + diff --git a/releng/org.eclipse.rse.updatesite/site.xml b/releng/org.eclipse.rse.updatesite/site.xml index 855c5987ad1..69c1644ef36 100644 --- a/releng/org.eclipse.rse.updatesite/site.xml +++ b/releng/org.eclipse.rse.updatesite/site.xml @@ -746,7 +746,7 @@ - + @@ -758,10 +758,10 @@ - + - + diff --git a/releng/org.eclipse.tm.releng/maps/rse.map b/releng/org.eclipse.tm.releng/maps/rse.map index 175c941b856..d747b3acef6 100644 --- a/releng/org.eclipse.tm.releng/maps/rse.map +++ b/releng/org.eclipse.tm.releng/maps/rse.map @@ -1,12 +1,12 @@ !*************** PROJECT CONTRIBUTION ******************************************************** !*** Project's plugins, features and fragments -feature@org.eclipse.rse=R33x_v201109141647,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse-feature -feature@org.eclipse.rse.core=R33x_v201109141647,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.core-feature +feature@org.eclipse.rse=v201109301448,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse-feature +feature@org.eclipse.rse.core=v201109301448,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.core-feature feature@org.eclipse.rse.dstore=R33x_v201109141647,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.dstore-feature feature@org.eclipse.rse.examples=v201103142315,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/examples/org.eclipse.rse.examples-feature feature@org.eclipse.rse.ftp=R33x_v201109141647,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.ftp-feature feature@org.eclipse.rse.local=v201103142315,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.local-feature -feature@org.eclipse.rse.sdk=R33x_v201109141647,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.sdk-feature +feature@org.eclipse.rse.sdk=v201109301448,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.sdk-feature feature@org.eclipse.rse.ssh=R33x_v201109141647,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.ssh-feature feature@org.eclipse.rse.telnet=v201106011538,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.telnet-feature feature@org.eclipse.rse.terminals=R33x_v201109141647,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.terminals-feature @@ -22,7 +22,7 @@ plugin@org.eclipse.rse.connectorservice.dstore=v201103141607,:pserver:anonymous: plugin@org.eclipse.rse.connectorservice.local=v201101042155,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.connectorservice.local plugin@org.eclipse.rse.connectorservice.ssh=v201101042155,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.connectorservice.ssh plugin@org.eclipse.rse.connectorservice.telnet=v201101042155,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.connectorservice.telnet -plugin@org.eclipse.rse.core=R33x_v201109141647,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.core +plugin@org.eclipse.rse.core=v201109301448,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.core plugin@org.eclipse.rse.doc.isv=v201101042155,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/doc/org.eclipse.rse.doc.isv plugin@org.eclipse.rse.doc.user=R33x_v201107181530,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/doc/org.eclipse.rse.doc.user plugin@org.eclipse.rse.dstore.security=v201103141607,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.dstore.security diff --git a/rse/features/org.eclipse.rse-feature/feature.xml b/rse/features/org.eclipse.rse-feature/feature.xml index 120d443cbe8..1f0704ccdf6 100644 --- a/rse/features/org.eclipse.rse-feature/feature.xml +++ b/rse/features/org.eclipse.rse-feature/feature.xml @@ -12,7 +12,7 @@ diff --git a/rse/features/org.eclipse.rse.core-feature/feature.xml b/rse/features/org.eclipse.rse.core-feature/feature.xml index ab9f8717f1a..7f83679cd5f 100644 --- a/rse/features/org.eclipse.rse.core-feature/feature.xml +++ b/rse/features/org.eclipse.rse.core-feature/feature.xml @@ -12,7 +12,7 @@ diff --git a/rse/features/org.eclipse.rse.sdk-feature/feature.xml b/rse/features/org.eclipse.rse.sdk-feature/feature.xml index 3078bd7885b..7a682a4f03a 100644 --- a/rse/features/org.eclipse.rse.sdk-feature/feature.xml +++ b/rse/features/org.eclipse.rse.sdk-feature/feature.xml @@ -12,7 +12,7 @@ diff --git a/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF index 95a0e2883d6..db8d9b91123 100644 --- a/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.rse.core;singleton:=true -Bundle-Version: 3.2.1.qualifier +Bundle-Version: 3.2.100.qualifier Bundle-Activator: org.eclipse.rse.core.RSECorePlugin Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime, diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/model/SystemRegistry.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/model/SystemRegistry.java index 249f61fd871..7195e115d32 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/model/SystemRegistry.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/model/SystemRegistry.java @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2006, 2009 IBM Corporation and others. All rights reserved. + * Copyright (c) 2006, 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 which accompanies this distribution, and is * available at http://www.eclipse.org/legal/epl-v10.html @@ -60,6 +60,7 @@ * David McKnight (IBM) - [254590] When disconnecting a subsystem with COLLAPSE option, subsystems of other connector services also get collapsed * Martin Oberhuber (Wind River) - [245154][api] add getSubSystemConfigurationProxiesBySystemType() * Zhou Renjian (Kortide) - [282238] NPE when copying host and overwrite itself + * Martin Oberhuber (Wind River) - [359554] Avoid disconnect when changing default user id only ********************************************************************************/ package org.eclipse.rse.internal.core.model; @@ -1965,12 +1966,17 @@ public class SystemRegistry implements ISystemRegistry ISubSystem[] subsystems = getSubSystems(conn); // get list of related subsystems for (int idx = 0; idx < subsystems.length; idx++) { - if (hostNameChanged || (subsystems[idx].getLocalUserId() == null)) + //Need to clear caches if host name changed or user ID is inherited from default + if (hostNameChanged || (subsystems[idx].getConnectorService().supportsUserId() && subsystems[idx].getLocalUserId() == null)) { try { - if (subsystems[idx].isConnected()) subsystems[idx].disconnect(); // MJB: added conditional for defect 45754 - if (defaultUserIdChanged) + //MOB - Bug 359554: There is no reason for disconnecting subsystems just because a default user ID changed + if (hostNameChanged && subsystems[idx].isConnected()) + { + subsystems[idx].disconnect(); // MJB: added conditional for defect 45754 + } + if (defaultUserIdChanged && !subsystems[idx].isConnected()) { subsystems[idx].getConnectorService().clearCredentials(); }