1 files changed, 152 insertions, 207 deletions
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/keys/SpecialKey.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/keys/SpecialKey.java
index 787ca88dedc..dbff02fa97c 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/keys/SpecialKey.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/keys/SpecialKey.java
@@ -42,306 +42,301 @@ import org.eclipse.jface.bindings.keys.KeyLookupFactory;
 public final class SpecialKey extends NaturalKey {
 
 	/**
-	 * An internal map used to lookup instances of <code>SpecialKey</code>
-	 * given the formal string representation of a special key.
+	 * An internal map used to lookup instances of <code>SpecialKey</code> given the
+	 * formal string representation of a special key.
 	 */
 	static SortedMap specialKeysByName = new TreeMap();
 
 	/**
-	 * The single static instance of <code>SpecialKey</code> which represents
-	 * the 'Arrow Down' key.
+	 * The single static instance of <code>SpecialKey</code> which represents the
+	 * 'Arrow Down' key.
 	 */
 	public static final SpecialKey ARROW_DOWN;
 
 	/**
-	 * The single static instance of <code>SpecialKey</code> which represents
-	 * the 'Arrow Left' key.
+	 * The single static instance of <code>SpecialKey</code> which represents the
+	 * 'Arrow Left' key.
 	 */
 	public static final SpecialKey ARROW_LEFT;
 
 	/**
-	 * The single static instance of <code>SpecialKey</code> which represents
-	 * the 'Arrow Right' key.
+	 * The single static instance of <code>SpecialKey</code> which represents the
+	 * 'Arrow Right' key.
 	 */
 	public static final SpecialKey ARROW_RIGHT;
 
 	/**
-	 * The single static instance of <code>SpecialKey</code> which represents
-	 * the 'Arrow Up' key.
+	 * The single static instance of <code>SpecialKey</code> which represents the
+	 * 'Arrow Up' key.
 	 */
 	public static final SpecialKey ARROW_UP;
 
 	/**
-	 * The single static instance of <code>SpecialKey</code> which represents
-	 * the 'Break' key.
+	 * The single static instance of <code>SpecialKey</code> which represents the
+	 * 'Break' key.
 	 */
 	public static final SpecialKey BREAK;
 
 	/**
-	 * The single static instance of <code>SpecialKey</code> which represents
-	 * the 'Caps Lock' key.
+	 * The single static instance of <code>SpecialKey</code> which represents the
+	 * 'Caps Lock' key.
 	 */
 	public static final SpecialKey CAPS_LOCK;
 
 	/**
-	 * The single static instance of <code>SpecialKey</code> which represents
-	 * the 'End' key.
+	 * The single static instance of <code>SpecialKey</code> which represents the
+	 * 'End' key.
 	 */
 	public static final SpecialKey END;
 
 	/**
-	 * The single static instance of <code>SpecialKey</code> which represents
-	 * the 'F1' key.
+	 * The single static instance of <code>SpecialKey</code> which represents the
+	 * 'F1' key.
 	 */
 	public static final SpecialKey F1;
 
 	/**
-	 * The single static instance of <code>SpecialKey</code> which represents
-	 * the 'F10' key.
+	 * The single static instance of <code>SpecialKey</code> which represents the
+	 * 'F10' key.
 	 */
 	public static final SpecialKey F10;
 
 	/**
-	 * The single static instance of <code>SpecialKey</code> which represents
-	 * the 'F11' key.
+	 * The single static instance of <code>SpecialKey</code> which represents the
+	 * 'F11' key.
 	 */
 	public static final SpecialKey F11;
 
 	/**
-	 * The single static instance of <code>SpecialKey</code> which represents
-	 * the 'F12' key.
+	 * The single static instance of <code>SpecialKey</code> which represents the
+	 * 'F12' key.
 	 */
 	public static final SpecialKey F12;
 
 	/**
-	 * The single static instance of <code>SpecialKey</code> which represents
-	 * the 'F13' key.
+	 * The single static instance of <code>SpecialKey</code> which represents the
+	 * 'F13' key.
 	 */
 	public static final SpecialKey F13;
 
 	/**
-	 * The single static instance of <code>SpecialKey</code> which represents
-	 * the 'F14' key.
+	 * The single static instance of <code>SpecialKey</code> which represents the
+	 * 'F14' key.
 	 */
 	public static final SpecialKey F14;
 
 	/**
-	 * The single static instance of <code>SpecialKey</code> which represents
-	 * the 'F15' key.
+	 * The single static instance of <code>SpecialKey</code> which represents the
+	 * 'F15' key.
 	 */
 	public static final SpecialKey F15;
 
 	/**
-	 * The single static instance of <code>SpecialKey</code> which represents
-	 * the 'F2' key.
+	 * The single static instance of <code>SpecialKey</code> which represents the
+	 * 'F2' key.
 	 */
 	public static final SpecialKey F2;
 
 	/**
-	 * The single static instance of <code>SpecialKey</code> which represents
-	 * the 'F3' key.
+	 * The single static instance of <code>SpecialKey</code> which represents the
+	 * 'F3' key.
 	 */
 	public static final SpecialKey F3;
 
 	/**
-	 * The single static instance of <code>SpecialKey</code> which represents
-	 * the 'F4' key.
+	 * The single static instance of <code>SpecialKey</code> which represents the
+	 * 'F4' key.
 	 */
 	public static final SpecialKey F4;
 
 	/**
-	 * The single static instance of <code>SpecialKey</code> which represents
-	 * the 'F5' key.
+	 * The single static instance of <code>SpecialKey</code> which represents the
+	 * 'F5' key.
 	 */
 	public static final SpecialKey F5;
 
 	/**
-	 * The single static instance of <code>SpecialKey</code> which represents
-	 * the 'F6' key.
+	 * The single static instance of <code>SpecialKey</code> which represents the
+	 * 'F6' key.
 	 */
 	public static final SpecialKey F6;
 
 	/**
-	 * The single static instance of <code>SpecialKey</code> which represents
-	 * the 'F7' key.
+	 * The single static instance of <code>SpecialKey</code> which represents the
+	 * 'F7' key.
 	 */
 	public static final SpecialKey F7;
 
 	/**
-	 * The single static instance of <code>SpecialKey</code> which represents
-	 * the 'F8' key.
+	 * The single static instance of <code>SpecialKey</code> which represents the
+	 * 'F8' key.
 	 */
 	public static final SpecialKey F8;
 
 	/**
-	 * The single static instance of <code>SpecialKey</code> which represents
-	 * the 'F9' key.
+	 * The single static instance of <code>SpecialKey</code> which represents the
+	 * 'F9' key.
 	 */
 	public static final SpecialKey F9;
 
 	/**
-	 * The single static instance of <code>SpecialKey</code> which represents
-	 * the 'Home' key.
+	 * The single static instance of <code>SpecialKey</code> which represents the
+	 * 'Home' key.
 	 */
 	public static final SpecialKey HOME;
 
 	/**
-	 * The single static instance of <code>SpecialKey</code> which represents
-	 * the 'Insert' key.
+	 * The single static instance of <code>SpecialKey</code> which represents the
+	 * 'Insert' key.
 	 */
 	public static final SpecialKey INSERT;
 
 	/**
-	 * The single static instance of <code>SpecialKey</code> which represents
-	 * the 'NumLock' key.
+	 * The single static instance of <code>SpecialKey</code> which represents the
+	 * 'NumLock' key.
 	 */
 	public static final SpecialKey NUM_LOCK;
 
 	/**
-	 * The single static instance of <code>SpecialKey</code> which represents
-	 * the '0' key on the numpad.
+	 * The single static instance of <code>SpecialKey</code> which represents the
+	 * '0' key on the numpad.
 	 */
 	public static final SpecialKey NUMPAD_0;
 
 	/**
-	 * The single static instance of <code>SpecialKey</code> which represents
-	 * the '1' key on the numpad.
+	 * The single static instance of <code>SpecialKey</code> which represents the
+	 * '1' key on the numpad.
 	 */
 	public static final SpecialKey NUMPAD_1;
 
 	/**
-	 * The single static instance of <code>SpecialKey</code> which represents
-	 * the '2' key on the numpad.
+	 * The single static instance of <code>SpecialKey</code> which represents the
+	 * '2' key on the numpad.
 	 */
 	public static final SpecialKey NUMPAD_2;
 
 	/**
-	 * The single static instance of <code>SpecialKey</code> which represents
-	 * the '3' key on the numpad.
+	 * The single static instance of <code>SpecialKey</code> which represents the
+	 * '3' key on the numpad.
 	 */
 	public static final SpecialKey NUMPAD_3;
 
 	/**
-	 * The single static instance of <code>SpecialKey</code> which represents
-	 * the '4' key on the numpad.
+	 * The single static instance of <code>SpecialKey</code> which represents the
+	 * '4' key on the numpad.
 	 */
 	public static final SpecialKey NUMPAD_4;
 
 	/**
-	 * The single static instance of <code>SpecialKey</code> which represents
-	 * the '5' key on the numpad.
+	 * The single static instance of <code>SpecialKey</code> which represents the
+	 * '5' key on the numpad.
 	 */
 	public static final SpecialKey NUMPAD_5;
 
 	/**
-	 * The single static instance of <code>SpecialKey</code> which represents
-	 * the '6' key on the numpad.
+	 * The single static instance of <code>SpecialKey</code> which represents the
+	 * '6' key on the numpad.
 	 */
 	public static final SpecialKey NUMPAD_6;
 
 	/**
-	 * The single static instance of <code>SpecialKey</code> which represents
-	 * the '7' key on the numpad.
+	 * The single static instance of <code>SpecialKey</code> which represents the
+	 * '7' key on the numpad.
 	 */
 	public static final SpecialKey NUMPAD_7;
 
 	/**
-	 * The single static instance of <code>SpecialKey</code> which represents
-	 * the '8' key on the numpad.
+	 * The single static instance of <code>SpecialKey</code> which represents the
+	 * '8' key on the numpad.
 	 */
 	public static final SpecialKey NUMPAD_8;
 
 	/**
-	 * The single static instance of <code>SpecialKey</code> which represents
-	 * the '9' key on the numpad.
+	 * The single static instance of <code>SpecialKey</code> which represents the
+	 * '9' key on the numpad.
 	 */
 	public static final SpecialKey NUMPAD_9;
 
 	/**
-	 * The single static instance of <code>SpecialKey</code> which represents
-	 * the 'Add' key on the numpad.
+	 * The single static instance of <code>SpecialKey</code> which represents the
+	 * 'Add' key on the numpad.
 	 */
 	public static final SpecialKey NUMPAD_ADD;
 
 	/**
-	 * The single static instance of <code>SpecialKey</code> which represents
-	 * the 'Decimal' key on the numpad.
+	 * The single static instance of <code>SpecialKey</code> which represents the
+	 * 'Decimal' key on the numpad.
 	 */
 	public static final SpecialKey NUMPAD_DECIMAL;
 
 	/**
-	 * The single static instance of <code>SpecialKey</code> which represents
-	 * the 'Divide' key on the numpad.
+	 * The single static instance of <code>SpecialKey</code> which represents the
+	 * 'Divide' key on the numpad.
 	 */
 	public static final SpecialKey NUMPAD_DIVIDE;
 
 	/**
-	 * The single static instance of <code>SpecialKey</code> which represents
-	 * the 'Enter' key on the numpad.
+	 * The single static instance of <code>SpecialKey</code> which represents the
+	 * 'Enter' key on the numpad.
 	 */
 	public static final SpecialKey NUMPAD_ENTER;
 
 	/**
-	 * The single static instance of <code>SpecialKey</code> which represents
-	 * the '=' key on the numpad.
+	 * The single static instance of <code>SpecialKey</code> which represents the
+	 * '=' key on the numpad.
 	 */
 	public static final SpecialKey NUMPAD_EQUAL;
 
 	/**
-	 * The single static instance of <code>SpecialKey</code> which represents
-	 * the 'Multiply' key on the numpad.
+	 * The single static instance of <code>SpecialKey</code> which represents the
+	 * 'Multiply' key on the numpad.
 	 */
 	public static final SpecialKey NUMPAD_MULTIPLY;
 
 	/**
-	 * The single static instance of <code>SpecialKey</code> which represents
-	 * the 'Subtract' key on the numpad.
+	 * The single static instance of <code>SpecialKey</code> which represents the
+	 * 'Subtract' key on the numpad.
 	 */
 	public static final SpecialKey NUMPAD_SUBTRACT;
 
 	/**
-	 * The single static instance of <code>SpecialKey</code> which represents
-	 * the 'Page Down' key.
+	 * The single static instance of <code>SpecialKey</code> which represents the
+	 * 'Page Down' key.
 	 */
 	public static final SpecialKey PAGE_DOWN;
 
 	/**
-	 * The single static instance of <code>SpecialKey</code> which represents
-	 * the 'Page Up' key.
+	 * The single static instance of <code>SpecialKey</code> which represents the
+	 * 'Page Up' key.
 	 */
 	public static final SpecialKey PAGE_UP;
 
 	/**
-	 * The single static instance of <code>SpecialKey</code> which represents
-	 * the 'Pause' key.
+	 * The single static instance of <code>SpecialKey</code> which represents the
+	 * 'Pause' key.
 	 */
 	public static final SpecialKey PAUSE;
 
 	/**
-	 * The single static instance of <code>SpecialKey</code> which represents
-	 * the 'Print Screen' key.
+	 * The single static instance of <code>SpecialKey</code> which represents the
+	 * 'Print Screen' key.
 	 */
 	public static final SpecialKey PRINT_SCREEN;
 
 	/**
-	 * The single static instance of <code>SpecialKey</code> which represents
-	 * the 'Scroll Lock' key.
+	 * The single static instance of <code>SpecialKey</code> which represents the
+	 * 'Scroll Lock' key.
 	 */
 	public static final SpecialKey SCROLL_LOCK;
 
 	static {
 		final IKeyLookup lookup = KeyLookupFactory.getDefault();
-		ARROW_DOWN = new SpecialKey(lookup
-				.formalKeyLookup(IKeyLookup.ARROW_DOWN_NAME));
-		ARROW_LEFT = new SpecialKey(lookup
-				.formalKeyLookup(IKeyLookup.ARROW_LEFT_NAME));
-		ARROW_RIGHT = new SpecialKey(lookup
-				.formalKeyLookup(IKeyLookup.ARROW_RIGHT_NAME));
-		ARROW_UP = new SpecialKey(lookup
-				.formalKeyLookup(IKeyLookup.ARROW_UP_NAME));
+		ARROW_DOWN = new SpecialKey(lookup.formalKeyLookup(IKeyLookup.ARROW_DOWN_NAME));
+		ARROW_LEFT = new SpecialKey(lookup.formalKeyLookup(IKeyLookup.ARROW_LEFT_NAME));
+		ARROW_RIGHT = new SpecialKey(lookup.formalKeyLookup(IKeyLookup.ARROW_RIGHT_NAME));
+		ARROW_UP = new SpecialKey(lookup.formalKeyLookup(IKeyLookup.ARROW_UP_NAME));
 		BREAK = new SpecialKey(lookup.formalKeyLookup(IKeyLookup.BREAK_NAME));
-		CAPS_LOCK = new SpecialKey(lookup
-				.formalKeyLookup(IKeyLookup.CAPS_LOCK_NAME));
+		CAPS_LOCK = new SpecialKey(lookup.formalKeyLookup(IKeyLookup.CAPS_LOCK_NAME));
 		END = new SpecialKey(lookup.formalKeyLookup(IKeyLookup.END_NAME));
 		F1 = new SpecialKey(lookup.formalKeyLookup(IKeyLookup.F1_NAME));
 		F2 = new SpecialKey(lookup.formalKeyLookup(IKeyLookup.F2_NAME));
@@ -360,63 +355,36 @@ public final class SpecialKey extends NaturalKey {
 		F15 = new SpecialKey(lookup.formalKeyLookup(IKeyLookup.F15_NAME));
 		HOME = new SpecialKey(lookup.formalKeyLookup(IKeyLookup.HOME_NAME));
 		INSERT = new SpecialKey(lookup.formalKeyLookup(IKeyLookup.INSERT_NAME));
-		NUM_LOCK = new SpecialKey(lookup
-				.formalKeyLookup(IKeyLookup.NUM_LOCK_NAME));
-		NUMPAD_0 = new SpecialKey(lookup
-				.formalKeyLookup(IKeyLookup.NUMPAD_0_NAME));
-		NUMPAD_1 = new SpecialKey(lookup
-				.formalKeyLookup(IKeyLookup.NUMPAD_1_NAME));
-		NUMPAD_2 = new SpecialKey(lookup
-				.formalKeyLookup(IKeyLookup.NUMPAD_2_NAME));
-		NUMPAD_3 = new SpecialKey(lookup
-				.formalKeyLookup(IKeyLookup.NUMPAD_3_NAME));
-		NUMPAD_4 = new SpecialKey(lookup
-				.formalKeyLookup(IKeyLookup.NUMPAD_4_NAME));
-		NUMPAD_5 = new SpecialKey(lookup
-				.formalKeyLookup(IKeyLookup.NUMPAD_5_NAME));
-		NUMPAD_6 = new SpecialKey(lookup
-				.formalKeyLookup(IKeyLookup.NUMPAD_6_NAME));
-		NUMPAD_7 = new SpecialKey(lookup
-				.formalKeyLookup(IKeyLookup.NUMPAD_7_NAME));
-		NUMPAD_8 = new SpecialKey(lookup
-				.formalKeyLookup(IKeyLookup.NUMPAD_8_NAME));
-		NUMPAD_9 = new SpecialKey(lookup
-				.formalKeyLookup(IKeyLookup.NUMPAD_9_NAME));
-		NUMPAD_ADD = new SpecialKey(lookup
-				.formalKeyLookup(IKeyLookup.NUMPAD_ADD_NAME));
-		NUMPAD_DECIMAL = new SpecialKey(lookup
-				.formalKeyLookup(IKeyLookup.NUMPAD_DECIMAL_NAME));
-		NUMPAD_DIVIDE = new SpecialKey(lookup
-				.formalKeyLookup(IKeyLookup.NUMPAD_DIVIDE_NAME));
-		NUMPAD_ENTER = new SpecialKey(lookup
-				.formalKeyLookup(IKeyLookup.NUMPAD_ENTER_NAME));
-		NUMPAD_EQUAL = new SpecialKey(lookup
-				.formalKeyLookup(IKeyLookup.NUMPAD_EQUAL_NAME));
-		NUMPAD_MULTIPLY = new SpecialKey(lookup
-				.formalKeyLookup(IKeyLookup.NUMPAD_MULTIPLY_NAME));
-		NUMPAD_SUBTRACT = new SpecialKey(lookup
-				.formalKeyLookup(IKeyLookup.NUMPAD_SUBTRACT_NAME));
-		PAGE_DOWN = new SpecialKey(lookup
-				.formalKeyLookup(IKeyLookup.PAGE_DOWN_NAME));
-		PAGE_UP = new SpecialKey(lookup
-				.formalKeyLookup(IKeyLookup.PAGE_UP_NAME));
+		NUM_LOCK = new SpecialKey(lookup.formalKeyLookup(IKeyLookup.NUM_LOCK_NAME));
+		NUMPAD_0 = new SpecialKey(lookup.formalKeyLookup(IKeyLookup.NUMPAD_0_NAME));
+		NUMPAD_1 = new SpecialKey(lookup.formalKeyLookup(IKeyLookup.NUMPAD_1_NAME));
+		NUMPAD_2 = new SpecialKey(lookup.formalKeyLookup(IKeyLookup.NUMPAD_2_NAME));
+		NUMPAD_3 = new SpecialKey(lookup.formalKeyLookup(IKeyLookup.NUMPAD_3_NAME));
+		NUMPAD_4 = new SpecialKey(lookup.formalKeyLookup(IKeyLookup.NUMPAD_4_NAME));
+		NUMPAD_5 = new SpecialKey(lookup.formalKeyLookup(IKeyLookup.NUMPAD_5_NAME));
+		NUMPAD_6 = new SpecialKey(lookup.formalKeyLookup(IKeyLookup.NUMPAD_6_NAME));
+		NUMPAD_7 = new SpecialKey(lookup.formalKeyLookup(IKeyLookup.NUMPAD_7_NAME));
+		NUMPAD_8 = new SpecialKey(lookup.formalKeyLookup(IKeyLookup.NUMPAD_8_NAME));
+		NUMPAD_9 = new SpecialKey(lookup.formalKeyLookup(IKeyLookup.NUMPAD_9_NAME));
+		NUMPAD_ADD = new SpecialKey(lookup.formalKeyLookup(IKeyLookup.NUMPAD_ADD_NAME));
+		NUMPAD_DECIMAL = new SpecialKey(lookup.formalKeyLookup(IKeyLookup.NUMPAD_DECIMAL_NAME));
+		NUMPAD_DIVIDE = new SpecialKey(lookup.formalKeyLookup(IKeyLookup.NUMPAD_DIVIDE_NAME));
+		NUMPAD_ENTER = new SpecialKey(lookup.formalKeyLookup(IKeyLookup.NUMPAD_ENTER_NAME));
+		NUMPAD_EQUAL = new SpecialKey(lookup.formalKeyLookup(IKeyLookup.NUMPAD_EQUAL_NAME));
+		NUMPAD_MULTIPLY = new SpecialKey(lookup.formalKeyLookup(IKeyLookup.NUMPAD_MULTIPLY_NAME));
+		NUMPAD_SUBTRACT = new SpecialKey(lookup.formalKeyLookup(IKeyLookup.NUMPAD_SUBTRACT_NAME));
+		PAGE_DOWN = new SpecialKey(lookup.formalKeyLookup(IKeyLookup.PAGE_DOWN_NAME));
+		PAGE_UP = new SpecialKey(lookup.formalKeyLookup(IKeyLookup.PAGE_UP_NAME));
 		PAUSE = new SpecialKey(lookup.formalKeyLookup(IKeyLookup.PAUSE_NAME));
-		PRINT_SCREEN = new SpecialKey(lookup
-				.formalKeyLookup(IKeyLookup.PRINT_SCREEN_NAME));
-		SCROLL_LOCK = new SpecialKey(lookup
-				.formalKeyLookup(IKeyLookup.SCROLL_LOCK_NAME));
-
-		specialKeysByName.put(SpecialKey.ARROW_DOWN.toString(),
-				SpecialKey.ARROW_DOWN);
-		specialKeysByName.put(SpecialKey.ARROW_LEFT.toString(),
-				SpecialKey.ARROW_LEFT);
-		specialKeysByName.put(SpecialKey.ARROW_RIGHT.toString(),
-				SpecialKey.ARROW_RIGHT);
-		specialKeysByName.put(SpecialKey.ARROW_UP.toString(),
-				SpecialKey.ARROW_UP);
+		PRINT_SCREEN = new SpecialKey(lookup.formalKeyLookup(IKeyLookup.PRINT_SCREEN_NAME));
+		SCROLL_LOCK = new SpecialKey(lookup.formalKeyLookup(IKeyLookup.SCROLL_LOCK_NAME));
+
+		specialKeysByName.put(SpecialKey.ARROW_DOWN.toString(), SpecialKey.ARROW_DOWN);
+		specialKeysByName.put(SpecialKey.ARROW_LEFT.toString(), SpecialKey.ARROW_LEFT);
+		specialKeysByName.put(SpecialKey.ARROW_RIGHT.toString(), SpecialKey.ARROW_RIGHT);
+		specialKeysByName.put(SpecialKey.ARROW_UP.toString(), SpecialKey.ARROW_UP);
 		specialKeysByName.put(SpecialKey.BREAK.toString(), SpecialKey.BREAK);
-		specialKeysByName.put(SpecialKey.CAPS_LOCK.toString(),
-				SpecialKey.CAPS_LOCK);
+		specialKeysByName.put(SpecialKey.CAPS_LOCK.toString(), SpecialKey.CAPS_LOCK);
 		specialKeysByName.put(SpecialKey.END.toString(), SpecialKey.END);
 		specialKeysByName.put(SpecialKey.F1.toString(), SpecialKey.F1);
 		specialKeysByName.put(SpecialKey.F10.toString(), SpecialKey.F10);
@@ -433,60 +401,37 @@ public final class SpecialKey extends NaturalKey {
 		specialKeysByName.put(SpecialKey.F7.toString(), SpecialKey.F7);
 		specialKeysByName.put(SpecialKey.F8.toString(), SpecialKey.F8);
 		specialKeysByName.put(SpecialKey.F9.toString(), SpecialKey.F9);
-		specialKeysByName.put(SpecialKey.NUM_LOCK.toString(),
-				SpecialKey.NUM_LOCK);
-		specialKeysByName.put(SpecialKey.NUMPAD_0.toString(),
-				SpecialKey.NUMPAD_0);
-		specialKeysByName.put(SpecialKey.NUMPAD_1.toString(),
-				SpecialKey.NUMPAD_1);
-		specialKeysByName.put(SpecialKey.NUMPAD_2.toString(),
-				SpecialKey.NUMPAD_2);
-		specialKeysByName.put(SpecialKey.NUMPAD_3.toString(),
-				SpecialKey.NUMPAD_3);
-		specialKeysByName.put(SpecialKey.NUMPAD_4.toString(),
-				SpecialKey.NUMPAD_4);
-		specialKeysByName.put(SpecialKey.NUMPAD_5.toString(),
-				SpecialKey.NUMPAD_5);
-		specialKeysByName.put(SpecialKey.NUMPAD_6.toString(),
-				SpecialKey.NUMPAD_6);
-		specialKeysByName.put(SpecialKey.NUMPAD_7.toString(),
-				SpecialKey.NUMPAD_7);
-		specialKeysByName.put(SpecialKey.NUMPAD_8.toString(),
-				SpecialKey.NUMPAD_8);
-		specialKeysByName.put(SpecialKey.NUMPAD_9.toString(),
-				SpecialKey.NUMPAD_9);
-		specialKeysByName.put(SpecialKey.NUMPAD_ADD.toString(),
-				SpecialKey.NUMPAD_ADD);
-		specialKeysByName.put(SpecialKey.NUMPAD_DECIMAL.toString(),
-				SpecialKey.NUMPAD_DECIMAL);
-		specialKeysByName.put(SpecialKey.NUMPAD_DIVIDE.toString(),
-				SpecialKey.NUMPAD_DIVIDE);
-		specialKeysByName.put(SpecialKey.NUMPAD_ENTER.toString(),
-				SpecialKey.NUMPAD_ENTER);
-		specialKeysByName.put(SpecialKey.NUMPAD_EQUAL.toString(),
-				SpecialKey.NUMPAD_EQUAL);
-		specialKeysByName.put(SpecialKey.NUMPAD_MULTIPLY.toString(),
-				SpecialKey.NUMPAD_MULTIPLY);
-		specialKeysByName.put(SpecialKey.NUMPAD_SUBTRACT.toString(),
-				SpecialKey.NUMPAD_SUBTRACT);
+		specialKeysByName.put(SpecialKey.NUM_LOCK.toString(), SpecialKey.NUM_LOCK);
+		specialKeysByName.put(SpecialKey.NUMPAD_0.toString(), SpecialKey.NUMPAD_0);
+		specialKeysByName.put(SpecialKey.NUMPAD_1.toString(), SpecialKey.NUMPAD_1);
+		specialKeysByName.put(SpecialKey.NUMPAD_2.toString(), SpecialKey.NUMPAD_2);
+		specialKeysByName.put(SpecialKey.NUMPAD_3.toString(), SpecialKey.NUMPAD_3);
+		specialKeysByName.put(SpecialKey.NUMPAD_4.toString(), SpecialKey.NUMPAD_4);
+		specialKeysByName.put(SpecialKey.NUMPAD_5.toString(), SpecialKey.NUMPAD_5);
+		specialKeysByName.put(SpecialKey.NUMPAD_6.toString(), SpecialKey.NUMPAD_6);
+		specialKeysByName.put(SpecialKey.NUMPAD_7.toString(), SpecialKey.NUMPAD_7);
+		specialKeysByName.put(SpecialKey.NUMPAD_8.toString(), SpecialKey.NUMPAD_8);
+		specialKeysByName.put(SpecialKey.NUMPAD_9.toString(), SpecialKey.NUMPAD_9);
+		specialKeysByName.put(SpecialKey.NUMPAD_ADD.toString(), SpecialKey.NUMPAD_ADD);
+		specialKeysByName.put(SpecialKey.NUMPAD_DECIMAL.toString(), SpecialKey.NUMPAD_DECIMAL);
+		specialKeysByName.put(SpecialKey.NUMPAD_DIVIDE.toString(), SpecialKey.NUMPAD_DIVIDE);
+		specialKeysByName.put(SpecialKey.NUMPAD_ENTER.toString(), SpecialKey.NUMPAD_ENTER);
+		specialKeysByName.put(SpecialKey.NUMPAD_EQUAL.toString(), SpecialKey.NUMPAD_EQUAL);
+		specialKeysByName.put(SpecialKey.NUMPAD_MULTIPLY.toString(), SpecialKey.NUMPAD_MULTIPLY);
+		specialKeysByName.put(SpecialKey.NUMPAD_SUBTRACT.toString(), SpecialKey.NUMPAD_SUBTRACT);
 		specialKeysByName.put(SpecialKey.HOME.toString(), SpecialKey.HOME);
 		specialKeysByName.put(SpecialKey.INSERT.toString(), SpecialKey.INSERT);
-		specialKeysByName.put(SpecialKey.PAGE_DOWN.toString(),
-				SpecialKey.PAGE_DOWN);
-		specialKeysByName
-				.put(SpecialKey.PAGE_UP.toString(), SpecialKey.PAGE_UP);
+		specialKeysByName.put(SpecialKey.PAGE_DOWN.toString(), SpecialKey.PAGE_DOWN);
+		specialKeysByName.put(SpecialKey.PAGE_UP.toString(), SpecialKey.PAGE_UP);
 		specialKeysByName.put(SpecialKey.PAUSE.toString(), SpecialKey.PAUSE);
-		specialKeysByName.put(SpecialKey.PRINT_SCREEN.toString(),
-				SpecialKey.PRINT_SCREEN);
-		specialKeysByName.put(SpecialKey.SCROLL_LOCK.toString(),
-				SpecialKey.SCROLL_LOCK);
+		specialKeysByName.put(SpecialKey.PRINT_SCREEN.toString(), SpecialKey.PRINT_SCREEN);
+		specialKeysByName.put(SpecialKey.SCROLL_LOCK.toString(), SpecialKey.SCROLL_LOCK);
 	}
 
 	/**
 	 * Constructs an instance of <code>SpecialKey</code> given a name.
 	 *
-	 * @param key
-	 *            The key to be wrapped.
+	 * @param key The key to be wrapped.
 	 */
 	private SpecialKey(final int key) {
 		super(key);
diff --git a/discovery/readme.txt b/discovery/readme.txt
deleted file mode 100644
index 28c4d2e1f..000000000
--- a/discovery/readme.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-The "discovery" folder holds the DSDP-TM Discovery Component.
-It depends on Eclipse Platform and Eclipse Modeling Framework (EMF).
-All these CVS modules should be named "org.eclipse.tm.discovery.*".
-See http://www.eclipse.org/dsdp/tm
diff --git a/releng/org.eclipse.rse.build/.cvsignore b/releng/org.eclipse.rse.build/.cvsignore
deleted file mode 100644
index f8b5b8240..000000000
--- a/releng/org.eclipse.rse.build/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-go.rb
diff --git a/releng/org.eclipse.rse.build/.project b/releng/org.eclipse.rse.build/.project
deleted file mode 100644
index a594b49dd..000000000
--- a/releng/org.eclipse.rse.build/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.rse.build</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>
diff --git a/releng/org.eclipse.rse.build/README_build.txt b/releng/org.eclipse.rse.build/README_build.txt
deleted file mode 100644
index f07cafdc1..000000000
--- a/releng/org.eclipse.rse.build/README_build.txt
+++ /dev/null
@@ -1,81 +0,0 @@
-Instructions for building TM and RSE
-------------------------------------
-
-1. Set up the build workspace
------------------------------
-ssh build.eclipse.org
-cd /shared/dsdp/tm/
-mkdir ws2_user
-cd ws2_user
-ln -s `pwd` $HOME/ws_31x
-ln -s /home/data/httpd/download.eclipse.org/dsdp/tm $HOME/downloads-tm
-cp -R ../ws_31x/IBMJava2-ppc-142 .
-wget -O setup.sh "http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.tm.rse/releng/org.eclipse.rse.build/setup.sh?root=DSDP_Project&content-type=text%2Fplain&view=co&pathrev=R3_1_maintenance"
-chmod a+x setup.sh
-./setup.sh
-
-
-2. Do an N-build
-----------------
-cd $HOME/ws_31x
-./doit_nightly.sh
-
-
-3. Do an I-build
-----------------
-On a local client PC, install Eclipse Platform Releng.Tools
-Have all TM plugins in the workspace (import tm-all-committer.psf)
-Synchronize CVS Workspace to HEAD
-Review all incoming changes
-Right-click > Team > Release...
-Select Mapfile "org.eclipse.rse.build"
-Press next ... tag and commit the Mapfiles
-ssh build.eclipse.org
-cd ws_31x
-./doit_irsbuild.sh I
-When build worked ok, tag org.eclipse.rse.build: e.g. I20070605-1200
-
-3a) Do an S-build
------------------
-Just like I-build, but also update 
-   org.eclipse.rse.build/template/buildNotes.php
-ssh build.eclipse.org
-cd ws_31x
-./doit_irsbuild.sh S 2.0RC3
-
-3b) Promote an S-build to official
-----------------------------------
-After testing the "invisible" S-build:
-ssh build.eclipse.org
-cd ws_31x/publish/S-3.1RC3*
-mv package.count.orig package.count
-
-3c) Promote an update site
---------------------------
-Any build generates its update site in $HOME/downlads-tm/testUpdates
-and $HOME/downloads-tm/signedUpdates . You need to manually copy these
-to its target repository, then re-generate repository metadata:
-
-cd $HOME/downloads-tm/updates/3.1milestones
-rm -rf plugins features
-cp -R ../../signedUpdates/plugins .
-cp -R ../../signedUpdates/features .
-cd bin
-cvs update
-./mkTestUpdates
-
-3d) Promote an S-build to Galileo
---------------------------------
-After S-build has been prepared (on signedUpdates)
-On local Eclipse client, checkout Galileo projects according to
-    http://wiki.eclipse.org/Galileo_Build
-and edit the build contribution.
-
-4) Convert a download to "signed" form
---------------------------------------
-Normally, only the TM update site is signed whereas the downloadable ZIPs
-are not. Downloadable ZIPs can be converted to signed, if the signed
-update site is available and installed. See
-
- org.eclipse.rse.build/bin/make_signed.sh
- 
-\ No newline at end of file
diff --git a/releng/org.eclipse.rse.build/about.html b/releng/org.eclipse.rse.build/about.html
deleted file mode 100644
index d4cc693f9..000000000
--- a/releng/org.eclipse.rse.build/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2007</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) 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 <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/releng/org.eclipse.rse.build/archive/.cvsignore b/releng/org.eclipse.rse.build/archive/.cvsignore
deleted file mode 100644
index a17291e0f..000000000
--- a/releng/org.eclipse.rse.build/archive/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-drops
diff --git a/releng/org.eclipse.rse.build/archive/build_types.html b/releng/org.eclipse.rse.build/archive/build_types.html
deleted file mode 100644
index 131c40e84..000000000
--- a/releng/org.eclipse.rse.build/archive/build_types.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-<title>Eclipse Corner</title>
-<link rel="stylesheet" href="http://www.eclipse.org/default_style.css">
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-<body text="#000000" bgcolor="#ffffff" link="#0000ee" vlink="#551a8b" alink="#ff0000">
-<table border=0 cellspacing=5 cellpadding=2 width="100%" >
-  <tr> 
-    <td align=left valign=top colspan="2" bgcolor="#0080c0"><b><font face="Arial,Helvetica" color="#ffffff">Eclipse 
-      Project Build Types</font></b></td>
-  </tr>
-  <tr> 
-    <td align=right valign=top><img src="http://www.eclipse.org/images/Adarrow.gif" border=0 height=16 width=16></td>
-    <td> 
-      <p><b><font face="arial,helvetica,geneva" size="-1">Releases</font></b> 
-        <br>
-        <font size="-1" face="arial,helvetica,geneva">Releases are builds 
-        that have been declared major releases by the development team - for example 
-        &quot;R1.0&quot;. Releases are the right builds for people who want to 
-        be on a stable, tested release, and don't need the latest greatest features 
-        and improvements. Release builds always have an &quot;R&quot; at the beginning 
-        of the name i.e. R1.0, R2.0 etc. Non-release builds are named according to the 
-        date of the build - for example 20060427 is the build from April 27, 2006.</font><br>
-      </p>
-    </td>
-  </tr>
-  <tr> 
-    <td align=right valign=top><img src="http://www.eclipse.org/images/Adarrow.gif" border=0 height=16 width=16></td>
-    <td><b><font face="arial,helvetica,geneva" size="-1">Stable Builds</font></b> 
-      <br>
-      <font size="-1" face="arial,helvetica,geneva"> Stable builds are integration 
-      builds that have been found to be stable enough for most people to use. 
-      They are promoted from integration build to stable build by the architecture 
-      team after they have been used for a few days and deemed reasonably stable. 
-      The latest stable build is the right build for people who want to stay up 
-      to date with what is going on in the latest development stream, and don't 
-      mind putting up with a few problems n in order to get the latest greatest 
-      features and bug fixes. The latest stable build is the one the development 
-      team likes people to be using, because of the valuable and timely feedback. 
-      </font></td>
-  </tr>
-  <tr> 
-    <td align=right valign=top><img src="http://www.eclipse.org/images/Adarrow.gif" border=0 height=16 width=16></td>
-    <td>
-      <p><b><font face="arial,helvetica,geneva" size="-1">Integration Builds</font></b> 
-        <br>
-        <font size="-1" face="arial,helvetica,geneva"> Periodically, component 
-        teams version off their work in what they believe is a stable, consistent 
-        state, and they update the build configuration to indicate that the next 
-        integration build should take this version of the component. Integration 
-        builds are built from these stable component versions that have been specified 
-        by each component team as the best version available. Integration builds 
-        may be promoted to stable builds after a few days of testing. Integration 
-        builds are built whenever new stable component versions are released into 
-        the build.</font></p>
-      </td>
-  </tr>
-  <tr> 
-    <td align=right valign=top><img src="http://www.eclipse.org/images/Adarrow.gif" border=0 height=16 width=16></td>
-    <td><b><font face="arial,helvetica,geneva" size="-1">Nightly Builds</font></b>
-      <br>
-      <font size="-1" face="arial,helvetica,geneva"> Nightly builds are produced 
-      every night from whatever has been released into the HEAD stream of the 
-      CVS repository. They are completely untested and will almost always have 
-      major problems. Many will not work at all. These drops are normally only 
-      useful to developers actually working on the Eclipse Project.</font></td>
-  </tr>
-  <tr>
-    <td align=right valign=top><img src="http://www.eclipse.org/images/Adarrow.gif" border=0 height=16 width=16></td>
-    <td><b><font face="arial,helvetica,geneva" size="-1">Maintenance Builds</font></b>
-      <br>
-      <font size="-1" face="arial,helvetica,geneva"> Maintenance builds are produced
-       periodically to incorporate fixes into an existing release. They are typically
-       built from tagged plug-in and feature pojects in a maintenance stream of the CVS 
-       repository (i.e. R1_0_maintenance). Maintenance builds are promoted to a minor 
-       or service release (i.e. R1.1 or R1.0.1) after development teams have deemed one 
-       to be stable following one or more test-fix pass cycles.</font></td>
-  </tr> 
-</table>
-<h3>&nbsp;</h3>
-</body>
-</html>
diff --git a/releng/org.eclipse.rse.build/archive/dlconfig.txt b/releng/org.eclipse.rse.build/archive/dlconfig.txt
deleted file mode 100644
index dd682ba91..000000000
--- a/releng/org.eclipse.rse.build/archive/dlconfig.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-dropPrefix[]=R&dropPrefix[]=S&
-dropType[]=Archived Release&dropType[]=Archived Stable Build&
diff --git a/releng/org.eclipse.rse.build/archive/index.php b/releng/org.eclipse.rse.build/archive/index.php
deleted file mode 100644
index 1414801a0..000000000
--- a/releng/org.eclipse.rse.build/archive/index.php
+++ /dev/null
@@ -1,230 +0,0 @@
-<html><head>
-<link rel="stylesheet" href="http://www.eclipse.org/default_style.css">
-<title>Target Management Project Archived Downloads</title></head>
-<body>
-
-<table border=0 cellspacing=5 cellpadding=2 width="100%" >
-  <tr> 
-    <td align=left width="72%"> <font class=indextop>Target Management project<br/>archived downloads</font> 
-      <br>
-      <font class=indexsub>archived downloads from the dsdp-tm project</font><br>
-</td>
-    <td width="28%"><img src="http://www.eclipse.org/images/Idea.jpg" height=86 width=120></td>
-  </tr>
-
-</table>
-<table border=0 cellspacing=5 cellpadding=2 width="100%" >
-	
-	<tr> 
-    <td align=LEFT valign=TOP colspan="2" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">Archived Downloads</font></b></td>
-  </tr>
-  
-	<tr> <td> <p>On this
-page you can find the archived 
-<a href="build_types.html">builds</a> for the Remote System Explorer (RSE),
-provided by the 
-<a href="http://www.eclipse.org/dsdp/tm/">Target Management</a> project.
-Archived builds consist of older releases and not propagated to Eclipse mirrors. 
-<!--
-To get started run the program and go through the
-user and developer documentation provided in the online help system.
--->
-To get started, see the build notes provided with each drop, run the
-program and go through the online user and developer documentation,
-or take a look at the project's online
-<a href="http://www.eclipse.org/dsdp/tm/tutorial/index.php">getting started</a>
-pages.
-
-If you have problems downloading the drops, contact the 
-<font face="arial,helvetica,geneva" size="-1"><a href="mailto:webmaster@eclipse.org">webmaster</a></font>.
-If you have problems installing or getting the workbench to run, 
-check out the 
-<a href="http://wiki.eclipse.org/TM_and_RSE_FAQ">Target Management FAQ</a>,
-or try posting a question to the 
-<a href="http://www.eclipse.org/newsgroups">newsgroup</a>,
-<a href="news://news.eclipse.org/eclipse.dsdp.tm">eclipse.dsdp.tm</a>.
-All downloads are provided under the terms and conditions of the 
-<a href="http://www.eclipse.org/legal/epl/notice.php">Eclipse.org
-Software User Agreement</a> unless otherwise specified. </p>
-
-<p>
-Current builds are available 
-<a href="http://download.eclipse.org/dsdp/tm/downloads/index.php">here</a>.
-For information about different kinds of builds look
-<a href="build_types.html" target="_top">here</a>. 
-</p>
-
-<p/>
-</td></tr>
-	
-  <tr> 
-    <td align=LEFT valign=TOP colspan="2" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">Archived
-      Downloads</font></b></td>
-  </tr>
-  </table>
-  <?php
-	$fileHandle = fopen("dlconfig.txt", "r");
-	while (!feof($fileHandle)) {
-		$aLine = fgets($fileHandle, 4096);
-		parse_str($aLine);
-	}
-	fclose($fileHandle);
-	
-	for ($i = 0; $i < count($dropType); $i++) {
-		$typeToPrefix[$dropType[$i]] = $dropPrefix[$i];
-	}
-	
-	$aDirectory = dir("drops");
-	while ($anEntry = $aDirectory->read()) {
-
-		// Short cut because we know aDirectory only contains other directories.
-		if ($anEntry != "." && $anEntry!="..") {
-			$aDropDirectory = dir("drops/".$anEntry);
-			$fileCount = 0;
-			while ($aDropEntry = $aDropDirectory->read()) {
-				if (stristr($aDropEntry, ".zip") || stristr($aDropEntry, ".tar")) {
-					// Count the files in the directory
-					$fileCount = $fileCount + 1;
-				}
-			}
-			//See http://at2.php.net/manual/en/class.dir.php
-			$aDropDirectory->close();
-			// Read the count file
-			$countFile = "drops/".$anEntry."/package.count";
-			$indexFile = "drops/".$anEntry."/index.php";
-			if (file_exists($countFile) && file_exists($indexFile)) {
-				$anArray = file($countFile);
-	
-				// If a match - process the directory
-				if ($anArray[0] == $fileCount) {
-					$parts = explode("-", $anEntry);
-					if (count($parts) == 2) {
-
-						//N-builds and I-builds	
-						$datePart = $parts[0];
-						$timePart = $parts[1];
-						$buildtype = substr($datePart, 0, 1);
-						$buckets[$buildtype][] = $anEntry;
-			
-						$year = substr($datePart, 1, 4);
-						$month = substr($datePart, 5, 2);
-						$day = substr($datePart, 7, 2);
-						$hour = substr($timePart,0,2);
-						$minute = substr($timePart,2,2);
-						$timeStamp = mktime($hour, $minute, 0, $month, $day, $year);
-					
-						$timeStamps[$anEntry] = date("D, j M Y -- H:i (O)", $timeStamp);
-			
-						if ($timeStamp > $latestTimeStamp[$buildtype]) {
-							$latestTimeStamp[$buildtype] = $timeStamp;
-							$latestFile[$buildtype] = $anEntry;
-						}
-
-					} else if (count($parts) == 3) {
-
-						//S-builds and R-builds
-						$buckets[$parts[0]][] = $anEntry;
-			
-						$timePart = $parts[2];
-						$year = substr($timePart, 0, 4);
-						$month = substr($timePart, 4, 2);
-						$day = substr($timePart, 6, 2);
-						$hour = substr($timePart,8,2);
-						$minute = substr($timePart,10,2);
-						$timeStamp = mktime($hour, $minute, 0, $month, $day, $year);
-					
-						$timeStamps[$anEntry] = date("D, j M Y -- H:i (O)", $timeStamp);
-			
-						if ($timeStamp > $latestTimeStamp[$parts[0]]) {
-							$latestTimeStamp[$parts[0]] = $timeStamp;
-							$latestFile[$parts[0]] = $anEntry;
-						}
-					}
-				}
-			}
-		}
-	}
-	$aDirectory->close();
- ?>
- 
-<table width="100%" cellspacing=0 cellpadding=3 align=center>
-<td align=left>
-<TABLE  width="100%" CELLSPACING=0 CELLPADDING=3>
-<tr>
-	<td width=\"30%\"><b>Build Type</b></td>
-	<td><b>Build Name</b></td>
-	<td><b>Build Date</b></td>
-</tr>
-
-<?php
-	foreach($dropType as $value) {
-		$prefix=$typeToPrefix[$value];
-		$fileName = $latestFile[$prefix];
-		echo "<tr>
-			<td width=\"30%\">$value</td>";
-		
-		$parts = explode("-", $fileName);
-		if (count($parts) == 2) {
-			$buildName=$fileName;
-		} else {
-			$buildName=$parts[1];
-		}
-		
-		// Uncomment the line below if we need click through licenses.
-		// echo "<td><a href=license.php?license=drops/$fileName>$buildName</a></td>";
-		
-		// Comment the line below if we need click through licenses.
-		echo "<td><a href=\"drops/$fileName/index.php\">$buildName</a></td>";
-		
-		echo "<td>$timeStamps[$fileName]</td>";
-		echo "</tr>";
-	}
-?>
-</table>
-</table>
-&nbsp;
-<?php
-	foreach($dropType as $value) {
-		$prefix=$typeToPrefix[$value];
-		echo "
-		<table width=\"100%\" cellspacing=0 cellpadding=3 align=center>
-		<tr bgcolor=\"#999999\">
-		<td align=left width=\"30%\"><b><a name=\"$value\"><font color=\"#FFFFFF\" face=\"Arial,Helvetica\">$value";
-		echo "s</font></b></a></td>
-		</TR>
-		<TR>
-		<td align=left>
-		<TABLE  width=\"100%\" CELLSPACING=0 CELLPADDING=3>
-		<tr>
-		<td width=\"30%\"><b>Build Name</b></td>
-		<td><b>Build Date</b></td>
-		</tr>";
-		
-		$aBucket = $buckets[$prefix];
-		if (isset($aBucket)) {
-			rsort($aBucket);
-			foreach($aBucket as $innerValue) {
-				$parts = explode("-", $innerValue);
-				if (count($parts) == 2) {
-					$buildName=$innerValue;
-				} else {
-					$buildName=$parts[1];
-				}
-				echo "<tr>";
-				
-					// Uncomment the line below if we need click through licenses.
-					// echo "<td><a href=\"license.php?license=drops/$innerValue\">$buildName</a></td>";
-					
-					// Comment the line below if we need click through licenses.
-					echo "<td><a href=\"drops/$innerValue/index.php\">$buildName</a></td>";
-
-					echo "<td>$timeStamps[$innerValue]</td>
-					</tr>";
-			}
-		}
-		echo "</table></table>&nbsp;";
-	}
-?>
-
-&nbsp;
-</body></html>
diff --git a/releng/org.eclipse.rse.build/bin/batch_sign.sh b/releng/org.eclipse.rse.build/bin/batch_sign.sh
deleted file mode 100755
index e6aee686d..000000000
--- a/releng/org.eclipse.rse.build/bin/batch_sign.sh
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/sh
-#*******************************************************************************
-# Copyright (c) 2006, 2009 Wind River Systems, Inc.
-# 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: 
-# Martin Oberhuber - initial API and implementation 
-#*******************************************************************************
-#:#
-#:# Script to sign all ZIP files in a directory
-#:#
-#:# Usage:
-#:#    batch_sign.sh {directory}
-#:# Examples:
-#:#    batch_sign.sh publish/S-1.0M5-200611100500
-
-#nothing we do should be hidden from the world
-umask 22
-
-#Use Java5 on build.eclipse.org
-#export PATH=/shared/dsdp/tm/ibm-java2-ppc64-50/bin:$PATH
-export PATH=/shared/dsdp/tm/ibm-java2-ppc64-50/jre/bin:/shared/dsdp/tm/ibm-java2-ppc64-50/bin:$PATH
-#export PATH=${HOME}/ws2/IBMJava2-ppc-142/bin:$PATH
-
-curdir=`pwd`
-
-#Get parameters
-dirToSign=$1
-usage=0
-if [ "$dirToSign" = "" ]; then
-  usage=1
-elif [ ! -d "$dirToSign" ]; then
-  usage=1
-fi
-if [ $usage = 1 ]; then
-  grep '^#:#' $0 | grep -v grep | sed -e 's,^#:#,,'
-  exit 0
-fi
-
-#sign the zipfiles
-cd "$dirToSign"
-RDIR=`pwd`
-mkdir -p signed
-nameToSign=`basename $RDIR`
-ZIPS=`ls *.zip *.jar`
-STAGING=/home/data/httpd/download-staging.priv/dsdp/tm
-STDIR=${STAGING}/${nameToSign}
-mkdir -p ${STDIR}
-cp ${ZIPS} ${STDIR}
-cd ${STDIR}
-mkdir out
-for x in $ZIPS ; do
-  sign $x nomail ${STDIR}/out
-done
-echo "Waiting for signature..."
-sleep 300
-TRIES=20
-MISSING="$ZIPS"
-while [ "$MISSING" != "" -a ${TRIES} -gt 0 ]; do
-  MISSING_NEW=""
-  sleep 60
-  for x in $MISSING ; do
-    if [ -f ${STDIR}/out/$x ]; then
-      echo "Done: TRIES=${TRIES}, $x"
-      cp -f ${STDIR}/out/$x ${RDIR}/signed/$x
-      chmod ugo+r ${RDIR}/signed/$x
-    else
-      MISSING_NEW="${MISSING_NEW} $x"
-    fi
-  done
-  echo "Signed: TRIES=${TRIES}, Missing ${MISSING_NEW}"
-  MISSING="${MISSING_NEW}"
-  TRIES=`expr $TRIES - 1`
-done
-rm -rf ${STDIR}
-
-cd "$curdir"
-if [ "$MISSING" != "" ]; then
-  echo "batch_sign failed: ${MISSING}"
-  exit 1
-fi
-echo "batch_sign complete"
-exit 0
diff --git a/releng/org.eclipse.rse.build/bin/doit_irsbuild.sh b/releng/org.eclipse.rse.build/bin/doit_irsbuild.sh
deleted file mode 100755
index 56a38f562..000000000
--- a/releng/org.eclipse.rse.build/bin/doit_irsbuild.sh
+++ /dev/null
@@ -1,165 +0,0 @@
-#!/bin/sh
-#*******************************************************************************
-# Copyright (c) 2006, 2009 Wind River Systems, Inc.
-# 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: 
-# Martin Oberhuber - initial API and implementation 
-#*******************************************************************************
-#:#
-#:# Bootstrapping script to perform S-builds and R-builds on build.eclipse.org
-#:# Will build based on HEAD of all mapfiles, and update the testPatchUpdates as well
-#:#
-#:# Usage:
-#:#    doit_irsbuild.sh {buildType} [buildId] [maptag]
-#:# Examples:
-#:#    doit_irsbuild.sh R 1.0
-#:#    doit_irsbuild.sh S 1.0M5 S1_0M5
-#:#    doit_irsbuild.sh I
-
-#nothing we do should be hidden from the world
-umask 22
-
-curdir=`pwd`
-cd `dirname $0`
-mydir=`pwd`
-echo ${mydir}
-
-#Use Java5 on build.eclipse.org
-#export PATH=/shared/dsdp/tm/ibm-java2-ppc64-50/bin:$PATH
-export PATH=/shared/dsdp/tm/ibm-java2-ppc64-50/jre/bin:/shared/dsdp/tm/ibm-java2-ppc64-50/bin:$PATH
-#export PATH=${HOME}/ws2/IBMJava2-ppc-142/bin:$PATH
-
-
-#Get parameters
-mapTag=HEAD
-buildType=$1
-buildId=$2
-case x$buildType in
-  xP|xN|xI|xS) ok=1 ;;
-  xR|xM|xJ) mapTag=R3_1_maintenance ; ok=1 ;;
-  xK|xL) mapTag=R3_0_maintenance ; ok=1 ;;
-  *) ok=0 ;;
-esac
-if [ "$3" != "" ]; then
-  mapTag=$3
-fi
-if [ $ok != 1 ]; then
-  grep '^#:#' $0 | grep -v grep | sed -e 's,^#:#,,'
-  cd ${curdir}
-  exit 0
-fi
-
-#Remove old logs and builds
-echo "Removing old logs and builds..."
-cd $HOME/ws_31x
-#rm log-*.txt
-if [ -d working/build ]; then
-  rm -rf working/build
-fi
-if [ -d working/package ]; then
-  rm -rf working/package
-fi
-
-#Do the main job
-echo "Updating builder from CVS..."
-cd org.eclipse.rse.build
-stamp=`date +'%Y%m%d-%H%M'`
-CHANGES=`cvs -nq update -r ${mapTag} | head -1`
-if [ "${CHANGES}" = "" ]; then
-  echo "Build ${buildType}${buildId} : ${mapTag} : ${stamp}"
-  echo "Build canceled, no mapfile or config changed in org.eclipse.rse.build."
-  exit 0
-fi
-log=$HOME/ws_31x/log-${buildType}$stamp.txt
-touch $log
-#cvs -q update -RPd >> $log 2>&1
-cvs -q update -r ${mapTag} -RPd >> $log 2>&1
-daystamp=`date +'%Y%m%d*%H'`
-
-echo "Running the builder..."
-./nightly.sh ${mapTag} ${buildType} ${buildId} >> $log 2>&1
-tail -30 $log
-
-#update the main download and archive pages: build.eclipse.org only
-if [ -d /home/data/httpd/archive.eclipse.org/dsdp/tm/downloads ]; then
-  cd /home/data/httpd/archive.eclipse.org/dsdp/tm/downloads
-  cvs -q update -RPd >> $log 2>&1
-  chgrp dsdp-tmadmin * CVS/* 2>/dev/null
-  cd /home/data/httpd/download.eclipse.org/dsdp/tm/downloads
-  cvs -q update -RPd >> $log 2>&1
-  chgrp dsdp-tmadmin * CVS/*
-
-  #Fixup permissions and group id on download.eclpse.org (just to be safe)
-  echo "Fixup: chgrp -R dsdp-tmadmin drops/${buildType}*${daystamp}*"
-  chgrp -R dsdp-tmadmin drops/${buildType}*${daystamp}*
-  chmod -R g+w drops/${buildType}*${daystamp}*
-fi
-
-#Check the publishing
-cd $HOME/ws_31x/publish
-DIRS=`ls -dt ${buildType}*${daystamp}* | head -1 2>/dev/null`
-cd ${DIRS}
-FILES=`ls RSE-SDK-*.zip 2>/dev/null`
-echo "FILES=$FILES"
-if [ -f package.count -a "$FILES" != "" ]; then
-  echo "package.count found, release seems ok"
-  if [ ${buildType} = S -o ${buildType} = R ]; then
-    #hide the release for now until it is tested
-    #mirrors will still pick it up
-    mv package.count package.count.orig
-    #Do not sign stable or R-builds since we want that signing done 
-    #via the update site in order to ensure that features get signed
-    #DO_SIGN=1
-  fi
-  
-  # Always sign maintenance builds for immediate consumption in patches
-  case x${buildType} in
-    xJ|xK|xL|xM)  DO_SIGN=1 ;;
-  esac
-  
-  if [ "$DO_SIGN" = "1" ]; then
-    #sign the zipfiles
-    #temporarily disabled, this is not a good use of processing power!
-    mkdir signer
-    cp rseserver-*-windows.zip signer
-    cd signer
-    ${mydir}/batch_sign.sh `pwd`
-    cd ..
-  fi
-
-  if [ ${buildType} = N -a -d ../N.latest ]; then
-    #update the doc server
-    rm -f ../N.latest/RSE-*.zip
-    rm -f ../N.latest/TM-*.zip
-    cp -f RSE-SDK-*.zip ../N.latest/RSE-SDK-latest.zip
-    cp -f TM-discovery-*.zip ../N.latest/TM-discovery-latest.zip
-    chgrp dsdp-tmadmin ../N.latest/*.zip
-    chmod g+w ../N.latest/*.zip
-    if [ -d /shared/dsdp/public_html/tm/downloads/drops/N.latest ]; then
-      cp -f ../N.latest/* /shared/dsdp/public_html/tm/downloads/drops/N.latest/
-      chmod -R g+w /shared/dsdp/public_html/tm/downloads/drops
-    fi
-  fi
-
-  if [ ${buildType} != N ]; then
-      #Update the testPatchUpdates site
-      echo "Refreshing update site"
-      cd $HOME/downloads-tm/testPatchUpdates/bin
-      cvs update
-      ./mkTestUpdates.sh
-      #Update the signedPatchUpdates site
-      echo "Refreshing signedPatchUpdates site"
-      cd $HOME/downloads-tm/signedPatchUpdates/bin
-      cvs update
-      ./mkTestUpdates.sh
-  fi
-  
-  cd "$curdir"
-else
-  echo "package.count missing, release seems failed"
-fi
-chgrp dsdp-tm-rse $log
diff --git a/releng/org.eclipse.rse.build/bin/doit_nightly.sh b/releng/org.eclipse.rse.build/bin/doit_nightly.sh
deleted file mode 100755
index 02057b23a..000000000
--- a/releng/org.eclipse.rse.build/bin/doit_nightly.sh
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/sh
-#*******************************************************************************
-# Copyright (c) 2006, 2009 Wind River Systems, Inc.
-# 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: 
-# Martin Oberhuber - initial API and implementation 
-#*******************************************************************************
-#Bootstrapping script to perform N-builds on build.eclipse.org
-
-#nothing we do should be hidden from the world
-umask 22
-
-#Use Java5 on build.eclipse.org
-#export PATH=/shared/dsdp/tm/ibm-java2-ppc64-50/bin:$PATH
-export PATH=/shared/dsdp/tm/ibm-java2-ppc64-50/jre/bin:/shared/dsdp/tm/ibm-java2-ppc64-50/bin:$PATH
-#export PATH=${HOME}/ws2/IBMJava2-ppc-142/bin:$PATH
-
-curdir=`pwd`
-
-#Remove old logs and builds
-echo "Removing old logs and builds..."
-cd $HOME/ws_31x
-rm log-N*.txt
-if [ -d working/build ]; then
-  rm -rf working/build
-fi
-if [ -d working/package ]; then
-  rm -rf working/package
-fi
-
-#Do the main job
-echo "Updating builder from CVS..."
-cd org.eclipse.rse.build
-stamp=`date +'%Y%m%d-%H%M'`
-log=$HOME/ws_31x/log-N$stamp.txt
-touch $log
-cvs -q update -RPd >> $log 2>&1
-daystamp=`date +'%Y%m%d-%H'`
-
-echo "Running the builder..."
-./nightly.sh >> $log 2>&1
-tail -30 $log
-
-#update the main download and archive pages: build.eclipse.org only
-if [ -d /home/data/httpd/archive.eclipse.org/dsdp/tm/downloads ]; then
-  cd /home/data/httpd/archive.eclipse.org/dsdp/tm/downloads
-  cvs -q update -RPd >> $log 2>&1
-  chgrp dsdp-tmadmin * CVS/* 2>/dev/null
-  cd /home/data/httpd/download.eclipse.org/dsdp/tm/downloads
-  cvs -q update -RPd >> $log 2>&1
-  chgrp dsdp-tmadmin * CVS/* 2>/dev/null
-
-  #Fixup permissions and group id on download.eclpse.org (just to be safe)
-  chgrp -R dsdp-tmadmin drops/${buildType}*${daystamp}* 2>/dev/null
-  chmod -R g+w drops/${buildType}*${daystamp}* 2>/dev/null
-fi
-
-#Copy latest SDK in order to give access to DOC server
-cd $HOME/ws_31x/publish
-if [ -d N.latest ]; then
-  FILES=`ls -t N${daystamp}*/RSE-SDK-N${daystamp}*.zip | head -1 2>/dev/null`
-  echo "FILES=$FILES"
-  if [ "$FILES" != "" ]; then
-    rm N.latest/RSE-SDK-N*.zip 2>/dev/null
-    cd `dirname ${FILES}`
-    cp -f RSE-SDK-N*.zip ../N.latest/RSE-SDK-latest.zip
-    cp -f TM-discovery-*.zip ../N.latest/TM-discovery-latest.zip
-    cd ../N.latest
-    chgrp dsdp-tmadmin *.zip
-    chmod g+w *.zip
-    if [ -d /shared/dsdp/public_html/tm/downloads/drops/N.latest ]; then
-      cp -f * /shared/dsdp/public_html/tm/downloads/drops/N.latest/
-      chmod -R g+w /shared/dsdp/public_html/tm/downloads/drops
-    fi
-  fi
-fi
-
-#Cleanup old nightly builds (leave only last 5 in place)
-cd $HOME/ws_31x/publish
-ls -d N200* | sort | head -n-5 | xargs rm -rf
-
diff --git a/releng/org.eclipse.rse.build/bin/make_signed.sh b/releng/org.eclipse.rse.build/bin/make_signed.sh
deleted file mode 100755
index 6a75c8e3d..000000000
--- a/releng/org.eclipse.rse.build/bin/make_signed.sh
+++ /dev/null
@@ -1,136 +0,0 @@
-#!/bin/sh
-#*******************************************************************************
-#  Copyright (c) 2008, 2009 Wind River Systems, Inc. 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:
-#  Martin Oberhuber (Wind River) - initial API and implementation
-#*******************************************************************************
-#
-# Usage: make sure that appropriate signed update site is referenced in UPDATE_SITE,
-# and current directory is a download. Will create signed downloads in subdirectory.
-#
-
-UPDATE_SITE=$HOME/downloads-tm/updates/3.1milestones
-
-curdir=`pwd`
-cd `dirname $0`
-mydir=`pwd`
-cd "${curdir}"
-
-#Use Java5 on build.eclipse.org
-#export PATH=/shared/dsdp/tm/ibm-java2-ppc64-50/bin:$PATH
-export PATH=/shared/dsdp/tm/ibm-java2-ppc64-50/jre/bin:/shared/dsdp/tm/ibm-java2-ppc64-50/bin:$PATH
-#export PATH=${HOME}/s/IBMJava2-ppc-142/bin:$PATH
-
-SIGNED_JAR_SOURCE=${mydir}/eclipse_ext/tm
-##SIGNED_JAR_SOURCE=${mydir}/eclipse_ext
-OUTPUT=${curdir}/output.$$
-RESULT=${curdir}/result.$$
-TMP=${curdir}/tmp.$$
-BASEBUILDER=$HOME/ws_31x/eclipse
-
-# Provision update site into SIGNED_JAR_SOURCE
-if [ ! -d "${SIGNED_JAR_SOURCE}" ]; then
-  mkdir -p "${SIGNED_JAR_SOURCE}"
-  ${BASEBUILDER}/eclipse -nosplash \
-    -data install-ws -consolelog -clean \
-    -application org.eclipse.equinox.p2.repository.repo2runnable \
-    -source file:${UPDATE_SITE} \
-    -destination file:${SIGNED_JAR_SOURCE} \
-    -vmargs \
-      -Xms128M -Xmx256M -XX:PermSize=128M -XX:MaxPermSize=256M 
-  retval=$?
-  echo "result: ${retval}"
-  exit ${retval}
-fi
-
-if [ ! -d ${SIGNED_JAR_SOURCE}/server ]; then
-  mkdir ${SIGNED_JAR_SOURCE}/server
-fi
-have_server=`ls "${SIGNED_JAR_SOURCE}"/server/*.jar 2>/dev/null`
-if [ "${have_server}" = "" ]; then
-  cd ${SIGNED_JAR_SOURCE}/server
-  if [ -d "${curdir}/signer/signed" ]; then
-    unzip ${curdir}/signer/signed/rseserver-*.zip
-  else
-    unzip ${curdir}/rseserver-*-signed.zip
-  fi
-  have_server=`ls *.jar 2>/dev/null`
-  cd "${curdir}"
-  if [ "${have_server}" = "" ]; then
-    echo 'ERROR: signed rseserver-*.zip not found!'
-    echo "Please sign a server zip on build.eclipse.org, upload and retry."
-    exit 1
-  fi
-fi
-
-if [ ! -d ${TMP} ]; then
-  mkdir -p ${TMP} 
-fi
-if [ ! -d ${OUTPUT} ]; then
-  mkdir -p ${OUTPUT} 
-fi
-if [ ! -d ${RESULT} ]; then
-  mkdir -p ${RESULT} 
-fi
-for zip in `ls *.zip *.tar` ; do
-  cd ${TMP}
-  case ${zip} in
-    *.zip) unzip -q ${curdir}/${zip} ;;
-    *.tar) tar xf ${curdir}/${zip} ;;
-  esac
-  case ${zip} in
-    rseserver*) SIGNED_JARS=${SIGNED_JAR_SOURCE}/server ;;
-    *) SIGNED_JARS=${SIGNED_JAR_SOURCE} ;;
-  esac
-  REF=`find . -name 'epl-v10.html'`
-  FILES=`find . -name '*.jar' -o -name 'META-INF'`
-  for f in ${FILES} ; do
-    printf "${f}: "
-    if [ -f ${SIGNED_JARS}/${f} ]; then
-      cp -f ${SIGNED_JARS}/${f} ./${f}
-      touch -r ${REF} ./${f}
-      echo "signed"
-    elif [ -d ${SIGNED_JARS}/${f} ]; then
-      cp -Rf ${SIGNED_JARS}/${f}/* ${f}
-      touch -r ${REF} ${f}/*
-      echo "signed"
-    else
-      echo "."
-    fi
-  done
-  ##cp ${curdir}/${zip} ${OUTPUT}
-  case ${zip} in
-    *.zip) zip -r -o -q ${OUTPUT}/${zip} * ;;
-    *.tar) tar cfv ${OUTPUT}/${zip} * ; touch -r ${REF} ${OUTPUT}/${zip};
-  esac
-  rm -rf *
-  rm "${OUTPUT}"/rseserver-*-signed.zip
-  cd ${RESULT}
-  case ${zip} in
-     rseserver*) mkdir ${zip} ; cd ${zip} ;
-        case ${zip} in
-           *.zip) unzip -q -o ${OUTPUT}/${zip} ;;
-           *.tar) tar xf ${OUTPUT}/${zip} ;;
-        esac
-        ;;
-     *) unzip -q -o ${OUTPUT}/${zip} ;;
-  esac
-done
-rm -rf ${TMP}
-
-echo "--------------------------------------"
-echo "DONE"
-echo "--------------------------------------"
-cd "${curdir}"
-echo "MAIN:---------------------------------"
-diff -r ${RESULT} ${SIGNED_JAR_SOURCE}
-for f in `ls rseserver-*.zip rseserver-*.tar` ; do
-  echo "${f}:-----------------------------------"
-  diff -r -b ${RESULT}/${f} ${SIGNED_JAR_SOURCE}/server
-done
-
diff --git a/releng/org.eclipse.rse.build/bin/rename_build.sh b/releng/org.eclipse.rse.build/bin/rename_build.sh
deleted file mode 100755
index d39d2672e..000000000
--- a/releng/org.eclipse.rse.build/bin/rename_build.sh
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/sh
-#
-## Rename a build for release
-## usage:
-##     cd drops/I20090916-0905
-##     rename_build.sh R 3.1.1 200909160905
-##
-## Creates ../R-3.1.1-200909160905 and prepares renamed build there
-#
-case x$1 in
-  xR) tgtBuild=Release ;;
-  xM) tgtBuild=Maintenance ;;
-  xI) tgtBuild=Integration ;;
-  xS) tgtBuild=Stable ;;
-  *) grep '^##' $0
-        exit 0
-        ;;
-esac
-tgtType=$1
-tgtVer=$2
-tgtDate=$3
-tgtDir=${tgtType}-${tgtVer}-${tgtDate}
-
-if [ ! -f package.count ]; then
-  echo ERROR: package.count not found. Please cd to source build before running.
-  exit 1
-fi
-if [ -d ../$tgtDir ]; then
-  echo ERROR: target dir ../$tgtDir already exists
-  exit 1
-fi
-srcVer=`ls RSE-SDK-*.zip | sed -e 's,RSE-SDK-,,' -e 's,\.zip,,'`
-if [ ! -f RSE-runtime-${srcVer}.zip ]; then
-  echo ERROR: RSE-runtime-${srcVer}.zip not found, incorrect source?
-  exit 1
-fi
-echo "Renaming Release: ${srcVer} --> ${tgtVer} into ../${tgtDir}"
-
-mkdir ../${tgtDir}
-for x in `ls` ; do
-  if [ -f ${x} ]; then
-    case $x in
-    *-signed.zip)
-      ;;
-    *.zip|*.tar)
-      y=`echo $x | sed -e "s,${srcVer},${tgtVer},"`
-      cp ${x} ../${tgtDir}/${y}
-      ;;
-    index.php|buildNotes.php)
-      cat ${x} | sed -e "s,/${srcVer},/${tgtDir},g" \
-        -e "s,${srcVer},${tgtVer},g" \
-        -e "/TM/s,Integration,${tgtBuild},g" \
-        -e "/TM/s,Maintenance,${tgtBuild},g" \
-        -e "/TM/s,Stable,${tgtBuild},g" \
-        > ../${tgtDir}/${x}
-      ;;
-    package.count)
-      cp ${x} ../${tgtDir}/${x}.orig
-      ;;
-    *)
-      cp ${x} ../${tgtDir}/${x}
-      ;;
-    esac
-  fi
-done
diff --git a/releng/org.eclipse.rse.build/bin/update_global_cvs_tags.sh b/releng/org.eclipse.rse.build/bin/update_global_cvs_tags.sh
deleted file mode 100755
index 3143f4f44..000000000
--- a/releng/org.eclipse.rse.build/bin/update_global_cvs_tags.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh
-#*******************************************************************************
-# Copyright (c) 2007, 2008 Wind River Systems, Inc. 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:
-# Martin Oberhuber (Wind River) - initial API and implementation
-#*******************************************************************************
-#
-# This script can be used to apply a release tag or branch tag globally
-# to those files of the TM CVS Repository that are usually not seen. It
-# needs to run from command-line because under Eclipse, these top-level
-# modules and files would require checking out the entire TM module tree;
-# from commandline, this works with checking out the top-level directories
-# only.
-#
-# These files are named "readme.txt" in the top-level CVS modules, and
-# contribute to the tags shown in the Eclipse CVS Repository Explorer
-# when expanding the "Branches" or the "Tags" node.
-#
-# Before running this script, customize the "cvs tag" commands below.
-#
-curdir=`pwd`
-CVSROOT=:ext:moberhuber@dev.eclipse.org:/cvsroot/dsdp
-export CVSROOT
-TOPMODULES="\
-  org.eclipse.tm.rse \
-  org.eclipse.tm.rse/doc \
-  org.eclipse.tm.rse/examples \
-  org.eclipse.tm.rse/features \
-  org.eclipse.tm.rse/plugins \
-  org.eclipse.tm.rse/releng \
-  org.eclipse.tm.rse/tests \
-  org.eclipse.tm.core \
-  org.eclipse.tm.core/discovery \
-  org.eclipse.tm.core/terminal \
-  org.eclipse.tm.core/wince \
-"
-###  org.eclipse.tm.core/thirdparty \
-cvs co -l $TOPMODULES
-##exit 0
-for topmod in $TOPMODULES ; do
-  cd $topmod
-  #cvs update -l -r R1_0 .
-  #cvs tag -b R1_0_maintenance readme.txt
-  #cvs tag -d v20060630 readme.txt
-  cvs update -l -A .
-  cvs tag R3_1_1
-  cd $curdir
-done
diff --git a/releng/org.eclipse.rse.build/bootstrap.sh b/releng/org.eclipse.rse.build/bootstrap.sh
deleted file mode 100644
index b826892b5..000000000
--- a/releng/org.eclipse.rse.build/bootstrap.sh
+++ /dev/null
@@ -1,242 +0,0 @@
-#!/bin/sh
-#*******************************************************************************
-# Copyright (c) 2005, 2007 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:
-# IBM Corporation - initial API and implementation
-# Martin Oberhuber (Wind River) - Adapt for TM / RSE
-#*******************************************************************************
-# User specific environment and startup programs
-umask 002
-
-BASE_PATH=.:/bin:/usr/bin:/usr/bin/X11:/usr/local/bin:/usr/bin:/usr/X11R6/bin
-LD_LIBRARY_PATH=.
-BASH_ENV=$HOME/.bashrc
-USERNAME=`whoami`
-xhost +$HOSTNAME
-DISPLAY=:0.0
-CVS_RSH=ssh
-ulimit -c unlimited
-export CVS_RSH USERNAME BASH_ENV LD_LIBRARY_PATH DISPLAY
-
-proc=$$
-
-curdir=`pwd`
-cd `dirname $0`
-mydir=`pwd`
-
-#notification list
-recipients=
-
-#sets skip.performance.tests Ant property
-skipPerf=""
-
-#sets skip.tests Ant property
-skipTest=""
-
-#sets sign Ant property
-sign=""
-
-tagMaps=""
-
-#sets fetchTag="HEAD" for nightly builds if required
-tag=""
-
-#Basebuilder for Eclipse 3.2.1 maintenance
-#buildProjectTags=v20060529
-buildProjectTags=r321_v20060830
-
-#updateSite property setting
-updateSite=""
-
-#flag indicating whether or not mail should be sent to indicate build has started
-mail=""
-
-#flag used to build based on changes in map files
-compareMaps=""
-
-#buildId - build name
-buildId=""
-
-#buildLabel - name parsed in php scripts <buildType>-<buildId>-<datestamp>
-buildLabel=""
-
-# tag for build contribution project containing .map files
-mapVersionTag=HEAD
-
-# directory in which to export builder projects
-#builderDir=/builds/eclipsebuilder
-builderDir=$mydir/../working/build
-
-# buildtype determines whether map file tags are used as entered or are replaced with HEAD
-buildType=N
-
-# directory where to copy build
-#postingDirectory=/builds/transfer/files/master/downloads/drops
-postingDirectory=$mydir/../publish
-
-
-# flag to indicate if test build
-testBuild=""
-
-# path to javadoc executable
-javadoc=""
-
-# value used in buildLabel and for text replacement in index.php template file
-builddate=`date +%Y%m%d`
-buildtime=`date +%H%M`
-timestamp=$builddate$buildtime
-
-
-# process command line arguments
-usage="usage: $0 [-notify emailaddresses][-test][-buildDirectory directory][-buildId name][-buildLabel directory name][-tagMapFiles][-mapVersionTag tag][-builderTag tag][-bootclasspath path][-compareMaps][-skipPerf] [-skipTest][-updateSite site][-sign] M|N|I|S|R"
-
-if [ $# -lt 1 ]
-then
-		 echo >&2 "$usage"
-		 exit 1
-fi
-
-while [ $# -gt 0 ]
-do
-		 case "$1" in
-		 		 -buildId) buildId="$2"; shift;;
-		 		 -buildLabel) buildLabel="$2"; shift;;
-		 		 -mapVersionTag) mapVersionTag="$2"; shift;;
-		 		 -tagMapFiles) tagMaps="-DtagMaps=true";;
-		 		 -skipPerf) skipPerf="-Dskip.performance.tests=true";;
-		 		 -skipTest) skipTest="-Dskip.tests=true";;
-		 		 -buildDirectory) builderDir="$2"; shift;;
-		 		 -notify) recipients="$2"; shift;;
-		 		 -test) postingDirectory="/builds/transfer/files/bogus/downloads/drops";testBuild="-Dtest=true";;
-		 		 -builderTag) buildProjectTags="$2"; shift;;
-		 		 -compareMaps) compareMaps="-DcompareMaps=true";;
-		 		 -updateSite) updateSite="-DupdateSite=$2";shift;;
-		 		 -sign) sign="-Dsign=true";;
-		 		 -*)
-		 		 		 echo >&2 $usage
-		 		 		 exit 1;;
-		 		 *) break;;		 # terminate while loop
-		 esac
-		 shift
-done
-
-# After the above the build type is left in $1.
-buildType=$1
-
-# Set default buildId and buildLabel if none explicitly set
-if [ "$buildId" = "" ]
-then
-		 buildId=$buildType$builddate-$buildtime
-fi
-
-if [ "$buildLabel" = "" ]
-then
-		 buildLabel=$buildId
-fi
-
-#Set the tag to HEAD for Nightly builds
-if [ "$buildType" = "N" ]
-then
-        tag="-DfetchTag=HEAD"
-        versionQualifier="-DforceContextQualifier=$buildId"
-fi
-
-# tag for eclipseInternalBuildTools on ottcvs1
-internalToolsTag=$buildProjectTags
-
-# tag for exporting org.eclipse.releng.basebuilder
-baseBuilderTag=$buildProjectTags
-
-# tag for exporting the custom builder
-customBuilderTag=$buildProjectTags
-
-if [ -e $builderDir ]
-then
-		 builderDir=$builderDir$timestamp
-fi
-
-# directory where features and plugins will be compiled
-buildDirectory=$builderDir/src
-
-mkdir -p $builderDir
-cd $builderDir
-
-#check out org.eclipse.releng.basebuilder
-cvs -d :pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse co -r $baseBuilderTag org.eclipse.releng.basebuilder
-
-#check out org.eclipse.rse.build
-cvs -d :pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp co -r $customBuilderTag org.eclipse.tm.rse/releng/org.eclipse.rse.build
-if [ "$tagMaps" == "-DtagMaps=true" ]; then  
-  cvs -d moberhuber@dev.eclipse.org:/cvsroot/dsdp rtag -r $customBuilderTag v$buildId org.eclipse.tm.rse/releng/org.eclipse.rse.build
-fi
-
-if [ "$HOSTNAME" == "utils" ]
-then
-	#Running on build.eclipse.org
-	java15_home=/shared/dsdp/tm/ibm-java2-ppc64-50
-	#java14_home=/shared/webtools/apps/IBMJava2-ppc64-142
-	java14_home=/shared/webtools/apps/IBMJava2-ppc-142
-    javadoc="-Djavadoc15=$java15_home/bin/javadoc"
-    PATH=$java15_home/jre/bin:$PATH;export PATH
-elif [ "$HOSTNAME" == "parser.wrs.com" ]
-then
-	#Running on parser
-	java15_home=/opt/jdk1.5.0_06
-	java14_home=/opt/j2sdk1.4.2_12
-    javadoc="-Djavadoc15=$java15_home/bin/javadoc"
-    PATH=$java15_home/jre/bin:$PATH;export PATH
-fi
-
-mkdir -p $postingDirectory/$buildLabel
-chmod -R 755 $builderDir
-
-#default value of the bootclasspath attribute used in ant javac calls.  
-bootclasspath="$java14_home/jre/lib/rt.jar:$java14_home/jre/lib/jsse.jar"
-bootclasspath_15="$java15_home/jre/lib/rt.jar"
-
-cd $builderDir/org.eclipse.rse.build
-
-echo buildId=$buildId >> monitor.properties 
-echo timestamp=$timestamp >> monitor.properties 
-echo buildLabel=$buildLabel >> monitor.properties 
-echo recipients=$recipients >> monitor.properties
-echo log=$postingDirectory/$buildLabel/index.php >> monitor.properties
-
-#the base command used to run AntRunner headless
-antRunner="`which java` -Xmx500m -jar ../org.eclipse.releng.basebuilder/plugins/org.eclipse.equinox.launcher.jar -Dosgi.os=linux -Dosgi.ws=gtk -Dosgi.arch=ppc -application org.eclipse.ant.core.antRunner"
-
-#clean drop directories
-#	$antRunner -buildfile eclipse/helper.xml cleanSites
-
-echo recipients=$recipients
-echo postingDirectory=$postingDirectory
-echo builderTag=$buildProjectTags
-echo buildDirectory=$buildDirectory
-echo bootclasspath=$bootclasspath
-echo bootclasspath_15=$bootclasspath_15
-
-#full command with args
-buildCommand="$antRunner -q -buildfile buildAll.xml $mail $testBuild $compareMaps -DmapVersionTag=$mapVersionTag -DpostingDirectory=$postingDirectory -Dbootclasspath=$bootclasspath -DbuildType=$buildType -D$buildType=true -DbuildId=$buildId -Dbuildid=$buildId -DbuildLabel=$buildLabel -Dtimestamp=$timestamp -DmapCvsRoot=:ext:sdimitro@dev.eclipse.org:/cvsroot/eclipse $skipPerf $skipTest $tagMaps -DJ2SE-1.5=$bootclasspath_15 -DJ2SE-1.4=$bootclasspath -DCDC-1.0/Foundation-1.0=$bootclasspath_foundation -DlogExtension=.xml $javadoc $updateSite $sign -DgenerateFeatureVersionSuffix=true -Djava15-home=$builderDir/jdk/linuxppc/ibm-java2-ppc-50/jre -listener org.eclipse.releng.build.listeners.EclipseBuildListener"
-
-#capture command used to run the build
-echo $buildCommand>command.txt
-
-#run the build
-$buildCommand
-retCode=$?
-
-if [ $retCode != 0 ]
-then
-        echo "Build failed (error code $retCode)."
-        exit -1
-fi
-
-#clean up
-rm -rf $builderDir
-
-
diff --git a/releng/org.eclipse.rse.build/build.pl b/releng/org.eclipse.rse.build/build.pl
deleted file mode 100644
index 55d79ed15..000000000
--- a/releng/org.eclipse.rse.build/build.pl
+++ /dev/null
@@ -1,125 +0,0 @@
-#!/usr/bin/perl
-#*******************************************************************************
-# Copyright (c) 2006, 2009 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:
-# David Dykstal (IBM) - initial API and implementation
-# Martin Oberhuber (Wind River) - ongoing maintenance
-#*******************************************************************************
-
-# Build script for Remote System Explorer
-# Authors: Dave Dykstal, Kushal Munir
-# java and cvs have to be in the path
-
-use warnings;
-use File::Spec;
-
-sub ask($$) {
-	my ($question, $default, $message, $ans); 
-	($question, $default) = @_;
-	$message = "${question} (default is ${default}): "; 
-	print STDERR $message;
-	$ans = <STDIN>;
-	chomp $ans;
-	$ans = $ans ? $ans : $default;
-	return $ans;
-}
-
-sub makeAbsolute($) {
-	my $path = File::Spec->canonpath($_[0]);
-	if (!File::Spec->file_name_is_absolute($path)) {
-		$current = `pwd`;
-		chomp($current);
-		$path = File::Spec->catdir($current, $path);
-		$path = File::Spec->canonpath($path);
-	}
-	return $path;
-}
-
-# $eclipse is the location of the basic PDE and plugins to compile against
-# This should include the org.eclipse.pde.build project
-$eclipse = "../eclipse"; 
-
-# $basebuilder" is the location of the Eclipse Releng basebuilder
-# This can also be set to ${eclipse}
-$basebuilder = "../org.eclipse.releng.basebuilder";
-
-# $builder is the location of the custom build scripts customTargets.xml and build.properties
-# (i.e. the contents of org.eclipse.rse.build)
-$builder = ".";
-
-# $working is where the build is actually done, does not need to exist
-$working = "../working";
-
-# make these absolute paths
-$eclipse = makeAbsolute($eclipse);
-$basebuilder = makeAbsolute($basebuilder);
-$builder = makeAbsolute($builder);
-$working = makeAbsolute($working);
-$plugins = File::Spec->catdir($basebuilder, "plugins");
-$pdeBuildGlob = File::Spec->catdir($plugins, "org.eclipse.pde.build*");
-
-# Find the base build scripts: genericTargets.xml and build.xml
-@candidates = glob($pdeBuildGlob);
-$n = @candidates;
-if ($n == 0) {
-	die("PDE Build was not found.");
-}
-if ($n > 1) {
-	die("Too many versions of PDE Build were found.");
-}
-$pdeBuild = $candidates[0];
-
-$buildDirectory = "$working/build";
-$packageDirectory = "$working/package";
-$publishDirectory = "$working/publish";
-
-$tag = ask("Enter tag to fetch from CVS", "HEAD");
-$buildType = ask("Enter build type (P=Personal, N=Nightly, I=Integration, S=Stable, J/M=Maintenance, K/L=Legacy)", "P");
-($sec, $minute, $hour, $mday, $mon, $year) = localtime();
-$mydstamp = sprintf("%4.4d%2.2d%2.2d", $year + 1900, ($mon + 1), $mday);
-$mytstamp = sprintf("%2.2d%2.2d", $hour, $minute, $sec);
-$timeStamp = "${mydstamp}-${mytstamp}";
-$buildId = $buildType . $timeStamp;
-$buildId = ask("Enter the build id", $buildType . $timeStamp);
-
-# default value of the bootclasspath attribute used in ant javac calls.
-# these pathes are valid on build.eclipse.org  
-$bootclasspath = "/shared/dsdp/JDKs/win32/j2sdk1.4.2_19/jre/lib/rt.jar:/shared/dsdp/JDKs/win32/j2sdk1.4.2_19/jre/lib/jsse.jar";
-$bootclasspath_15 = "/shared/common/jdk-1.5.0_16/jre/lib/rt.jar";
-#$bootclasspath_16 = "$builderDir/jdk/win32_16/jdk6/jre/lib/rt.jar";
-#$bootclasspath_foundation = "/shared/common/Java_ME_platform_SDK_3.0_EA/runtimes/cdc-hi/lib/rt.jar";
-$bootclasspath_foundation11 = "/shared/dsdp/JDKs/win32/j9_cdc11/lib/jclFoundation11/classes.zip";
-
-$incantation = "java -cp ${basebuilder}/plugins/org.eclipse.equinox.launcher.jar org.eclipse.core.launcher.Main ";
-$incantation .= "-application org.eclipse.ant.core.antRunner ";
-$incantation .= "-buildfile ${pdeBuild}/scripts/build.xml ";
-$incantation .= "-DbuildDirectory=${buildDirectory} ";
-$incantation .= "-DpackageDirectory=${packageDirectory} ";
-$incantation .= "-DpublishDirectory=${publishDirectory} ";
-$incantation .= "-Dbuilder=${builder} ";
-$incantation .= "-DbaseLocation=${eclipse} ";
-$incantation .= "-DbuildType=${buildType} ";
-$incantation .= "-DbuildId=${buildId} ";
-$incantation .= "-DmapVersionTag=${tag} ";
-$incantation .= "-Dmydstamp=${mydstamp} ";
-$incantation .= "-Dmytstamp=${mytstamp} ";
-if ($buildType =~ "N") {
-	$incantation .= "-DforceContextQualifier=${buildId} ";
-	$incantation .= "-DfetchTag=HEAD ";
-}
-$incantation .= "-DdoPublish=true ";
-$incantation .= "-Dbootclasspath=${bootclasspath} ";
-$incantation .= "-DJ2SE-1.4=${bootclasspath} ";
-$incantation .= "-DJ2SE-1.5=${bootclasspath_15} ";
-$incantation .= "-DCDC-1.1/Foundation-1.1=${bootclasspath_foundation11} ";
-#$incantation .= "postBuild ";
-
-
-print("${incantation}\n");
-
-system($incantation);
-\ No newline at end of file
diff --git a/releng/org.eclipse.rse.build/build.properties b/releng/org.eclipse.rse.build/build.properties
deleted file mode 100644
index d38eb48a2..000000000
--- a/releng/org.eclipse.rse.build/build.properties
+++ /dev/null
@@ -1,53 +0,0 @@
-###############################################################################
-#  Copyright (c) 2001, 2009 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:
-#  IBM Corporation - initial API and implementation
-#  Martin Oberhuber (Wind River) - Fix bug 153655 incorrect source features
-###############################################################################
-outputUpdateJars=true
-archivePrefix=eclipse
-collectingFolder=${archivePrefix}
-buildType=P
-buildId=unknown
-buildLabel=${buildId}
-mapVersionTag=HEAD
-
-#this is set to the tag from the map file unless forced here
-#forceContextQualifier=vYYYYMMDD
-
-#adds checksum suffix to directory names
-generateFeatureVersionSuffix=true
-
-##Packager
-collPlace=eclipse
-collBase=.
-# configs=linux,gtk,ppc & *,*,*
-archivesFormat =\
-linux, gtk, ppc-zip &\
-	*,*,*-zip
-# bootclasspath=${java.home}/lib/rt.jar:${java.home}/lib/jsse.jar
-baseos=linux
-basews=gtk
-basearch=ppc
-#runPackager=true
-### We do not build individual source bundles yet because Eclipse 3.3 dont understand it
-individualSourceBundles=true
-
-#Compiler options
-javacFailOnError=false
-javacDebugInfo=on
-#javacVerbose=true
-#compilerArg=-enableJavadoc
-#This fixes a problem with the IBM 1.5 VM, see bug 158358
-compilerArg=-inlineJSR -enableJavadoc -warn:+javadoc
-
-zipargs=
-tarargs=--owner=0 --group=0
-
-#Runtime libs - needed for headless build of Apache Commons Net
-#J2SE-1.2=../jres/1.2.2/lib/rt.jar
diff --git a/releng/org.eclipse.rse.build/build.rb b/releng/org.eclipse.rse.build/build.rb
deleted file mode 100644
index a5d1d0e07..000000000
--- a/releng/org.eclipse.rse.build/build.rb
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/usr/bin/ruby
-#*******************************************************************************
-# Copyright (c) 2006, 2009 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:
-# David Dykstal (IBM) - initial API and implementation
-# Martin Oberhuber (Wind River) - ongoing maintenance
-#*******************************************************************************
-
-# Build script for Remote System Explorer
-# Author: Dave Dykstal, Kushal Munir
-# Prerequisites:
-# written in ruby
-# java and cvs have to be in the path
-
-require "ftools"
-
-def ask(question, default)
-	message = "#{question} (default is #{default}): " 
-	STDERR.print message
-	answer = readline().strip
-	answer = answer.empty? ? default : answer
-	return answer
-end
-
-# "eclipse" is the location of the basic PDE and plugins to compile against
-# This should include the org.eclipse.pde.build project
-eclipse	= "../eclipse" 
-
-# "basebuilder" is the location of the Eclipse Releng basebuilder
-# This can be set to #{eclipse}
-basebuilder = "../org.eclipse.releng.basebuilder"
-
-# "builder" is the location of the custom build scripts customTargets.xml and build.properties
-# (i.e. the contents of org.eclipse.rse.build)
-builder	= "."
-
-# "working" is where the build is actually done, does not need to exist
-working = "../working"
-
-# make these absolute paths
-eclipse = File.expand_path(eclipse)
-basebuilder = File.expand_path(basebuilder)
-builder = File.expand_path(builder)
-working = File.expand_path(working)
-
-# Find the base build scripts: genericTargets.xml and build.xml
-candidates = Dir["#{basebuilder}/plugins/org.eclipse.pde.build*"]
-if (candidates.size == 0) then 
-	raise("PDE Build was not found.")
-end
-if (candidates.size > 1) then
-	raise("Too many versions of PDE Build were found.")
-end
-pdeBuild = candidates[0]
-
-buildDirectory = "#{working}/build"
-packageDirectory = "#{working}/package"
-publishDirectory = "#{working}/publish"
-
-tag = ask("Enter tag to fetch from CVS", "HEAD")
-buildType = ask("Enter build type (P=Personal, N=Nightly, I=Integration, S=Stable, J/M=Maintenance, K/L=Legacy)", "P")
-mydstamp = Time.now.strftime("%Y%m%d")
-mytstamp = Time.now.strftime("%H%M")
-buildId = ask("Enter the build id", buildType + mydstamp + "-" + mydstamp)
-
-# default value of the bootclasspath attribute used in ant javac calls.
-# these pathes are valid on build.eclipse.org  
-bootclasspath = "/shared/dsdp/JDKs/win32/j2sdk1.4.2_19/jre/lib/rt.jar:/shared/dsdp/JDKs/win32/j2sdk1.4.2_19/jre/lib/jsse.jar"
-bootclasspath_15 = "/shared/common/jdk-1.5.0_16/jre/lib/rt.jar"
-#bootclasspath_16 = "$builderDir/jdk/win32_16/jdk6/jre/lib/rt.jar"
-#bootclasspath_foundation = "/shared/common/Java_ME_platform_SDK_3.0_EA/runtimes/cdc-hi/lib/rt.jar"
-bootclasspath_foundation11 = "/shared/dsdp/JDKs/win32/j9_cdc11/lib/jclFoundation11/classes.zip"
-
-command = "java -cp #{basebuilder}/plugins/org.eclipse.equinox.launcher.jar org.eclipse.core.launcher.Main "
-command += "-application org.eclipse.ant.core.antRunner "
-command += "-buildfile #{pdeBuild}/scripts/build.xml "
-command += "-DbuildDirectory=#{buildDirectory} "
-command += "-DpackageDirectory=#{packageDirectory} "
-command += "-DpublishDirectory=#{publishDirectory} "
-command += "-Dbuilder=#{builder} "
-command += "-DbaseLocation=#{eclipse} "
-command += "-DbuildType=#{buildType} "
-command += "-DbuildId=#{buildId} "
-command += "-DmapVersionTag=#{tag} "
-command += "-Dmydstamp=#{mydstamp} "
-command += "-Dmytstamp=#{mytstamp} "
-if ("#{buildType}" == "N") then
-	command += "-DforceContextQualifier=#{buildId} "
-	command += "-DfetchTag=HEAD "
-end
-command += "-DdoPublish=true "
-command += "-Dbootclasspath=#{bootclasspath} "
-command += "-DJ2SE-1.4=#{bootclasspath} "
-command += "-DJ2SE-1.5=#{bootclasspath_15} "
-command += "-DCDC-1.1/Foundation-1.1=#{bootclasspath_foundation11} "
-#command += "postBuild "
-
-puts(command)
-
-system(command)
-\ No newline at end of file
diff --git a/releng/org.eclipse.rse.build/copyrights/NOTES.txt b/releng/org.eclipse.rse.build/copyrights/NOTES.txt
deleted file mode 100644
index 7d80a45f6..000000000
--- a/releng/org.eclipse.rse.build/copyrights/NOTES.txt
+++ /dev/null
@@ -1,66 +0,0 @@
-Standardizing Copyright Headers
--------------------------------
-Some have "and others" on the Copyright line, others not.
-Some like to indent their Contributors, others not.
-Some have "All rights reserved." on the Copyright line, others below. STANDARD IS below
-! MV is even missing the "All rights reserved." completely!
-Some have a dot after "and others.", others not. -- STANDARD IS and others.
-Some have a dot after "Inc", others not. -- STANDARD IS DOT
-Some have a comma before ", Inc" others not. -- STANDARD IS COMMA
-Some have trailing space, others not. -- STANDARD IS no trailing space
-Some have an EPL Copyright, but formatted differently (in terms of line breaks)
-
-
-AdvancedCopyrightTool:
-Looks like it deletes all Contributors ?!?
-Falls back to Eclipse/IBM Copyright if no exact match on 1st line
-Matches the line with the ${date} only
-
-234873 -- jun 18,08 -- extends
-140936 -- dec 31,08 -- delete space
-
-
-Take Care on HTML:
-* about.html must not change date
-* about.html has <blockquote>apache and stuff
-
-
-Improvements:
-* Fix insertion of space in IBM copyright
-* Handle .html files (from docs)
-* Allow fuzzy replacement of Copyright Year only
-* Should we only act if it is EPL, i.e. not only company name but also license match?
-MUST HAVE:
-* It must be capable of adding "and others." if not already there. And do a corresponding fuzzy match.
-
-
-IBM can standardize: "All rights reserved." on newline; always "And others."; 
-- We have 818 where "All rights reserved." is on the Copyright line!
-- In case of IBM, some have "and others.", some not.
-
-
-Statistics:
-- 818 with "All rights reserved." on first line - should always be 2nd!
-- 730 of 2887 are non-IBM
-- 269 (461) are also not "Wind River Systems, Inc. and others"
-- 217 (52) are also not "Radoslav Gerganov" -- rse.wince
-- 111 (106) are also not "Symbian Software Ltd" -- tm.discovery
-- 105 (6) are also not "Celunite, Inc" -- services.telnet
-- 72 (33) are also not "MontaVista Software, Inc"
-- 26 (46) are also not "Wind River Systems, Inc"
-- 24 (2) are also not "PalmSource, Inc" -- rse.services
-- 9 (15) are also not "Takuya Miyamoto" -- rse.importexport
-- rest are OK
-
-Final Regex:
-Copyright [(cC)]+ [0-9, -]+
-Final filter:
-IBM Corporation|Wind River Systems|Radoslav Gerganov|Symbian Software Ltd|Celunite, Inc|MontaVista Software, Inc|PalmSource, Inc|Takuya Miyamoto
-
-What to do:
-1. Fix the Wind River ones to be consistent
-2. Advanced tool: dont match for "and others." but re-add it if it was not there. (Preference ?!?)
-3. Advanced tool: if it is EPL and replacement takes place, insert standard EPL. (Preference ?!?)
-4. Advanced tool: write documentation, and attach it to context help of Copyrights Tool Preference.
-   (what it does, when if falls back etc)
-3. What to do with diffs in punctuation -- "Inc" vs ", Inc" vs ", Inc." 
-\ No newline at end of file
diff --git a/releng/org.eclipse.rse.build/copyrights/ibmCopyright.txt b/releng/org.eclipse.rse.build/copyrights/ibmCopyright.txt
deleted file mode 100644
index af6d8a638..000000000
--- a/releng/org.eclipse.rse.build/copyrights/ibmCopyright.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Copyright (c) ${date} 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:
-    IBM Corporation - initial API and implementation
-\ No newline at end of file
diff --git a/releng/org.eclipse.rse.build/copyrights/mvCopyright.txt b/releng/org.eclipse.rse.build/copyrights/mvCopyright.txt
deleted file mode 100644
index db51430dc..000000000
--- a/releng/org.eclipse.rse.build/copyrights/mvCopyright.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Copyright (c) ${date} MontaVista Software, Inc. 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:
-Yu-Fen Kuo      (MontaVista) - initial API and implementation
diff --git a/releng/org.eclipse.rse.build/copyrights/palmCopyright.txt b/releng/org.eclipse.rse.build/copyrights/palmCopyright.txt
deleted file mode 100644
index f3b0d2a24..000000000
--- a/releng/org.eclipse.rse.build/copyrights/palmCopyright.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Copyright (c) ${date} PalmSource, Inc. 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: 
-Ewa Matejska (PalmSource)
diff --git a/releng/org.eclipse.rse.build/copyrights/radoCopyright.txt b/releng/org.eclipse.rse.build/copyrights/radoCopyright.txt
deleted file mode 100644
index 7651f7d7b..000000000
--- a/releng/org.eclipse.rse.build/copyrights/radoCopyright.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Copyright (c) ${date} Radoslav Gerganov 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:
-   Radoslav Gerganov - initial API and implementation
diff --git a/releng/org.eclipse.rse.build/copyrights/symbianCopyright.txt b/releng/org.eclipse.rse.build/copyrights/symbianCopyright.txt
deleted file mode 100644
index 471fb3e72..000000000
--- a/releng/org.eclipse.rse.build/copyrights/symbianCopyright.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Copyright (c) ${date} Symbian Software Ltd. 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:
-  Javier Montalvo Orus (Symbian) - initial API and implementation
diff --git a/releng/org.eclipse.rse.build/copyrights/takuyaCopyright.txt b/releng/org.eclipse.rse.build/copyrights/takuyaCopyright.txt
deleted file mode 100644
index 1db8e8353..000000000
--- a/releng/org.eclipse.rse.build/copyrights/takuyaCopyright.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Copyright (c) ${date} Takuya Miyamoto 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:
-    Takuya Miyamoto - initial API and implementation
diff --git a/releng/org.eclipse.rse.build/copyrights/wrCopyright.txt b/releng/org.eclipse.rse.build/copyrights/wrCopyright.txt
deleted file mode 100644
index 50c4bba64..000000000
--- a/releng/org.eclipse.rse.build/copyrights/wrCopyright.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Copyright (c) ${date} Wind River Systems, Inc. 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:
-Martin Oberhuber (Wind River) - initial API and implementation
diff --git a/releng/org.eclipse.rse.build/customAssembly.xml b/releng/org.eclipse.rse.build/customAssembly.xml
deleted file mode 100644
index 473f4c13d..000000000
--- a/releng/org.eclipse.rse.build/customAssembly.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<!--
-     Copyright (c) 2008, 2009 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:
-         IBM Corporation - initial API and implementation
- -->
-<project name="Build specific targets and properties" default="noDefault">
-
-	<!-- =====================================================================
-	    
-	    The Following Properties are available in all targets:
-		 - eclipse.base : the base folder everything will be collected into
-		 - eclipse.plugins : the plugins folder
-		 - eclipse.features: the features folder
-		 - archiveFullPath : the full path of the final archive once it is created
-		 
-		 ===================================================================== -->
-		 
-	<!-- =====================================================================  -->
-	<!-- Called after each invocation of the gather.bin.parts target on the     -->
-	<!-- individual plugins and features.                                       -->
-	<!-- Available properties are:                                              -->
-	<!--   projectLocation: location of the project being gathered              -->
-	<!--   projectName: symbolic name with version (org.eclipse.foo_1.0.0.v123) -->
-	<!--   target.folder: the destination, eclipse/plugins or eclipse/features  -->
-	<!--                                                                        -->
-	<!-- The generated pattern is that plugins/features are gathered into the   -->
-	<!-- folder ${target.folder}/${projectName}                                 -->
-	<!-- =====================================================================  -->
-	<target name="gather.bin.parts">	
-		<apitooling.apigeneration
-			projectname="${projectName}"
-			target="${target.folder}"
-			binary="${target.folder}/${projectName}"
-			project="${projectLocation}" />
-	</target>
-
-	
-	<!-- ===================================================================== -->
-	<!-- Called after invoking the gather.bin.parts targets for all plugins    -->
-	<!-- and features. Results exist as folders and have not yet been jarred.  -->
-	<!-- ===================================================================== -->
-	<target name="post.gather.bin.parts">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Called just prior to signing a jar                                    -->
-	<!-- In addititon to the properties listed above:						   -->
-	<!--    - source : plugins or features directory                           -->
-	<!--    - elementName: element being signed without .jar                   -->
-	<!--                   (eg "org.eclipse.foo_1.0.0"                         -->
-	<!-- ===================================================================== -->
-	<target name="pre.jarSigning">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Called after all plugins and features have been jarred                -->
-	<!-- (and potentially signed)                                              -->
-	<!-- ===================================================================== -->
-	<target name="post.jarUp">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Called just before the archive file is built                          -->
-	<!-- In addititon to the properties listed above:						   -->
-	<!--    - rootFolder : the folder containing the root files                -->
-	<!-- ===================================================================== -->
-	<target name="pre.archive">
-	</target>
-	
-	<!-- ===================================================================== -->
-	<!-- Default target                                                        -->
-	<!-- ===================================================================== -->
-	<target name="noDefault">
-		<echo message="You must specify a target when invoking this file" />
-	</target>
-
-</project>
diff --git a/releng/org.eclipse.rse.build/customTargets.xml b/releng/org.eclipse.rse.build/customTargets.xml
deleted file mode 100644
index e75c42464..000000000
--- a/releng/org.eclipse.rse.build/customTargets.xml
+++ /dev/null
@@ -1,577 +0,0 @@
-<!--
-     Copyright (c) 2005, 2009 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:
-         IBM Corporation - initial API and implementation
- -->
-<project name="Build specific targets and properties" default="noDefault">
-
-	<!-- ===================================================================== -->
-	<!-- Run a given ${target} on all elements being built -->
-	<!-- Add one <ant> task for each top level element being built. -->
-	<!-- ===================================================================== -->
-	<target name="allElements">
-		<ant antfile="${genericTargets}" target="${target}">
-			<property name="type" value="feature" />
-			<property name="id" value="org.eclipse.rse" />
-		</ant>
-		<ant antfile="${genericTargets}" target="${target}">
-			<property name="type" value="feature" />
-			<property name="id" value="org.eclipse.rse.sdk" />
-		</ant>
-		<ant antfile="${genericTargets}" target="${target}">
-			<property name="type" value="feature" />
-			<property name="id" value="org.eclipse.rse.useractions" />
-		</ant>
-		<ant antfile="${genericTargets}" target="${target}">
-			<property name="type" value="feature" />
-			<property name="id" value="org.eclipse.rse.wince" />
-		</ant>
-		<ant antfile="${genericTargets}" target="${target}">
-			<property name="type" value="feature" />
-			<property name="id" value="org.eclipse.rse.examples" />
-		</ant>
-		<ant antfile="${genericTargets}" target="${target}">
-			<property name="type" value="feature" />
-			<property name="id" value="org.eclipse.rse.tests" />
-		</ant>
-		<ant antfile="${genericTargets}" target="${target}">
-			<property name="type" value="feature" />
-			<property name="id" value="org.eclipse.tm.discovery" />
-		</ant>
-		<ant antfile="${genericTargets}" target="${target}">
-			<property name="type" value="feature" />
-			<property name="id" value="org.eclipse.tm.terminal.sdk" />
-		</ant>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Targets to assemble the built elements for particular configurations  -->
-	<!-- These generally call the generated assemble scripts (named in         -->
-	<!-- ${assembleScriptName}) but may also add pre and post processing       -->
-	<!-- Add one target for each root element and each configuration           -->
-	<!-- ===================================================================== -->
-
-	<target name="assemble.org.eclipse.rse">
-		<property name="archiveName" value="RSE-runtime-${buildId}.zip"/>
-		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
-		<antcall target="unpackUpdateJarsForPackaging" />
-	</target>
-
-	<target name="assemble.org.eclipse.rse.sdk">
-		<property name="archiveName" value="RSE-SDK-${buildId}.zip"/>
-		<property name="copyOrbit" value="true"/>
-		<property name="copyOrbitSrc" value="true"/>
-		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
-		<antcall target="unpackUpdateJarsForPackaging" />
-	</target>
-
-	<target name="assemble.org.eclipse.rse.useractions">
-		<property name="archiveName" value="RSE-useractions-${buildId}.zip"/>
-		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
-		<antcall target="unpackUpdateJarsForPackaging" />
-	</target>
-
-	<target name="assemble.org.eclipse.rse.examples">
-		<property name="archiveName" value="RSE-examples-${buildId}.zip"/>
-		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
-		<antcall target="unpackUpdateJarsForPackaging" />
-	</target>
-
-	<target name="assemble.org.eclipse.rse.wince">
-		<property name="archiveName" value="RSE-wince-incubation-${buildId}.zip"/>
-		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
-		<antcall target="unpackUpdateJarsForPackaging" />
-	</target>
-
-	<target name="assemble.org.eclipse.rse.tests">
-		<property name="archiveName" value="RSE-tests-${buildId}.zip"/>
-		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
-		<antcall target="unpackUpdateJarsForPackaging" />
-	</target>
-
-	<target name="assemble.org.eclipse.tm.discovery">
-		<property name="archiveName" value="TM-discovery-${buildId}.zip"/>
-		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
-		<antcall target="unpackUpdateJarsForPackaging" />
-	</target>
-
-	<target name="assemble.org.eclipse.tm.terminal.sdk">
-		<property name="archiveName" value="TM-terminal-${buildId}.zip"/>
-		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
-		<antcall target="unpackUpdateJarsForPackaging" />
-	</target>
-
-	<target name="unpackUpdateJarsForPackaging" depends="myInit">
-		<property name="tmpsite" value="${buildDirectory}/tmpsite" />
-		<mkdir dir="${tmpsite}/new/eclipse/features" />
-		<mkdir dir="${tmpsite}/new/eclipse/plugins" />
-		<exec executable="unzip" dir="${buildDirectory}/${buildLabel}">
-			<arg line="-q ${archiveName} -d ${tmpsite}" />
-		</exec>
-		<property name="orbitDest" value="${tmpsite}/eclipse"/>
-		<antcall target="copyOrbitBundlesToUpdateSite"/>
-		<copy todir="${buildUpdateSitePath}">
-		    <fileset dir="${tmpsite}/eclipse"/>
-		</copy>
-
-		<unpackUpdateJars site="${tmpsite}/eclipse" output="${tmpsite}/new/eclipse"/>
-		<antcall target="packageLicenseFiles"/>
-		<zip destfile="${buildDirectory}/${buildLabel}/${archiveName}"
-			basedir="${tmpsite}/new"
-	  	/>
-		<delete dir="${tmpsite}"/>
-	</target>
-
-	<target name="copyOrbitBundlesToUpdateSite" depends="copyOrbit,copyOrbitSrc">
-	</target>
-
-	<target name="copyOrbit" if="copyOrbit">
-		<copy todir="${orbitDest}/plugins">
-			<fileset dir="${buildDirectory}/plugins">
-				<include name="org.apache.commons.net_*.jar"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="copyOrbitSrc" if="copyOrbitSrc">
-		<copy todir="${orbitDest}/plugins">
-			<fileset dir="${buildDirectory}/plugins">
-				<include name="org.apache.commons.net.source_*.jar"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="packageLicenseFiles">
-		<copy file="${builder}/template/epl-v10.html" todir="${tmpsite}/new/eclipse"/>
-		<copy file="${builder}/template/notice.html" todir="${tmpsite}/new/eclipse"/>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Place the map files into the "maps" directory, specify version tags -->
-	<!-- ===================================================================== -->
-	<target name="getMapFiles">
-		<copy todir="${buildDirectory}/maps">
-			<fileset dir="${builder}/maps" includes="*.map" />
-		</copy>
-		<replace dir="${buildDirectory}/maps" token="@tag@" value="${mapVersionTag}">
-			<include name="*.map"/>
-		</replace>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before setup -->
-	<!-- ===================================================================== -->
-	<target name="preSetup" depends="myInit">
-		<echo message="builder = ${builder}"/>
-		<echo message="builderDirectory = ${builderDirectory}"/>
-		<echo message="buildProperties = ${buildProperties}"/>
-		<echo message="customTargets = ${customTargets}"/>
-		<echo message="genericTargets = ${genericTargets}"/>
-		<echo message="buildId = ${buildId}"/>
-		<echo message="buildName = ${buildName}"/>
-		<echo message="buildType = ${buildType}"/>
-		<echo message="buildLabel = ${buildLabel}"/>
-		<echo message="tstamp = ${mydstamp}-${mytstamp} of ${dateLong}"/>
-		<echo message="archivePrefix = ${archivePrefix}"/>
-		<echo message="collectingFolder = ${collectingFolder}"/>
-	</target>
-
-	<target name="myInit">
-		<tstamp>
-			<format property="dateLong" pattern="MMM d, yyyy"/>
-		</tstamp>
-		<property name="messagefile" value="message.in"/>
-		<property name="xxmailto" value="dsdp-tm-cvs-commit@eclipse.org"/>
-		<property name="mailto" value="martin.oberhuber@windriver.com"/>
-		<property name="remotedir" value="moberhuber@dev.eclipse.org:downloads-tm/downloads/drops"/>
-		<condition property="doNBuild">
-		    <equals arg1="${fetchTag}" arg2="HEAD"/>
-		</condition>
-		<condition property="doUpload">
-			<equals arg1="${publishDirectory}" arg2=""/>
-		</condition>
-		<condition property="doCopy">
-			<not><equals arg1="${publishDirectory}" arg2=""/></not>
-		</condition>
-		<condition property="dropDir" value="${buildType}-${buildId}-${mydstamp}${mytstamp}" else="${buildId}">
-			<or>
-				<equals arg1="${buildType}" arg2="S"/>
-				<equals arg1="${buildType}" arg2="R"/>
-				<and>
-					<equals arg1="${buildType}" arg2="M"/>
-					<not><matches pattern="M[0-9-]*" string="${buildId}"/></not>
-				</and>
-				<and>
-					<equals arg1="${buildType}" arg2="J"/>
-					<not><matches pattern="J[0-9-]*" string="${buildId}"/></not>
-				</and>
-				<and>
-					<equals arg1="${buildType}" arg2="K"/>
-					<not><matches pattern="K[0-9-]*" string="${buildId}"/></not>
-				</and>
-				<and>
-					<equals arg1="${buildType}" arg2="L"/>
-					<not><matches pattern="L[0-9-]*" string="${buildId}"/></not>
-				</and>
-			</or>
-		</condition>
-		<property name="buildUpdateSitePath" value="${packageDirectory}/${dropDir}/updates"/>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after setup but before starting the build proper -->
-	<!-- ===================================================================== -->
-	<target name="postSetup">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before fetching the build elements -->
-	<!-- ===================================================================== -->
-	<target name="preFetchOrbitBundles" depends="myInit" if="doNBuild">
-		<!-- fetch Orbit stuff first in order to ensure we get      -->
-		<!-- the latest released version even in case of an N-build -->
-		<!--
-		<ant antfile="${genericTargets}" target="fetchElement">
-			<property name="type" value="plugin" />
-			<property name="id" value="org.apache.commons.net" />
-		</ant>
-		-->
-		<mkdir dir="${buildDirectory}/plugins"/>
-		<eclipse.fetch
-			elements="plugin@org.apache.commons.net"
-			buildDirectory="${buildDirectory}"
-			directory="${buildDirectory}/directory.txt"
-			fetchTag=""
-			configInfo="*,*,*"
-			baseLocation="${baseLocation}"
-		/>
-		<!-- Run generated fetch script -->
-		<ant antfile="${buildDirectory}/fetch_org.apache.commons.net.xml">
-			<property name="featureOnly" value="true"/>
-			<property name="featureAndPlugins" value="true"/>
-		</ant>
-	</target>
-
-	<target name="preFetchOrbitSource" depends="myInit">
-		<!-- fetch Orbit stuff since I'm not sure how to get sources -->
-		<mkdir dir="${buildDirectory}/plugins"/>
-		<eclipse.fetch
-			elements="plugin@org.apache.commons.net.source"
-			buildDirectory="${buildDirectory}"
-			directory="${buildDirectory}/directory.txt"
-			fetchTag=""
-			configInfo="*,*,*"
-			baseLocation="${baseLocation}"
-		/>
-		<!-- Run generated fetch script -->
-		<ant antfile="${buildDirectory}/fetch_org.apache.commons.net.source.xml">
-			<property name="featureOnly" value="true"/>
-			<property name="featureAndPlugins" value="true"/>
-		</ant>
-	</target>
-
-	<target name="preFetch" depends="preFetchOrbitBundles,preFetchOrbitSource">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after fetching the build elements -->
-	<!-- ===================================================================== -->
-	<target name="postFetch">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before generating the build scripts. -->
-	<!-- ===================================================================== -->
-	<target name="preGenerate">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after generating the build scripts. -->
-	<!-- ===================================================================== -->
-	<target name="postGenerate">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before running the build.xmls for the elements being built. -->
-	<!-- ===================================================================== -->
-	<target name="preProcess">
-		<condition property="buildIdForMappings" value="${buildId} (${mydstamp}-${mytstamp})" else="${buildId}">
-			<or>
-				<equals arg1="${buildType}" arg2="S"/>
-				<equals arg1="${buildType}" arg2="R"/>
-			</or>
-		</condition>
-		<replace dir="${buildDirectory}/plugins" value="${buildIdForMappings}" token="@build@">
-			<include name="**/about.mappings" />
-		</replace>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after running the build.xmls for the elements being built. -->
-	<!-- ===================================================================== -->
-	<target name="postProcess">
-		<antcall target="allElements">
-			<param name="target" value="gatherLogs" />
-		</antcall>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before running assemble. -->
-	<!-- ===================================================================== -->
-	<target name="preAssemble">
-		<antcall target="serverruntime" />
-		<antcall target="hideServerStuff" />
-		<antcall target="allElements">
-			<param name="target" value="gatherSources" />
-		</antcall>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after  running assemble. -->
-	<!-- ===================================================================== -->
-	<target name="postAssemble">
-		<antcall target="revealServerStuff" />
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before running package. -->
-	<!-- ===================================================================== -->
-	<target name="prePackage">
-		<echo message="builder - all - customTargets.xml - prePackage"/>
-		<!-- TODO? -->
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after  running package. -->
-	<!-- ===================================================================== -->
-	<target name="postPackage">
-		<echo message="builder - all - customTargets.xml - postPackage"/>
-		<!-- TODO? -->
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the build is done. -->
-	<!-- ===================================================================== -->
-	<target name="postBuild" depends="myInit">
-		<mkdir dir="${packageDirectory}/${dropDir}" />
-		<move todir="${packageDirectory}/${dropDir}">
-			<fileset dir="${buildDirectory}/${buildLabel}" includes="RSE-*.zip,TM-*.zip"/>
-		</move>
-		<move todir="${packageDirectory}/${dropDir}">
-			<fileset dir="${buildDirectory}/${buildLabel}" includes="rseserver-*"/>
-		</move>
-		<copy todir="${packageDirectory}/${dropDir}" file="${buildDirectory}/directory.txt"/>
-		<!-- Create and analyze the compilelog.txt file -->
-		<concat destfile="${packageDirectory}/${dropDir}/compilelog.txt">
-			<fileset dir="${buildDirectory}/plugins" includes="**/*.log"/>
-		</concat>
-		<loadfile property="compileLog" srcFile="${packageDirectory}/${dropDir}/compilelog.txt"/>
-		<condition property="hasErrors">
-			<contains string="${compileLog}" substring=" ERROR"/>
-		</condition>
-		<!-- Create the index.php file -->
-		<copy todir="${packageDirectory}/${dropDir}">
-			<fileset dir="${builder}/template/" includes="*.php,*.gif,package.count"/>
-		</copy>
-		<condition property="buildTypeLong" value="Private"><equals arg1="${buildType}" arg2="P"/></condition>
-		<condition property="buildTypeLong" value="Nightly"><equals arg1="${buildType}" arg2="N"/></condition>
-		<condition property="buildTypeLong" value="Integration"><equals arg1="${buildType}" arg2="I"/></condition>
-		<condition property="buildTypeLong" value="Stable"><equals arg1="${buildType}" arg2="S"/></condition>
-		<condition property="buildTypeLong" value="Release"><equals arg1="${buildType}" arg2="R"/></condition>
-		<condition property="buildTypeLong" value="Maintenance"><equals arg1="${buildType}" arg2="J"/></condition>
-		<condition property="buildTypeLong" value="Maintenance"><equals arg1="${buildType}" arg2="M"/></condition>
-		<condition property="buildTypeLong" value="Legacy"><equals arg1="${buildType}" arg2="K"/></condition>
-		<condition property="buildTypeLong" value="Legacy"><equals arg1="${buildType}" arg2="L"/></condition>
-		<replace file="${packageDirectory}/${dropDir}/index.php">
-			<replacefilter token="@buildTypeLong@" value="${buildTypeLong}"/>
-			<replacefilter token="@dateLong@" value="${dateLong}"/>
-			<replacefilter token="@dropDir@" value="${dropDir}"/>
-			<replacefilter token="@buildId@" value="${buildId}"/>
-		</replace>
-		<replace file="${packageDirectory}/${dropDir}/buildNotes.php">
-			<replacefilter token="@dateLong@" value="${dateLong}"/>
-			<replacefilter token="@buildId@" value="${buildId}"/>
-		</replace>
-		<antcall target="publish"/>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do to test the build results -->
-	<!-- ===================================================================== -->
-	<target name="test">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do to publish the build results -->
-	<!-- ===================================================================== -->
-	<target name="publish" if="doPublish">
-		<antcall target="publishCopy"/>
-		<antcall target="publishUpload"/>
-		<antcall target="mail"/>
-	</target>
-
-	<target name="publishCopy" depends="myInit" if="doCopy" unless="hasErrors">
-		<mkdir dir="${publishDirectory}/${dropDir}" />
-		<copy todir="${publishDirectory}/${dropDir}">
-			<fileset dir="${packageDirectory}/${dropDir}" includes="*.zip,*.tar,*.php,*.txt,*.gif,package.count" />
-		</copy>
-	</target>
-
-	<target name="publishUpload" depends="myInit" if="doUpload" unless="hasErrors">
-		<exec dir="${packageDirectory}" executable="scp">
-			<arg line="-r ${dropDir} ${remotedir}"/>
-		</exec>
-	</target>
-
-	<target name="mail" depends="myInit">
-		<antcall target="mailPass"/>
-		<antcall target="mailFail"/>
-	</target>
-	
-	<target name="mailPass" unless="hasErrors">
-		<copy file="${builder}/${messagefile}" tofile="${buildDirectory}/message.txt" overwrite="true"/>
-		<replace file="${buildDirectory}/message.txt">
-			<replacefilter token="@dropDir@" value="${dropDir}"/>
-		</replace>
-		<mail subject="RSE Build ${buildId} completed"
- 			tolist="${mailto}" from="martin.oberhuber@windriver.com">
-			<message src="${buildDirectory}/message.txt"/>
-		</mail>
-	</target>
-
-	<target name="mailFail" if="hasErrors">
-		<mail subject="RSE Build ${buildId} failed"
-			tolist="${mailto}" from="martin.oberhuber@windriver.com">
-			<message src="${packageDirectory}/${dropDir}/compilelog.txt"/>
-		</mail>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Default target                                                        -->
-	<!-- ===================================================================== -->
-	<target name="noDefault">
-		<echo message="You must specify a target when invoking this file" />
-	</target>
-
-	<!-- =====================================================================
-	     Specialized targets to build the server runtime.           
-	     ===================================================================== -->
-
-	<target name="serverruntime">
-
-		<property name="working" value="${buildDirectory}/${buildLabel}/rseserver"/>
-		<mkdir dir="${working}" />
-		<mkdir dir="${working}/jars" />
-
-		<copy todir="${working}">
-			<fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime" includes="**" />
-		</copy>
-
-		<copy todir="${working}/jars">
-			<fileset dir="${buildDirectory}/plugins/org.eclipse.dstore.core" includes="dstore_core.jar" />
-			<fileset dir="${buildDirectory}/plugins/org.eclipse.dstore.extra" includes="dstore_extra_server.jar" />
-			<fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services" includes="clientserver.jar" />
-			<fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services.dstore" includes="dstore_miners.jar" />
-		</copy>
-
-		<antcall target="rseserver-os-tar">
-			<param name="os" value="unix"/>
-			<param name="eol" value="lf"/>
-		</antcall>
-		<antcall target="rseserver-os-tar">
-			<param name="os" value="macosx"/>
-			<param name="eol" value="lf"/>
-		</antcall>
-		<antcall target="rseserver-os-tar">
-			<param name="os" value="linux"/>
-			<param name="eol" value="lf"/>
-		</antcall>
-		<antcall target="rseserver-os-zip">
-			<param name="os" value="windows"/>
-			<param name="eol" value="crlf"/>
-		</antcall>
-
-		<delete dir="${working}" />
-
-	</target>
-
-	<target name="rseserver-os-tar" depends="rseserver-os-collect">
-		<tar destfile="${buildDirectory}/${buildLabel}/rseserver-${buildId}-${os}.tar">
-			<tarfileset dir="${working}/collector" mode="755" includes="*.pl,*.sh" />
-			<tarfileset dir="${working}/collector" mode="644" excludes="*.pl,*.sh" />
-		</tar>
-		<delete dir="${working}/collector" />
-	</target>
-	<target name="rseserver-os-zip" depends="rseserver-os-collect">
-		<zip destfile="${buildDirectory}/${buildLabel}/rseserver-${buildId}-${os}.zip" basedir="${working}/collector" includes="*"/>
-		<delete dir="${working}/collector" />
-	</target>
-
-	<target name="rseserver-os-collect">
-		<mkdir dir="${working}/collector" />
-		<copy todir="${working}/collector">
-			<fileset dir="${working}/scripts/${os}" includes="*"/>
-			<fileset dir="${working}/data" includes="*"/>
-		</copy>
-		<replace file="${working}/collector/build.dat">
-			<replacefilter token="@build@" value="${buildId}"/>
-			<replacefilter token="@version@" value="${mapVersionTag}"/>
-		</replace>
-		<fixcrlf srcdir="${working}/collector" eol="${eol}" eof="asis" includes="*"/>
-		<copy todir="${working}/collector">
-			<fileset dir="${working}/jars" includes="*"/>
-			<fileset dir="${builder}/template" includes="notice.html,epl-v10.html" />
-		</copy>
-	</target>
-
-	<!-- =====================================================================
-	     Specialized targets hide/reveal the server stuff so it doesn't get packaged
-	     in the client.          
-	     ===================================================================== -->
-
-	<target name="hideServerStuff">
-		<mkdir dir="${buildDirectory}/hidden"/>
-		<move todir="${buildDirectory}/hidden">
-			<fileset dir="${buildDirectory}/plugins">
-				<include name="**/clientserver.jar"/>
-				<include name="**/dstore_core.jar"/>
-				<include name="**/dstore_extra_server.jar"/>
-				<include name="**/dstore_miners.jar"/>
-				<include name="**/clientserversrc.zip"/>
-				<include name="**/dstore_coresrc.zip"/>
-				<include name="**/dstore_extra_serversrc.zip"/>
-				<include name="**/dstore_minerssrc.zip"/>
-			</fileset>
-		</move>
-	</target>
-
-	<target name="revealServerStuff">
-		<move todir="${buildDirectory}/plugins">
-			<fileset dir="${buildDirectory}/hidden" includes="**" />
-		</move>
-		<delete dir="${buildDirectory}/hidden"/>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Zip the docs                                                          -->
-	<!-- ===================================================================== -->
-	<target name="zipDoc">
-		<zip destfile="${buildDirectory}\plugins\${docPluginID}\doc.zip" filesonly="false" defaultexcludes="true">
-			<fileset dir="${buildDirectory}\plugins\${docPluginID}" defaultexcludes="true">
-				<include name="**/*.gif" />
-				<include name="**/*.html" />
-				<include name="**/*.htm" />
-				<include name="**/*.GIF" />
-				<include name="**/*.HTML" />
-				<include name="**/*.HTM" />
-				<include name="**/*.css" />
-			</fileset>
-		</zip>
-	</target>
-	
-</project>
diff --git a/releng/org.eclipse.rse.build/downloads/.cvsignore b/releng/org.eclipse.rse.build/downloads/.cvsignore
deleted file mode 100644
index a17291e0f..000000000
--- a/releng/org.eclipse.rse.build/downloads/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-drops
diff --git a/releng/org.eclipse.rse.build/downloads/build_types.html b/releng/org.eclipse.rse.build/downloads/build_types.html
deleted file mode 100644
index 759069c19..000000000
--- a/releng/org.eclipse.rse.build/downloads/build_types.html
+++ /dev/null
@@ -1,94 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-<title>Eclipse Corner</title>
-<link rel="stylesheet" href="http://www.eclipse.org/default_style.css">
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-<body text="#000000" bgcolor="#ffffff" link="#0000ee" vlink="#551a8b" alink="#ff0000">
-<table border=0 cellspacing=5 cellpadding=2 width="100%" >
-  <tr> 
-    <td align=left valign=top colspan="2" bgcolor="#0080c0"><b><font face="Arial,Helvetica" color="#ffffff">Eclipse 
-      Project Build Types</font></b></td>
-  </tr>
-  <tr> 
-    <td align=right valign=top><img src="http://www.eclipse.org/images/Adarrow.gif" border=0 height=16 width=16></td>
-    <td> 
-      <p><b><font face="arial,helvetica,geneva" size="-1">R - Releases</font></b> 
-        <br>
-        <font size="-1" face="arial,helvetica,geneva">Releases are builds 
-        that have been declared major releases by the development team - for example 
-        &quot;R1.0&quot;. Releases are the right builds for people who want to 
-        be on a stable, tested release, and don't need the latest greatest features 
-        and improvements. Release builds always have an &quot;R&quot; at the beginning 
-        of the name i.e. R1.0, R2.0 etc. Non-release builds are named according to the 
-        date of the build - for example 20060427 is the build from April 27, 2006.</font><br>
-      </p>
-    </td>
-  </tr>
-  <tr> 
-    <td align=right valign=top><img src="http://www.eclipse.org/images/Adarrow.gif" border=0 height=16 width=16></td>
-    <td><b><font face="arial,helvetica,geneva" size="-1">S - Stable Builds</font></b> 
-      <br>
-      <font size="-1" face="arial,helvetica,geneva"> Stable builds are integration 
-      builds that have been found to be stable enough for most people to use. 
-      They are promoted from integration build to stable build by the architecture 
-      team after they have been used for a few days and deemed reasonably stable. 
-      The latest stable build is the right build for people who want to stay up 
-      to date with what is going on in the latest development stream, and don't 
-      mind putting up with a few problems n in order to get the latest greatest 
-      features and bug fixes. The latest stable build is the one the development 
-      team likes people to be using, because of the valuable and timely feedback. 
-      </font></td>
-  </tr>
-  <tr> 
-    <td align=right valign=top><img src="http://www.eclipse.org/images/Adarrow.gif" border=0 height=16 width=16></td>
-    <td>
-      <p><b><font face="arial,helvetica,geneva" size="-1">I - Integration Builds</font></b> 
-        <br>
-        <font size="-1" face="arial,helvetica,geneva"> Periodically, component 
-        teams version off their work in what they believe is a stable, consistent 
-        state, and they update the build configuration to indicate that the next 
-        integration build should take this version of the component. Integration 
-        builds are built from these stable component versions that have been specified 
-        by each component team as the best version available. Integration builds 
-        may be promoted to stable builds after a few days of testing. Integration 
-        builds are built whenever new stable component versions are released into 
-        the build.</font></p>
-      </td>
-  </tr>
-  <tr> 
-    <td align=right valign=top><img src="http://www.eclipse.org/images/Adarrow.gif" border=0 height=16 width=16></td>
-    <td><b><font face="arial,helvetica,geneva" size="-1">N - Nightly Builds</font></b>
-      <br>
-      <font size="-1" face="arial,helvetica,geneva"> Nightly builds are produced 
-      every night from whatever has been released into the HEAD stream of the 
-      CVS repository. They are completely untested and will almost always have 
-      major problems. Many will not work at all. These drops are normally only 
-      useful to developers actually working on the Eclipse Project.</font></td>
-  </tr>
-  <tr>
-    <td align=right valign=top><img src="http://www.eclipse.org/images/Adarrow.gif" border=0 height=16 width=16></td>
-    <td><b><font face="arial,helvetica,geneva" size="-1">J,M - Maintenance Builds</font></b>
-      <br>
-      <font size="-1" face="arial,helvetica,geneva"> Maintenance builds are produced
-       periodically to incorporate fixes into an existing release. They are typically
-       built from tagged plug-in and feature pojects in a maintenance stream of the CVS 
-       repository (i.e. R1_0_maintenance). Maintenance builds are promoted to a minor 
-       or service release (i.e. R1.1 or R1.0.1) after development teams have deemed one 
-       to be stable following one or more test-fix pass cycles.</font></td>
-  </tr> 
-  <tr>
-    <td align=right valign=top><img src="http://www.eclipse.org/images/Adarrow.gif" border=0 height=16 width=16></td>
-    <td><b><font face="arial,helvetica,geneva" size="-1">K,L - Legacy Builds</font></b>
-      <br>
-      <font size="-1" face="arial,helvetica,geneva"> Legacy builds are maintenance builds
-       for some older release, after the usual service releases (n.n.2 release). 
-       Legacy builds do not intend to culminate into any release, and are produced for
-       escalated fixes only on request. Typically, companies requesting a legacy build
-       need to contribute the resources for doing that build themselves.</font></td>
-  </tr> 
-</table>
-<h3>&nbsp;</h3>
-</body>
-</html>
diff --git a/releng/org.eclipse.rse.build/downloads/dlconfig.txt b/releng/org.eclipse.rse.build/downloads/dlconfig.txt
deleted file mode 100644
index acc7e5570..000000000
--- a/releng/org.eclipse.rse.build/downloads/dlconfig.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-dropPrefix[]=R&dropPrefix[]=S&dropPrefix[]=I&dropPrefix[]=N&dropPrefix[]=J&dropPrefix[]=M&dropPrefix[]=L&
-dropType[]=Latest Release&dropType[]=3.2 Stream Stable Build&dropType[]=3.2 Stream Integration Build&dropType[]=3.2 Stream Nightly Build&dropType[]=3.1.x Stream Maintenance Build&dropType[]=3.0.x Stream Maintenance Build&dropType[]=3.0.x Stream Legacy Build&
diff --git a/releng/org.eclipse.rse.build/downloads/index.php b/releng/org.eclipse.rse.build/downloads/index.php
deleted file mode 100644
index 5e2117d4d..000000000
--- a/releng/org.eclipse.rse.build/downloads/index.php
+++ /dev/null
@@ -1,242 +0,0 @@
-<html><head>
-<link rel="stylesheet" href="http://www.eclipse.org/default_style.css">
-<title>Target Management Project RSE Downloads</title></head>
-<body>
-
-<table border=0 cellspacing=5 cellpadding=2 width="100%" >
-  <tr> 
-    <td align=left width="72%"> <font class=indextop>Target Management project<br/>RSE downloads</font> 
-      <br>
-      <font class=indexsub>latest downloads from the dsdp-tm project</font><br>
-</td>
-    <td width="28%"><img src="http://www.eclipse.org/images/Idea.jpg" height=86 width=120></td>
-  </tr>
-
-</table>
-<table border=0 cellspacing=5 cellpadding=2 width="100%" >
-	
-	<tr> 
-    <td align=LEFT valign=TOP colspan="2" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">Download Information</font></b></td>
-  </tr>
-  
-	<tr> <td> <p>On this
-page you can find the latest 
-<a href="build_types.html">builds</a> for the Remote System Explorer (RSE),
-provided by the 
-<a href="http://www.eclipse.org/dsdp/tm/">Target Management</a> project.
-<!--
-To get started run the program and go through the
-user and developer documentation provided in the online help system.
--->
-To get started, see the build notes provided with each drop, run the
-program and go through the online user and developer documentation,
-or take a look at the project's online
-<a href="http://www.eclipse.org/dsdp/tm/tutorial/index.php">getting started</a>
-pages.
-
-If you have problems downloading the drops, contact the 
-<font face="arial,helvetica,geneva" size="-1"><a href="mailto:webmaster@eclipse.org">webmaster</a></font>.
-If you have problems installing or getting the workbench to run, 
-check out the 
-<a href="http://wiki.eclipse.org/TM_and_RSE_FAQ">Target Management FAQ</a>,
-or try posting a question to the 
-<a href="http://www.eclipse.org/newsgroups">newsgroup</a>,
-<a href="news://news.eclipse.org/eclipse.dsdp.tm">eclipse.dsdp.tm</a>.
-All downloads are provided under the terms and conditions of the 
-<a href="http://www.eclipse.org/legal/epl/notice.php">Eclipse.org
-Software User Agreement</a> unless otherwise specified. </p>
-
-<p>
-<b>Other eclipse.org project</b> downloads are available
-<a href="http://www.eclipse.org/downloads/index.php">here</a>.<br/>
-If you just want the latest drops (no dstore server), you can also get them from the 
-<a href="http://download.eclipse.org/dsdp/tm/updates/3.0">TM 3.0 update site</a>.</p>
-
-<p>
-For information about different kinds of builds look
-<a href="build_types.html" target="_top">here</a>.
-
-<img src="http://www.eclipse.org/images/new.gif">
-For access to archived builds, look 
-<a href="http://archive.eclipse.org/dsdp/tm/downloads/index.php" target="_top">here</a>.
-</p>
-
-<p/>
-<!--
-<p>Builds can also be installed via Update Manager, from an existing installation of Eclipse, by following these  
-<a href="http://download.eclipse.org/dsdp/tm/downloads/updates/index.php" target="_self">steps</a>.
-</p>
--->
-</td></tr>
-	
-  <tr> 
-    <td align=LEFT valign=TOP colspan="2" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">Latest 
-      Downloads</font></b></td>
-  </tr>
-  </table>
-  <?php
-	$fileHandle = fopen("dlconfig.txt", "r");
-	while (!feof($fileHandle)) {
-		$aLine = fgets($fileHandle, 4096);
-		parse_str($aLine);
-	}
-	fclose($fileHandle);
-	
-	for ($i = 0; $i < count($dropType); $i++) {
-		$typeToPrefix[$dropType[$i]] = $dropPrefix[$i];
-	}
-	
-	$aDirectory = dir("drops");
-	while ($anEntry = $aDirectory->read()) {
-
-		// Short cut because we know aDirectory only contains other directories.
-		if ($anEntry != "." && $anEntry!="..") {
-			$aDropDirectory = dir("drops/".$anEntry);
-			$fileCount = 0;
-			while ($aDropEntry = $aDropDirectory->read()) {
-				if (stristr($aDropEntry, ".zip") || stristr($aDropEntry, ".tar")) {
-					// Count the files in the directory
-					$fileCount = $fileCount + 1;
-				}
-			}
-			//See http://at2.php.net/manual/en/class.dir.php
-			$aDropDirectory->close();
-			// Read the count file
-			$countFile = "drops/".$anEntry."/package.count";
-			$indexFile = "drops/".$anEntry."/index.php";
-			if (file_exists($countFile) && file_exists($indexFile)) {
-				$anArray = file($countFile);
-	
-				// If a match - process the directory
-				if ($anArray[0] == $fileCount) {
-					$parts = explode("-", $anEntry);
-					if (count($parts) == 2) {
-
-						//N-builds and I-builds	
-						$datePart = $parts[0];
-						$timePart = $parts[1];
-						$buildtype = substr($datePart, 0, 1);
-						$buckets[$buildtype][] = $anEntry;
-			
-						$year = substr($datePart, 1, 4);
-						$month = substr($datePart, 5, 2);
-						$day = substr($datePart, 7, 2);
-						$hour = substr($timePart,0,2);
-						$minute = substr($timePart,2,2);
-						$timeStamp = mktime($hour, $minute, 0, $month, $day, $year);
-					
-						$timeStamps[$anEntry] = date("D, j M Y -- H:i (O)", $timeStamp);
-			
-						if ($timeStamp > $latestTimeStamp[$buildtype]) {
-							$latestTimeStamp[$buildtype] = $timeStamp;
-							$latestFile[$buildtype] = $anEntry;
-						}
-
-					} else if (count($parts) == 3) {
-
-						//S-builds and R-builds
-						$buckets[$parts[0]][] = $anEntry;
-			
-						$timePart = $parts[2];
-						$year = substr($timePart, 0, 4);
-						$month = substr($timePart, 4, 2);
-						$day = substr($timePart, 6, 2);
-						$hour = substr($timePart,8,2);
-						$minute = substr($timePart,10,2);
-						$timeStamp = mktime($hour, $minute, 0, $month, $day, $year);
-					
-						$timeStamps[$anEntry] = date("D, j M Y -- H:i (O)", $timeStamp);
-			
-						if ($timeStamp > $latestTimeStamp[$parts[0]]) {
-							$latestTimeStamp[$parts[0]] = $timeStamp;
-							$latestFile[$parts[0]] = $anEntry;
-						}
-					}
-				}
-			}
-		}
-	}
-	$aDirectory->close();
- ?>
- 
-<table width="100%" cellspacing=0 cellpadding=3 align=center>
-<td align=left>
-<TABLE  width="100%" CELLSPACING=0 CELLPADDING=3>
-<tr>
-	<td width=\"30%\"><b>Build Type</b></td>
-	<td><b>Build Name</b></td>
-	<td><b>Build Date</b></td>
-</tr>
-
-<?php
-	foreach($dropType as $value) {
-		$prefix=$typeToPrefix[$value];
-		$fileName = $latestFile[$prefix];
-		echo "<tr>
-			<td width=\"30%\">$value</td>";
-		
-		$parts = explode("-", $fileName);
-		if (count($parts) == 2) {
-			$buildName=$fileName;
-		} else {
-			$buildName=$parts[1];
-		}
-		
-		// Uncomment the line below if we need click through licenses.
-		// echo "<td><a href=license.php?license=drops/$fileName>$buildName</a></td>";
-		
-		// Comment the line below if we need click through licenses.
-		echo "<td><a href=\"drops/$fileName/index.php\">$buildName</a></td>";
-		
-		echo "<td>$timeStamps[$fileName]</td>";
-		echo "</tr>";
-	}
-?>
-</table>
-</table>
-&nbsp;
-<?php
-	foreach($dropType as $value) {
-		$prefix=$typeToPrefix[$value];
-		echo "
-		<table width=\"100%\" cellspacing=0 cellpadding=3 align=center>
-		<tr bgcolor=\"#999999\">
-		<td align=left width=\"30%\"><b><a name=\"$value\"><font color=\"#FFFFFF\" face=\"Arial,Helvetica\">$value";
-		echo "s</font></b></a></td>
-		</TR>
-		<TR>
-		<td align=left>
-		<TABLE  width=\"100%\" CELLSPACING=0 CELLPADDING=3>
-		<tr>
-		<td width=\"30%\"><b>Build Name</b></td>
-		<td><b>Build Date</b></td>
-		</tr>";
-		
-		$aBucket = $buckets[$prefix];
-		if (isset($aBucket)) {
-			rsort($aBucket);
-			foreach($aBucket as $innerValue) {
-				$parts = explode("-", $innerValue);
-				if (count($parts) == 2) {
-					$buildName=$innerValue;
-				} else {
-					$buildName=$parts[1];
-				}
-				echo "<tr>";
-				
-					// Uncomment the line below if we need click through licenses.
-					// echo "<td><a href=\"license.php?license=drops/$innerValue\">$buildName</a></td>";
-					
-					// Comment the line below if we need click through licenses.
-					echo "<td><a href=\"drops/$innerValue/index.php\">$buildName</a></td>";
-
-					echo "<td>$timeStamps[$innerValue]</td>
-					</tr>";
-			}
-		}
-		echo "</table></table>&nbsp;";
-	}
-?>
-
-&nbsp;
-</body></html>
diff --git a/releng/org.eclipse.rse.build/fetchBuilder.pl b/releng/org.eclipse.rse.build/fetchBuilder.pl
deleted file mode 100755
index 399661b03..000000000
--- a/releng/org.eclipse.rse.build/fetchBuilder.pl
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/perl
-#*******************************************************************************
-# Copyright (c) 2006 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:
-# David Dykstal (IBM) - initial API and implementation
-# Martin Oberhuber (Wind River) - ongoing maintenance
-#*******************************************************************************
-use warnings;
-
-print STDERR "Which tag do you want to fetch? (default is HEAD): ";
-$answer = <STDIN>;
-chomp($answer);
-$tag = $answer ? $answer : "HEAD";
-
-$incantation = "cvs ";
-$incantation .= '-d :pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp ';
-$incantation .= "checkout ";
-$incantation .= "-r ${tag} ";
-$incantation .= "-d builder ";
-$incantation .= "org.eclipse.tm.rse/releng/org.eclipse.rse.build ";
-
-print($incantation);
-system($incantation);
-
-print("\n");
-print("Builder has been fetched and is in the builder subdirectory\n");
diff --git a/releng/org.eclipse.rse.build/go.sh b/releng/org.eclipse.rse.build/go.sh
deleted file mode 100755
index d5a69faee..000000000
--- a/releng/org.eclipse.rse.build/go.sh
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/sh
-#*******************************************************************************
-# Copyright (c) 2006, 2009 Wind River Systems, Inc.
-# 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: 
-# Martin Oberhuber - initial API and implementation 
-#*******************************************************************************
-# go.sh -- build script like nightly build but for testing stuff without
-# fetch in a local workspace
-#
-# Prerequisites:
-# - Eclipse 3.2 installed or linked from ../eclipse
-# - org.eclipse.releng.basebuilder checked out to ../org.eclipse.releng.basebuilder
-#
-#author: martin oberhuber
-
-curdir=`pwd`
-cd `dirname $0`
-mydir=`pwd`
-
-# pathes: see build.rb for reference
-cd "$mydir/../eclipse" ; eclipse=`pwd`
-cd "$mydir/../org.eclipse.releng.basebuilder" ; basebuilder=`pwd`
-cd "$mydir/../working" ; working=`pwd`
-cd "$mydir/../publish" ; publishDirectory=`pwd`
-cd "$mydir" ; builder=`pwd`
-
-# Find the base build scripts: genericTargets.xml and build.xml
-pdeBuild="${basebuilder}/plugins/org.eclipse.pde.build"
-buildDirectory="${working}/build"
-packageDirectory="${working}/package"
-
-tag="HEAD"
-buildType="N"
-mydstamp=`date +'%Y%m%d'`
-mytstamp=`date +'%H%M'`
-timestamp="${mydstamp}-${mytstamp}"
-buildId="${buildType}${timestamp}"
-rm -rf "${buildDirectory}"
-
-# default value of the bootclasspath attribute used in ant javac calls.
-# these pathes are valid on build.eclipse.org  
-bootclasspath="/shared/dsdp/JDKs/win32/j2sdk1.4.2_19/jre/lib/rt.jar:/shared/dsdp/JDKs/win32/j2sdk1.4.2_19/jre/lib/jsse.jar"
-bootclasspath_15="/shared/common/jdk-1.5.0_16/jre/lib/rt.jar"
-#bootclasspath_16="$builderDir/jdk/win32_16/jdk6/jre/lib/rt.jar"
-#bootclasspath_foundation="/shared/common/Java_ME_platform_SDK_3.0_EA/runtimes/cdc-hi/lib/rt.jar"
-bootclasspath_foundation11="/shared/dsdp/JDKs/win32/j9_cdc11/lib/jclFoundation11/classes.zip"
-
-command="java -cp ${basebuilder}/plugins/org.eclipse.equinox.launcher.jar org.eclipse.core.launcher.Main "
-command="$command -application org.eclipse.ant.core.antRunner "
-command="$command -buildfile ${pdeBuild}/scripts/build.xml "
-command="$command -DbuildDirectory=${buildDirectory} "
-command="$command -DpackageDirectory=${packageDirectory} "
-command="$command -DpublishDirectory=${publishDirectory} "
-command="$command -Dbuilder=${builder} "
-command="$command -DbaseLocation=${eclipse} "
-command="$command -DbuildType=${buildType} "
-command="$command -DbuildId=${buildId} "
-command="$command -DmapVersionTag=${tag} "
-command="$command -DdoPublish=true "
-command="$command -DforceContextQualifier=${buildId} "
-command="$command -DfetchTag=HEAD "
-command="$command -DskipFetch "
-command="$command -Dmydstamp=${mydstamp} "
-command="$command -Dmytstamp=${mytstamp} "
-#command="$command -Dbootclasspath=${bootclasspath} "
-#command="$command -DJ2SE-1.4=${bootclasspath} "
-#command="$command -DJ2SE-1.5=${bootclasspath_15} "
-#command="$command -DCDC-1.1/Foundation-1.1=${bootclasspath_foundation11} "
-#command="$command -DJ2SE-1.2=../jres/1.2.2/lib/rt.jar "
-#command="$command postBuild "
-
-echo "$command"
-exec $command
diff --git a/releng/org.eclipse.rse.build/maps/discovery.map b/releng/org.eclipse.rse.build/maps/discovery.map
deleted file mode 100644
index c3ec4c7a6..000000000
--- a/releng/org.eclipse.rse.build/maps/discovery.map
+++ /dev/null
@@ -1,10 +0,0 @@
-feature@org.eclipse.tm.discovery=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery-feature
-plugin@org.eclipse.rse.discovery=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.rse.discovery
-plugin@org.eclipse.tm.discovery.doc.isv=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.doc.isv
-plugin@org.eclipse.tm.discovery.engine=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.engine
-plugin@org.eclipse.tm.discovery.model=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.model
-plugin@org.eclipse.tm.discovery.model.edit=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.model.edit
-plugin@org.eclipse.tm.discovery.protocol.dnssd=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.protocol.dnssd
-plugin@org.eclipse.tm.discovery.transport.udp=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.transport.udp
-plugin@org.eclipse.tm.discovery.view=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.view
-plugin@org.eclipse.tm.discovery.wizard=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.wizard
-\ No newline at end of file
diff --git a/releng/org.eclipse.rse.build/maps/rse.map b/releng/org.eclipse.rse.build/maps/rse.map
deleted file mode 100644
index 30db658b7..000000000
--- a/releng/org.eclipse.rse.build/maps/rse.map
+++ /dev/null
@@ -1,64 +0,0 @@
-!***************  PROJECT CONTRIBUTION  ******************************************************** 
-!*** Project's plugins, features and fragments
-feature@org.eclipse.rse=R31x_v200911051655,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse-feature
-feature@org.eclipse.rse.core=v200907301400,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.core-feature
-feature@org.eclipse.rse.dstore=v200907301400,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.dstore-feature
-feature@org.eclipse.rse.examples=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/examples/org.eclipse.rse.examples-feature
-feature@org.eclipse.rse.ftp=v200909160005,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.ftp-feature
-feature@org.eclipse.rse.local=v200907301400,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.local-feature
-feature@org.eclipse.rse.sdk=R31x_v200911051655,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.sdk-feature
-feature@org.eclipse.rse.ssh=v200909160005,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.ssh-feature
-feature@org.eclipse.rse.telnet=v200908051630,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.telnet-feature
-feature@org.eclipse.rse.terminals=R31x_v200911051655,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.terminals-feature
-feature@org.eclipse.rse.tests=v200909160005,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/tests/org.eclipse.rse.tests-feature
-feature@org.eclipse.rse.useractions=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.useractions-feature
-!!feature@org.eclipse.rse.useractions.wrapper=v20080609a,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.useractions.wrapper-feature
-!!feature@org.eclipse.tm.releng.master=v20080609,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/releng/org.eclipse.tm.releng.master-feature
-plugin@org.eclipse.dstore.core=v200909160005,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.dstore.core
-plugin@org.eclipse.dstore.doc.isv=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/doc/org.eclipse.dstore.doc.isv
-plugin@org.eclipse.dstore.extra=v200907301400,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.dstore.extra
-plugin@org.eclipse.rse=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse
-plugin@org.eclipse.rse.connectorservice.dstore=v200909160005,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.connectorservice.dstore
-plugin@org.eclipse.rse.connectorservice.local=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.connectorservice.local
-plugin@org.eclipse.rse.connectorservice.ssh=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.connectorservice.ssh
-plugin@org.eclipse.rse.connectorservice.telnet=v200908051630,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.connectorservice.telnet
-plugin@org.eclipse.rse.core=v200909160005,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.core
-plugin@org.eclipse.rse.doc.isv=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/doc/org.eclipse.rse.doc.isv
-plugin@org.eclipse.rse.doc.user=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/doc/org.eclipse.rse.doc.user
-plugin@org.eclipse.rse.dstore.security=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.dstore.security
-plugin@org.eclipse.rse.efs=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.efs
-plugin@org.eclipse.rse.efs.ui=v200907301550,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.efs.ui
-plugin@org.eclipse.rse.examples.daytime=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/examples/org.eclipse.rse.examples.daytime
-plugin@org.eclipse.rse.examples.tutorial=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/examples/org.eclipse.rse.examples.tutorial
-plugin@org.eclipse.rse.files.ui=v200908061445,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.files.ui
-plugin@org.eclipse.rse.importexport=v200909160005,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.importexport
-plugin@org.eclipse.rse.processes.ui=v200907301400,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.processes.ui
-plugin@org.eclipse.rse.sdk=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.sdk
-plugin@org.eclipse.rse.services.dstore=v200909160005,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.dstore
-plugin@org.eclipse.rse.services.files.ftp=v200909160005,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.files.ftp
-plugin@org.eclipse.rse.services.local=v200909160005,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.local
-plugin@org.eclipse.rse.services.ssh=v200909160005,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.ssh
-plugin@org.eclipse.rse.services.telnet=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.telnet
-plugin@org.eclipse.rse.services=v200909160005,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services
-plugin@org.eclipse.rse.shells.ui=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.shells.ui
-plugin@org.eclipse.rse.subsystems.files.core=v200909160005,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.core
-plugin@org.eclipse.rse.subsystems.files.dstore=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.dstore
-plugin@org.eclipse.rse.subsystems.files.ftp=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.ftp
-plugin@org.eclipse.rse.subsystems.files.local=v200907301400,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.local
-plugin@org.eclipse.rse.subsystems.files.ssh=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.ssh
-plugin@org.eclipse.rse.subsystems.processes.core=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.processes.core
-plugin@org.eclipse.rse.subsystems.processes.dstore=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.processes.dstore
-plugin@org.eclipse.rse.subsystems.processes.local=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.processes.local
-plugin@org.eclipse.rse.subsystems.processes.shell.linux=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.processes.shell.linux
-plugin@org.eclipse.rse.subsystems.shells.core=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.core
-plugin@org.eclipse.rse.subsystems.shells.dstore=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.dstore
-plugin@org.eclipse.rse.subsystems.shells.local=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.local
-plugin@org.eclipse.rse.subsystems.shells.ssh=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.ssh
-plugin@org.eclipse.rse.subsystems.shells.telnet=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.telnet
-plugin@org.eclipse.rse.subsystems.terminals.core=v200908051630,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.terminals.core
-plugin@org.eclipse.rse.subsystems.terminals.ssh=v200908051630,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.terminals.ssh
-plugin@org.eclipse.rse.terminals.ui=v200908061445,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.terminals.ui
-plugin@org.eclipse.rse.tests=v200909160005,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/tests/org.eclipse.rse.tests
-plugin@org.eclipse.rse.tests.framework=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/tests/org.eclipse.rse.tests.framework
-plugin@org.eclipse.rse.ui=v200909160005,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.ui
-plugin@org.eclipse.rse.useractions=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.useractions
-\ No newline at end of file
diff --git a/releng/org.eclipse.rse.build/maps/terminal.map b/releng/org.eclipse.rse.build/maps/terminal.map
deleted file mode 100644
index c606608cb..000000000
--- a/releng/org.eclipse.rse.build/maps/terminal.map
+++ /dev/null
@@ -1,13 +0,0 @@
-feature@org.eclipse.tm.terminal=R31x_v200911051655,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal-feature
-feature@org.eclipse.tm.terminal.sdk=R31x_v200911051655,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.sdk-feature
-feature@org.eclipse.tm.terminal.serial=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.serial-feature
-feature@org.eclipse.tm.terminal.ssh=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.ssh-feature
-feature@org.eclipse.tm.terminal.telnet=v200907301400,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.telnet-feature
-feature@org.eclipse.tm.terminal.test=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.test-feature
-feature@org.eclipse.tm.terminal.view=v200907301400,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.view-feature
-plugin@org.eclipse.tm.terminal=R31x_v201002160030,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal
-plugin@org.eclipse.tm.terminal.serial=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.serial
-plugin@org.eclipse.tm.terminal.ssh=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.ssh
-plugin@org.eclipse.tm.terminal.telnet=v200909160005,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.telnet
-plugin@org.eclipse.tm.terminal.test=v200907301400,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.test
-plugin@org.eclipse.tm.terminal.view=v200907301400,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.view
-\ No newline at end of file
diff --git a/releng/org.eclipse.rse.build/maps/testdrivers.map b/releng/org.eclipse.rse.build/maps/testdrivers.map
deleted file mode 100644
index cd8025fde..000000000
--- a/releng/org.eclipse.rse.build/maps/testdrivers.map
+++ /dev/null
@@ -1,6 +0,0 @@
-!***************  PROJECT CONTRIBUTION  ******************************************************** 
-
-!*** Special entries from eclipse
-
-plugin@org.eclipse.test=v20081002,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,
-fragment@org.eclipse.ant.optional.junit=v20080717,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,
diff --git a/releng/org.eclipse.rse.build/maps/tmcore.map b/releng/org.eclipse.rse.build/maps/tmcore.map
deleted file mode 100644
index fdb1a725f..000000000
--- a/releng/org.eclipse.rse.build/maps/tmcore.map
+++ /dev/null
@@ -1,2 +0,0 @@
-plugin@org.apache.commons.net,2.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/bundles/org.apache.commons.net_2.0.0.v200905272248.jar
-plugin@org.apache.commons.net.source,2.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20100114021427/bundles/org.apache.commons.net.source_2.0.0.v200905272248.jar
diff --git a/releng/org.eclipse.rse.build/maps/wince.map b/releng/org.eclipse.rse.build/maps/wince.map
deleted file mode 100644
index 112198643..000000000
--- a/releng/org.eclipse.rse.build/maps/wince.map
+++ /dev/null
@@ -1,6 +0,0 @@
-feature@org.eclipse.rse.wince=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/wince/org.eclipse.rse.wince-feature
-!! feature@org.eclipse.rse.wince.wrapper=v20080609a,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.wince.wrapper-feature
-plugin@org.eclipse.rse.subsystems.wince=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/wince/org.eclipse.rse.subsystems.wince
-plugin@org.eclipse.tm.rapi=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/wince/org.eclipse.tm.rapi
-plugin@org.eclipse.tm.rapi.examples=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/wince/org.eclipse.tm.rapi.examples
-plugin@org.eclipse.tm.rapi.tests=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/wince/org.eclipse.tm.rapi.tests
-\ No newline at end of file
diff --git a/releng/org.eclipse.rse.build/message.in b/releng/org.eclipse.rse.build/message.in
deleted file mode 100644
index e807f6032..000000000
--- a/releng/org.eclipse.rse.build/message.in
+++ /dev/null
@@ -1,6 +0,0 @@
-The build is available at
-
-	http://download.eclipse.org/dsdp/tm/downloads/drops/@dropDir@
-
-Cheers,
-the RSE nightly build...
diff --git a/releng/org.eclipse.rse.build/monitor.properties b/releng/org.eclipse.rse.build/monitor.properties
deleted file mode 100755
index e6047a91f..000000000
--- a/releng/org.eclipse.rse.build/monitor.properties
+++ /dev/null
@@ -1,29 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 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:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# properties file used by the class org.eclipse.releng.build.listeners.EclipseBuildListener
-
-#prefix added to subject line of build related email messages
-buildSubjectPrefix=[RSE-build]
-
-#email information for sending build failure notices
-host=localhost
-sender=moberhuber@eclipse.org
-
-#the http Url to Eclipse drop directories
-httpUrl=http://download.eclipse.org/dsdp/tm/downloads/drops
-
-#the ftp Url to Eclipse drop directories
-#ftpUrl=ftp://download.eclipse.org
-
-#use comma separated list for recipients
-#build log name.This file is copied into drop directory until files.count file updated with correct number of zip files
-#additional information added a build time by build shell script
-#buildid, timestamp, buildLabel, email notification list, buildlog location
diff --git a/releng/org.eclipse.rse.build/nightly.sh b/releng/org.eclipse.rse.build/nightly.sh
deleted file mode 100755
index 2eb2abd3f..000000000
--- a/releng/org.eclipse.rse.build/nightly.sh
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/sh
-#*******************************************************************************
-# Copyright (c) 2006, 2009 Wind River Systems, Inc.
-# 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: 
-# Martin Oberhuber - initial API and implementation 
-#*******************************************************************************
-#nightly build for RSE - to be executed on build.eclipse.org
-#
-# Usage:
-#   nightly.sh [mapVersionTag] [buildType] [buildId]
-# Examples:
-#   nightly.sh HEAD I
-#   nightly.sh HEAD S 1.0RC3
-#
-# Prerequisites:
-# - Eclipse 3.2 installed or linked from ../eclipse
-# - org.eclipse.releng.basebuilder checked out to ../org.eclipse.releng.basebuilder
-#
-#author: martin oberhuber
-
-curdir=`pwd`
-cd `dirname $0`
-mydir=`pwd`
-
-# pathes: see build.rb for reference
-cd "$mydir/../eclipse" ; eclipse=`pwd`
-cd "$mydir/../org.eclipse.releng.basebuilder" ; basebuilder=`pwd`
-cd "$mydir/../working" ; working=`pwd`
-cd "$mydir/../publish" ; publishDirectory=`pwd`
-cd "$mydir" ; builder=`pwd`
-
-# Find the base build scripts: genericTargets.xml and build.xml
-cd "${basebuilder}/plugins"
-pdeBuild=`ls -d org.eclipse.pde.build* | sort | tail -1`
-cd "${builder}"
-pdeBuild="${basebuilder}/plugins/${pdeBuild}"
-buildDirectory="${working}/build"
-packageDirectory="${working}/package"
-
-tag="HEAD"
-if [ "$1" != "" ]; then
-  tag="$1"
-fi
-buildType="N"
-if [ "$2" != "" ]; then
-  buildType="$2"
-fi
-mydstamp=`date +'%Y%m%d'`
-mytstamp=`date +'%H%M'`
-timestamp="${mydstamp}-${mytstamp}"
-buildId="${buildType}${timestamp}"
-if [ "$3" != "" ]; then
-  buildId="$3"
-fi
-rm -rf "${buildDirectory}"
-
-# default value of the bootclasspath attribute used in ant javac calls.
-# these pathes are valid on build.eclipse.org  
-bootclasspath="/shared/dsdp/JDKs/win32/j2sdk1.4.2_19/jre/lib/rt.jar:/shared/dsdp/JDKs/win32/j2sdk1.4.2_19/jre/lib/jsse.jar"
-bootclasspath_15="/shared/common/jdk-1.5.0_16/jre/lib/rt.jar"
-#bootclasspath_16="$builderDir/jdk/win32_16/jdk6/jre/lib/rt.jar"
-#bootclasspath_foundation="/shared/common/Java_ME_platform_SDK_3.0_EA/runtimes/cdc-hi/lib/rt.jar"
-bootclasspath_foundation11="/shared/dsdp/JDKs/win32/j9_cdc11/lib/jclFoundation11/classes.zip"
-
-
-command="java -cp ${basebuilder}/plugins/org.eclipse.equinox.launcher.jar org.eclipse.core.launcher.Main "
-command="$command -application org.eclipse.ant.core.antRunner "
-command="$command -buildfile ${pdeBuild}/scripts/build.xml "
-command="$command -DbuildDirectory=${buildDirectory} "
-command="$command -DpackageDirectory=${packageDirectory} "
-command="$command -DpublishDirectory=${publishDirectory} "
-command="$command -Dbuilder=${builder} "
-command="$command -DbaseLocation=${eclipse} "
-command="$command -DbuildType=${buildType} "
-command="$command -DbuildId=${buildId} "
-command="$command -DmapVersionTag=${tag} "
-command="$command -Dmydstamp=${mydstamp} "
-command="$command -Dmytstamp=${mytstamp} "
-if [ "$buildType" = "N" ]; then
-  command="$command -DforceContextQualifier=${buildId} "
-  command="$command -DfetchTag=HEAD "
-fi
-command="$command -DdoPublish=true "
-command="$command -Dbootclasspath=${bootclasspath} "
-command="$command -DJ2SE-1.4=${bootclasspath} "
-command="$command -DJ2SE-1.5=${bootclasspath_15} "
-command="$command -DCDC-1.1/Foundation-1.1=${bootclasspath_foundation11} "
-#command="$command postBuild "
-
-echo "$command"
-exec $command
diff --git a/releng/org.eclipse.rse.build/setup.sh b/releng/org.eclipse.rse.build/setup.sh
deleted file mode 100755
index ee834a094..000000000
--- a/releng/org.eclipse.rse.build/setup.sh
+++ /dev/null
@@ -1,248 +0,0 @@
-#!/bin/sh
-#*******************************************************************************
-# Copyright (c) 2006, 2009 Wind River Systems, Inc.
-# 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: 
-# Martin Oberhuber - initial API and implementation 
-#*******************************************************************************
-#
-# setup.sh : Set up an environment for building TM / RSE
-# Works on build.eclipse.org -- may need to be adjusted
-# for other hosts.
-#
-# This must be run in $HOME/ws_31x in order for the mkTestUpdateSite.sh
-# script to find the published packages
-#
-# Bootstrapping: Get this script by
-# export CVSROOT=:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp
-# cvs co -r R3_1_maintenance org.eclipse.tm.rse/releng/org.eclipse.rse.build
-# sh org.eclipse.tm.rse/releng/org.eclipse.rse.build/setup.sh
-#
-# - OR -
-#
-# wget -O setup.sh "http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.tm.rse/releng/org.eclipse.rse.build/setup.sh?root=DSDP_Project&content-type=text%2Fplain&view=co&pathrev=R3_1_maintenance"
-# sh setup.sh
-# ./doit_ibuild.sh
-# cd testPatchUpdates/bin
-# mkTestUpdates.sh
-
-curdir=`pwd`
-
-uname_s=`uname -s`
-uname_m=`uname -m`
-case ${uname_s}${uname_m} in
-  Linuxppc*) ep_arch=linux-gtk-ppc
-             cdt_arch=linux.ppc
-             ;;
-  Linuxx86_64*) ep_arch=linux-gtk-x86_64 
-                cdt_arch=linux.x86_64
-                ;;
-  Linuxx86*) ep_arch=linux-gtk
-             cdt_arch=linux.x86
-             ;;
-esac
-
-# prepare the base Eclipse installation in folder "eclipse"
-ep_rel="R-"
-ep_ver=3.5.1
-ep_date="-200909170800"
-P2_disabled=false
-P2_no_dropins=false
-if [ ! -f eclipse/plugins/org.eclipse.swt_3.5.1.v3555a.jar ]; then
-  curdir2=`pwd`
-  if [ ! -d eclipse -o -h eclipse ]; then
-    if [ -d eclipse-${ep_ver}-${ep_arch} ]; then
-      rm -rf eclipse-${ep_ver}-${ep_arch}
-    fi
-    mkdir eclipse-${ep_ver}-${ep_arch}
-    cd eclipse-${ep_ver}-${ep_arch}
-  else
-    rm -rf eclipse
-  fi
-  # Eclipse SDK: Need the SDK so we can link into docs
-  echo "Getting Eclipse SDK..."
-  wget "http://download.eclipse.org/eclipse/downloads/drops/${ep_rel}${ep_ver}${ep_date}/eclipse-SDK-${ep_ver}-${ep_arch}.tar.gz"
-  tar xfvz eclipse-SDK-${ep_ver}-${ep_arch}.tar.gz
-  rm eclipse-SDK-${ep_ver}-${ep_arch}.tar.gz
-  if ${P2_disabled} ; then
-    # Remove P2 due to https://bugs.eclipse.org/bugs/show_bug.cgi?id=225537
-    # See http://wiki.eclipse.org/Equinox_p2_Removal
-    rm -rf eclipse/configuration/* eclipse/configuration/.settings
-    cp ../eclipse-3.3-linux-gtk-ppc/eclipse/configuration/config.ini eclipse/configuration
-    cp -f ../eclipse-3.3-linux-gtk-ppc/eclipse/eclipse.ini eclipse/
-    rm -rf eclipse/features/org.eclipse.equinox.p2.user.ui*
-    rm -f eclipse/plugins/org.eclipse.equinox.p2.*
-    rm -rf eclipse/p2
-    # </Remove P2>
-  fi
-  cd "${curdir2}"
-  if [ ! -d eclipse -o -h eclipse ]; then
-    if [ -e eclipse ]; then 
-      rm eclipse
-    fi
-    ln -s eclipse-${ep_ver}-${ep_arch}/eclipse eclipse
-  fi
-fi
-if [ ! -f eclipse/startup.jar ]; then
-  curdir2=`pwd`
-  cd eclipse/plugins
-  if [ -h ../startup.jar ]; then
-    rm ../startup.jar
-  fi
-  LAUNCHER=`ls org.eclipse.equinox.launcher_*.jar | sort | tail -1`
-  if [ "${LAUNCHER}" != "" ]; then
-    echo "eclipse LAUNCHER=${LAUNCHER}" 
-    ln -s plugins/${LAUNCHER} ../startup.jar
-  else
-    echo "Eclipse: NO startup.jar LAUNCHER FOUND!"
-  fi
-  cd ${curdir2}
-fi
-
-if ${P2_no_dropins} ; then
-  #P2 disabled?
-  DROPIN=.
-  DROPUP=.
-else
-  #P2 enabled
-  DROPIN=eclipse/dropins
-  DROPUP=../..
-fi
-
-# EMF 2.5.0
-EMFBRANCH=2.5.0
-EMFREL=R
-EMFDATE=200906151043
-EMFVER=2.5.0
-if [ ! -f ${DROPIN}/eclipse/plugins/org.eclipse.emf.doc_${EMFBRANCH}.v${EMFDATE}.jar ]; then
-  # Need EMF 2.4 SDK for Service Discovery ISV Docs Backlinks
-  echo "Getting EMF SDK..."
-  cd ${DROPIN}
-  wget "http://download.eclipse.org/modeling/emf/emf/downloads/drops/${EMFBRANCH}/${EMFREL}${EMFDATE}/emf-xsd-SDK-${EMFVER}.zip"
-  unzip -o emf-xsd-SDK-${EMFVER}.zip
-  rm emf-xsd-SDK-${EMFVER}.zip
-  cd ${DROPUP}
-fi
-if [ ! -f eclipse/plugins/org.junit_3.8.2.v20090203-1005/junit.jar ]; then
-  # Eclipse Test Framework
-  echo "Getting Eclipse Test Framework..."
-  wget "http://download.eclipse.org/eclipse/downloads/drops/${ep_rel}${ep_ver}${ep_date}/eclipse-test-framework-${ep_ver}.zip"
-  unzip -o eclipse-test-framework-${ep_ver}.zip
-  rm eclipse-test-framework-${ep_ver}.zip
-fi
-if [ ! -f ${DROPIN}/eclipse/plugins/gnu.io.rxtx_2.1.7.4_v20071016.jar ]; then
-  echo "Getting RXTX..."
-  cd ${DROPIN}
-  wget "http://rxtx.qbang.org/eclipse/downloads/RXTX-SDK-I20071016-1945.zip"
-  unzip -o RXTX-SDK-I20071016-1945.zip
-  rm RXTX-SDK-I20071016-1945.zip
-  cd ${DROPUP}
-fi
-
-# checkout the basebuilder
-baseBuilderTag=r35x_v20090811
-if [ ! -f org.eclipse.releng.basebuilder/plugins/org.eclipse.pde.core_3.5.0.v20090528.jar \
-  -o ! -f org.eclipse.releng.basebuilder/plugins/org.eclipse.pde.build_3.5.0.v20090527-1800/pdebuild.jar \
-  -o ! -f org.eclipse.releng.basebuilder/plugins/org.eclipse.equinox.p2.metadata.generator_1.0.100.v20090520-1905.jar ]; then
-  if [ -d org.eclipse.releng.basebuilder ]; then
-    echo "Re-getting basebuilder from CVS..."
-    rm -rf org.eclipse.releng.basebuilder
-  else
-    echo "Getting basebuilder from CVS..."
-  fi
-  cvs -Q -d :pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse co -r ${baseBuilderTag} org.eclipse.releng.basebuilder
-fi
-if [ ! -f org.eclipse.releng.basebuilder/startup.jar ]; then
-  curdir2=`pwd`
-  cd org.eclipse.releng.basebuilder/plugins
-  if [ -h ../startup.jar ]; then
-    rm ../startup.jar
-  fi
-  LAUNCHER=`ls org.eclipse.equinox.launcher*.jar | sort | tail -1`
-  if [ "${LAUNCHER}" != "" ]; then
-    echo "basebuilder: LAUNCHER=${LAUNCHER}" 
-    ln -s plugins/${LAUNCHER} ../startup.jar
-  else 
-    echo "basebuilder: NO LAUNCHER FOUND"
-  fi
-  cd ${curdir2}
-fi
-
-# checkout the RSE builder
-if [ -f org.eclipse.rse.build/CVS/Entries ]; then
-  echo "Updating org.eclipse.rse.build from CVS"
-  cd org.eclipse.rse.build
-  cvs -q update -r R3_1_maintenance -dPR
-  cd ..
-else
-  if [ -d org.eclipse.rse.build ]; then
-    echo "Re-getting org.eclipse.rse.build from CVS"
-    rm -rf org.eclipse.rse.build
-  else
-    echo "Getting org.eclipse.rse.build from CVS"
-  fi
-  cvs -q -d :pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp co -r R3_1_maintenance -Rd org.eclipse.rse.build org.eclipse.tm.rse/releng/org.eclipse.rse.build
-fi
-
-# prepare directories for the build
-echo "Preparing directories and symbolic links..."
-if [ ! -d working/package ]; then
-  mkdir -p working/package
-fi
-if [ ! -d working/build ]; then
-  mkdir -p working/build
-fi
-if [ ! -d publish ]; then
-  D=/home/data/httpd/download.eclipse.org/dsdp/tm/downloads/drops
-  if [ -d ${D} ]; then ln -s ${D} publish; else mkdir publish; fi
-fi
-if [ ! -d testPatchUpdates ]; then
-  D=/home/data/httpd/download.eclipse.org/dsdp/tm/testPatchUpdates
-  if [ -d ${D} ]; then ln -s ${D} testPatchUpdates; else mkdir testPatchUpdates; fi
-fi
-if [ ! -d updates ]; then
-  D=/home/data/httpd/download.eclipse.org/dsdp/tm/updates
-  if [ -d ${D} ]; then ln -s ${D} updates; else mkdir updates; fi
-fi
-if [ ! -d staging ]; then
-  D=/home/data/httpd/download-staging.priv/dsdp/tm
-  if [ -d ${D} ]; then ln -s ${D} staging; else mkdir staging; fi
-fi
-
-# create symlinks as needed
-if [ ! -h doit_irsbuild.sh ]; then
-  ln -s org.eclipse.rse.build/bin/doit_irsbuild.sh .
-fi
-if [ ! -h batch_sign.sh ]; then
-  ln -s org.eclipse.rse.build/bin/batch_sign.sh .
-fi
-if [ ! -h doit_nightly.sh ]; then
-  ln -s org.eclipse.rse.build/bin/doit_nightly.sh .
-fi
-if [ ! -h setup.sh ]; then
-  if [ -f setup.sh ]; then rm -f setup.sh; fi
-  ln -s org.eclipse.rse.build/setup.sh .
-fi
-chmod a+x doit_irsbuild.sh doit_nightly.sh
-cd org.eclipse.rse.build
-chmod a+x build.pl build.rb go.sh nightly.sh setup.sh
-cd ..
-
-echo "Your build environment is now created."
-echo ""
-echo "Run \"./doit_irsbuild.sh M\" to create an M-build."
-echo ""
-echo "Test the testPatchUpdates, then copy them to updates:"
-echo "cd updates"
-echo "rm -rf plugins features"
-echo "cp -R ../testPatchUpdates/plugins ."
-echo "cp -R ../testPatchUpdates/features ."
-echo "cd bin"
-echo "cvs update"
-echo "./mkTestUpdates.sh"
-
-exit 0
diff --git a/releng/org.eclipse.rse.build/template/.cvsignore b/releng/org.eclipse.rse.build/template/.cvsignore
deleted file mode 100644
index cba5080f0..000000000
--- a/releng/org.eclipse.rse.build/template/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-buildNotes.php.html
-index.php.html
diff --git a/releng/org.eclipse.rse.build/template/FAIL.gif b/releng/org.eclipse.rse.build/template/FAIL.gif
deleted file mode 100755
index 28bba6610..000000000
--- a/releng/org.eclipse.rse.build/template/FAIL.gif
+++ /dev/null
diff --git a/releng/org.eclipse.rse.build/template/OK.gif b/releng/org.eclipse.rse.build/template/OK.gif
deleted file mode 100755
index 689e5234f..000000000
--- a/releng/org.eclipse.rse.build/template/OK.gif
+++ /dev/null
diff --git a/releng/org.eclipse.rse.build/template/buildNotes.php b/releng/org.eclipse.rse.build/template/buildNotes.php
deleted file mode 100755
index 36e8eb0bb..000000000
--- a/releng/org.eclipse.rse.build/template/buildNotes.php
+++ /dev/null
@@ -1,187 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://www.eclipse.org/default_style.css" type="text/css">
-<title>Build Notes for TM @buildId@</title>
-</head>
-
-<body>
-<table border="0" cellspacing="5" cellpadding="2" width="100%">
-	<tr>
-		<td align="LEFT" width="80%">
-		<p><b><font class=indextop>Build Notes for TM @buildId@</font></b><br>
-		@dateLong@ </p>
-		</td>
-	</tr>
-</table>
-<table border="0" cellspacing="5" cellpadding="2" width="100%">
-	<tr>
-		<td align="LEFT" valign="TOP" colspan="3" bgcolor="#0080C0"><b>
-		<font face="Arial,Helvetica" color="#FFFFFF">New and Noteworthy</font></b></td>
-	</tr>
-</table>
-<table><tbody><tr><td>
-<ul>
-<li>TM @buildId@ <b>requires Eclipse 3.4 or later</b>.
-  <b>Import/Export, Telnet and FTP require Java 1.5</b>, the rest of
-  RSE runs on Java 1.4.
-  Platform Runtime is the minimum requirement for core RSE and Terminal.
-  Discovery needs EMF.</li>
-<li>Highlights of Bugs fixed since <a href="http://download.eclipse.org/dsdp/tm/downloads/drops/R-3.1.1-200909160905/index.php">TM 3.1.1</a>:
-<ul>
-  <li>A regression in the Terminal widget was fixed, which made initial output after login
-      invisible above the initial viewport
-      [<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=294327">294327</a>].</li>
-</ul>
-</li>
-<li>At least 1 bug was resolved: Use 
-  <!-- <a href="https://bugs.eclipse.org/bugs/buglist.cgi?negate0=1;field0-0-0=target_milestone;type0-0-1=regexp;field0-0-1=target_milestone;resolution=FIXED;resolution=WONTFIX;resolution=WORKSFORME;classification=DSDP;value0-0-2=3.1;chfieldto=2010-03-01;chfield=resolution;query_format=advanced;type0-0-3=equals;field0-0-3=target_milestone;value0-0-3=3.1.1;chfieldfrom=2009-09-24;bug_status=RESOLVED;bug_status=VERIFIED;bug_status=CLOSED;field0-0-2=target_milestone;value0-0-1=3.2%20M[234567];type0-0-0=regexp;value0-0-0=[23]\.[02].*;component=Core;component=RSE;component=Terminal;product=Target%20Management;type0-0-2=equals"> -->
-  <a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&classification=DSDP&product=Target+Management&component=Core&component=RSE&component=Terminal&target_milestone=3.1.2&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&resolution=FIXED&resolution=WONTFIX&resolution=WORKSFORME&cmdtype=doit">
-  this query</a> to show the list of bugs fixed since
-  <a href="http://download.eclipse.org/dsdp/tm/downloads/drops/R-3.1.1-200909160905/">
-  TM 3.1.1</a>
-  [<a href="http://download.eclipse.org/dsdp/tm/downloads/drops/R-3.1.1-200909160905/buildNotes.php">build notes</a>].</li>
-<li>For details on checkins, see
-  <a href="http://dsdp.eclipse.org/dsdp/tm/searchcvs.php">TM SearchCVS</a>, the
-  <a href="http://download.eclipse.org/dsdp/tm/downloads/drops/N-changelog/index.html">
-  RSE CVS changelog</a>, and the
-  <a href="http://download.eclipse.org/dsdp/tm/downloads/drops/N-changelog/core/index.html">
-  TM Core CVS changelog</a>.</li>
-<li>For other questions, please check the
-  <a href="http://wiki.eclipse.org/TM_and_RSE_FAQ">TM and RSE FAQ</a>
-  as well as the
-  <a href="http://wiki.eclipse.org/DSDP/TM/3.1_Known_Issues_and_Workarounds">
-  TM 3.1 Known Issues and Workarounds</a>.</li>
-</ul>
-</td></tr></tbody></table>
-
-<table border="0" cellspacing="5" cellpadding="2" width="100%">
-	<tr>
-		<td align="LEFT" valign="TOP" colspan="3" bgcolor="#0080C0"><b>
-		<font face="Arial,Helvetica" color="#FFFFFF">Getting Started</font></b></td>
-	</tr>
-</table>
-<table><tbody><tr><td>
-<p>The RSE User Documentation has a
-<a href="http://dsdp.eclipse.org/help/latest/index.jsp?topic=/org.eclipse.rse.doc.user/gettingstarted/g_start.html">
-Tutorial</a> that guides you through installation, first steps,
-connection setup and important tasks.</p>
-<p>
-If you want to know more about future directions of the Target Management
-Project, developer documents, architecture or how to get involved,
-the online
-<a href="http://www.eclipse.org/dsdp/tm/tutorial/index.php">Getting Started page</a>
-as well as the
-<a href="http://wiki.eclipse.org/TM_and_RSE_FAQ">TM and RSE FAQ</a>
-are the best places for you to get started.
-</p>
-</td></tr></tbody></table>
-
-<table border="0" cellspacing="5" cellpadding="2" width="100%">
-	<tr>
-		<td align="LEFT" valign="TOP" colspan="3" bgcolor="#0080C0"><b>
-		<font face="Arial,Helvetica" color="#FFFFFF">API Status</font></b></td>
-	</tr>
-</table>
-<table><tbody><tr><td>
-<p>No API changes are allowed in the TM 3.1.x maintenance stream.
-Therefore, <b>TM 3.1.x is fully upward and backward compatible with TM 3.1</b>,
-and can be fully exchanged for TM 3.1 in any product based on it.
-Take care of API specification updates though, where the TM 3.1.x API Docs
-have been updated to add clarifications or missing information compared
-to 3.1.</p>
-
-<p>For the upcoming TM 3.2 release, only backward compatible API changes
-are planned, especially in order to support improved componentization
-and UI/Non-UI splitting.
-In the interest of improving the code base, though, please 
-take care of API marked as <b>@deprecated</b> in the Javadoc.
-Such API is prime candidate to be removed in the future.
-Also, observe the API Tooling tags such as <b>@noextend</b> and 
-<b>@noimplement</b>.
-</p>
-</td></tr></tbody></table>
-
-<table border="0" cellspacing="5" cellpadding="2" width="100%">
-	<tr>
-		<td align="LEFT" valign="TOP" colspan="3" bgcolor="#808080"><b>
-		<font face="Arial,Helvetica" color="#FFFFFF">API Specification Updates since TM 3.1</font></b></td>
-	</tr>
-</table>
-<table><tbody><tr><td>
-The following lists amendments to API specifications that are worth noticing,
-and may require changes in client code even though they are binary compatible.
-More information can be found in the associated bugzilla items.
-
-<ul>
-<li>TM @buildId@ API Specification Updates
-<ul>
-  <li>None.</li>
-</ul></li>
-</ul>
-</li>
-</ul>
-
-Use 
-  <!-- 
-  <a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=%5Bapi&classification=DSDP&product=Target+Management&component=Core&component=RSE&component=Terminal&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&resolution=FIXED&resolution=WORKSFORME&chfieldfrom=2009-06-20&chfieldto=2009-09-25&chfield=resolution&cmdtype=doit">
-   -->
-  <a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=%5Bapi&classification=DSDP&product=Target+Management&component=Core&component=RSE&component=Terminal&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&resolution=FIXED&resolution=WORKSFORME&target_milestone=3.1.1&cmdtype=doit">
-  this query</a> to show the full list of API related updates since TM 3.1
-  <!--
-  , and
-  <a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=%5Bapi%5D&classification=DSDP&product=Target+Management&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&cmdtype=doit">
-  this query</a> to show the list of additional API changes proposed for TM 3.1
-  -->
-  .
-</td></tr></tbody></table>
-
-<table border="0" cellspacing="5" cellpadding="2" width="100%">
-	<tr>
-		<td align="LEFT" valign="TOP" colspan="3" bgcolor="#0080C0"><b>
-		<font face="Arial,Helvetica" color="#FFFFFF">Known Problems and Workarounds</font></b></td>
-	</tr>
-</table>
-<table><tbody><tr><td>
-The following critical or major bugs are currently known.
-We'll strive to fix these as soon as possible.
-<ul>
-  <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=279837">bug 279837</a> - maj - [shells] RemoteCommandShellOperation can miss output</li>
-  <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=271015">bug 271015</a> - maj - [ftp] "My Home" with "Empty list" doesn't refresh</li>
-  <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=268463">bug 268463</a> - maj - [ssh] [sftp] SftpFileService.getFile(...) fails with cryptic jsch exception (4)</li>
-  <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=260796">bug 260796</a> - maj - [ftp] Fetching folder job sometimes runs forever with Outpost firewall</li>
-  <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=248913">bug 248913</a> - maj - [ssh] SSH subsystem loses connection</li> 
-  <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=238156">bug 238156</a> - maj - Export/Import Connection doesn't create default filters for the specified connection</li>
-  <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=226564">bug 226564</a> - maj - [efs] Deadlock while starting dirty workspace
-  <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=222380">bug 222380</a> - maj - [persistence][migration][team] Subsystem association is lost when creating connection with an installation that does not have subsystem impl</li>
-  <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=218387">bug 218387</a> - maj - [efs] Eclipse hangs on startup of a Workspace with a large efs-shared file system on a slow connection</li>
-  <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=208185">bug 208185</a> - maj - [terminal][serial] terminal can hang the UI when text is entered while the backend side is not reading characters</li>
-  <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=198395">bug 198395</a> - maj - [dstore] Can connect to DStore with expired password</li>
-  <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=175300">bug 175300</a> - maj - [performance] processes.shell.linux subsystem is slow over ssh</li>
-</ul>
-<!--
-<p>No major or critical bugs are known at the time of release.
--->
-Use 
-<a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&classification=DSDP&product=Target+Management&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_severity=blocker&bug_severity=critical&bug_severity=major&cmdtype=doit">this query</a>
-for an up-to-date list of major or critical bugs.</p>
-
-<p>The 
-<a href="http://wiki.eclipse.org/DSDP/TM/3.1_Known_Issues_and_Workarounds">
-TM 3.1 Known Issues and Workarounds</a> Wiki page gives an up-to-date list
-of the most frequent and obvious problems, and describes workarounds for them.<br/>
-If you have other questions regarding TM or RSE, please check the
-<a href="http://wiki.eclipse.org/TM_and_RSE_FAQ">TM and RSE FAQ</a>
-</p>
-
-<p>Click 
-<a href="https://bugs.eclipse.org/bugs/report.cgi?x_axis_field=bug_severity&y_axis_field=op_sys&z_axis_field=&query_format=report-table&classification=DSDP&product=Target+Management&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&format=table&action=wrap">here</a>
-for a complete up-to-date bugzilla status report, or
-<a href="https://bugs.eclipse.org/bugs/report.cgi?x_axis_field=bug_severity&y_axis_field=op_sys&z_axis_field=&query_format=report-table&classification=DSDP&product=Target+Management&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&format=table&action=wrap">here</a>
-for a report on bugs fixed so far.
-</p>
-</td></tr></tbody></table>
-
-</body>
-</html>
diff --git a/releng/org.eclipse.rse.build/template/buildNotesGenerated.html b/releng/org.eclipse.rse.build/template/buildNotesGenerated.html
deleted file mode 100644
index a14db454b..000000000
--- a/releng/org.eclipse.rse.build/template/buildNotesGenerated.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<p>I
-
-<p>Integration Build (December 13, 2006, 9:39 a.m.)</p>
-  <p>Problem reports updated</p>
-  <p>
-  </p>
-
-<p>Integration Build (December 06, 2006, 8:08 p.m.)</p>
-  <p>Problem reports updated</p>
-  <p>
-  </p>
-
-<p>Integration Build (November 29, 2006, 11:12 a.m.)</p>
-  <p>Problem reports updated</p>
-  <p>
-  </p>ntegration Build (November 28, 2006, 2:03 p.m.)</p>
-<p>Problem reports updated</p>
-<p>
-</p>
diff --git a/releng/org.eclipse.rse.build/template/egg.gif b/releng/org.eclipse.rse.build/template/egg.gif
deleted file mode 100644
index 62e22f0ad..000000000
--- a/releng/org.eclipse.rse.build/template/egg.gif
+++ /dev/null
diff --git a/releng/org.eclipse.rse.build/template/epl-v10.html b/releng/org.eclipse.rse.build/template/epl-v10.html
deleted file mode 100644
index 9321f4082..000000000
--- a/releng/org.eclipse.rse.build/template/epl-v10.html
+++ /dev/null
@@ -1,256 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-
-
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Eclipse Public License - Version 1.0</title>
-
-<style type="text/css">
-  body {
-    size: 8.5in 11.0in;
-    margin: 0.25in 0.5in 0.25in 0.5in;
-    tab-interval: 0.5in;
-    }
-  p {  	
-    margin-left: auto;
-    margin-top:  0.5em;
-    margin-bottom: 0.5em;
-    }
-  p.list {
-  	margin-left: 0.5in;
-    margin-top:  0.05em;
-    margin-bottom: 0.05em;
-    }
-  </style></head><body lang="EN-US">
-
-<p align="center"><b>Eclipse Public License - v 1.0</b></p>
-
-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.</p>
-
-<p><b>1. DEFINITIONS</b></p>
-
-<p>"Contribution" means:</p>
-
-<p class="list">a) in the case of the initial Contributor, the initial
-code and documentation distributed under this Agreement, and</p>
-<p class="list">b) in the case of each subsequent Contributor:</p>
-<p class="list">i) changes to the Program, and</p>
-<p class="list">ii) additions to the Program;</p>
-<p class="list">where such changes and/or additions to the Program
-originate from and are distributed by that particular Contributor. A
-Contribution 'originates' from a Contributor if it was added to the
-Program by such Contributor itself or anyone acting on such
-Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii)
-are not derivative works of the Program.</p>
-
-<p>"Contributor" means any person or entity that distributes
-the Program.</p>
-
-<p>"Licensed Patents" mean patent claims licensable by a
-Contributor which are necessarily infringed by the use or sale of its
-Contribution alone or when combined with the Program.</p>
-
-<p>"Program" means the Contributions distributed in accordance
-with this Agreement.</p>
-
-<p>"Recipient" means anyone who receives the Program under
-this Agreement, including all Contributors.</p>
-
-<p><b>2. GRANT OF RIGHTS</b></p>
-
-<p class="list">a) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works
-of, publicly display, publicly perform, distribute and sublicense the
-Contribution of such Contributor, if any, and such derivative works, in
-source code and object code form.</p>
-
-<p class="list">b) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell,
-offer to sell, import and otherwise transfer the Contribution of such
-Contributor, if any, in source code and object code form. This patent
-license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor,
-such addition of the Contribution causes such combination to be covered
-by the Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.</p>
-
-<p class="list">c) Recipient understands that although each Contributor
-grants the licenses to its Contributions set forth herein, no assurances
-are provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility to
-secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow Recipient
-to distribute the Program, it is Recipient's responsibility to acquire
-that license before distributing the Program.</p>
-
-<p class="list">d) Each Contributor represents that to its knowledge it
-has sufficient copyright rights in its Contribution, if any, to grant
-the copyright license set forth in this Agreement.</p>
-
-<p><b>3. REQUIREMENTS</b></p>
-
-<p>A Contributor may choose to distribute the Program in object code
-form under its own license agreement, provided that:</p>
-
-<p class="list">a) it complies with the terms and conditions of this
-Agreement; and</p>
-
-<p class="list">b) its license agreement:</p>
-
-<p class="list">i) effectively disclaims on behalf of all Contributors
-all warranties and conditions, express and implied, including warranties
-or conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;</p>
-
-<p class="list">ii) effectively excludes on behalf of all Contributors
-all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;</p>
-
-<p class="list">iii) states that any provisions which differ from this
-Agreement are offered by that Contributor alone and not by any other
-party; and</p>
-
-<p class="list">iv) states that source code for the Program is available
-from such Contributor, and informs licensees how to obtain it in a
-reasonable manner on or through a medium customarily used for software
-exchange.</p>
-
-<p>When the Program is made available in source code form:</p>
-
-<p class="list">a) it must be made available under this Agreement; and</p>
-
-<p class="list">b) a copy of this Agreement must be included with each
-copy of the Program.</p>
-
-<p>Contributors may not remove or alter any copyright notices contained
-within the Program.</p>
-
-<p>Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.</p>
-
-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
-
-<p>Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use of
-the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create
-potential liability for other Contributors. Therefore, if a Contributor
-includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and
-indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses")
-arising from claims, lawsuits and other legal actions brought by a third
-party against the Indemnified Contributor to the extent caused by the
-acts or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In
-order to qualify, an Indemnified Contributor must: a) promptly notify
-the Commercial Contributor in writing of such claim, and b) allow the
-Commercial Contributor to control, and cooperate with the Commercial
-Contributor in, the defense and any related settlement negotiations. The
-Indemnified Contributor may participate in any such claim at its own
-expense.</p>
-
-<p>For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.</p>
-
-<p><b>5. NO WARRANTY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED 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. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable laws,
-damage to or loss of data, programs or equipment, and unavailability or
-interruption of operations.</p>
-
-<p><b>6. DISCLAIMER OF LIABILITY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
-
-<p><b>7. GENERAL</b></p>
-
-<p>If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.</p>
-
-<p>If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.</p>
-
-<p>All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.</p>
-
-<p>Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.</p>
-
-<p>This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No party
-to this Agreement will bring a legal action under this Agreement more
-than one year after the cause of action arose. Each party waives its
-rights to a jury trial in any resulting litigation.</p>
-
-</body></html>
-\ No newline at end of file
diff --git a/releng/org.eclipse.rse.build/template/index.php b/releng/org.eclipse.rse.build/template/index.php
deleted file mode 100755
index c33598802..000000000
--- a/releng/org.eclipse.rse.build/template/index.php
+++ /dev/null
@@ -1,282 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://www.eclipse.org/default_style.css" type="text/css">
-<title>DSDP-TM @buildTypeLong@ Build: @buildId@</title>
-</head>
-
-<body>
-<table border="0" cellspacing="5" cellpadding="2" width="100%">
-	<tr>
-		<td align="LEFT" width="80%">
-		<p><b><font class=indextop>TM @buildTypeLong@ Build: @buildId@</font></b><br>
-		@dateLong@ </p>
-		<p>These downloads are provided under the
-		<a href="http://www.eclipse.org/legal/epl/notice.php">Eclipse.org Software 
-		User Agreement</a>.</p>
-		
-		<p><font size="+1"><strong>
-<!-- -->
-		  <a href="buildNotes.php">New and Noteworthy / Build Notes</a>
-<!-- -->
-<!--
-		  <p><a href="http://www.eclipse.org/dsdp/tm/development/relnotes/3.1/tm-news-3.1.html">New and Noteworthy</a></p>
-		  <p><a href="http://www.eclipse.org/dsdp/tm/development/relnotes/3.1/readme_tm_3.1.html">TM 3.1.2 Readme / Release Notes</a></p>
-		  <p><a href="buildNotes.php">Build Notes</a></p>
--->
-		</strong></font></p>
-		
-		To view the map file entries for this build, click
-		<a href="directory.txt">here</a>.<br/>
-		To view the compile logs for this build, click 
-		<a href="compilelog.txt">here</a>.<br/>
-		For getting started, consider the <a href="http://www.eclipse.org/dsdp/tm/tutorial/index.php">TM Tutorials</a>
-		and the <a href="http://wiki.eclipse.org/TM_and_RSE_FAQ">TM and RSE FAQ</a>.
-		</p>
-<!--
-		<p>To view the build notes for this build click <a
- href="buildNotes.php">here</a>.<br>
-		To view the test results for this build, click 
-		<a href="testResults.php">here</a>.<br>
--->
-		</td>
-<!--
-		<td width="28%"><img src="http://www.eclipse.org/images/Idea.jpg" height=86 width=120></td>
--->
-	</tr>
-</table>
-<table border="0" cellspacing="5" cellpadding="2" width="100%">
-	<tr>
-		<td align="LEFT" valign="TOP" colspan="3" bgcolor="#0080C0"><b>
-		<font face="Arial,Helvetica" color="#FFFFFF">Requirements</font></b></td>
-	</tr>
-</table>
-<table>
-  <tbody>
-    <tr><td><b>TM @buildId@ requires 
-    	<a href="http://download.eclipse.org/eclipse/downloads/">
-         Eclipse 3.4</a> or later</b>.
-         <b>RSE Import/Export as well as FTP and Telnet</b> require <b>Java 1.5</b>
-         or higher, the rest of RSE works with Java 1.4.
-    </b></td></tr>
-    <tr><td>
-      For core RSE and TM-Terminal, the Eclipse <b>Platform Runtime Binary</b> is sufficient.
-      Of course you can also use the popular <b>SDK</b> or one of the <b>Packages</b>. 
-      Prerequisites for the discovery add-on (EMF) can be retrieved from the
-      <a href="http://download.eclipse.org/releases/europa/">Europa</a>, 
-      <a href="http://download.eclipse.org/releases/ganymede/">Ganymede</a> or
-      <a href="http://download.eclipse.org/releases/galileo/">Galileo</a>
-      Discovery Sites</a>.
-    </td></tr> 
-  </tbody>
-</table>
-</table>
-
-<table border="0" cellspacing="5" cellpadding="2" width="100%">
-	<tr><td colspan="2">&nbsp;</td></tr>
-</table>
-<table border="0" cellspacing="5" cellpadding="2" width="100%">
-	<tr>
-		<td align="LEFT" valign="TOP" colspan="3" bgcolor="#0080C0">
-		<font face="Arial,Helvetica" color="#FFFFFF"><b>All-in-one</b> (includes runtime and documentation for <b>dstore, ftp, local, ssh, and telnet</b>)</font></td>
-	</tr>
-	<tr><td align="LEFT">
-	For tool writers, <b>the SDK</b> also includes the runtime as listed, plus programmer documentation and source.
-	</td></tr>
-</table>
-<table border="0" cellspacing="2" cellpadding="0" width="100%">
-	<tr>
-		<td align="RIGHT" valign="TOP" width="7%">
-		<div align="left">
-			<b>Status</b></div>
-		</td>
-		<td width="30%"><b>Platform</b></td>
-		<td width="63%"><b>Download</b></td>
-	</tr>
-	<tr><td><div align=left><img src = "OK.gif" width=19 height=23></div></td>
-        <td>All</td>
-        <td><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/downloads/drops/@dropDir@/RSE-runtime-@buildId@.zip">RSE-runtime-@buildId@.zip</a>
-           <i>(Recommended for most users)</i></td>
-    </tr>
-	<tr><td><div align=left><img src = "OK.gif" width=19 height=23></div></td>
-		<td>All</td>
-		<td><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/downloads/drops/@dropDir@/RSE-SDK-@buildId@.zip">RSE-SDK-@buildId@.zip</a></td>
-	</tr>
-</table>
-
-<table border="0" cellspacing="5" cellpadding="2" width="100%">
-	<tr><td colspan="2">&nbsp;</td></tr>
-</table>
-<table border="0" cellspacing="5" cellpadding="2" width="100%">
-	<tr>
-		<td align="LEFT" valign="TOP" colspan="3" bgcolor="#808080"><b>
-		<font face="Arial,Helvetica" color="#FFFFFF">Stand-alone Offerings, Integrations and Add-ons</font></b>
-		</td>
-	</tr>
-</table>
-<table border="0" cellspacing="2" cellpadding="0" width="100%">
-	<tr>
-		<td align="RIGHT" valign="TOP" width="7%">
-		   <div align="left"><b>Status</b></div>
-		</td>
-		<td width="7%"><b>Platform</b></td>
-		<td width="23%"><b>Download</b></td>
-		<td width="63%"><b>Notes</b></td>
-	</tr>
-	<tr><td><div align=left><img src = "OK.gif" width=19 height=23></div></td>
-        <td>All</td>
-        <td><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/downloads/drops/@dropDir@/TM-terminal-@buildId@.zip">TM-terminal-@buildId@.zip</a></td>
-        <td>
-			A stand-alone ANSI / vt102 terminal emulator widget and view (with minor 
-			  <a href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.tm.core/terminal/org.eclipse.tm.terminal/README.txt?revision=1.4&root=DSDP_Project&view=markup">
-			limitations</a>). Includes pluggable connectors 
-			for serial line (through RXTX, see the 
-			  <a href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.serial/README.txt?revision=1.5&root=DSDP_Project&view=markup">
-			installation notes</a>), ssh and telnet. Includes Source.
-        </td>
-    </tr>
-	<tr><td><div align=left><img src = "OK.gif" width=19 height=23></div></td>
-		<td>All</td>
-		<td><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/downloads/drops/@dropDir@/RSE-useractions-@buildId@.zip">RSE-useractions-@buildId@.zip</a></td>
-        <td><small>&nbsp;</small><br/>
-        	Additional Framework for user-defined actions and compile commands.
-        	Includes Source.
-        </td>
-    </tr>
-	<tr><td><div align=left><img src = "OK.gif" width=19 height=23></div></td>
-		<td>All</td>
-		<td><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/downloads/drops/@dropDir@/RSE-examples-@buildId@.zip">RSE-examples-@buildId@.zip</a></td>
-        <td><small>&nbsp;</small><br/>
-        	Tutorial code and example projects for developing against RSE SDK.
-        	Includes Source.
-        </td>
-    </tr>
-	<tr><td><div align=left><img src = "OK.gif" width=19 height=23></div></td>
-        <td>All</td>
-        <td><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/downloads/drops/@dropDir@/TM-discovery-@buildId@.zip">TM-discovery-@buildId@.zip</a></td>
-        <td><small>&nbsp;</small><br/>
-	    	An API and DNS-SD / Zeroconf based 
-			implementation for remote network service discovery. 
-			Runs stand-alone or integrated with RSE.
-			Requires EMF 2.2.0 or later. Includes Source.
-        </td>
-    </tr>
-</table>
-<b>Note:</b> As of TM 3.1, the <b>RSE-remotecdt</b> integration for remote launch and debug through gdbserver has moved into CDT 6.0.
-
-<table border="0" cellspacing="5" cellpadding="2" width="100%">
-	<tr><td colspan="2">&nbsp;</td></tr>
-</table>
-<table border="0" cellspacing="5" cellpadding="2" width="100%">
-	<tr>
-		<td align="LEFT" valign="TOP" colspan="3" bgcolor="#808080"><b>
-		<font face="Arial,Helvetica" color="#FFFFFF">Add-ons in Incubation</font></b>
-		</td>
-	</tr>
-	<tr>
-	    <td>Add-ons in 
-	    <a href="http://www.eclipse.org/projects/what-is-incubation.php">
-	    Incubation</a> state provide new features, but have 
-	    not yet hardened their APIs through public review such that there could be 
-	    a promise to keep them stable over releases. These add-ons have a 0.x version
-	    number, and are provided for early adopters. Note that these features may 
-	    already be very mature in terms of features provided, but not yet in terms
-	    of the APIs provided.</td>
-	</tr>
-</table>
-<table border="0" cellspacing="2" cellpadding="0" width="100%">
-	<tr>
-		<td align="RIGHT" valign="TOP" width="7%">
-		   <div align="left"><b>Status</b></div>
-		</td>
-		<td width="7%"><b>Platform</b></td>
-		<td width="23%"><b>Download</b></td>
-		<td width="63%"><b>Notes</b></td>
-	</tr>
-	<tr><td><div align=left><img src = "OK.gif" width=19 height=23></div></td>
-        <td>All <img src="egg.gif" width=20 height=20></td>
-        <td><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/downloads/drops/@dropDir@/RSE-wince-incubation-@buildId@.zip">RSE-wince-incubation-@buildId@.zip</a></td>
-        <td><small>&nbsp;</small><br/>
-			RSE Services for accessing Windows CE devices via Microsoft RAPI2.
-			Provides a File subsystem for transparent remote file access.
-			Requires Microsoft RAPI libraries installed.
-			Includes Source.
-        </td>
-    </tr>
-</table>
-
-<table border="0" cellspacing="5" cellpadding="2" width="100%">
-	<tr><td colspan="2">&nbsp;</td></tr>
-</table>
-<table border="0" cellspacing="5" cellpadding="2" width="100%">
-	<tr>
-		<td align="LEFT" valign="TOP" colspan="3" bgcolor="#0080C0"><b>
-		<font face="Arial,Helvetica" color="#FFFFFF">DStore Server Runtime</font></b></td>
-	</tr>
-</table>
-<table border="0" cellspacing="2" cellpadding="0" width="100%">
-	<tr>
-		<td align="RIGHT" valign="TOP" width="7%">
-			<div align="left"><b>Status</b></div></td>
-		<td width="30%"><b>Platform</b></td>
-		<td width="63%"><b>Download</b></td></tr>
-	<tr><td><div align=left><img src = "OK.gif" width=19 height=23></div></td>
-        <td>Windows (<a href="http://www.eclipse.org/dsdp/tm/development/plan.php#OperatingEnvironments">Supported Versions</a>)</td>
-        <td><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/downloads/drops/@dropDir@/rseserver-@buildId@-windows.zip">rseserver-@buildId@-windows.zip</a></td></tr>
-	<tr><td><div align=left><img src = "OK.gif" width=19 height=23></div></td>
-        <td>Linux (<a href="http://www.eclipse.org/dsdp/tm/development/plan.php#OperatingEnvironments">Supported Versions</a>)</td>
-        <td><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/downloads/drops/@dropDir@/rseserver-@buildId@-linux.tar">rseserver-@buildId@-linux.tar</a></td></tr>
-	<tr><td><div align=left><img src = "OK.gif" width=19 height=23></div></td>
-        <td>Other Unix (<a href="http://www.eclipse.org/dsdp/tm/development/plan.php#OperatingEnvironments">Supported Versions</a>)</td>
-        <td><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/downloads/drops/@dropDir@/rseserver-@buildId@-unix.tar">rseserver-@buildId@-unix.tar</a></td></tr>
-	<tr><td><div align=left><img src = "OK.gif" width=19 height=23></div></td>
-        <td>Mac OS X (<a href="http://www.eclipse.org/dsdp/tm/development/plan.php#OperatingEnvironments"><i>Experimental</i></a>)</td>
-        <td><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/downloads/drops/@dropDir@/rseserver-@buildId@-macosx.tar">rseserver-@buildId@-macosx.tar</a></td></tr>
-</table>
-<table border="0" cellspacing="5" cellpadding="2" width="100%">
-	<tr><td colspan="2">&nbsp;</td></tr>
-</table>
-
-<table border="0" cellspacing="5" cellpadding="2" width="100%">
-	<tr><td colspan="2">&nbsp;</td></tr>
-</table>
-<table border="0" cellspacing="5" cellpadding="2" width="100%">
-	<tr>
-		<td align="LEFT" valign="TOP" colspan="3" bgcolor="#808080"><b>
-		<font face="Arial,Helvetica" color="#FFFFFF">JUnit Plugin Tests</font></b></td>
-	</tr>
-	<tr>
-	    <td>The RSE test suite requires the JUnit plug-in, which is included in the 
-        <a href="http://archive.eclipse.org/eclipse/downloads/drops/R-3.3-200706251500/index.php#EclipseSDK">
-        Eclipse SDK</a> or available as<br/>
-        <a href="http://archive.eclipse.org/eclipse/downloads/drops/R-3.3-200706251500/index.php#JUnitPlugin">
-        eclipse-test-framework download</a> for users of the Eclipse Platform Runtime Binary. 
-	    </td>
-	</tr>
-</table>
-
-
-
-<table border="0" cellspacing="2" cellpadding="0" width="100%">
-	<tr>
-		<td align="RIGHT" valign="TOP" width="7%">
-		<div align="left">
-			<b>Status</b></div>
-		</td>
-		<td width="30%"><b>Platform</b></td>
-		<td width="63%"><b>Download</b></td>
-	</tr>
-	<tr><td><div align=left><img src = "OK.gif" width=19 height=23></div></td>
-		<td>All</td>
-		<td><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/downloads/drops/@dropDir@/RSE-tests-@buildId@.zip">RSE-tests-@buildId@.zip</a></td>
-	</tr>
-</table>
-<table border="0" cellspacing="5" cellpadding="2" width="100%">
-	<tr><td colspan="2">&nbsp;</td></tr>
-</table>
-
-<p>&nbsp;</p>
-</body>
-</html>
diff --git a/releng/org.eclipse.rse.build/template/notice.html b/releng/org.eclipse.rse.build/template/notice.html
deleted file mode 100644
index c6af966b6..000000000
--- a/releng/org.eclipse.rse.build/template/notice.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/releng/org.eclipse.rse.build/template/package.count b/releng/org.eclipse.rse.build/template/package.count
deleted file mode 100755
index 48082f72f..000000000
--- a/releng/org.eclipse.rse.build/template/package.count
+++ /dev/null
@@ -1 +0,0 @@
-12
diff --git a/releng/org.eclipse.rse.releng.infocenter/.project b/releng/org.eclipse.rse.releng.infocenter/.project
deleted file mode 100644
index 3e151d5c4..000000000
--- a/releng/org.eclipse.rse.releng.infocenter/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.rse.releng.infocenter</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>
diff --git a/releng/org.eclipse.rse.releng.infocenter/about.html b/releng/org.eclipse.rse.releng.infocenter/about.html
deleted file mode 100644
index d4cc693f9..000000000
--- a/releng/org.eclipse.rse.releng.infocenter/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2007</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) 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 <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/releng/org.eclipse.rse.releng.infocenter/doit_nightly.sh b/releng/org.eclipse.rse.releng.infocenter/doit_nightly.sh
deleted file mode 100755
index ab7d18a58..000000000
--- a/releng/org.eclipse.rse.releng.infocenter/doit_nightly.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-#*******************************************************************************
-# Copyright (c) 2006 Wind River Systems, Inc.
-# 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: 
-# Martin Oberhuber - initial API and implementation 
-#*******************************************************************************
-
-#Find out the IHOME - it's the parent of my own directory ($IHOME/bin)
-curdir=`pwd`
-cd `dirname $0`
-mydir=`pwd`
-cd ..
-IHOME=`pwd`
-export IHOME
-
-#Update scripts - prerequisite: IHOME is infocenter home
-umask 022
-cd "$IHOME/bin"
-cvs -q update -d
-chmod a+x *.sh
-
-#Update the infocenter
-./update.sh
diff --git a/releng/org.eclipse.rse.releng.infocenter/infocenter.sh b/releng/org.eclipse.rse.releng.infocenter/infocenter.sh
deleted file mode 100755
index ddf77475c..000000000
--- a/releng/org.eclipse.rse.releng.infocenter/infocenter.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-#*******************************************************************************
-# Copyright (c) 2006, 2009 Wind River Systems, Inc.
-# 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: 
-# Martin Oberhuber - initial API and implementation 
-#*******************************************************************************
-umask 022
-
-#PATH=/opt/j2sdk1.4.2_12/bin:$PATH
-PATH=/opt/JDKs/amd64/jdk1.6.0_11/bin:$PATH
-export PATH
-
-if [ "$IHOME" = "" ]; then
-  IHOME=/home/infocenter/latest
-fi
-EHOME=${IHOME}/eclipse/eclipse
-curdir=`pwd`
-
-if [ "$1" = "" -o "$1" = "help" ]; then
-  echo "Usage: infocenter.sh [start|shutdown|addSite -from dir|apply]"
-  exit 1
-fi
-
-HELP_PLUGIN=`ls $EHOME/plugins/org.eclipse.help.base_3.*.jar | sort | tail -1`
-
-java \
-  -classpath $HELP_PLUGIN \
-  org.eclipse.help.standalone.Infocenter \
-  -command $* \
-  -eclipsehome $EHOME \
-  -data $IHOME/workspace \
-  -port 27127 \
-  -nl en -locales en
diff --git a/releng/org.eclipse.rse.releng.infocenter/readme.txt b/releng/org.eclipse.rse.releng.infocenter/readme.txt
deleted file mode 100644
index a0fea5931..000000000
--- a/releng/org.eclipse.rse.releng.infocenter/readme.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-DSDP Project Infocenter
------------------------
-
-This project contains scripts needed to run the Eclipse headless infocenter
-application, serving latest online help from dsdp.eclipse.org.
-
-The scripts are written to run by cron job, as user "infocenter", on dsdp.eclipse.org.
-
-This project can be checked out with
-  cvs -d :pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp \
-    co -d bin org.eclipse.tm.rse/releng/org.eclipse.tm.rse.releng.infocenter
-
-Apache Installation:
-* vi /etc/httpd/conf/httpd.conf
-  ADD
-  AddDefaultCharset Off
-  ProxyPass /help/latest http://localhost:27127/help
-  ProxyPassReverse /help/latest http://localhost:27127/help
-
-Installation:
-* Infocenter home (IHOME) at /home/infocenter/latest
-  - Scripts checked out at $IHOME/bin
-  - Deployable doc plugins at $IHOME/deploy
-* cd $IHOME/bin
-  ./setup.sh
-  ./update.sh
-* Cronjob created to execute doit_nightly.sh
-    ssh dsdp.eclipse.org -l infocenter
-    crontab -e
-    #Run the doc update at 2:00 every weekday
-    0 2 * * 1-5     /home/infocenter/latest/bin/doit_nightly.sh
-
-Other infocenter administration commands:
-  infocenter.sh shutdown
-  infocenter.sh start &
-
-For more documentation on infocenter, see
-http://help.eclipse.org/ganymede/index.jsp?topic=/org.eclipse.platform.doc.isv/guide/ua_help_setup_infocenter.htm
-http://help.eclipse.org/stable/topic/org.eclipse.platform.doc.isv/guide/ua_help_setup_infocenter.htm
-
--- Martin Oberhuber, 20-Jul-2006
-\ No newline at end of file
diff --git a/releng/org.eclipse.rse.releng.infocenter/setup.sh b/releng/org.eclipse.rse.releng.infocenter/setup.sh
deleted file mode 100755
index 00c108852..000000000
--- a/releng/org.eclipse.rse.releng.infocenter/setup.sh
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/bin/sh
-#*******************************************************************************
-# Copyright (c) 2008, 2009 Wind River Systems, Inc.
-# 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: 
-# Martin Oberhuber - initial API and implementation 
-#*******************************************************************************
-umask 022
-
-curdir=`pwd`
-#PATH=/opt/j2sdk1.4.2_12/bin:$PATH
-PATH=/opt/JDKs/amd64/jdk1.6.0_11/bin:$PATH
-export PATH
-
-if [ "$IHOME" = "" ]; then
-  IHOME=/home/infocenter/latest
-fi
-# prepare the base Eclipse installation in folder "eclipse"
-ECL_DIR=$IHOME/eclipse
-ep_rel=S
-ep_ver=3.5M4
-ep_date=200812111908
-
-uname_s=`uname -s`
-uname_m=`uname -m`
-case ${uname_s}${uname_m} in
-  Linuxppc*) ep_arch=linux-gtk-ppc
-             cdt_arch=linux.ppc
-             ;;
-  Linuxx86_64*) ep_arch=linux-gtk-x86_64 
-                cdt_arch=linux.x86_64
-                ;;
-  Linuxx86*|Linuxi686*) ep_arch=linux-gtk
-             cdt_arch=linux.x86
-             ;;
-esac
-
-P2_no_dropins=false
-if [ ! -f ${ECL_DIR}/eclipse/plugins/org.eclipse.swt_3.5.0.v3525.jar ]; then
-  if [ ! -d ${ECL_DIR} ]; then
-    mkdir -p ${ECL_DIR}
-  else
-    rm -rf ${ECL_DIR}/*
-  fi
-  cd "${ECL_DIR}"
-  echo "Getting Eclipse Platform SDK..."
-  wget "http://download.eclipse.org/eclipse/downloads/drops/${ep_rel}-${ep_ver}-${ep_date}/eclipse-platform-SDK-${ep_ver}-${ep_arch}.tar.gz"
-  tar xfvz eclipse-platform-SDK-${ep_ver}-${ep_arch}.tar.gz
-  rm eclipse-platform-SDK-${ep_ver}-${ep_arch}.tar.gz
-  cd "${curdir}"
-fi
-if [ ! -f "${ECL_DIR}/eclipse/startup.jar" ]; then
-  cd "${ECL_DIR}/eclipse/plugins"
-  if [ -h ../startup.jar ]; then
-    rm ../startup.jar
-  fi
-  LAUNCHER=`ls org.eclipse.equinox.launcher_*.jar | sort | tail -1`
-  if [ "${LAUNCHER}" != "" ]; then
-    echo "eclipse LAUNCHER=${LAUNCHER}" 
-    ln -s plugins/${LAUNCHER} ../startup.jar
-  else
-    echo "Eclipse: NO startup.jar LAUNCHER FOUND!"
-  fi
-  cd "${curdir}"
-fi
-if [ ! -d "${ECL_DIR}/eclipse/plugins.disabled" ]; then
-  mkdir -p "${ECL_DIR}/eclipse/plugins.disabled"
-  cd "${ECL_DIR}/eclipse/plugins"
-  mv org.eclipse.platform.doc.user_*.jar ../plugins.disabled
-  cd "${curdir}"
-fi 
diff --git a/releng/org.eclipse.rse.releng.infocenter/update.sh b/releng/org.eclipse.rse.releng.infocenter/update.sh
deleted file mode 100755
index e61a74bdb..000000000
--- a/releng/org.eclipse.rse.releng.infocenter/update.sh
+++ /dev/null
@@ -1,136 +0,0 @@
-#!/bin/sh
-#*******************************************************************************
-# Copyright (c) 2006, 2009 Wind River Systems, Inc.
-# 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: 
-# Martin Oberhuber - initial API and implementation 
-#*******************************************************************************
-umask 022
-echo "Infocenter Update: running as"
-id
-if [ "$IHOME" = "" ]; then
-  IHOME=/home/infocenter/latest
-fi
-ECL_DIR=$IHOME/eclipse
-curdir=`pwd`
-
-#update RSE into deployment directory
-if [ ! -d $IHOME/deploy/rse ]; then
-  mkdir -p $IHOME/deploy/rse
-fi
-cd $IHOME/deploy/rse
-rm *.zip
-echo "Downloading RSE-SDK-latest.zip..."
-wget -q "http://build.eclipse.org/dsdp/tm/downloads/drops/N.latest/RSE-SDK-latest.zip"
-#wget -q "http://download.eclipse.org/dsdp/tm/downloads/drops/N.latest/RSE-SDK-latest.zip"
-if [ -e RSE-SDK-latest.zip ]; then
-  echo "Unzipping..."
-  unzip -q RSE-SDK-latest.zip
-  if [ -e plugins.tmp ]; then
-    rm -rf plugins.tmp
-  fi
-  mkdir plugins.tmp
-  mv eclipse/plugins/*doc* plugins.tmp
-  rm -rf eclipse
-  NUM=`ls plugins.tmp/*.jar | wc -l`
-  echo "RSE plugins.tmp: NUM=$NUM"
-  if [ "$NUM" = "3" ]; then
-    echo "Doc plugins got successfully, installing from plugins.tmp into plugins..."
-    if [ -e plugins ]; then 
-      rm -rf plugins
-    fi
-    mv plugins.tmp plugins
-  fi
-else
-  echo "Error downloading RSE-SDK-latest.zip"
-fi
-
-#update MTJ into deployment directory
-if [ ! -d $IHOME/deploy/mtj ]; then
-  mkdir -p $IHOME/deploy/mtj
-fi
-cd $IHOME/deploy/mtj
-rm *.zip
-echo "Downloading dsdp-mtj-SDK-incubation-latest.zip..."
-#wget -q "http://build.eclipse.org/dsdp/mtj/downloads/drops/N.latest/dsdp-mtj-SDK-incubation-latest.zip"
-wget -q "http://download.eclipse.org/dsdp/mtj/downloads/drops/N.latest/dsdp-mtj-SDK-incubation-latest.zip"
-if [ -e dsdp-mtj-SDK-incubation-latest.zip ]; then
-  echo "Unzipping..."
-  unzip -q dsdp-mtj-SDK-incubation-latest.zip
-  if [ -e plugins.tmp ]; then
-    rm -rf plugins.tmp
-  fi
-  mkdir plugins.tmp
-  mv eclipse/plugins/*doc* plugins.tmp
-  rm -rf eclipse
-  NUM=`ls plugins.tmp/*.jar | wc -l`
-  echo "MTJ plugins.tmp: NUM=$NUM"
-  if [ "$NUM" = "2" -o "$NUM" = "1" ]; then
-    echo "Doc plugins got successfully, installing from plugins.tmp into plugins..."
-    if [ -e plugins ]; then 
-      rm -rf plugins
-    fi
-    mv plugins.tmp plugins
-  fi
-else
-  echo "Error downloading dsdp-mtj-SDK-incubation-latest.zip"
-fi
-
-######################### Deploy all #############################
-echo "Deploying new plug-ins..."
-NEED_RESTART=0
-for COMP in rse dd.dsf nab ercp mtj ; do
-  if [ -d "${IHOME}/deploy/${COMP}/plugins" ]; then
-    if [ -d "$ECL_DIR/eclipse/dropins/${COMP}/eclipse/plugins" ]; then
-      diff -r "${IHOME}/deploy/${COMP}/plugins" "$ECL_DIR/eclipse/dropins/${COMP}/eclipse/plugins" >/dev/null
-      result=$?
-      if [ "${result}" != "0" ]; then
-        echo "${COMP} diffs as ${result} --> deploying"
-        NEED_RESTART=1
-      else
-        echo "${COMP} is unchanged"
-      fi
-    else
-      echo "${COMP} is NEW"
-      NEED_RESTART=1
-    fi
-  fi
-done 
-
-######################### Restart Infocenter #############################
-#update Infocenter with latest deployable plug-ins
-if [ "$NEED_RESTART" != "0" ]; then
-  echo "Shutting down infocenter..."
-  $IHOME/bin/infocenter.sh shutdown
-
-  for COMP in rse dd.dsf nab ercp mtj ; do
-    if [ -d "${IHOME}/deploy/${COMP}/plugins" ]; then
-      if [ -d "$ECL_DIR/eclipse/dropins/${COMP}/eclipse/plugins" ]; then
-        rm -rf "$ECL_DIR/eclipse/dropins/${COMP}"
-      fi
-      mkdir -p "$ECL_DIR/eclipse/dropins/${COMP}/eclipse"
-      cp -Rp $IHOME/deploy/${COMP}/plugins "$ECL_DIR/eclipse/dropins/${COMP}/eclipse/"
-    fi 
-  done 
-  
-  #TODO: not sure if we need to delete the old index to force re-indexing
-  echo "Deleting old index..."
-  rm -rf $IHOME/config/org.eclipse.help.base
-
-  cd $IHOME
-  echo "Restarting infocenter..."
-  nohup $IHOME/bin/infocenter.sh start &
-  echo "Waiting for Infocenter / Apache to come up [60 seconds]"
-  sleep 60
-  echo "Doing fake search to force rebuilding index"
-  wget -q "http://localhost/help/latest/advanced/searchView.jsp?searchWord=SystemBasePlugin&maxHits=2" -O search.out.jsp -t 3 --waitretry=30
-  echo "Done, index should be up again!"
-else
-  echo "Nothing new deployed, no restart necessary."
-fi
-
-cd "$curdir"
diff --git a/releng/org.eclipse.rse.updatesite/.cvsignore b/releng/org.eclipse.rse.updatesite/.cvsignore
deleted file mode 100644
index 51689449b..000000000
--- a/releng/org.eclipse.rse.updatesite/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-features
-plugins
-interim
-milestones
-digest.zip
-site-europa.xml
diff --git a/releng/org.eclipse.rse.updatesite/.project b/releng/org.eclipse.rse.updatesite/.project
deleted file mode 100644
index fc8928ebd..000000000
--- a/releng/org.eclipse.rse.updatesite/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.rse.updatesite</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.UpdateSiteBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.UpdateSiteNature</nature>
-	</natures>
-</projectDescription>
diff --git a/releng/org.eclipse.rse.updatesite/bin/.cvsignore b/releng/org.eclipse.rse.updatesite/bin/.cvsignore
deleted file mode 100644
index 3f0ee91c7..000000000
--- a/releng/org.eclipse.rse.updatesite/bin/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-pack200.stamp
diff --git a/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh b/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh
deleted file mode 100755
index 34ef8e191..000000000
--- a/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh
+++ /dev/null
@@ -1,458 +0,0 @@
-#!/bin/sh
-#*******************************************************************************
-# Copyright (c) 2006, 2009 Wind River Systems, Inc.
-# 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: 
-# Martin Oberhuber - initial API and implementation 
-#*******************************************************************************
-# Convert normal "site.xml" to "testPatchUpdates"
-#
-# Prerequisites: 
-# - Eclipse 3.3Mx installed in $HOME/ws_31x/eclipse
-# - Java5 in the PATH or in /shared/dsdp/tm/ibm-java2-ppc64-50
-
-curdir=`pwd`
-cd `dirname $0`
-mydir=`pwd`
-
-umask 022
-
-#Use Java5 on build.eclipse.org - need JRE for pack200
-export PATH=/shared/dsdp/tm/ibm-java2-ppc64-50/jre/bin:/shared/dsdp/tm/ibm-java2-ppc64-50/bin:$PATH
-basebuilder=${HOME}/ws_31x/org.eclipse.releng.basebuilder
-
-# patch site.xml
-cd ..
-SITE=`pwd`
-if [ -f index.html.new ]; then
-  rm -f index.html.new
-fi
-if [ -f site.xml.new ]; then
-  rm -f site.xml.new
-fi
-if [ -f web/site.xsl.new ]; then
-  rm -f web/site.xsl.new
-fi
-
-# get newest plugins and features: to be done manually on real update site
-TPVERSION="Target Management"
-VERSION=3.1.2
-TYPE=none
-SITEDIR=`basename ${SITE}`
-case ${SITEDIR} in
-  test*Updates)   TYPE=test ;;
-  signed*Updates) TYPE=testSigned ;;
-  *milestones)    TYPE=milestone ;;
-  *interim)       TYPE=interim ;;
-  *)              TYPE=unknown ;;
-esac
-case ${SITEDIR} in
-  3.2*)  VERSION=3.2 ;;
-esac
-if [ ${TYPE} = test ]; then
-    echo "Working on test patch update site for ${VERSION}"
-    TPTYPE="${VERSION} Test"
-    TPVERSION="${TPVERSION} ${TPTYPE}"
-    REL=`ls $HOME/ws_31x/working/package | sort | tail -1`
-    if [ "$REL" != "" ]; then
-      echo "Checking new Updates from $REL"
-      DIR="$HOME/ws_31x/working/package/$REL/updates"
-      if [ -d "$DIR/features" ]; then
-        echo "Copying new plugins and features from $DIR"
-        rm -rf features
-        rm -rf plugins
-        cp -R $DIR/features .
-        cp -R $DIR/plugins .
-      fi
-    fi
-    # CHECK VERSION CORRECTNESS for MICRO UPDATES only
-    # Minor/major version updates are not allowed.
-    # Update of "qualifier" requires also updating "micro"
-    echo "VERIFYING VERSION CORRECTNESS: Features"
-    ls features/*.jar | sed -e 's,^.*features/,,' | sort > f1.$$.txt
-    ls ../updates/3.1/features/*.jar | sed -e 's,^.*features/,,' | sort > f2.$$.txt
-    diff f2.$$.txt f1.$$.txt | grep '^[>]' \
-       | sed -e 's,[>] \(.*_[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\)\..*,\1,' > f_new.txt
-    for f in `cat f_new.txt`; do
-      fold=`grep ${f} f2.$$.txt`
-      if [ "${fold}" != "" ]; then
-        echo "PROBLEM: QUALIFIER update without MICRO: ${f}"
-      fi
-      fbase=`echo $f | sed -e 's,\(.*_[0-9][0-9]*\.[0-9][0-9]*\)\..*,\1,'`
-      fold=`grep ${fbase} f2.$$.txt`
-      if [ "${fold}" = "" ]; then
-        echo "PROBLEM: MAJOR or MINOR update : ${f}"
-      fi
-    done
-    echo "VERIFYING VERSION CORRECTNESS: Plugins"
-    ls plugins/*.jar | sed -e 's,^.*plugins/,,' | sort > p1.$$.txt
-    ls ../updates/3.1/plugins/*.jar | sed -e 's,^.*plugins/,,' | sort > p2.$$.txt
-    diff p2.$$.txt p1.$$.txt | grep '^[>]' \
-       | sed -e 's,[>] \(.*_[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\)\..*,\1,' > p_new.txt
-    for p in `cat p_new.txt`; do
-      pold=`grep ${p} p2.$$.txt`
-      if [ "${pold}" != "" ]; then
-        echo "PROBLEM: QUALIFIER update without MICRO: ${p}"
-      fi
-      pbase=`echo $p | sed -e 's,\(.*_[0-9][0-9]*\.[0-9][0-9]*\)\..*,\1,'`
-      pold=`grep ${pbase} p2.$$.txt`
-      if [ "${pold}" = "" ]; then
-        echo "PROBLEM: MAJOR or MINOR update : ${p}"
-      fi
-    done
-    #rm f_new.txt p_new.txt
-    mv -f f1.$$.txt fversions.txt
-    mv -f p1.$$.txt pversions.txt
-    mv -f f2.$$.txt f30versions.txt
-    mv -f p2.$$.txt p30versions.txt
-    ## rm f1.$$.txt f2.$$.txt p1.$$.txt p2.$$.txt    
-    rm index.html site.xml web/site.xsl
-    cvs -q update -dPR
-    sed -e "s,/dsdp/tm/updates/2.0,/dsdp/tm/${SITEDIR},g" \
-    	-e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \
-    	index.html > index.html.new
-    mv -f index.html.new index.html
-    sed -e "s,/dsdp/tm/updates/2.0,/dsdp/tm/${SITEDIR},g" \
-        -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \
-    	-e '/<!-- BEGIN_2_0 -->/,/<!-- END_2_0_4 -->/d' \
-    	-e '/<!-- BEGIN_3_0 -->/,/<!-- END_3_1_1 -->/d' \
-        site.xml > site.xml.new
-    mv -f site.xml.new site.xml
-    sed -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \
-    	web/site.xsl > web/site.xsl.new
-    mv -f web/site.xsl.new web/site.xsl
-    echo "Conditioning the site... $SITE"
-    #java -Dorg.eclipse.update.jarprocessor.pack200=$mydir \
-    #java -jar $HOME/ws_31x/eclipse/startup.jar \
-    java \
-        -jar ${basebuilder}/plugins/org.eclipse.equinox.launcher.jar \
-        -application org.eclipse.update.core.siteOptimizer \
-        -jarProcessor -outputDir $SITE \
-        -processAll -repack $SITE
-    #java -Dorg.eclipse.update.jarprocessor.pack200=$mydir \
-    #	$HOME/ws_31x/jarprocessor/jarprocessor.jar \
-	#	-outputDir $SITE -processAll -repack $SITE
-elif [ ${TYPE} = testSigned ]; then
-    echo "Working on signed patch update site for ${VERSION}"
-    TPTYPE="${VERSION} Signed Test Patch"
-    TPVERSION="${TPVERSION} ${TPTYPE}"
-    echo "Signing jars from test patch update site (expecting conditioned jars)..."
-    STAGING=/home/data/httpd/download-staging.priv/dsdp/tm
-    stamp=`date +'%Y%m%d-%H%M'`
-    if [ -d ${STAGING} -a -d ${SITE}/../testPatchUpdates ]; then
-      #get jars from testPatchUpdates, sign them and put them here
-      mkdir ${SITE}/features.${stamp}
-      mkdir -p ${STAGING}/updates.${stamp}/features
-      cp -R ${SITE}/../testPatchUpdates/features/*.jar ${STAGING}/updates.${stamp}/features
-      cd ${STAGING}/updates.${stamp}/features
-      for x in `ls *.jar`; do
-        result=`jarsigner -verify ${x} | head -1`
-        if [ "$result" != "jar verified." ]; then
-          # do not sign Orbit bundles again since they are signed already 
-          echo "signing feature: ${x}"
-          sign ${x} nomail >/dev/null
-        fi
-      done
-      TRIES=10
-      while [ $TRIES -gt 0 ]; do
-        sleep 30
-        echo "TRIES to go: ${TRIES}"
-        for x in `ls *.jar | grep -v '^temp[_.]'`; do
-          result=`jarsigner -verify ${x} | head -1`
-          if [ "$result" = "jar verified." ]; then
-            echo "${result}: ${x}"
-            cp ${x} ${SITE}/features.${stamp}
-            rm ${x}
-          else
-            echo "-pending- ${x} : ${result}" | head -1
-            sleep 30
-          fi
-        done
-        FILES=`ls 2>/dev/null`
-        if [ "$FILES" = "" ]; then
-          TRIES=0
-          ok=1
-        else
-          echo "--> FILES is $FILES"
-          TRIES=`expr $TRIES - 1`
-          ok=0
-        fi
-      done
-      if [ "$ok" = "1" ]; then
-        rmdir ${STAGING}/updates.${stamp}/features
-        mkdir ${SITE}/plugins.${stamp}
-        mkdir -p ${STAGING}/updates.${stamp}/plugins
-        cp ${SITE}/../testPatchUpdates/plugins/*.jar ${STAGING}/updates.${stamp}/plugins
-        cd ${STAGING}/updates.${stamp}/plugins
-        for x in `ls *.jar`; do
-          result=`jarsigner -verify ${x} | head -1`
-          if [ "$result" != "jar verified." ]; then
-            # do not sign Orbit bundles again since they are signed already 
-            echo "signing plugin: ${x}"
-            sign ${x} nomail >/dev/null
-          fi
-        done
-        TRIES=10
-        while [ $TRIES -gt 0 ]; do
-          sleep 30
-          echo "TRIES to go: ${TRIES}"
-          for x in `ls *.jar | grep -v '^temp[_.]'`; do
-            result=`jarsigner -verify ${x} | head -1`
-            if [ "$result" = "jar verified." ]; then
-              echo "${result}: ${x}"
-              cp ${x} ${SITE}/plugins.${stamp}
-              rm ${x}
-            else
-              echo "-pending- ${x} : ${result}" | head -1
-              sleep 30
-            fi
-          done
-          FILES=`ls 2>/dev/null`
-          if [ "$FILES" = "" ]; then
-            TRIES=0
-            ok=1
-          else
-            echo "--> FILES is $FILES"
-            TRIES=`expr $TRIES - 1`
-            ok=0
-          fi
-        done
-      fi
-      if [ "$ok" = "1" ]; then
-        cd ${SITE}
-        rmdir ${STAGING}/updates.${stamp}/plugins
-        rmdir ${STAGING}/updates.${stamp}
-        #mv features features.old.${stamp}
-        #mv plugins plugins.old.${stamp}
-        rm fversions.txt pversions.txt f30versions.txt p30versions.txt f_new.txt p_new.txt 2>/dev/null
-        rm -rf features plugins
-        mv features.${stamp} features
-        mv plugins.${stamp} plugins
-      else
-        echo "Something went wrong during staging and signing."
-        echo "Keeping existing update site intact."
-        exit 1
-      fi
-    else
-      echo "staging or testPatchUpdates not found:"
-      echo "please fix your pathes"
-      exit 1
-    fi
-    rm index.html site.xml web/site.xsl
-    cvs -q update -dPR
-    sed -e "s,/dsdp/tm/updates/2.0,/dsdp/tm/${SITEDIR},g" \
-    	-e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \
-    	index.html > index.html.new
-    mv -f index.html.new index.html
-    sed -e "s,/dsdp/tm/updates/2.0,/dsdp/tm/${SITEDIR},g" \
-        -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \
-    	-e '/<!-- BEGIN_2_0 -->/,/<!-- END_2_0_4 -->/d' \
-    	-e '/<!-- BEGIN_3_0 -->/,/<!-- END_3_1_1 -->/d' \
-        site.xml > site.xml.new
-    mv -f site.xml.new site.xml
-    sed -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \
-    	web/site.xsl > web/site.xsl.new
-    mv -f web/site.xsl.new web/site.xsl
-elif [ ${TYPE} = milestone ]; then
-    echo "Working on milestone update site for ${VERSION}"
-    TPTYPE="${VERSION} Milestone"
-    TPVERSION="${TPVERSION} ${TPTYPE}"
-    echo "Expect that you copied your features and plugins yourself"
-    stamp=`date +'%Y%m%d-%H%M'`
-    rm index.html site.xml web/site.xsl
-    cvs -q update -dPR
-    sed -e "s,/dsdp/tm/updates/2.0,/dsdp/tm/updates/${SITEDIR},g" \
-    	-e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \
-    	-e '\,</h1>,a\
-This site contains Target Management Milestones (I-, S- and M- builds) which are \
-being contributed to the Galileo coordinated release train (Eclipse 3.5.x).' \
-    	index.html > index.html.new
-    mv -f index.html.new index.html
-    ## keep 3.0.x features in site.xml
-    ##	-e '/<!-- BEGIN_2_0_1 -->/,/<!-- END_2_0_4 -->/d' \
-    sed -e "s,/dsdp/tm/updates/2.0,/dsdp/tm/updates/${SITEDIR},g" \
-        -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \
-    	-e '/<!-- BEGIN_2_0 -->/,/<!-- END_2_0_4 -->/d' \
-    	-e '/<!-- BEGIN_3_0 -->/,/<!-- END_3_1_1 -->/d' \
-        site.xml > site.xml.new
-    mv -f site.xml.new site.xml
-    sed -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \
-    	web/site.xsl > web/site.xsl.new
-    mv -f web/site.xsl.new web/site.xsl
-elif [ ${TYPE} = interim ]; then
-    echo "Working on interim update site for ${version}"
-    TPTYPE="${VERSION} Interim"
-    TPVERSION="${TPVERSION} ${TPTYPE}"
-    echo "Expect that you copied your features and plugins yourself"
-    stamp=`date +'%Y%m%d-%H%M'`
-    rm index.html site.xml web/site.xsl
-    cvs -q update -dPR
-    sed -e "s,/dsdp/tm/updates/2.0,/dsdp/tm/updates/${SITEDIR},g" \
-    	-e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \
-    	-e '\,</h1>,a\
-This site contains Target Management Interim Maintenance builds (I-, S-, and M-builds) in order \
-to test them before going live.' \
-    	index.html > index.html.new
-    mv -f index.html.new index.html
-    ## keep 2.0.x features in site.xml
-    ##	-e '/<!-- BEGIN_2_0_1 -->/,/<!-- END_2_0_4 -->/d' \
-    sed -e "s,/dsdp/tm/updates/2.0,/dsdp/tm/updates/${SITEDIR},g" \
-        -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \
-    	-e '/<!-- BEGIN_2_0 -->/,/<!-- END_2_0_4 -->/d' \
-    	-e '/<!-- BEGIN_3_0 -->/,/<!-- END_3_1_1 -->/d' \
-        site.xml > site.xml.new
-    mv -f site.xml.new site.xml
-    sed -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \
-    	web/site.xsl > web/site.xsl.new
-    mv -f web/site.xsl.new web/site.xsl
-elif [ `basename $SITE` = 3.0 ]; then
-    echo "Working on 3.0 update site"
-    TPTYPE="3.0"
-    TPVERSION="${TPVERSION} ${TPTYPE}"
-    TYPE=official
-    echo "Expect that you copied your features and plugins yourself"
-    stamp=`date +'%Y%m%d-%H%M'`
-    rm index.html site.xml web/site.xsl
-    cvs -q update -dPR
-    sed -e "s,/dsdp/tm/updates/2.0,/dsdp/tm/updates/${SITEDIR},g" \
-    	-e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \
-    	-e '\,</h1>,a\
-This site contains Target Management 3.0 Releases and Updates (R- builds) which are \
-being contributed to the Ganymede coordinated release train (Eclipse 3.4).' \
-    	index.html > index.html.new
-    mv -f index.html.new index.html
-    ## dont keep 2.0.x features in site.xml -- this site has 3.0 and 3.1 content
-    sed -e "s,/dsdp/tm/updates/2.0,/dsdp/tm/updates/${SITEDIR},g" \
-        -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \
-    	-e '/<!-- BEGIN_2_0 -->/,/<!-- END_2_0_4 -->/d' \
-    	-e '/<!-- BEGIN_3_2 -->/,/<!-- END_3_2 -->/d' \
-        site.xml > site.xml.new
-    mv -f site.xml.new site.xml
-    sed -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \
-    	web/site.xsl > web/site.xsl.new
-    mv -f web/site.xsl.new web/site.xsl
-elif [ `basename $SITE` = 3.1 ]; then
-    echo "Working on 3.1 update site"
-    TPTYPE="3.1"
-    TPVERSION="${TPVERSION} ${TPTYPE}"
-    TYPE=official
-    echo "Expect that you copied your features and plugins yourself"
-    stamp=`date +'%Y%m%d-%H%M'`
-    rm index.html site.xml web/site.xsl
-    cvs -q update -dPR
-    sed -e "s,/dsdp/tm/updates/2.0,/dsdp/tm/updates/${SITEDIR},g" \
-    	-e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \
-    	-e '\,</h1>,a\
-This site contains Target Management 3.1 Releases and Updates (R- builds) which are \
-being contributed to the Galileo coordinated release train (Eclipse 3.5).' \
-    	index.html > index.html.new
-    mv -f index.html.new index.html
-    ## dont keep 2.0.x and 3.0.x features in site.xml
-    ## this site has 3.1.x content
-    sed -e "s,/dsdp/tm/updates/2.0,/dsdp/tm/updates/${SITEDIR},g" \
-        -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \
-    	-e '/<!-- BEGIN_2_0 -->/,/<!-- END_2_0_4 -->/d' \
-        -e '/<!-- BEGIN_3_0 -->/,/<!-- END_3_0_3 -->/d' \
-        -e '/<!-- BEGIN_3_2 -->/,/<!-- END_3_2 -->/d' \
-        site.xml > site.xml.new
-    mv -f site.xml.new site.xml
-    sed -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \
-    	web/site.xsl > web/site.xsl.new
-    mv -f web/site.xsl.new web/site.xsl
-else
-    echo "Working on official update site"
-    TYPE=official
-    echo "Expect that you copied your features and plugins yourself"
-    stamp=`date +'%Y%m%d-%H%M'`
-    rm index.html site.xml web/site.xsl
-    cvs -q update -dPR
-    sed -e '/<!-- BEGIN_2_0_5 -->/,/<!-- END_2_0_5 -->/d' \
-        site.xml > site.xml.new1
-    sed -e '/<!-- BEGIN_3_0_4 -->/,/<!-- END_3_0_4 -->/d' \
-        site.xml.new1 > site.xml.new2
-    sed -e '/<!-- BEGIN_3_2 -->/,/<!-- END_3_2 -->/d' \
-        site.xml.new2 > site.xml.new
-    mv -f site.xml.new site.xml
-    rm site.xml.new1 site.xml.new2
-fi
-FEATURES=`grep 'features/[^ ]*\.qualifier\.jar' site.xml | sed -e 's,^[^"]*"features/\([^0-9]*[0-9][0-9.]*\).*$,\1,g'`
-for feature in $FEATURES ; do
-  #list newest ones first
-  TAG=`ls -t features/${feature}*.jar | head -1 | sed -e 's,[^0-9]*[0-9][0-9]*\.[0-9]*\.[0-9]*\.\([^.]*\).jar,\1,'`
-  if [ "$TAG" != "" ]; then
-    echo "$feature : $TAG"
-    sed -e "/$feature/s/qualifier/$TAG/g" site.xml > site.xml.new
-    mv -f site.xml.new site.xml
-  fi
-done
-#Create Europa version of site.xml
-if [ -f site-europa.xml ]; then
-  rm -rf site-europa.xml
-fi
-sed -e '/!EUROPA_ONLY!/d' site.xml > site-europa.xml
-
-#Get rid of Europa comments completely in order to avoid SAX exception 
-#in comment when the feature qualifier extends to --
-awk 'BEGIN {doit=1}
-  /-- !EUROPA_ONLY!/ {doit=0}
-  { if(doit==1) print; }
-  /!EUROPA_ONLY! --/ {doit=1}' site.xml > site.xml.tmp
-mv -f site.xml.tmp site.xml
-
-# optimize the site
-# see http://wiki.eclipse.org/Platform-releng-faq
-case ${TYPE} in test*)
-  echo "Packing the site... $SITE"
-  # Workaround for downgrading effort of pack200 to avoid VM bug
-  # See https://bugs.eclipse.org/bugs/show_bug.cgi?id=154069
-  #java -Dorg.eclipse.update.jarprocessor.pack200=$mydir \
-  #java -jar $HOME/ws_31x/eclipse/startup.jar \
-  java -jar ${basebuilder}/plugins/org.eclipse.equinox.launcher.jar \
-    -application org.eclipse.update.core.siteOptimizer \
-    -jarProcessor -outputDir $SITE \
-    -processAll -pack $SITE
-  #java -Dorg.eclipse.update.jarprocessor.pack200=$mydir \
-  #    $HOME/ws_31x/jarprocessor/jarprocessor.jar \
-  #    -outputDir $SITE -processAll -pack $SITE
-  ;;
-esac
-
-#Create the digest
-echo "Creating digest..."
-#java -jar $HOME/ws_31x/eclipse/startup.jar \
-java -jar ${basebuilder}/plugins/org.eclipse.equinox.launcher.jar \
-    -application org.eclipse.update.core.siteOptimizer \
-    -digestBuilder -digestOutputDir=$SITE \
-    -siteXML=$SITE/site-europa.xml
-
-##if false ; then
-#Create P2 metadata
-echo "Creating P2 metadata..."
-#Always create from scratch
-cd ${SITE}
-for x in content.xml content.jar content.jar.pack.gz artifacts.xml artifacts.jar artifacts.jar.pack.gz ; do
-  if [ -f $x ]; then rm -f $x; fi
-done
-java -jar ${basebuilder}/plugins/org.eclipse.equinox.launcher.jar \
-    -application org.eclipse.equinox.p2.metadata.generator.EclipseGenerator \
-    -updateSite ${SITE}/ \
-    -site file:${SITE}/site.xml \
-    -metadataRepository file:${SITE}/ \
-    -metadataRepositoryName "${TPVERSION} Update Site" \
-    -artifactRepository file:${SITE}/ \
-    -artifactRepositoryName "${TPVERSION} Artifacts" \
-    -compress \
-    -reusePack200Files \
-    -noDefaultIUs \
-    -vmargs -Xmx256M
-##fi
-
-cd $SITE
-chgrp -R dsdp-tmadmin .
-chmod -R g+w .
-chmod -R a+r .
-cd $curdir
diff --git a/releng/org.eclipse.rse.updatesite/bin/pack200 b/releng/org.eclipse.rse.updatesite/bin/pack200
deleted file mode 100755
index 1bdf59749..000000000
--- a/releng/org.eclipse.rse.updatesite/bin/pack200
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-#
-# Workaround for downgrading effort of pack200 to avoid VM bug
-# See https://bugs.eclipse.org/bugs/show_bug.cgi?id=154069
-#
-curdir=`pwd`
-cd `dirname $0`
-mydir=`pwd`
-cd "$curdir"
-
-rm "$mydir/pack200.stamp"
-touch "$mydir/pack200.stamp"
-date >> "$mydir/pack200.stamp"
-echo "pack200 -E4 $*" >> "$mydir/pack200.stamp"
-pack200 -E4 $*
diff --git a/releng/org.eclipse.rse.updatesite/bin/sign.sh b/releng/org.eclipse.rse.updatesite/bin/sign.sh
deleted file mode 100755
index 733da58d6..000000000
--- a/releng/org.eclipse.rse.updatesite/bin/sign.sh
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/bin/sh
-#*******************************************************************************
-# Copyright (c) 2007, 2009 Wind River Systems, Inc.
-# 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: 
-# Martin Oberhuber - initial API and implementation 
-#*******************************************************************************
-# Sign a list of files on build.eclipse.org
-#
-# Usage:
-# sign.sh a.jar featurs/b.jar `ls plugins/*.jar`
-#
-# Prerequisites: 
-# - Eclipse 3.3Mx installed in $HOME/ws_31x/eclipse
-# - Java5 in the PATH or in /shared/dsdp/tm/ibm-java2-ppc64-50
-
-curdir=`pwd`
-cd `dirname $0`
-mydir=`pwd`
-
-umask 022
-
-#Use Java5 on build.eclipse.org - need JRE for pack200
-export PATH=/shared/dsdp/tm/ibm-java2-ppc64-50/jre/bin:/shared/dsdp/tm/ibm-java2-ppc64-50/bin:$PATH
-basebuilder=${HOME}/ws_31x/org.eclipse.releng.basebuilder
-
-FILES=$*
-
-# Work on update site
-cd ..
-SITE=`pwd`
-
-STAGING=/home/data/httpd/download-staging.priv/dsdp/tm
-stamp=`date +'%Y%m%d-%H%M'`
-WORKDIR=${STAGING}/${stamp}
-mkdir -p ${WORKDIR}
-REALFILES=""
-NAMES=""
-echo "Bock ma's"
-for file in ${FILES}; do
-  echo "file: ${file}"
-  cd ${SITE}
-  if [ -f ${file} ]; then
-    name=`basename ${file}`
-    echo "signing: ${name}"
-    NAMES="${NAMES} ${name}"
-    REALFILES="${REALFILES} ${file}"
-    cp ${file} ${WORKDIR}
-    cd ${WORKDIR}
-    sign ${name} nomail >/dev/null
-  fi
-done
-mkdir ${WORKDIR}/done
-cd ${WORKDIR}
-TRIES=10
-while [ $TRIES -gt 0 ]; do
-  sleep 30
-  anyleft=0
-  echo "TRIES to go: ${TRIES}"
-  for x in ${NAMES} ; do
-    if [ -f ${x} ]; then
-      anyleft=1
-      result=`jarsigner -verify ${x}`
-      if [ "$result" = "jar verified." ]; then
-        echo "${result}: ${x}"
-        mv ${x} ${WORKDIR}/done/${x}
-      else
-        echo "-pending- ${x} : ${result}" | head -1
-        sleep 30
-      fi
-    fi
-  done
-  if [ "${anyleft}" = "0" ]; then
-     TRIES=0
-     ok=1
-  else
-     echo "--> left:"
-     ls
-     TRIES=`expr $TRIES - 1`
-     ok=0
-  fi
-done
-if [ "$ok" = "1" ]; then
-  cd ${SITE}
-  echo "Signed, ok, packing: ${REALFILES}"
-  for x in ${REALFILES} ; do
-    name=`basename ${x}`
-    #cp -f ${WORKDIR}/done/${name} ${x}
-    echo "signed, packing: ${x}"
-    java -jar ${basebuilder}/plugins/org.eclipse.equinox.launcher.jar \
-      -application org.eclipse.update.core.siteOptimizer \
-      -jarProcessor -outputDir `dirname ${x}` \
-      -pack ${WORKDIR}/done/${name}
-  done
-  rm -rf ${WORKDIR}
-else
-  echo "Something went wrong during staging and signing."
-  echo "Keeping existing update site intact."
-  rm -rf ${WORKDIR}
-  exit 1
-fi
-
-#Create the digest
-echo "Creating digest..."
-#java -jar $HOME/ws_31x/eclipse/startup.jar \
-java -jar ${basebuilder}/plugins/org.eclipse.equinox.launcher.jar \
-    -application org.eclipse.update.core.siteOptimizer \
-    -digestBuilder -digestOutputDir=$SITE \
-    -siteXML=$SITE/site.xml
-
-cd $SITE
-chgrp -R dsdp-tmadmin .
-chmod -R g+w .
-chmod -R a+r .
-cd $curdir
diff --git a/releng/org.eclipse.rse.updatesite/bin/stageMilestones.sh b/releng/org.eclipse.rse.updatesite/bin/stageMilestones.sh
deleted file mode 100755
index 5ecfefa6d..000000000
--- a/releng/org.eclipse.rse.updatesite/bin/stageMilestones.sh
+++ /dev/null
@@ -1,67 +0,0 @@
-#*******************************************************************************
-# Copyright (c) 2007, 2009 Wind River Systems, Inc. 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: 
-# Martin Oberhuber (Wind River) - initial API and implementation
-#*******************************************************************************
-#!/bin/sh
-curdir=`pwd`
-cd `dirname $0`
-mydir=`pwd`
-
-umask 022
-
-#Use Java5 on build.eclipse.org - need JRE for pack200
-export PATH=/shared/dsdp/tm/ibm-java2-ppc64-50/jre/bin:/shared/dsdp/tm/ibm-java2-ppc64-50/bin:$PATH
-basebuilder=${HOME}/ws_31x/org.eclipse.releng.basebuilder
-
-# patch site.xml
-cd ..
-SITE=`pwd`
-
-# get newest plugins and features: to be done manually on real update site
-if [ `basename $SITE` != milestones ]; then
-    echo "Must run on milestones update site"
-    cd "$curdir"
-    exit 1
-fi
-
-# store away previous version
-echo "Storing away old versions"
-if [ -d features.sav ]; then
-    rm -rf features.sav
-fi
-if [ -d plugins.sav ]; then
-    rm -rf plugins.sav
-fi
-mkdir features.sav
-mkdir plugins.sav
-mv features/*_2.0.1.v* features.sav
-mv features/*_1.0.1.v* features.sav
-mv plugins/*_2.0.1.v* plugins.sav
-mv plugins/*_1.0.1.v* plugins.sav
-
-# copy new version
-echo "Copying new versions"
-cp ../../signedPatchUpdates/features/*_2.0.1.v* features
-cp ../../signedPatchUpdates/features/*_1.0.1.v* features
-cp ../../signedPatchUpdates/plugins/*_2.0.1.v* plugins
-cp ../../signedPatchUpdates/plugins/*_1.0.1.v* plugins
-
-# diff, to be safe
-ls features.sav | sort > f1.$$.txt
-ls plugins.sav | sort > p1.$$.txt
-ls features | grep '_[12]\.0\.1\.v' | sort > f2.$$.txt
-ls plugins | grep  '_[12]\.0\.1\.v' | sort > p2.$$.txt
-echo "Plugins diff:"
-diff p1.$$.txt p2.$$.txt
-echo "Features diff:"
-diff f1.$$.txt f2.$$.txt
-rm f1.$$.txt f2.$$.txt p1.$$.txt p2.$$.txt
-
-cd "$curdir"
-exit 0
-\ No newline at end of file
diff --git a/releng/org.eclipse.rse.updatesite/index.html b/releng/org.eclipse.rse.updatesite/index.html
deleted file mode 100644
index 0bfdcea12..000000000
--- a/releng/org.eclipse.rse.updatesite/index.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<html>
-<head>
-<title>Target Management Project 2.0 Updates</title>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<style>@import url("web/site.css");</style>
-<script type="text/javascript">
-	var returnval = 0;
-	var stylesheet, xmlFile, cache, doc;
-	function init(){
-		// NSCP 7.1+ / Mozilla 1.4.1+ / Safari
-		// Use the standard DOM Level 2 technique, if it is supported
-		if (document.implementation && document.implementation.createDocument) {
-			xmlFile = document.implementation.createDocument("", "", null);
-			stylesheet = document.implementation.createDocument("", "", null);
-			if (xmlFile.load){
-				xmlFile.load("site.xml");
-				stylesheet.load("web/site.xsl");
-			} else {
-				alert("Document could not be loaded by browser.");
-			}
-			xmlFile.addEventListener("load", transform, false);
-			stylesheet.addEventListener("load", transform, false);
-		}
-		//IE 6.0+ solution
-		else if (window.ActiveXObject) {
-			xmlFile = new ActiveXObject("msxml2.DOMDocument.3.0");
-			xmlFile.async = false;
-			xmlFile.load("site.xml");
-			stylesheet = new ActiveXObject("msxml2.FreeThreadedDOMDocument.3.0");
-			stylesheet.async = false;
-			stylesheet.load("web/site.xsl");
-			cache = new ActiveXObject("msxml2.XSLTemplate.3.0");
-			cache.stylesheet = stylesheet;
-			transformData();
-		}
-	}
-	// separate transformation function for IE 6.0+
-	function transformData(){
-		var processor = cache.createProcessor();
-		processor.input = xmlFile;
-		processor.transform();
-		data.innerHTML = processor.output;
-	}
-	// separate transformation function for NSCP 7.1+ and Mozilla 1.4.1+ 
-	function transform(){
-		returnval+=1;
-		if (returnval==2){
-			var processor = new XSLTProcessor();
-			processor.importStylesheet(stylesheet); 
-			doc = processor.transformToDocument(xmlFile);
-			document.getElementById("data").innerHTML = doc.documentElement.innerHTML;
-		}
-	}
-</script>
-</head>
-<body onload="init();">
-	<div align="right" width="230">
-	  <a href="http://www.eclipse.org/dsdp/tm/images/RSESample.gif">
-        <img src="http://www.eclipse.org/dsdp/tm/images/RSESample_4x.gif" alt="[RSE Sample Screenshot]" border="0" width="230" height="165" title="RSE Sample Screenshot" />
-      </a>
-    </div>
-
-	<h1 class="title">Target Management Project 2.0 Updates</h1>
-	<h2>Just getting started?</h2>
-      <p><b>See <a href="http://www.eclipse.org/dsdp/tm/tutorial/">http://www.eclipse.org/dsdp/tm/tutorial/</a></b></p>
-    <hr/>
-    <p>For getting the software on this site, you need to use the Eclipse
-    <a href="http://help.eclipse.org/help33/index.jsp?topic=/org.eclipse.platform.doc.user/tasks/tasks-34.htm">
-    Update Manager</a> (choose <i>Help &gt; Software Updates &gt; Find and Install</i>
-    in Eclipse 3.3 or later).<br/>
-    Define a new remote update site named "Target Management Updates",
-    and specify</p>
-    <p><code>&nbsp;&nbsp;&nbsp;http://download.eclipse.org/dsdp/tm/updates/2.0/</code></p>
-    <p>as the URL to use.
-    See <a href="http://help.eclipse.org/help33/index.jsp?topic=/org.eclipse.platform.doc.user/tasks/tasks-34.htm">
-      Eclipse Help</a> for general information about using Update Manager.</p>
-    <p>If you do not have Eclipse installed yet, better use the 
-    <a href="http://download.eclipse.org/dsdp/tm/downloads/">downloads from this site</a>.</p>
-<!--[insert static HTML here]-->
-<div id="data"><!-- this is where the transformed data goes --></div>
-</body>
-</html>
diff --git a/releng/org.eclipse.rse.updatesite/site.xml b/releng/org.eclipse.rse.updatesite/site.xml
deleted file mode 100644
index 6b1d0487c..000000000
--- a/releng/org.eclipse.rse.updatesite/site.xml
+++ /dev/null
@@ -1,684 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Copyright (c) 2006, 2009 Wind River Systems, Inc. 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:
-    Martin Oberhuber (Wind River) - initial API and implementation
- -->
-
-<site pack200="true" 
-	mirrorsURL="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/updates/2.0/site.xml&amp;format=xml&amp;protocol=http"
-	digestURL="http://download.eclipse.org/dsdp/tm/updates/2.0/">
-<!-- was disabled due to bug 163406 digestURL="http://download.eclipse.org/dsdp/tm/updates/2.0/" -->
-   <description url="http://download.eclipse.org/dsdp/tm/updates/2.0/">
-      This is the Target Management Project 2.0 Update Site.
-   </description>
-<!-- BEGIN_2_0 -->
-   <feature url="features/org.eclipse.rse.sdk_2.0.0.v20070609-7J--E7ZoHIP4RfkXykCt2OjoBujq.jar" id="org.eclipse.rse.sdk" version="2.0.0.v20070609-7J--E7ZoHIP4RfkXykCt2OjoBujq">
-      <category name="TM and RSE 2.0"/>
-   </feature>
-   <feature url="features/org.eclipse.rse_2.0.0.v20070609-7D--8mJIOQ6RwTkIMtp8OQKB.jar" id="org.eclipse.rse" version="2.0.0.v20070609-7D--8mJIOQ6RwTkIMtp8OQKB">
-      <category name="TM and RSE 2.0"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.examples_2.0.0.v20070609-6--9oA55P5M7Q.jar" id="org.eclipse.rse.examples" version="2.0.0.v20070609-6--9oA55P5M7Q">
-      <category name="TM and RSE 2.0"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.remotecdt_2.0.0.v20070609-4--8s733G3E3G.jar" id="org.eclipse.rse.remotecdt" version="2.0.0.v20070609-4--8s733G3E3G">
-      <category name="TM and RSE 2.0"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.discovery_2.0.0.v20070611-7J--E8McIJNJCPr.jar" id="org.eclipse.tm.discovery" version="2.0.0.v20070611-7J--E8McIJNJCPr">
-      <category name="TM and RSE 2.0"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.sdk_1.0.0.v20070609-7_--AvNDwNXrOcIwMflhNDDmDhHa.jar" id="org.eclipse.tm.terminal.sdk" version="1.0.0.v20070609-7_--AvNDwNXrOcIwMflhNDDmDhHa">
-      <category name="TM and RSE 2.0"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.core_2.0.0.v20070609-7P--EB7sQRxRjbc.jar" id="org.eclipse.rse.core" version="2.0.0.v20070609-7P--EB7sQRxRjbc">
-      <category name="TM and RSE 2.0"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.dstore_2.0.0.v20070609-7F--DUUEF6Ez0L1.jar" id="org.eclipse.rse.dstore" version="2.0.0.v20070609-7F--DUUEF6Ez0L1">
-      <category name="TM and RSE 2.0"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.ftp_2.0.0.v20070609-77378_kE77Y7U9K5G7A.jar" id="org.eclipse.rse.ftp" version="2.0.0.v20070609-77378_kE77Y7U9K5G7A">
-      <category name="TM and RSE 2.0"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.local_2.0.0.v20070609-7_--AgI99h9c9c.jar" id="org.eclipse.rse.local" version="2.0.0.v20070609-7_--AgI99h9c9c">
-      <category name="TM and RSE 2.0"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.ssh_2.0.0.v20070609-78--_kE77Y7U7U.jar" id="org.eclipse.rse.ssh" version="2.0.0.v20070609-78--_kE77Y7U7U">
-      <category name="TM and RSE 2.0"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.telnet_2.0.0.v20070609-6378AgI99h9cEU5G7A.jar" id="org.eclipse.rse.telnet" version="2.0.0.v20070609-6378AgI99h9cEU5G7A">
-      <category name="TM and RSE 2.0"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.tests_2.0.0.v20070609-6--9oA55P5M7J.jar" id="org.eclipse.rse.tests" version="2.0.0.v20070609-6--9oA55P5M7J">
-      <category name="TM and RSE 2.0"/>
-   </feature>
-   <category-def name="TM and RSE 2.0" label="TM and RSE 2.0">
-      <description>
-         Features and add-ons of the 2.0 release of Target Management / RSE.
-      </description>
-   </category-def>
-<!-- END_2_0 -->
-<!-- BEGIN_2_0_patches -->
-   <feature url="features/org.eclipse.rse.sdk_2.0.0.v20070706-7J--E7ZoHIP4TfeXykCt2OjqBvjq.jar" id="org.eclipse.rse.sdk" version="2.0.0.v20070706-7J--E7ZoHIP4TfeXykCt2OjqBvjq">
-      <category name="TM and RSE 2.0 patches (aka 2.0.0.1)"/>
-   </feature>
-   <feature url="features/org.eclipse.rse_2.0.0.v20070706-7D--8mJIOQ6RwTkIMvp9OQKB.jar" id="org.eclipse.rse" version="2.0.0.v20070706-7D--8mJIOQ6RwTkIMvp9OQKB">
-      <category name="TM and RSE 2.0 patches (aka 2.0.0.1)"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.core_2.0.0.v20070706-7P--EB7sQRxRkbd.jar" id="org.eclipse.rse.core" version="2.0.0.v20070706-7P--EB7sQRxRkbd">
-      <category name="TM and RSE 2.0 patches (aka 2.0.0.1)"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.ftp_2.0.0.v20070706-77378_kE77Y7V9K5G7A.jar" id="org.eclipse.rse.ftp" version="2.0.0.v20070706-77378_kE77Y7V9K5G7A">
-      <category name="TM and RSE 2.0 patches (aka 2.0.0.1)"/>
-   </feature>
-   <category-def name="TM and RSE 2.0 patches (aka 2.0.0.1)" label="TM and RSE 2.0 patches (aka 2.0.0.1)">
-      <description>
-         Patches for features and add-ons of the 2.0 release of Target Management / RSE.
-      </description>
-   </category-def>
-<!-- END_2_0_patches -->
-<!-- BEGIN_2_0_1 -->
-   <feature url="features/org.eclipse.rse.sdk_2.0.1.v20070926-7J-77E7ZoHOP4inkX-oUe-z-wI6x.jar" id="org.eclipse.rse.sdk" version="2.0.1.v20070926-7J-77E7ZoHOP4inkX-oUe-z-wI6x">
-      <category name="TM and RSE 2.0.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse_2.0.1.v20070926-7D-58mJIkP9WAviqV7HBvSLC.jar" id="org.eclipse.rse" version="2.0.1.v20070926-7D-58mJIkP9WAviqV7HBvSLC">
-      <category name="TM and RSE 2.0.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.examples_2.0.0.v20070609-6--9oA55P5M7Q.jar" id="org.eclipse.rse.examples" version="2.0.0.v20070609-6--9oA55P5M7Q">
-      <category name="TM and RSE 2.0.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.remotecdt_2.0.1.v20070926-4-18s733G3K5H.jar" id="org.eclipse.rse.remotecdt" version="2.0.1.v20070926-4-18s733G3K5H">
-      <category name="TM and RSE 2.0.1"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.discovery_2.0.0.v20070611-7J--E8McIJNJCPr.jar" id="org.eclipse.tm.discovery" version="2.0.0.v20070611-7J--E8McIJNJCPr">
-      <category name="TM and RSE 2.0.1"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.sdk_1.0.1.v20070926-7_-77AvNHwNY0SWJ6NvlhNDDmDtI.jar" id="org.eclipse.tm.terminal.sdk" version="1.0.1.v20070926-7_-77AvNHwNY0SWJ6NvlhNDDmDtI">
-      <category name="TM and RSE 2.0.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.core_2.0.1.v20070926-7P-7BEB7sQRxSFkT.jar" id="org.eclipse.rse.core" version="2.0.1.v20070926-7P-7BEB7sQRxSFkT">
-      <category name="TM and RSE 2.0.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.dstore_2.0.1.v20070926-7F-4DUUEF6FALu.jar" id="org.eclipse.rse.dstore" version="2.0.1.v20070926-7F-4DUUEF6FALu">
-      <category name="TM and RSE 2.0.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.ftp_2.0.1.v20070926-7737__kE77Y7dDK4I7B.jar" id="org.eclipse.rse.ftp" version="2.0.1.v20070926-7737__kE77Y7dDK4I7B">
-      <category name="TM and RSE 2.0.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.local_2.0.1.v20070705-7_-2AgI99h9l9l.jar" id="org.eclipse.rse.local" version="2.0.1.v20070705-7_-2AgI99h9l9l">
-      <category name="TM and RSE 2.0.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.ssh_2.0.1.v20070926-78-2_kE77Y7cAW.jar" id="org.eclipse.rse.ssh" version="2.0.1.v20070926-78-2_kE77Y7cAW">
-      <category name="TM and RSE 2.0.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.telnet_2.0.1.v20070704-637AAgI99h9mBW4I7B.jar" id="org.eclipse.rse.telnet" version="2.0.1.v20070704-637AAgI99h9mBW4I7B">
-      <category name="TM and RSE 2.0.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.tests_2.0.1.v20070926-6-19oA55P5SAG.jar" id="org.eclipse.rse.tests" version="2.0.1.v20070926-6-19oA55P5SAG">
-      <category name="TM and RSE 2.0.1"/>
-   </feature>
-   <category-def name="TM and RSE 2.0.1" label="TM and RSE 2.0.1">
-      <description>
-         Features and add-ons of the 2.0.1 release of Target Management / RSE.
-      </description>
-   </category-def>
-<!-- END_2_0_1 -->
-<!-- BEGIN_2_0_2 -->
-   <feature url="features/org.eclipse.rse.sdk_2.0.2.v20071030-7J-79E7ZoHPP5ZoeZ-oUe1z-wJnl.jar" id="org.eclipse.rse.sdk" version="2.0.2.v20071030-7J-79E7ZoHPP5ZoeZ-oUe1z-wJnl">
-      <category name="TM and RSE 2.0.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse_2.0.2.v20071030-7D-68mJIkR9WAviqV8z0U9vz-C.jar" id="org.eclipse.rse" version="2.0.2.v20071030-7D-68mJIkR9WAviqV8z0U9vz-C">
-      <category name="TM and RSE 2.0.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.examples_2.0.0.v20070609-6--9oA55P5M7Q.jar" id="org.eclipse.rse.examples" version="2.0.0.v20070609-6--9oA55P5M7Q">
-      <category name="TM and RSE 2.0.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.remotecdt_2.0.1.v20070926-4-18s733G3K5H.jar" id="org.eclipse.rse.remotecdt" version="2.0.1.v20070926-4-18s733G3K5H">
-      <category name="TM and RSE 2.0.2"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.discovery_2.0.0.v20070611-7J--E8McIJNJCPr.jar" id="org.eclipse.tm.discovery" version="2.0.0.v20070611-7J--E8McIJNJCPr">
-      <category name="TM and RSE 2.0.2"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.sdk_1.0.2.v20071030-7_-7CAvNKwNabWDLhQglhNDDmGSL.jar" id="org.eclipse.tm.terminal.sdk" version="1.0.2.v20071030-7_-7CAvNKwNabWDLhQglhNDDmGSL">
-      <category name="TM and RSE 2.0.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.core_2.0.2.v20071030-7P-7DEB7sQRxTz0jQb.jar" id="org.eclipse.rse.core" version="2.0.2.v20071030-7P-7DEB7sQRxTz0jQb">
-      <category name="TM and RSE 2.0.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.dstore_2.0.1.v20070926-7F-4DUUEF6FALu.jar" id="org.eclipse.rse.dstore" version="2.0.1.v20070926-7F-4DUUEF6FALu">
-      <category name="TM and RSE 2.0.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.ftp_2.0.1.v20070926-7737__kE77Y7dDK4I7B.jar" id="org.eclipse.rse.ftp" version="2.0.1.v20070926-7737__kE77Y7dDK4I7B">
-      <category name="TM and RSE 2.0.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.local_2.0.1.v20070705-7_-2AgI99h9l9l.jar" id="org.eclipse.rse.local" version="2.0.1.v20070705-7_-2AgI99h9l9l">
-      <category name="TM and RSE 2.0.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.ssh_2.0.1.v20070926-78-2_kE77Y7cAW.jar" id="org.eclipse.rse.ssh" version="2.0.1.v20070926-78-2_kE77Y7cAW">
-      <category name="TM and RSE 2.0.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.telnet_2.0.1.v20070704-637AAgI99h9mBW4I7B.jar" id="org.eclipse.rse.telnet" version="2.0.1.v20070704-637AAgI99h9mBW4I7B">
-      <category name="TM and RSE 2.0.2"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal_1.0.2.v20071030-1-17w31182141.jar" id="org.eclipse.tm.terminal" version="1.0.2.v20071030-1-17w31182141">
-      <category name="TM and RSE 2.0.2"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.serial_1.0.2.v20071030-1-17w31182141.jar" id="org.eclipse.tm.terminal.serial" version="1.0.2.v20071030-1-17w31182141">
-      <category name="TM and RSE 2.0.2"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.view_1.0.2.v20071023-1-17w31182134.jar" id="org.eclipse.tm.terminal.view" version="1.0.2.v20071023-1-17w31182134">
-      <category name="TM and RSE 2.0.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.tests_2.0.1.v20070926-6-19oA55P5SAG.jar" id="org.eclipse.rse.tests" version="2.0.1.v20070926-6-19oA55P5SAG">
-      <category name="TM and RSE 2.0.2"/>
-   </feature>
-   <category-def name="TM and RSE 2.0.2" label="TM and RSE 2.0.2">
-      <description>
-         Features and add-ons of the 2.0.2 release of Target Management / RSE.
-      </description>
-   </category-def>
-<!-- END_2_0_2 -->
-<!-- BEGIN_2_0_3 -->
-   <feature url="features/org.eclipse.rse.sdk_2.0.3.v20080225-7J-7EE7ZoHQURqoFwQQpz0MuGUHD.jar" id="org.eclipse.rse.sdk" version="2.0.3.v20080225-7J-7EE7ZoHQURqoFwQQpz0MuGUHD">
-      <category name="TM and RSE 2.0.3"/>
-   </feature>
-   <feature url="features/org.eclipse.rse_2.0.3.v20080225-7D-7A8mJIoa9WAvksISSE8yz-C.jar" id="org.eclipse.rse" version="2.0.3.v20080225-7D-7A8mJIoa9WAvksISSE8yz-C">
-      <category name="TM and RSE 2.0.3"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.examples_2.0.0.v20070609-6--9oA55P5M7Q.jar" id="org.eclipse.rse.examples" version="2.0.0.v20070609-6--9oA55P5M7Q">
-      <category name="TM and RSE 2.0.3"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.remotecdt_2.0.1.v20070926-4-18s733G3K5H.jar" id="org.eclipse.rse.remotecdt" version="2.0.1.v20070926-4-18s733G3K5H">
-      <category name="TM and RSE 2.0.3"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.discovery_2.0.0.v20070611-7J--E8McIJNJCPr.jar" id="org.eclipse.tm.discovery" version="2.0.0.v20070611-7J--E8McIJNJCPr">
-      <category name="TM and RSE 2.0.3"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.sdk_1.0.3.v20080225-7_-7QAvNRwRYVZHJaTqlhNDDqELO.jar" id="org.eclipse.tm.terminal.sdk" version="1.0.3.v20080225-7_-7QAvNRwRYVZHJaTqlhNDDqELO">
-      <category name="TM and RSE 2.0.3"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.core_2.0.3.v20080225-7P-7IEB7sQRz0SoiTb.jar" id="org.eclipse.rse.core" version="2.0.3.v20080225-7P-7IEB7sQRz0SoiTb">
-      <category name="TM and RSE 2.0.3"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.dstore_2.0.1.v20070926-7F-4DUUEF6FALu.jar" id="org.eclipse.rse.dstore" version="2.0.1.v20070926-7F-4DUUEF6FALu">
-      <category name="TM and RSE 2.0.3"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.ftp_2.0.3.v20080225-7737D_kE77a7PDI4I7B.jar" id="org.eclipse.rse.ftp" version="2.0.3.v20080225-7737D_kE77a7PDI4I7B">
-      <category name="TM and RSE 2.0.3"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.local_2.0.1.v20070705-7_-2AgI99h9l9l.jar" id="org.eclipse.rse.local" version="2.0.1.v20070705-7_-2AgI99h9l9l">
-      <category name="TM and RSE 2.0.3"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.ssh_2.0.3.v20080225-78-6_kE77a7OAU.jar" id="org.eclipse.rse.ssh" version="2.0.3.v20080225-78-6_kE77a7OAU">
-      <category name="TM and RSE 2.0.3"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.telnet_2.0.1.v20070704-637AAgI99h9mBW4I7B.jar" id="org.eclipse.rse.telnet" version="2.0.1.v20070704-637AAgI99h9mBW4I7B">
-      <category name="TM and RSE 2.0.3"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal_1.0.3.v20080225-1-27w31191336.jar" id="org.eclipse.tm.terminal" version="1.0.3.v20080225-1-27w31191336">
-      <category name="TM and RSE 2.0.3"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.serial_1.0.2.v20071030-1-17w31182141.jar" id="org.eclipse.tm.terminal.serial" version="1.0.2.v20071030-1-17w31182141">
-      <category name="TM and RSE 2.0.3"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.ssh_1.0.3.v20080225-1-27w31191336.jar" id="org.eclipse.tm.terminal.ssh" version="1.0.3.v20080225-1-27w31191336">
-      <category name="TM and RSE 2.0.3"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.telnet_1.0.3.v20080225-1-27w31191336.jar" id="org.eclipse.tm.terminal.telnet" version="1.0.3.v20080225-1-27w31191336">
-      <category name="TM and RSE 2.0.3"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.view_1.0.3.v20080225-1-27w31191336.jar" id="org.eclipse.tm.terminal.view" version="1.0.3.v20080225-1-27w31191336">
-      <category name="TM and RSE 2.0.3"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.tests_2.0.1.v20070926-6-19oA55P5SAG.jar" id="org.eclipse.rse.tests" version="2.0.1.v20070926-6-19oA55P5SAG">
-      <category name="TM and RSE 2.0.3"/>
-   </feature>
-   <category-def name="TM and RSE 2.0.3" label="TM and RSE 2.0.3">
-      <description>
-         Features and add-ons of the 2.0.3 release of Target Management / RSE.
-      </description>
-   </category-def>
-<!-- END_2_0_3 -->
-<!-- BEGIN_2_0_4 -->
-   <feature url="features/org.eclipse.rse.sdk_2.0.4.v20080418-7J-7GE7ZoHQVRsnIwSQpz0OuGULB.jar" id="org.eclipse.rse.sdk" version="2.0.4.v20080418-7J-7GE7ZoHQVRsnIwSQpz0OuGULB">
-      <category name="TM and RSE 2.0.4"/>
-   </feature>
-   <feature url="features/org.eclipse.rse_2.0.4.v20080418-7D-7B8mJIoc9WAvksIWQK8yz-C.jar" id="org.eclipse.rse" version="2.0.4.v20080418-7D-7B8mJIoc9WAvksIWQK8yz-C">
-      <category name="TM and RSE 2.0.4"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.examples_2.0.0.v20070609-6--9oA55P5M7Q.jar" id="org.eclipse.rse.examples" version="2.0.0.v20070609-6--9oA55P5M7Q">
-      <category name="TM and RSE 2.0.4"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.remotecdt_2.0.1.v20070926-4-18s733G3K5H.jar" id="org.eclipse.rse.remotecdt" version="2.0.1.v20070926-4-18s733G3K5H">
-      <category name="TM and RSE 2.0.4"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.discovery_2.0.0.v20070611-7J--E8McIJNJCPr.jar" id="org.eclipse.tm.discovery" version="2.0.0.v20070611-7J--E8McIJNJCPr">
-      <category name="TM and RSE 2.0.4"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.sdk_1.0.3.v20080225-7_-7QAvNRwRYVZHJaTqlhNDDqELO.jar" id="org.eclipse.tm.terminal.sdk" version="1.0.3.v20080225-7_-7QAvNRwRYVZHJaTqlhNDDqELO">
-      <category name="TM and RSE 2.0.4"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.core_2.0.3.v20080225-7P-7IEB7sQRz0SoiTb.jar" id="org.eclipse.rse.core" version="2.0.3.v20080225-7P-7IEB7sQRz0SoiTb">
-      <category name="TM and RSE 2.0.4"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.dstore_2.0.1.v20070926-7F-4DUUEF6FALu.jar" id="org.eclipse.rse.dstore" version="2.0.1.v20070926-7F-4DUUEF6FALu">
-      <category name="TM and RSE 2.0.4"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.ftp_2.0.4.v20080418-7737F_kE77a7TBO4I7B.jar" id="org.eclipse.rse.ftp" version="2.0.4.v20080418-7737F_kE77a7TBO4I7B">
-      <category name="TM and RSE 2.0.4"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.local_2.0.1.v20070705-7_-2AgI99h9l9l.jar" id="org.eclipse.rse.local" version="2.0.1.v20070705-7_-2AgI99h9l9l">
-      <category name="TM and RSE 2.0.4"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.ssh_2.0.3.v20080225-78-6_kE77a7OAU.jar" id="org.eclipse.rse.ssh" version="2.0.3.v20080225-78-6_kE77a7OAU">
-      <category name="TM and RSE 2.0.4"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.telnet_2.0.1.v20070704-637AAgI99h9mBW4I7B.jar" id="org.eclipse.rse.telnet" version="2.0.1.v20070704-637AAgI99h9mBW4I7B">
-      <category name="TM and RSE 2.0.4"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal_1.0.3.v20080225-1-27w31191336.jar" id="org.eclipse.tm.terminal" version="1.0.3.v20080225-1-27w31191336">
-      <category name="TM and RSE 2.0.4"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.serial_1.0.2.v20071030-1-17w31182141.jar" id="org.eclipse.tm.terminal.serial" version="1.0.2.v20071030-1-17w31182141">
-      <category name="TM and RSE 2.0.4"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.ssh_1.0.3.v20080225-1-27w31191336.jar" id="org.eclipse.tm.terminal.ssh" version="1.0.3.v20080225-1-27w31191336">
-      <category name="TM and RSE 2.0.4"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.telnet_1.0.3.v20080225-1-27w31191336.jar" id="org.eclipse.tm.terminal.telnet" version="1.0.3.v20080225-1-27w31191336">
-      <category name="TM and RSE 2.0.4"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.view_1.0.3.v20080225-1-27w31191336.jar" id="org.eclipse.tm.terminal.view" version="1.0.3.v20080225-1-27w31191336">
-      <category name="TM and RSE 2.0.4"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.tests_2.0.1.v20070926-6-19oA55P5SAG.jar" id="org.eclipse.rse.tests" version="2.0.1.v20070926-6-19oA55P5SAG">
-      <category name="TM and RSE 2.0.4"/>
-   </feature>
-   <category-def name="TM and RSE 2.0.4" label="TM and RSE 2.0.4">
-      <description>
-         Features and add-ons of the 2.0.4 release of Target Management / RSE.
-      </description>
-   </category-def>
-<!-- END_2_0_4 -->
-<!-- BEGIN_3_0 -->
-   <feature url="features/org.eclipse.rse.core_3.0.0.v20080609-7Z3-EB7sQS9RiVd.jar" id="org.eclipse.rse.core" version="3.0.0.v20080609-7Z3-EB7sQS9RiVd">
-      <category name="TM and RSE 3.0"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.dstore_3.0.0.v20080609-7J3-DUUEFDEyF.jar" id="org.eclipse.rse.dstore" version="3.0.0.v20080609-7J3-DUUEFDEyF">
-      <category name="TM and RSE 3.0"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.ftp_3.0.0.v20080609-78478_kE77c7O7W5I55.jar" id="org.eclipse.rse.ftp" version="3.0.0.v20080609-78478_kE77c7O7W5I55">
-      <category name="TM and RSE 3.0"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.local_2.1.0.v20080604-7_4-AgI99m9c9S.jar" id="org.eclipse.rse.local" version="2.1.0.v20080604-7_4-AgI99m9c9S">
-      <category name="TM and RSE 3.0"/>
-   </feature>
-   <feature url="features/org.eclipse.rse_3.0.0.v20080609-7H3-8qfbaJJZCz-G-QT8RWUC6.jar" id="org.eclipse.rse" version="3.0.0.v20080609-7H3-8qfbaJJZCz-G-QT8RWUC6">
-      <category name="TM and RSE 3.0"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.sdk_3.0.0.v20080609-7Q3-E8VwNKi_uz0rSEApXAaTcHQS.jar" id="org.eclipse.rse.sdk" version="3.0.0.v20080609-7Q3-E8VwNKi_uz0rSEApXAaTcHQS">
-      <category name="TM and RSE 3.0"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.ssh_2.1.0.v20080604-783-_kE77c7U7M.jar" id="org.eclipse.rse.ssh" version="2.1.0.v20080604-783-_kE77c7U7M">
-      <category name="TM and RSE 3.0"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.telnet_2.1.0.v20080604-6678AgI99m9W9W5I55.jar" id="org.eclipse.rse.telnet" version="2.1.0.v20080604-6678AgI99m9W9W5I55">
-      <category name="TM and RSE 3.0"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.examples_3.0.0.v20080604-780-9oA55S5M5G.jar" id="org.eclipse.rse.examples" version="3.0.0.v20080604-780-9oA55S5M5G">
-      <category name="TM and RSE 3.0"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.remotecdt_2.1.0.v20080604-41-8s733I3E39.jar" id="org.eclipse.rse.remotecdt" version="2.1.0.v20080604-41-8s733I3E39">
-      <category name="TM and RSE 3.0"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.terminals_0.1.0.v20080610-22-9sB6EO_O8X2842.jar" id="org.eclipse.rse.terminals" version="0.1.0.v20080610-22-9sB6EO_O8X2842">
-      <category name="TM and RSE 3.0"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.useractions_1.1.0.v20080604-21-8s733I3E3A.jar" id="org.eclipse.rse.useractions" version="1.1.0.v20080604-21-8s733I3E3A">
-      <category name="TM and RSE 3.0"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.wince_0.1.0.v20080604-02-9oA55S5M5I.jar" id="org.eclipse.rse.wince" version="0.1.0.v20080604-02-9oA55S5M5I" os="win32" arch="x86">
-      <category name="TM and RSE 3.0"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.discovery_3.0.0.v20080530-7N-E8ME8McIJXIwdh.jar" id="org.eclipse.tm.discovery" version="3.0.0.v20080530-7N-E8ME8McIJXIwdh">
-      <category name="TM and RSE 3.0"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.sdk_2.0.0.v20080609-7J--B-NDwSXnUKIyQYlhNDDrDeLT.jar" id="org.eclipse.tm.terminal.sdk" version="2.0.0.v20080609-7J--B-NDwSXnUKIyQYlhNDDrDeLT">
-      <category name="TM and RSE 3.0"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.tests_3.0.0.v20080605-7D3_79oA55S5M5J.jar" id="org.eclipse.rse.tests" version="3.0.0.v20080605-7D3_79oA55S5M5J">
-      <category name="TM and RSE 3.0"/>
-   </feature>
-   <category-def name="TM and RSE 3.0" label="TM and RSE 3.0">
-      <description>
-         Features and add-ons of the 3.0 release of Target Management / RSE.
-      </description>
-   </category-def>
-<!-- END_3_0 -->
-<!-- BEGIN_3_0_1 -->
-   <feature url="features/org.eclipse.rse.core_3.0.1.v200809171600-7Z379EB7sQS9S4YPJaHC.jar" id="org.eclipse.rse.core" version="3.0.1.v200809171600-7Z379EB7sQS9S4YPJaHC">
-      <category name="TM and RSE 3.0.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.dstore_3.0.1.v200809181500-7J32DUUEFDF8Hu9FH7.jar" id="org.eclipse.rse.dstore" version="3.0.1.v200809181500-7J32DUUEFDF8Hu9FH7">
-      <category name="TM and RSE 3.0.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.ftp_3.0.1.v200809171630-78479_kE77c7Q8b8T_F.jar" id="org.eclipse.rse.ftp" version="3.0.1.v200809171630-78479_kE77c7Q8b8T_F">
-      <category name="TM and RSE 3.0.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.local_2.1.1.v20080710-7_40AgI99m9d_O.jar" id="org.eclipse.rse.local" version="2.1.1.v20080710-7_40AgI99m9d_O">
-      <category name="TM and RSE 3.0.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse_3.0.1.v200809181500-7H368qfenEMeUOENNFdiKV_gK8.jar" id="org.eclipse.rse" version="3.0.1.v200809181500-7H368qfenEMeUOENNFdiKV_gK8">
-      <category name="TM and RSE 3.0.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.sdk_3.0.1.v200809181500-7Q379E8VwNRiAF6ydJFuZH7RGg1d.jar" id="org.eclipse.rse.sdk" version="3.0.1.v200809181500-7Q379E8VwNRiAF6ydJFuZH7RGg1d">
-      <category name="TM and RSE 3.0.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.ssh_2.1.1.v20080714-7830_kE77c7V8M.jar" id="org.eclipse.rse.ssh" version="2.1.1.v20080714-7830_kE77c7V8M">
-      <category name="TM and RSE 3.0.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.telnet_2.1.1.v200809181500-6678AgI99m9W9X5J79.jar" id="org.eclipse.rse.telnet" version="2.1.1.v200809181500-6678AgI99m9W9X5J79">
-      <category name="TM and RSE 3.0.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.examples_3.0.0.v20080604-780-9oA55S5M5G.jar" id="org.eclipse.rse.examples" version="3.0.0.v20080604-780-9oA55S5M5G">
-      <category name="TM and RSE 3.0.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.remotecdt_2.1.1.v200809041200-4118s733I3J4F5C48.jar" id="org.eclipse.rse.remotecdt" version="2.1.1.v200809041200-4118s733I3J4F5C48">
-      <category name="TM and RSE 3.0.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.terminals_0.1.1.v200809041200-2229sB7EO_T_T5C6B3457.jar" id="org.eclipse.rse.terminals" version="0.1.1.v200809041200-2229sB7EO_T_T5C6B3457">
-      <category name="TM and RSE 3.0.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.useractions_1.1.1.v200809041200-2118s733I3K484673.jar" id="org.eclipse.rse.useractions" version="1.1.1.v200809041200-2118s733I3K484673">
-      <category name="TM and RSE 3.0.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.wince_0.1.1.v20080626-0219oA55S5M9M.jar" id="org.eclipse.rse.wince" version="0.1.1.v20080626-0219oA55S5M9M" os="win32" arch="x86">
-      <category name="TM and RSE 3.0.1"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.discovery_3.0.0.v20080530-7N-E8ME8McIJXIwdh.jar" id="org.eclipse.tm.discovery" version="3.0.0.v20080530-7N-E8ME8McIJXIwdh">
-      <category name="TM and RSE 3.0.1"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.sdk_2.0.1.v200807281235-7J-79B-NIwSXwVTN4Y0c5RRRNHYG.jar" id="org.eclipse.tm.terminal.sdk" version="2.0.1.v200807281235-7J-79B-NIwSXwVTN4Y0c5RRRNHYG">
-      <category name="TM and RSE 3.0.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.tests_3.0.1.v200809041200-7D3_99oA55S5R7H2311.jar" id="org.eclipse.rse.tests" version="3.0.1.v200809041200-7D3_99oA55S5R7H2311">
-      <category name="TM and RSE 3.0.1"/>
-   </feature>
-   <category-def name="TM and RSE 3.0.1" label="TM and RSE 3.0.1">
-      <description>
-         Features and add-ons of the 3.0.1 release of Target Management / RSE.
-      </description>
-   </category-def>
-<!-- END_3_0_1 -->
-<!-- BEGIN_3_0_2 -->
-   <feature url="features/org.eclipse.rse.core_3.0.2.v200812041720-7Z37BEB7sQS9UkXMIjJI.jar" id="org.eclipse.rse.core" version="3.0.2.v200812041720-7Z37BEB7sQS9UkXMIjJI">
-      <category name="TM and RSE 3.0.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.dstore_3.0.2.v200812041720-7J35DUUEFDHoHxAT97.jar" id="org.eclipse.rse.dstore" version="3.0.2.v200812041720-7J35DUUEFDHoHxAT97">
-      <category name="TM and RSE 3.0.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.ftp_3.0.1.v200809171630-78479_kE77c7Q8b8T_F.jar" id="org.eclipse.rse.ftp" version="3.0.1.v200809171630-78479_kE77c7Q8b8T_F">
-      <category name="TM and RSE 3.0.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.local_2.1.1.v20080710-7_40AgI99m9d_O.jar" id="org.eclipse.rse.local" version="2.1.1.v20080710-7_40AgI99m9d_O">
-      <category name="TM and RSE 3.0.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse_3.0.2.v200812041720-7H3788qfeqHMeUOEQ2IKjVLIiQ8.jar" id="org.eclipse.rse" version="3.0.2.v200812041720-7H3788qfeqHMeUOEQ2IKjVLIiQ8">
-      <category name="TM and RSE 3.0.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.sdk_3.0.2.v200812041720-7Q37BE8VwNShWC5jCH32fQz0U6Ng.jar" id="org.eclipse.rse.sdk" version="3.0.2.v200812041720-7Q37BE8VwNShWC5jCH32fQz0U6Ng">
-      <category name="TM and RSE 3.0.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.ssh_2.1.1.v20080714-7830_kE77c7V8M.jar" id="org.eclipse.rse.ssh" version="2.1.1.v20080714-7830_kE77c7V8M">
-      <category name="TM and RSE 3.0.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.telnet_2.1.1.v200809181500-6678AgI99m9W9X5J79.jar" id="org.eclipse.rse.telnet" version="2.1.1.v200809181500-6678AgI99m9W9X5J79">
-      <category name="TM and RSE 3.0.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.examples_3.0.0.v20080604-780-9oA55S5M5G.jar" id="org.eclipse.rse.examples" version="3.0.0.v20080604-780-9oA55S5M5G">
-      <category name="TM and RSE 3.0.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.remotecdt_2.1.1.v200809041200-4118s733I3J4F5C48.jar" id="org.eclipse.rse.remotecdt" version="2.1.1.v200809041200-4118s733I3J4F5C48">
-      <category name="TM and RSE 3.0.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.terminals_0.1.1.v200809041200-2229sB7EO_T_T5C6B3457.jar" id="org.eclipse.rse.terminals" version="0.1.1.v200809041200-2229sB7EO_T_T5C6B3457">
-      <category name="TM and RSE 3.0.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.useractions_1.1.2.v200812041720-2138s733I573A5G73.jar" id="org.eclipse.rse.useractions" version="1.1.2.v200812041720-2138s733I573A5G73">
-      <category name="TM and RSE 3.0.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.wince_0.1.1.v20080626-0219oA55S5M9M.jar" id="org.eclipse.rse.wince" version="0.1.1.v20080626-0219oA55S5M9M" os="win32" arch="x86">
-      <category name="TM and RSE 3.0.2"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.discovery_3.0.0.v20080530-7N-E8ME8McIJXIwdh.jar" id="org.eclipse.tm.discovery" version="3.0.0.v20080530-7N-E8ME8McIJXIwdh">
-      <category name="TM and RSE 3.0.2"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.sdk_2.0.2.v200811110900-7J-7AB-NJwSYqUMN5TqbBONRNHYG.jar" id="org.eclipse.tm.terminal.sdk" version="2.0.2.v200811110900-7J-7AB-NJwSYqUMN5TqbBONRNHYG">
-      <category name="TM and RSE 3.0.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.tests_3.0.1.v200809041200-7D3_99oA55S5R7H2311.jar" id="org.eclipse.rse.tests" version="3.0.1.v200809041200-7D3_99oA55S5R7H2311">
-      <category name="TM and RSE 3.0.2"/>
-   </feature>
-   <category-def name="TM and RSE 3.0.2" label="TM and RSE 3.0.2">
-      <description>
-         Features and add-ons of the 3.0.2 release of Target Management / RSE.
-      </description>
-   </category-def>
-<!-- END_3_0_2 -->
-<!-- BEGIN_3_0_3 -->
-   <feature url="features/org.eclipse.rse.core_3.0.3.v200902042310-7Z37HEB7sQSCRiULOVOE.jar" id="org.eclipse.rse.core" version="3.0.3.v200902042310-7Z37HEB7sQSCRiULOVOE">
-      <category name="TM and RSE 3.0.3"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.dstore_3.0.3.v200902042310-7J378DUUEFGEpIz-AW8E.jar" id="org.eclipse.rse.dstore" version="3.0.3.v200902042310-7J378DUUEFGEpIz-AW8E">
-      <category name="TM and RSE 3.0.3"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.ftp_3.0.1.v200809171630-78479_kE77c7Q8b8T_F.jar" id="org.eclipse.rse.ftp" version="3.0.1.v200809171630-78479_kE77c7Q8b8T_F">
-      <category name="TM and RSE 3.0.3"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.local_2.1.1.v20080710-7_40AgI99m9d_O.jar" id="org.eclipse.rse.local" version="2.1.1.v20080710-7_40AgI99m9d_O">
-      <category name="TM and RSE 3.0.3"/>
-   </feature>
-   <feature url="features/org.eclipse.rse_3.0.3.v200902042310-7H37E8qfisI6diJKMbrhR-TV-a3.jar" id="org.eclipse.rse" version="3.0.3.v200902042310-7H37E8qfisI6diJKMbrhR-TV-a3">
-      <category name="TM and RSE 3.0.3"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.sdk_3.0.3.v200902042310-7Q37JE8VwNSsU34mKIp3tM4Uhwlm.jar" id="org.eclipse.rse.sdk" version="3.0.3.v200902042310-7Q37JE8VwNSsU34mKIp3tM4Uhwlm">
-      <category name="TM and RSE 3.0.3"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.ssh_2.1.1.v20080714-7830_kE77c7V8M.jar" id="org.eclipse.rse.ssh" version="2.1.1.v20080714-7830_kE77c7V8M">
-      <category name="TM and RSE 3.0.3"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.telnet_2.1.1.v200809181500-6678AgI99m9W9X5J79.jar" id="org.eclipse.rse.telnet" version="2.1.1.v200809181500-6678AgI99m9W9X5J79">
-      <category name="TM and RSE 3.0.3"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.examples_3.0.0.v20080604-780-9oA55S5M5G.jar" id="org.eclipse.rse.examples" version="3.0.0.v20080604-780-9oA55S5M5G">
-      <category name="TM and RSE 3.0.3"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.remotecdt_2.1.1.v200809041200-4118s733I3J4F5C48.jar" id="org.eclipse.rse.remotecdt" version="2.1.1.v200809041200-4118s733I3J4F5C48">
-      <category name="TM and RSE 3.0.3"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.terminals_0.1.3.v200902181600-2269sB9EP_M_W5B5B3822.jar" id="org.eclipse.rse.terminals" version="0.1.3.v200902181600-2269sB9EP_M_W5B5B3822">
-      <category name="TM and RSE 3.0.3"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.useractions_1.1.2.v200812041720-2138s733I573A5G73.jar" id="org.eclipse.rse.useractions" version="1.1.2.v200812041720-2138s733I573A5G73">
-      <category name="TM and RSE 3.0.3"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.wince_0.1.1.v20080626-0219oA55S5M9M.jar" id="org.eclipse.rse.wince" version="0.1.1.v20080626-0219oA55S5M9M" os="win32" arch="x86">
-      <category name="TM and RSE 3.0.3"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.discovery_3.0.0.v20080530-7N-E8ME8McIJXIwdh.jar" id="org.eclipse.tm.discovery" version="3.0.0.v20080530-7N-E8ME8McIJXIwdh">
-      <category name="TM and RSE 3.0.3"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.sdk_2.0.3.v200902181600-7J-7EB-NLwTYlTNN4PlbFLKRNHYG.jar" id="org.eclipse.tm.terminal.sdk" version="2.0.3.v200902181600-7J-7EB-NLwTYlTNN4PlbFLKRNHYG">
-      <category name="TM and RSE 3.0.3"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.tests_3.0.1.v200809041200-7D3_99oA55S5R7H2311.jar" id="org.eclipse.rse.tests" version="3.0.1.v200809041200-7D3_99oA55S5R7H2311">
-      <category name="TM and RSE 3.0.3"/>
-   </feature>
-   <category-def name="TM and RSE 3.0.3" label="TM and RSE 3.0.3">
-      <description>
-         Features and add-ons of the 3.0.3 release of Target Management / RSE.
-      </description>
-   </category-def>
-<!-- END_3_0_3 -->
-<!-- BEGIN_3_1 -->
-   <feature url="features/org.eclipse.rse.core_3.1.0.v200905272300-7a7CEoFC7sRTNS_oZt3fk.jar" id="org.eclipse.rse.core" version="3.1.0.v200905272300-7a7CEoFC7sRTNS_oZt3fk">
-      <category name="TM and RSE 3.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.dstore_3.1.0.v200905272300-7L6EoEVVFGMFvQtVaPU.jar" id="org.eclipse.rse.dstore" version="3.1.0.v200905272300-7L6EoEVVFGMFvQtVaPU">
-      <category name="TM and RSE 3.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.ftp_3.0.100.v200905272300-780A79oB55W5KBQBD9D.jar" id="org.eclipse.rse.ftp" version="3.0.100.v200905272300-780A79oB55W5KBQBD9D">
-      <category name="TM and RSE 3.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.local_2.1.100.v200905272300-7B4EoBgJ99r9YJhJO99.jar" id="org.eclipse.rse.local" version="2.1.100.v200905272300-7B4EoBgJ99r9YJhJO99">
-      <category name="TM and RSE 3.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse_3.1.0.v200905272300-7L5A78wqaCHMdrOqK3DvjpYKCnp3.jar" id="org.eclipse.rse" version="3.1.0.v200905272300-7L5A78wqaCHMdrOqK3DvjpYKCnp3">
-      <category name="TM and RSE 3.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.sdk_3.1.0.v200905272300-7U78A7F8Wz-QWqV1Uz0r3gyz0Pcu.jar" id="org.eclipse.rse.sdk" version="3.1.0.v200905272300-7U78A7F8Wz-QWqV1Uz0r3gyz0Pcu">
-      <category name="TM and RSE 3.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.ssh_3.0.0.v200905272300-7A2BgAkF77g7RFZFJ77.jar" id="org.eclipse.rse.ssh" version="3.0.0.v200905272300-7A2BgAkF77g7RFZFJ77">
-      <category name="TM and RSE 3.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.telnet_2.2.0.v200905272300-773-AkF77g7RFZFIBF.jar" id="org.eclipse.rse.telnet" version="2.2.0.v200905272300-773-AkF77g7RFZFIBF">
-      <category name="TM and RSE 3.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.examples_3.1.0.v200905272300-7B5-AkF77g7RFZFJ77.jar" id="org.eclipse.rse.examples" version="3.1.0.v200905272300-7B5-AkF77g7RFZFJ77">
-      <category name="TM and RSE 3.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.terminals_1.0.0.v200905272300-77--9uC6FSANEbEMAF4522.jar" id="org.eclipse.rse.terminals" version="1.0.0.v200905272300-77--9uC6FSANEbEMAF4522">
-      <category name="TM and RSE 3.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.tests_3.1.0.v200905272300-7H5F8NAkF77g7RFZFJ77.jar" id="org.eclipse.rse.tests" version="3.1.0.v200905272300-7H5F8NAkF77g7RFZFJ77">
-      <category name="TM and RSE 3.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.useractions_1.1.100.v200905272300-31A78s733L3D7H7933.jar" id="org.eclipse.rse.useractions" version="1.1.100.v200905272300-31A78s733L3D7H7933">
-      <category name="TM and RSE 3.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.wince_0.2.0.v200905272300-15A7AkF77g7RFZFJ77.jar" id="org.eclipse.rse.wince" version="0.2.0.v200905272300-15A7AkF77g7RFZFJ77" os="win32" arch="x86">
-      <category name="TM and RSE 3.1"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.discovery_3.0.100.v200905272300-7d-FhJFEx2XZtYr4N3JXX.jar" id="org.eclipse.tm.discovery" version="3.0.100.v200905272300-7d-FhJFEx2XZtYr4N3JXX">
-      <category name="TM and RSE 3.1"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.sdk_3.0.0.v200905272300-7N-FBVC5OpbOz0uZ45hjchPQEB.jar" id="org.eclipse.tm.terminal.sdk" version="3.0.0.v200905272300-7N-FBVC5OpbOz0uZ45hjchPQEB">
-      <category name="TM and RSE 3.1"/>
-   </feature>
-   <category-def name="TM and RSE 3.1" label="TM and RSE 3.1">
-      <description>
-         Features and add-ons of the 3.1 release of Target Management / RSE.
-      </description>
-   </category-def>
-<!-- END_3_1 -->
-<!-- BEGIN_3_1_1 -->
-   <feature url="features/org.eclipse.rse.core_3.1.1.v200907301400-7a7CEwFC7sRTNSwodfv_u.jar" id="org.eclipse.rse.core" version="3.1.1.v200907301400-7a7CEwFC7sRTNSwodfv_u">
-      <category name="TM and RSE 3.1.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.dstore_3.1.1.v200907301400-7L6EsEVVFGMG4TyOVFU.jar" id="org.eclipse.rse.dstore" version="3.1.1.v200907301400-7L6EsEVVFGMG4TyOVFU">
-      <category name="TM and RSE 3.1.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.ftp_3.0.101.v200909160005-780A89oB55W5OAP9A9I.jar" id="org.eclipse.rse.ftp" version="3.0.101.v200909160005-780A89oB55W5OAP9A9I">
-      <category name="TM and RSE 3.1.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.local_2.1.101.v200907301400-7B4EqBgJ99r9dJ_GM9E.jar" id="org.eclipse.rse.local" version="2.1.101.v200907301400-7B4EqBgJ99r9dJ_GM9E">
-      <category name="TM and RSE 3.1.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse_3.1.1.v200907301400-7L5AE8wqaHPUdsOqKFUpxnbxGiz-.jar" id="org.eclipse.rse" version="3.1.1.v200907301400-7L5AE8wqaHPUdsOqKFUpxnbxGiz-">
-      <category name="TM and RSE 3.1.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.sdk_3.1.1.v200907301400-7U78AFF8Wz-QWxVKUVnCs7-PcuWk.jar" id="org.eclipse.rse.sdk" version="3.1.1.v200907301400-7U78AFF8Wz-QWxVKUVnCs7-PcuWk">
-      <category name="TM and RSE 3.1.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.ssh_3.0.1.v200909160005-7A2BhAkF77g7VEYDG7C.jar" id="org.eclipse.rse.ssh" version="3.0.1.v200909160005-7A2BhAkF77g7VEYDG7C">
-      <category name="TM and RSE 3.1.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.telnet_2.2.1.v200908051630-7730AkF77g7UDXELEF.jar" id="org.eclipse.rse.telnet" version="2.2.1.v200908051630-7730AkF77g7UDXELEF">
-      <category name="TM and RSE 3.1.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.examples_3.1.0.v200905272300-7B5-AkF77g7RFZFJ77.jar" id="org.eclipse.rse.examples" version="3.1.0.v200905272300-7B5-AkF77g7RFZFJ77">
-      <category name="TM and RSE 3.1.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.terminals_1.0.1.v200907301400-77-39uC7FSAW8XBVLD3622.jar" id="org.eclipse.rse.terminals" version="1.0.1.v200907301400-77-39uC7FSAW8XBVLD3622">
-      <category name="TM and RSE 3.1.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.tests_3.1.1.v200909160005-7H5F8PAkF77g7ZDXBD7H.jar" id="org.eclipse.rse.tests" version="3.1.1.v200909160005-7H5F8PAkF77g7ZDXBD7H">
-      <category name="TM and RSE 3.1.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.useractions_1.1.100.v200905272300-31A78s733L3D7H7933.jar" id="org.eclipse.rse.useractions" version="1.1.100.v200905272300-31A78s733L3D7H7933">
-      <category name="TM and RSE 3.1.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.wince_0.2.0.v200905272300-15A7AkF77g7RFZFJ77.jar" id="org.eclipse.rse.wince" version="0.2.0.v200905272300-15A7AkF77g7RFZFJ77" os="win32" arch="x86">
-      <category name="TM and RSE 3.1.1"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.discovery_3.0.100.v200905272300-7d-FhJFEx2XZtYr4N3JXX.jar" id="org.eclipse.tm.discovery" version="3.0.100.v200905272300-7d-FhJFEx2XZtYr4N3JXX">
-      <category name="TM and RSE 3.1.1"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.sdk_3.0.1.v200907301400-7N-FBaC5OqdP-0Zr1iqaZNOEG.jar" id="org.eclipse.tm.terminal.sdk" version="3.0.1.v200907301400-7N-FBaC5OqdP-0Zr1iqaZNOEG">
-      <category name="TM and RSE 3.1.1"/>
-   </feature>
-   <category-def name="TM and RSE 3.1.1" label="TM and RSE 3.1.1">
-      <description>
-         Features and add-ons of the 3.1.1 release of Target Management / RSE.
-      </description>
-   </category-def>
-<!-- END_3_1_1 -->
-<!-- BEGIN_3_1_2 -->
-   <feature url="features/org.eclipse.rse.core_3.1.1.qualifier.jar" id="org.eclipse.rse.core" version="3.1.1.qualifier">
-      <category name="TM and RSE 3.1.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.dstore_3.1.1.qualifier.jar" id="org.eclipse.rse.dstore" version="3.1.1.qualifier">
-      <category name="TM and RSE 3.1.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.ftp_3.0.101.qualifier.jar" id="org.eclipse.rse.ftp" version="3.0.101.qualifier">
-      <category name="TM and RSE 3.1.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.local_2.1.101.qualifier.jar" id="org.eclipse.rse.local" version="2.1.101.qualifier">
-      <category name="TM and RSE 3.1.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse_3.1.2.qualifier.jar" id="org.eclipse.rse" version="3.1.2.qualifier">
-      <category name="TM and RSE 3.1.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.sdk_3.1.2.qualifier.jar" id="org.eclipse.rse.sdk" version="3.1.2.qualifier">
-      <category name="TM and RSE 3.1.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.ssh_3.0.1.qualifier.jar" id="org.eclipse.rse.ssh" version="3.0.1.qualifier">
-      <category name="TM and RSE 3.1.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.telnet_2.2.1.qualifier.jar" id="org.eclipse.rse.telnet" version="2.2.1.qualifier">
-      <category name="TM and RSE 3.1.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.examples_3.1.0.qualifier.jar" id="org.eclipse.rse.examples" version="3.1.0.qualifier">
-      <category name="TM and RSE 3.1.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.terminals_1.0.2.qualifier.jar" id="org.eclipse.rse.terminals" version="1.0.2.qualifier">
-      <category name="TM and RSE 3.1.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.tests_3.1.1.qualifier.jar" id="org.eclipse.rse.tests" version="3.1.1.qualifier">
-      <category name="TM and RSE 3.1.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.useractions_1.1.100.qualifier.jar" id="org.eclipse.rse.useractions" version="1.1.100.qualifier">
-      <category name="TM and RSE 3.1.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.wince_0.2.0.qualifier.jar" id="org.eclipse.rse.wince" version="0.2.0.qualifier" os="win32" arch="x86">
-      <category name="TM and RSE 3.1.2"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.discovery_3.0.100.qualifier.jar" id="org.eclipse.tm.discovery" version="3.0.100.qualifier">
-      <category name="TM and RSE 3.1.2"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.sdk_3.0.2.qualifier.jar" id="org.eclipse.tm.terminal.sdk" version="3.0.2.qualifier">
-      <category name="TM and RSE 3.1.2"/>
-   </feature>
-   <category-def name="TM and RSE 3.1.2" label="TM and RSE 3.1.2">
-      <description>
-         Features and add-ons of the 3.1.2 release of Target Management / RSE.
-      </description>
-   </category-def>
-<!-- END_3_1_2 -->
-</site>
diff --git a/releng/org.eclipse.rse.updatesite/web/site.css b/releng/org.eclipse.rse.updatesite/web/site.css
deleted file mode 100644
index 62c6f9ffa..000000000
--- a/releng/org.eclipse.rse.updatesite/web/site.css
+++ /dev/null
@@ -1,12 +0,0 @@
-<STYLE type="text/css">
-td.spacer {padding-bottom: 10px; padding-top: 10px;}
-.title { font-family: sans-serif; color: #99AACC;}
-.bodyText { font-family: sans-serif; font-size: 9pt; color:#000000;  }
-.sub-header { font-family: sans-serif; font-style: normal; font-weight: bold; font-size: 9pt; color: white;}
-.log-text {font-family: sans-serif; font-style: normal; font-weight: lighter; font-size: 8pt; color:black;}
-.big-header { font-family: sans-serif; font-style: normal; font-weight: bold; font-size: 9pt; color: white; border-top:10px solid white;}
-.light-row {background:#FFFFFF}
-.dark-row {background:#EEEEFF}
-.header {background:#99AADD}
-#indent {word-wrap : break-word;width :300px;text-indent:10px;}
-</STYLE>
diff --git a/releng/org.eclipse.rse.updatesite/web/site.xsl b/releng/org.eclipse.rse.updatesite/web/site.xsl
deleted file mode 100644
index 070c3540e..000000000
--- a/releng/org.eclipse.rse.updatesite/web/site.xsl
+++ /dev/null
@@ -1,214 +0,0 @@
-<xsl:stylesheet version = '1.0' xmlns:xsl='http://www.w3.org/1999/XSL/Transform' xmlns:msxsl="urn:schemas-microsoft-com:xslt">
-<xsl:output method="html" encoding="UTF-8"/>
-<xsl:key name="cat" match="category" use="@name"/>
-<xsl:template match="/">
-<xsl:for-each select="site">
-	<html>
-	<head>
-	<title>Target Management Project 2.0 Updates</title>
-	<style>@import url("web/site.css");</style>
-	</head>
-	<body>
-
-	<p class="bodyText"><xsl:value-of select="description"/></p>
-	<table width="100%" border="0" cellspacing="1" cellpadding="2">
-	<xsl:for-each select="category-def">
-		<xsl:sort select="@label" order="ascending" case-order="upper-first"/>
-		<xsl:sort select="@name" order="ascending" case-order="upper-first"/>
-	<xsl:if test="count(key('cat',@name)) != 0">
-			<tr class="header">
-				<td class="sub-header" width="30%">
-					<xsl:value-of select="@name"/>
-				</td>
-				<td class="sub-header" width="70%">
-					<xsl:value-of select="@label"/>
-				</td>
-			</tr>
-			<xsl:for-each select="key('cat',@name)">
-			<xsl:sort select="ancestor::feature//@version" order="ascending"/>
-			<xsl:sort select="ancestor::feature//@id" order="ascending" case-order="upper-first"/>
-			<tr>
-				<xsl:choose>
-				<xsl:when test="(position() mod 2 = 1)">
-					<xsl:attribute name="class">dark-row</xsl:attribute>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:attribute name="class">light-row</xsl:attribute>
-				</xsl:otherwise>
-				</xsl:choose>
-				<td class="log-text" id="indent">
-						<xsl:choose>
-						<xsl:when test="ancestor::feature//@label">
-							<a href="{ancestor::feature//@url}"><xsl:value-of select="ancestor::feature//@label"/></a>
-							<br/>
-							<div id="indent">
-							(<xsl:value-of select="ancestor::feature//@id"/> - <xsl:value-of select="ancestor::feature//@version"/>)
-							</div>
-						</xsl:when>
-						<xsl:otherwise>
-						<a href="{ancestor::feature//@url}"><xsl:value-of select="ancestor::feature//@id"/> - <xsl:value-of select="ancestor::feature//@version"/></a>
-						</xsl:otherwise>
-						</xsl:choose>
-						<br />
-				</td>
-				<td>
-					<table>
-						<xsl:if test="ancestor::feature//@os">
-							<tr><td class="log-text" id="indent">Operating Systems:</td>
-							<td class="log-text" id="indent"><xsl:value-of select="ancestor::feature//@os"/></td>
-							</tr>
-						</xsl:if>
-						<xsl:if test="ancestor::feature//@ws">
-							<tr><td class="log-text" id="indent">Windows Systems:</td>
-							<td class="log-text" id="indent"><xsl:value-of select="ancestor::feature//@ws"/></td>
-							</tr>
-						</xsl:if>
-						<xsl:if test="ancestor::feature//@nl">
-							<tr><td class="log-text" id="indent">Languages:</td>
-							<td class="log-text" id="indent"><xsl:value-of select="ancestor::feature//@nl"/></td>
-							</tr>
-						</xsl:if>
-						<xsl:if test="ancestor::feature//@arch">
-							<tr><td class="log-text" id="indent">Architecture:</td>
-							<td class="log-text" id="indent"><xsl:value-of select="ancestor::feature//@arch"/></td>
-							</tr>
-						</xsl:if>
-					</table>
-				</td>
-			</tr>
-			</xsl:for-each>
-			<tr><td class="spacer"><br/></td><td class="spacer"><br/></td></tr>
-		</xsl:if>
-	</xsl:for-each>
-	<xsl:if test="count(feature)  &gt; count(feature/category)">
-	<tr class="header">
-		<td class="sub-header" colspan="2">
-		Uncategorized
-		</td>
-	</tr>
-	</xsl:if>
-	<xsl:choose>
-	<xsl:when test="function-available('msxsl:node-set')">
-	   <xsl:variable name="rtf-nodes">
-		<xsl:for-each select="feature[not(category)]">
-			<xsl:sort select="@id" order="ascending" case-order="upper-first"/>
-			<xsl:sort select="@version" order="ascending" />
-			<xsl:value-of select="."/>
-			<xsl:copy-of select="." />
-		</xsl:for-each>
-	   </xsl:variable>
-	   <xsl:variable name="myNodeSet" select="msxsl:node-set($rtf-nodes)/*"/>
-	<xsl:for-each select="$myNodeSet">
-	<tr>
-		<xsl:choose>
-		<xsl:when test="position() mod 2 = 1">
-		<xsl:attribute name="class">dark-row</xsl:attribute>
-		</xsl:when>
-		<xsl:otherwise>
-		<xsl:attribute name="class">light-row</xsl:attribute>
-		</xsl:otherwise>
-		</xsl:choose>
-		<td class="log-text" id="indent">
-			<xsl:choose>
-			<xsl:when test="@label">
-				<a href="{@url}"><xsl:value-of select="@label"/></a>
-				<br />
-				<div id="indent">
-				(<xsl:value-of select="@id"/> - <xsl:value-of select="@version"/>)
-				</div>
-			</xsl:when>
-			<xsl:otherwise>
-				<a href="{@url}"><xsl:value-of select="@id"/> - <xsl:value-of select="@version"/></a>
-			</xsl:otherwise>
-			</xsl:choose>
-			<br /><br />
-		</td>
-		<td>
-			<table>
-				<xsl:if test="@os">
-					<tr><td class="log-text" id="indent">Operating Systems:</td>
-					<td class="log-text" id="indent"><xsl:value-of select="@os"/></td>
-					</tr>
-				</xsl:if>
-				<xsl:if test="@ws">
-					<tr><td class="log-text" id="indent">Windows Systems:</td>
-					<td class="log-text" id="indent"><xsl:value-of select="@ws"/></td>
-					</tr>
-				</xsl:if>
-				<xsl:if test="@nl">
-					<tr><td class="log-text" id="indent">Languages:</td>
-					<td class="log-text" id="indent"><xsl:value-of select="@nl"/></td>
-					</tr>
-				</xsl:if>
-				<xsl:if test="@arch">
-					<tr><td class="log-text" id="indent">Architecture:</td>
-					<td class="log-text" id="indent"><xsl:value-of select="@arch"/></td>
-					</tr>
-				</xsl:if>
-			</table>
-		</td>
-	</tr>
-	</xsl:for-each>
-	</xsl:when>
-	<xsl:otherwise>
-	<xsl:for-each select="feature[not(category)]">
-	<xsl:sort select="@id" order="ascending" case-order="upper-first"/>
-	<xsl:sort select="@version" order="ascending" />
-	<tr>
-		<xsl:choose>
-		<xsl:when test="count(preceding-sibling::feature[not(category)]) mod 2 = 1">
-		<xsl:attribute name="class">dark-row</xsl:attribute>
-		</xsl:when>
-		<xsl:otherwise>
-		<xsl:attribute name="class">light-row</xsl:attribute>
-		</xsl:otherwise>
-		</xsl:choose>
-		<td class="log-text" id="indent">
-			<xsl:choose>
-			<xsl:when test="@label">
-				<a href="{@url}"><xsl:value-of select="@label"/></a>
-				<br />
-				<div id="indent">
-				(<xsl:value-of select="@id"/> - <xsl:value-of select="@version"/>)
-				</div>
-			</xsl:when>
-			<xsl:otherwise>
-				<a href="{@url}"><xsl:value-of select="@id"/> - <xsl:value-of select="@version"/></a>
-			</xsl:otherwise>
-			</xsl:choose>
-			<br /><br />
-		</td>
-		<td>
-			<table>
-				<xsl:if test="@os">
-					<tr><td class="log-text" id="indent">Operating Systems:</td>
-					<td class="log-text" id="indent"><xsl:value-of select="@os"/></td>
-					</tr>
-				</xsl:if>
-				<xsl:if test="@ws">
-					<tr><td class="log-text" id="indent">Windows Systems:</td>
-					<td class="log-text" id="indent"><xsl:value-of select="@ws"/></td>
-					</tr>
-				</xsl:if>
-				<xsl:if test="@nl">
-					<tr><td class="log-text" id="indent">Languages:</td>
-					<td class="log-text" id="indent"><xsl:value-of select="@nl"/></td>
-					</tr>
-				</xsl:if>
-				<xsl:if test="@arch">
-					<tr><td class="log-text" id="indent">Architecture:</td>
-					<td class="log-text" id="indent"><xsl:value-of select="@arch"/></td>
-					</tr>
-				</xsl:if>
-			</table>
-		</td>
-	</tr>
-	</xsl:for-each>
-	</xsl:otherwise>
-	</xsl:choose>
-	</table>
-	</body>
-	</html>
-</xsl:for-each>
-</xsl:template>
-</xsl:stylesheet>
diff --git a/releng/org.eclipse.tm.releng.master-feature/.project b/releng/org.eclipse.tm.releng.master-feature/.project
deleted file mode 100644
index 2bf620474..000000000
--- a/releng/org.eclipse.tm.releng.master-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.tm.releng.master-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/releng/org.eclipse.tm.releng.master-feature/build.properties b/releng/org.eclipse.tm.releng.master-feature/build.properties
deleted file mode 100644
index 1284a5491..000000000
--- a/releng/org.eclipse.tm.releng.master-feature/build.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-################################################################################
-# Copyright (c) 2006, 2008 Wind River Systems, Inc.
-# 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: 
-# Martin Oberhuber - initial API and implementation 
-################################################################################
-bin.includes = feature.xml,\
-               license.html,\
-               feature.properties,\
-               epl-v10.html,\
-               eclipse_update_120.jpg
diff --git a/releng/org.eclipse.tm.releng.master-feature/eclipse_update_120.jpg b/releng/org.eclipse.tm.releng.master-feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/releng/org.eclipse.tm.releng.master-feature/eclipse_update_120.jpg
+++ /dev/null
diff --git a/releng/org.eclipse.tm.releng.master-feature/epl-v10.html b/releng/org.eclipse.tm.releng.master-feature/epl-v10.html
deleted file mode 100644
index 9321f4082..000000000
--- a/releng/org.eclipse.tm.releng.master-feature/epl-v10.html
+++ /dev/null
@@ -1,256 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-
-
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Eclipse Public License - Version 1.0</title>
-
-<style type="text/css">
-  body {
-    size: 8.5in 11.0in;
-    margin: 0.25in 0.5in 0.25in 0.5in;
-    tab-interval: 0.5in;
-    }
-  p {  	
-    margin-left: auto;
-    margin-top:  0.5em;
-    margin-bottom: 0.5em;
-    }
-  p.list {
-  	margin-left: 0.5in;
-    margin-top:  0.05em;
-    margin-bottom: 0.05em;
-    }
-  </style></head><body lang="EN-US">
-
-<p align="center"><b>Eclipse Public License - v 1.0</b></p>
-
-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.</p>
-
-<p><b>1. DEFINITIONS</b></p>
-
-<p>"Contribution" means:</p>
-
-<p class="list">a) in the case of the initial Contributor, the initial
-code and documentation distributed under this Agreement, and</p>
-<p class="list">b) in the case of each subsequent Contributor:</p>
-<p class="list">i) changes to the Program, and</p>
-<p class="list">ii) additions to the Program;</p>
-<p class="list">where such changes and/or additions to the Program
-originate from and are distributed by that particular Contributor. A
-Contribution 'originates' from a Contributor if it was added to the
-Program by such Contributor itself or anyone acting on such
-Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii)
-are not derivative works of the Program.</p>
-
-<p>"Contributor" means any person or entity that distributes
-the Program.</p>
-
-<p>"Licensed Patents" mean patent claims licensable by a
-Contributor which are necessarily infringed by the use or sale of its
-Contribution alone or when combined with the Program.</p>
-
-<p>"Program" means the Contributions distributed in accordance
-with this Agreement.</p>
-
-<p>"Recipient" means anyone who receives the Program under
-this Agreement, including all Contributors.</p>
-
-<p><b>2. GRANT OF RIGHTS</b></p>
-
-<p class="list">a) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works
-of, publicly display, publicly perform, distribute and sublicense the
-Contribution of such Contributor, if any, and such derivative works, in
-source code and object code form.</p>
-
-<p class="list">b) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell,
-offer to sell, import and otherwise transfer the Contribution of such
-Contributor, if any, in source code and object code form. This patent
-license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor,
-such addition of the Contribution causes such combination to be covered
-by the Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.</p>
-
-<p class="list">c) Recipient understands that although each Contributor
-grants the licenses to its Contributions set forth herein, no assurances
-are provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility to
-secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow Recipient
-to distribute the Program, it is Recipient's responsibility to acquire
-that license before distributing the Program.</p>
-
-<p class="list">d) Each Contributor represents that to its knowledge it
-has sufficient copyright rights in its Contribution, if any, to grant
-the copyright license set forth in this Agreement.</p>
-
-<p><b>3. REQUIREMENTS</b></p>
-
-<p>A Contributor may choose to distribute the Program in object code
-form under its own license agreement, provided that:</p>
-
-<p class="list">a) it complies with the terms and conditions of this
-Agreement; and</p>
-
-<p class="list">b) its license agreement:</p>
-
-<p class="list">i) effectively disclaims on behalf of all Contributors
-all warranties and conditions, express and implied, including warranties
-or conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;</p>
-
-<p class="list">ii) effectively excludes on behalf of all Contributors
-all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;</p>
-
-<p class="list">iii) states that any provisions which differ from this
-Agreement are offered by that Contributor alone and not by any other
-party; and</p>
-
-<p class="list">iv) states that source code for the Program is available
-from such Contributor, and informs licensees how to obtain it in a
-reasonable manner on or through a medium customarily used for software
-exchange.</p>
-
-<p>When the Program is made available in source code form:</p>
-
-<p class="list">a) it must be made available under this Agreement; and</p>
-
-<p class="list">b) a copy of this Agreement must be included with each
-copy of the Program.</p>
-
-<p>Contributors may not remove or alter any copyright notices contained
-within the Program.</p>
-
-<p>Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.</p>
-
-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
-
-<p>Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use of
-the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create
-potential liability for other Contributors. Therefore, if a Contributor
-includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and
-indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses")
-arising from claims, lawsuits and other legal actions brought by a third
-party against the Indemnified Contributor to the extent caused by the
-acts or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In
-order to qualify, an Indemnified Contributor must: a) promptly notify
-the Commercial Contributor in writing of such claim, and b) allow the
-Commercial Contributor to control, and cooperate with the Commercial
-Contributor in, the defense and any related settlement negotiations. The
-Indemnified Contributor may participate in any such claim at its own
-expense.</p>
-
-<p>For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.</p>
-
-<p><b>5. NO WARRANTY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED 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. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable laws,
-damage to or loss of data, programs or equipment, and unavailability or
-interruption of operations.</p>
-
-<p><b>6. DISCLAIMER OF LIABILITY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
-
-<p><b>7. GENERAL</b></p>
-
-<p>If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.</p>
-
-<p>If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.</p>
-
-<p>All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.</p>
-
-<p>Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.</p>
-
-<p>This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No party
-to this Agreement will bring a legal action under this Agreement more
-than one year after the cause of action arose. Each party waives its
-rights to a jury trial in any resulting litigation.</p>
-
-</body></html>
-\ No newline at end of file
diff --git a/releng/org.eclipse.tm.releng.master-feature/feature.properties b/releng/org.eclipse.tm.releng.master-feature/feature.properties
deleted file mode 100644
index 1e294ba62..000000000
--- a/releng/org.eclipse.tm.releng.master-feature/feature.properties
+++ /dev/null
@@ -1,142 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2009 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:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# NLS_MESSAGEFORMAT_NONE
-# NLS_ENCODING=UTF-8
-
-# "featureName" property - name of the feature
-featureName=TM Releng Master Feature
-
-# "description" property - description of the feature
-description=All of Target Management in one Feature
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org - DSDP
-
-# "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management Updates
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2000, 2009 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-This product includes software developed by the\n\
-Apache Software Foundation http://www.apache.org/
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/releng/org.eclipse.tm.releng.master-feature/feature.xml b/releng/org.eclipse.tm.releng.master-feature/feature.xml
deleted file mode 100644
index 9a718bbe6..000000000
--- a/releng/org.eclipse.tm.releng.master-feature/feature.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Copyright (c) 2008, 2009 Wind River Systems, Inc. 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:
-         IBM Corporation - initial API and implementation
- -->
-
-<feature
-      id="org.eclipse.tm.releng.master"
-      label="%featureName"
-      version="3.0.0.qualifier"
-      provider-name="%providerName"
-      image="eclipse_update_120.jpg">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/>
-      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/>
-   </url>
-
-   <includes
-         id="org.eclipse.rse.sdk"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.tm.terminal.sdk"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.tm.discovery"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.rse.useractions.wrapper"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.rse.wince.wrapper"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.rse.examples"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.rse.tests"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.tm.terminal.test"
-         version="0.0.0"/>
-
-</feature>
diff --git a/releng/org.eclipse.tm.releng.master-feature/license.html b/releng/org.eclipse.tm.releng.master-feature/license.html
deleted file mode 100644
index c6af966b6..000000000
--- a/releng/org.eclipse.tm.releng.master-feature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/releng/org.eclipse.tm.releng/.cvsignore b/releng/org.eclipse.tm.releng/.cvsignore
deleted file mode 100644
index 3a4edf690..000000000
--- a/releng/org.eclipse.tm.releng/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-.project
diff --git a/releng/org.eclipse.tm.releng/build.xml b/releng/org.eclipse.tm.releng/build.xml
deleted file mode 100644
index 1d4767e05..000000000
--- a/releng/org.eclipse.tm.releng/build.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<project default="main">
-	<property name="pde.build.scripts" value="../org.eclipse.releng.basebuilder/plugins/org.eclipse.pde.build/scripts" />
-
-	<target name="init">
-		<tstamp/>
-		<touch file="${user.home}/.cvspass" />
-		<property name="timestamp" value="${DSTAMP}${TSTAMP}" />
-		<property name="buildDirectory" value="${basedir}/src/eclipse" />
-
-		<property name="buildType" value="I" />
-		<property name="buildId" value="${buildType}${timestamp}" />
-		
-		<!-- Verify buildDirectory ends in eclipse. -->
-		<property name="fullBuild" location="${buildDirectory}"/>
-		<basename file="${fullBuild}" property="lastSeg"/>
-		<condition property="endsInEclipse">
-			<equals arg1="${lastSeg}" arg2="eclipse"/>
-		</condition>
-		<fail message="buildDirectory's last segment is not eclipse." unless="endsInEclipse"/>
-	</target>
-
-	<target name="main" depends="init">
-		<ant antfile="build.xml" dir="${pde.build.scripts}">
-			<property name="builder" value="${basedir}/${component}" />
-		</ant>
-	</target>
-</project>
-\ No newline at end of file
diff --git a/releng/org.eclipse.tm.releng/buildAll.xml b/releng/org.eclipse.tm.releng/buildAll.xml
deleted file mode 100644
index bc33b9f5a..000000000
--- a/releng/org.eclipse.tm.releng/buildAll.xml
+++ /dev/null
@@ -1,227 +0,0 @@
-<project default="run">
-	<target name="init">
-
-		<echo message="Set compilerArgs = '-enableJavadoc -encoding ISO-8859-1 -warn:-serial,nls,unused,unchecked,raw'"/>
-		<property name="compilerArg" value="-enableJavadoc -encoding ISO-8859-1 -warn:-serial,nls,unused,unchecked,raw" />
-
-		<!-- TODO: set correct source and target levels here -->
-		<echo message="Set javacSource and javacTarget = 1.4"/>
-		<property name="javacSource" value="1.4" />
-		<property name="javacTarget" value="1.4" />
-		
-		<path id="bc">
-			<fileset dir="${java.home}/lib">
-				<include name="*.jar" />
-			</fileset>
-		</path>
-		<property name="bootclasspath" refid="bc" />
-
-		<!-- TODO: if using JDK1.4, comment out these lines -->
-		<!--
-		<echo message="Set J2SE-1.5 = ${bootclasspath}"/>
-		<property name="J2SE-1.5" value="${bootclasspath}"/>
-		<condition property="bundleBootClasspath" value="${J2SE-1.5}"><isset property="J2SE-1.5"/></condition>
-		<condition property="bundleJavacSource" value="1.5"><isset property="J2SE-1.5"/></condition>
-		<condition property="bundleJavacTarget" value="1.5"><isset property="J2SE-1.5"/></condition>
-		-->
-		
-		<property name="buildingOSGi" value="true" />
-		<property name="collectingFolder" value="eclipse" />
-		<property name="archivePrefix" value="eclipse" />
-
-		<!-- Reduce the amount of info in the build log -->
-		<property name="javacVerbose" value="false" />
-
-		<property name="buildDirectory" location="${basedir}/../src/eclipse" />
-		<property file="${basedir}/repoInfo.properties" />
-		<property name="testBase" location="${buildDirectory}/../testing" />
-		<available file="${buildDirectory}/label.properties" property="label.properties.exists" />
-		<antcall target="create.label.properties" />
-		<property file="${buildDirectory}/label.properties" />
-		
-		<echo message="buildAll.xml properties:"/>
-		<echo message="basedir = ${basedir}"/>
-
-		<!-- load a value for ${subprojectName}, among other variables, from build.cfg -->
-		<property name="buildConfigFile" value="${basedir}/../build.cfg"/>
-		<available file="${buildConfigFile}" type="file" property="buildConfigIsAvailable" />
-		<fail message="Can't load build properties from ${buildConfigFile}" unless="buildConfigIsAvailable"/>
-		<!-- TODO: set any special build-related properties here by echoing them into ${buildConfigFile}:
-		<echo file="${buildConfigFile}" append="true">
-
-# extra properties specific to just this build
-propertyName=propertyValue
-</echo>	-->
-
-		<property file="${buildConfigFile}" />
-
-		<echo message="buildVer = ${buildVer}"/>
-		<echo message="subprojectName = ${subprojectName}"/>
-
-		<!-- <echo message="Base OS: ${baseos}; Base Window System: ${basews}"/> -->
-		<condition property="isWindows">
-			<equals arg1="${baseos}.${basews}" arg2="win32.win32" />
-		</condition>
-		<condition property="isLinuxGTK">
-			<equals arg1="${baseos}.${basews}" arg2="linux.gtk" />
-		</condition>
-		<condition property="isLinuxMotif">
-			<equals arg1="${baseos}.${basews}" arg2="linux.motif" />
-		</condition>
-
-	</target>
-
-	<target name="create.label.properties" unless="label.properties.exists">
-		<mkdir dir="${buildDirectory}" />
-		<tstamp />
-		<property name="date" value="${DSTAMP}" />
-		<property name="time" value="${TSTAMP}" />
-		<property name="timestamp" value="${date}${time}" />
-		<property name="buildType" value="I" />
-
-		<!--this naming convention used by php scripts on download server-->
-		<property name="buildLabel" value="${buildType}${timestamp}" />
-
-		<property name="buildAlias" value="${buildLabel}" />
-		<property name="buildId" value="${buildAlias}" />
-		<!-- <property name="forceContextQualifier" value="v${timestamp}"/> -->
-
-		<!--store the build label information in a file-->
-		<echo file="${buildDirectory}/label.properties" append="true" >
-		buildType=${buildType}
-		</echo>
-		<echo file="${buildDirectory}/label.properties" append="true">
-		buildId=${buildId}
-		</echo>
-		<echo file="${buildDirectory}/label.properties" append="true">
-		timestamp=${timestamp}
-		</echo>
-		<echo file="${buildDirectory}/label.properties" append="true">
-		buildLabel=${buildLabel}
-		</echo>
-		<echo file="${buildDirectory}/label.properties" append="true">
-		buildAlias=${buildAlias}
-		</echo>
-		<!--
-		<echo file="${buildDirectory}/label.properties" append="true" >
-		forceContextQualifier=${forceContextQualifier}
-		</echo>
-		-->
-	</target>
-
-	<target name="run" depends="init">
-		<antcall target="buildAll" />
-		<antcall target="test" />
-		<antcall target="publish" />
-		<antcall target="cleanUp" />
-	</target>
-
-	<target name="runTestsOnly" depends="init">
-		<delete dir="${buildDirectory}" />
-		<mkdir dir="${buildDirectory}/${buildLabel}" />
-		<copy todir="${buildDirectory}/${buildLabel}">
-			<fileset dir="${buildDirectory}/..">
-				<include name="**/*.zip" />
-			</fileset>
-		</copy>
-		<antcall target="test" />
-		<antcall target="publish" />
-		<antcall target="cleanUp" />
-	</target>
-
-	<target name="runWithoutTest" depends="init">
-		<antcall target="buildAll" />
-		<antcall target="publish" />
-		<antcall target="cleanUp" />
-	</target>
-
-	<target name="buildOnly" depends="init">
-		<antcall target="buildAll" />
-		<antcall target="cleanUp" />
-	</target>
-
-	<target name="buildAll">
-		<ant antfile="build.xml" target="main">
-			<property name="component" value="builder/terminal" />
-		</ant>
-		<ant antfile="build.xml" target="main">
-			<property name="component" value="builder/sdk" />
-		</ant>
-		<ant antfile="build.xml" target="main">
-			<property name="component" value="builder/runtime" />
-		</ant>
-		<ant antfile="build.xml" target="main">
-			<property name="component" value="builder/examples" />
-		</ant>
-		<ant antfile="build.xml" target="main">
-			<property name="component" value="builder/discovery" />
-		</ant>
-		<ant antfile="build.xml" target="main">
-			<property name="component" value="builder/tests" />
-		</ant>
-
-		<!-- doc must be the last execution -->
-		<!-- we dont have a separate doc feature for TM/RSE, so leave that out for now
-		<ant antfile="build.xml" target="main">
-			<property name="component" value="builder/doc" />
-		</ant>
-		-->
-
-		<!-- TODO: if necessary, you can copy files from the SDK into the runtime or examples zips here  -->
-		<!-- for example, see validation/buildAll.xml or cdo/buildAll.xml -->
-			
-		<!-- TODO: if necessary, you can remove 3rd party jars used at build time from the zips here -->
-		<!-- for example, see cdo's buildAll.xml -->
-
-		<!-- TODO: you can run extra build scripts here, like for building additional zip bundles -->
-			
-		<!-- md5 files generation -->
-		<exec executable="bash" dir="${buildDirectory}/${buildLabel}">
-			<arg line="${basedir}/../org.eclipse.modeling.common.releng/scripts/createZipCheckSum.sh" />
-		</exec>
-	</target>
-
-	<target name="cleanUp">
-		<echo message="** Copying generated zips to drop folder... **" />
-		<copy todir="${buildDirectory}/.." failonerror="false" overwrite="true">
-			<fileset dir="${buildDirectory}/${buildLabel}" />
-		</copy>
-	</target>
-
-	<target name="test">
-		
-		<property name="test.xml" value="../org.eclipse.releng.basebuilder/plugins/org.eclipse.build.tools/scripts/test.xml" />
-		<antcall target="test-win32-local" />
-		<antcall target="test-linux-gtk-local" />
-		<antcall target="test-linux-motif-local" />
-	</target>
-
-	<target name="test-win32-local" if="isWindows">
-		<ant antfile="${test.xml}">
-			<property name="shell" value="relengbuildwin2.bat" />
-			<property name="tester" value="${basedir}/builder/tests/configs/local" />
-		</ant>
-	</target>
-
-	<target name="test-linux-gtk-local" if="isLinuxGTK">
-		<ant antfile="${test.xml}">
-			<property name="shell" value="relengbuildgtk.sh" />
-			<property name="tester" value="${basedir}/builder/tests/configs/local" />
-		</ant>
-	</target>
-
-	<target name="test-linux-motif-local" if="isLinuxMotif">
-		<ant antfile="${test.xml}">
-			<property name="shell" value="relengbuildmotif.sh" />
-			<property name="tester" value="${basedir}/builder/tests/configs/local" />
-		</ant>
-	</target>
-
-	<target name="publish">
-		<copy todir="${buildDirectory}/${buildLabel}" overwrite="true">
-			<fileset
-				dir="${buildDirectory}/../org.eclipse.modeling.common.releng/staticDropFiles" />
-		</copy>
-	</target>
-	
-</project>
diff --git a/releng/org.eclipse.tm.releng/builder/discovery/build.properties b/releng/org.eclipse.tm.releng/builder/discovery/build.properties
deleted file mode 100644
index 60a9131e9..000000000
--- a/releng/org.eclipse.tm.releng/builder/discovery/build.properties
+++ /dev/null
@@ -1,36 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2008 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:
-#     IBM Corporation - initial API and implementation
-# Martin Oberhuber (Wind River) - adapt for DSDP from o.e.emf.validation.releng
-###############################################################################
-# TODO: set correct source and target levels here
-javacSource=1.4
-javacTarget=1.4
-
-buildDirectory=${builder}/../eclipse
-buildType=I
-buildId=${buildId}
-buildLabel=${buildLabel}
-timestamp=0000
-collPlace=.
-collBase=.
-baseLocation=
-configs=*,*,*
-baseos=linux
-basews=gtk
-basearch=x86
-bootclasspath=${java.home}/lib/*.jar
-javacFailOnError=true
-javacVerbose=true
-javacDebugInfo=on
-zipargs=
-archivesFormat = *,*,*-antZip
-collectingFolder=eclipse
-archivePrefix=eclipse
-generateFeatureVersionSuffix=true
diff --git a/releng/org.eclipse.tm.releng/builder/discovery/customTargets.xml b/releng/org.eclipse.tm.releng/builder/discovery/customTargets.xml
deleted file mode 100644
index 54d7ac7eb..000000000
--- a/releng/org.eclipse.tm.releng/builder/discovery/customTargets.xml
+++ /dev/null
@@ -1,177 +0,0 @@
-<project name="Build specific targets and properties" default="noDefault" basedir=".">
-
-	<!-- ===================================================================== -->
-	<!-- Run a given ${target} on all elements being built -->
-	<!-- ===================================================================== -->
-	<target name="allElements">
-		<ant antfile="${genericTargets}" target="${target}">
-			<property name="type" value="feature" />
-			<property name="id" value="org.eclipse.tm.discovery" />
-		</ant>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Targets to assemble the built elements for particular configurations  -->
-	<!-- These generally call the generated assemble scripts (named in -->
-	<!-- ${assembleScriptName}) but may also add pre and post processing -->
-	<!-- Add one target for each root element and each configuration -->
-	<!-- ===================================================================== -->
-
-	<target name="assemble.org.eclipse.tm.discovery">
-		<property name="archiveName" value="TM-discovery-${buildAlias}.zip" />
-		<ant antfile="${assembleScriptName}" />
-		<!-- ADD POST STEPS -->
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Check out map files from correct repository -->
-	<!-- Replace values for cvsRoot, package and mapVersionTag as desired. -->
-	<!-- ===================================================================== -->
-	<target name="checkLocal">
-		<available property="mapsLocal" file="${buildDirectory}/maps" />
-	</target>
-
-	<target name="getMapFiles" depends="checkLocal" unless="mapsLocal">
-
-		<!-- ***  change the repo info -->
-		<property name="mapCvsRoot" value=":${cvsReadProtocol}:${cvsReadUser}@${cvsHost}:${cvsRep}" />
-
-		<property name="mapVersionTag" value="HEAD" />
-		<!-- <property name="packagePath" value="org.eclipse.${projectName}/org.eclipse.${subprojectName2}.releng/maps"/> -->
-		<property name="packagePath" value="org.eclipse.${projectName}.${subprojectName2}/releng/org.eclipse.${projectName}.releng/maps"/>
-
-		<cvs cvsRsh="ssh" cvsRoot="${mapCvsRoot}" tag="${mapVersionTag}" 
-			package="${packagePath}" dest="${buildDirectory}/maps" />
-		<copy todir="${buildDirectory}/maps/CVS" overwrite="true">
-			<fileset dir="${buildDirectory}/maps/${packagePath}/CVS" />
-		</copy>
-		<copy todir="${buildDirectory}/maps" overwrite="true">
-			<fileset dir="${buildDirectory}/maps/${packagePath}" />
-		</copy>
-		<delete dir="${buildDirectory}/maps/org.eclipse.${projectName}" />
-
-		<!--tag the map files project-->
-		<antcall target="tagMapFiles" />
-	</target>
-
-	<target name="tagMapFiles" if="tagMaps">
-		<cvs cvsRsh="ssh" dest="${buildDirectory}/maps" command="tag v${timestamp}" />
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before setup -->
-	<!-- ===================================================================== -->
-	<target name="preSetup">
-		<mkdir dir="${buildDirectory}/${buildLabel}"/>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after setup but before starting the build proper -->
-	<!-- ===================================================================== -->
-	<target name="postSetup">
-		<!-- TODO: if your project requires more dependencies, add them here; if it does not require all of these, remove those not required -->
-		<echo message="Download, then unpack: Eclipse, EMF ..." />
-		<ant target="getDependency" antfile="${buildDirectory}/../org.eclipse.modeling.common.releng/scripts/getDependencies.xml">
-			<property name="url" value="${eclipseURL}" />
-			<property name="file" value="${eclipseFile}" />
-			<property name="isUnpackedFile" value="${buildDirectory}/plugins/org.eclipse.platform.doc.isv/plugin.xml" />
-		</ant>
-		<ant target="getDependency" antfile="${buildDirectory}/../org.eclipse.modeling.common.releng/scripts/getDependencies.xml">
-			<property name="url" value="${emfURL}" />
-			<property name="file" value="${emfFile}" />
-			<property name="isUnpackedFile" value="${buildDirectory}/plugins/org.eclipse.emf.ecore/plugin.xml" />
-		</ant>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before fetching the build elements -->
-	<!-- ===================================================================== -->
-	<target name="preFetch">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the fetch -->
-	<!-- ===================================================================== -->
-	<target name="postFetch">
-		<replace dir="${buildDirectory}/plugins" value="${timestamp}" token="@buildid@">
-			<include name="**/about.mappings" />
-		</replace>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before generating build scripts -->
-	<!-- ===================================================================== -->
-	<target name="preGenerate">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after generating the build scripts -->
-	<!-- ===================================================================== -->
-	<target name="postGenerate">
-		<antcall target="clean" />
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before assembling -->
-	<!-- ===================================================================== -->
-	<target name="preAssemble">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after assembling-->
-	<!-- ===================================================================== -->
-	<target name="postAssemble">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before running the build.xmls for the elements being built. -->
-	<!-- ===================================================================== -->
-	<target name="preProcess">
-		<replace dir="${buildDirectory}/plugins" value="${timestamp}" token="@build@">
-			<include name="**/about.mappings" />
-		</replace>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after running the build.xmls for the elements being built. -->
-	<!-- ===================================================================== -->
-	<target name="postProcess">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after everything is built and assembled -->
-	<!-- (e.g., testing, posting, emailing, ...) -->
-	<!-- ===================================================================== -->
-	<target name="postBuild">
-		<antcall target="gatherLogs" />
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Helper targets -->
-	<!-- ===================================================================== -->
-	<target name="gatherLogs">
-		<mkdir dir="${buildDirectory}/${buildLabel}/compilelogs" />
-		<antcall target="allElements">
-			<param name="target" value="gatherLogs" />
-		</antcall>
-
-		<unzip dest="${buildDirectory}/${buildLabel}/compilelogs" overwrite="true">
-			<fileset dir="${buildDirectory}/features/org.eclipse.tm.discovery">
-				<include name="*.log.zip" />
-			</fileset>
-		</unzip>
-	</target>
-	<target name="clean" unless="noclean">
-		<antcall target="allElements">
-			<param name="target" value="cleanElement" />
-		</antcall>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Default target                                                        -->
-	<!-- ===================================================================== -->
-	<target name="noDefault">
-		<echo message="You must specify a target when invoking this file" />
-	</target>
-
-</project>
diff --git a/releng/org.eclipse.tm.releng/builder/doc/build.properties b/releng/org.eclipse.tm.releng/builder/doc/build.properties
deleted file mode 100644
index 918aa8e7f..000000000
--- a/releng/org.eclipse.tm.releng/builder/doc/build.properties
+++ /dev/null
@@ -1,37 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2008 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:
-#     IBM Corporation - initial API and implementation
-# Martin Oberhuber (Wind River) - adapt for DSDP from o.e.emf.validation.releng
-###############################################################################
-# TODO: set correct source and target levels here
-javacSource=1.4
-javacTarget=1.4
-
-buildDirectory=${builder}/../eclipse
-buildType=I
-buildId=${buildId}
-buildLabel=${buildLabel}
-timestamp=0000
-collPlace=.
-collBase=.
-baseLocation=
-configs=*,*,*
-baseos=linux
-basews=gtk
-basearch=x86
-bootclasspath=${java.home}/lib/*.jar
-javacFailOnError=true
-javacVerbose=true
-javacDebugInfo=on
-zipargs=
-archivesFormat = *,*,*-antZip
-collectingFolder=eclipse
-archivePrefix=eclipse
-generateFeatureVersionSuffix=true
-generateVersionsList=true
diff --git a/releng/org.eclipse.tm.releng/builder/doc/customTargets.xml b/releng/org.eclipse.tm.releng/builder/doc/customTargets.xml
deleted file mode 100644
index 1f3fab9bd..000000000
--- a/releng/org.eclipse.tm.releng/builder/doc/customTargets.xml
+++ /dev/null
@@ -1,186 +0,0 @@
-<project name="Build specific targets and properties" default="noDefault" basedir=".">
-
-	<!-- ===================================================================== -->
-	<!-- Run a given ${target} on all elements being built -->
-	<!-- ===================================================================== -->
-	<target name="allElements">
-		<ant antfile="${genericTargets}" target="${target}">
-			<property name="type" value="feature" />
-			<property name="id" value="org.eclipse.rse.doc" />
-		</ant>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Targets to assemble the built elements for particular configurations  -->
-	<!-- These generally call the generated assemble scripts (named in -->
-	<!-- ${assembleScriptName}) but may also add pre and post processing -->
-	<!-- Add one target for each root element and each configuration -->
-	<!-- ===================================================================== -->
-
-	<target name="assemble.org.eclipse.rse.doc">
-		<property name="archiveName" value="RSE-SDK-${buildAlias}.zip" />
-		<ant antfile="${assembleScriptName}" />
-		<!-- ADD POST STEPS -->
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Check out map files from correct repository -->
-	<!-- Replace values for cvsRoot, package and mapVersionTag as desired. -->
-	<!-- ===================================================================== -->
-	<target name="checkLocal">
-		<available property="mapsLocal" file="${buildDirectory}/maps" />
-	</target>
-
-	<target name="getMapFiles" depends="checkLocal" unless="mapsLocal">
-
-		<!-- ***  change the repo info -->
-		<property name="mapCvsRoot" value=":${cvsReadProtocol}:${cvsReadUser}@${cvsHost}:${cvsRep}" />
-		<property name="mapVersionTag" value="HEAD" />
-		<!-- <property name="packagePath" value="org.eclipse.${projectName}/org.eclipse.${subprojectName2}.releng/maps"/> -->
-		<property name="packagePath" value="org.eclipse.${projectName}.${subprojectName2}/releng/org.eclipse.${projectName}.releng/maps"/>
-
-		<cvs cvsRsh="ssh" cvsRoot="${mapCvsRoot}" tag="${mapVersionTag}" 
-			package="${packagePath}" dest="${buildDirectory}/maps" />
-		<copy todir="${buildDirectory}/maps/CVS" overwrite="true">
-			<fileset dir="${buildDirectory}/maps/${packagePath}/CVS" />
-		</copy>
-		<copy todir="${buildDirectory}/maps" overwrite="true">
-			<fileset dir="${buildDirectory}/maps/${packagePath}" />
-		</copy>
-		<delete dir="${buildDirectory}/maps/org.eclipse.${projectName}" />
-
-		<!--tag the map files project-->
-		<antcall target="tagMapFiles" />
-	</target>
-
-	<target name="tagMapFiles" if="tagMaps">
-		<cvs cvsRsh="ssh" dest="${buildDirectory}/maps" command="tag v${timestamp}" />
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before setup -->
-	<!-- ===================================================================== -->
-	<target name="preSetup">
-		<mkdir dir="${buildDirectory}/${buildLabel}" />
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after setup but before starting the build proper -->
-	<!-- ===================================================================== -->
-	<target name="postSetup">
-		<!-- TODO: if your project requires more dependencies, add them here; if it does not require all of these, remove those not required -->
-		<echo message="Download, then unpack: Eclipse, EMF ..." />
-		<ant target="getDependency" antfile="${buildDirectory}/../org.eclipse.modeling.common.releng/scripts/getDependencies.xml">
-			<property name="url" value="${eclipseURL}" />
-			<property name="file" value="${eclipseFile}" />
-			<property name="isUnpackedFile" value="${buildDirectory}/plugins/org.eclipse.platform.doc.isv/plugin.xml" />
-		</ant>
-
-		<!-- Important: This must be the last dependency downloaded, because the
-				getDependency target strips versions from all plug-ins -->
-		<echo message="Download Orbit Bundles ..." />
-		<ant target="getBundle" antfile="${buildDirectory}/../org.eclipse.modeling.common.releng/scripts/getDependenciesHelper.xml">
-			<property name="url" value="${orbitURL}"/>
-			<property name="file" value="${orbitFile}"/>
-		</ant>
-		<echo message="Unpack selected jars ..." />
-		<unzip dest="${buildDirectory}/.." src="${downloadsDir}/${orbitFile}">
-			<patternset>
-				<include name="**/org.apache.commons.net*.jar"/>
-			</patternset>
-		</unzip>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before fetching the build elements -->
-	<!-- ===================================================================== -->
-	<target name="preFetch">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the fetch -->
-	<!-- ===================================================================== -->
-	<target name="postFetch">
-		<replace dir="${buildDirectory}/plugins" value="${timestamp}" token="@buildid@">
-			<include name="**/about.mappings" />
-		</replace>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before generating build scripts -->
-	<!-- ===================================================================== -->
-	<target name="preGenerate">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after generating the build scripts -->
-	<!-- ===================================================================== -->
-	<target name="postGenerate">
-		<antcall target="clean" />
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before assembling -->
-	<!-- ===================================================================== -->
-	<target name="preAssemble">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after assembling-->
-	<!-- ===================================================================== -->
-	<target name="postAssemble">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before running the build.xmls for the elements being built. -->
-	<!-- ===================================================================== -->
-	<target name="preProcess">
-		<replace dir="${buildDirectory}/plugins" value="${timestamp}" token="@build@">
-			<include name="**/about.mappings" />
-		</replace>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after running the build.xmls for the elements being built. -->
-	<!-- ===================================================================== -->
-	<target name="postProcess">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after everything is built and assembled -->
-	<!-- (e.g., testing, posting, emailing, ...) -->
-	<!-- ===================================================================== -->
-	<target name="postBuild">
-		<antcall target="gatherLogs" />
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Helper targets -->
-	<!-- ===================================================================== -->
-	<target name="gatherLogs">
-		<mkdir dir="${buildDirectory}/${buildLabel}/compilelogs" />
-		<antcall target="allElements">
-			<param name="target" value="gatherLogs" />
-		</antcall>
-
-		<unzip dest="${buildDirectory}/${buildLabel}/compilelogs" overwrite="true">
-			<fileset dir="${buildDirectory}/features/org.eclipse.rse.doc">
-				<include name="*.log.zip" />
-			</fileset>
-		</unzip>
-	</target>
-
-	<target name="clean" unless="noclean">
-		<antcall target="allElements">
-			<param name="target" value="cleanElement" />
-		</antcall>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Default target                                                        -->
-	<!-- ===================================================================== -->
-	<target name="noDefault">
-		<echo message="You must specify a target when invoking this file" />
-	</target>
-
-</project>
diff --git a/releng/org.eclipse.tm.releng/builder/examples/build.properties b/releng/org.eclipse.tm.releng/builder/examples/build.properties
deleted file mode 100644
index 5cfbca4fd..000000000
--- a/releng/org.eclipse.tm.releng/builder/examples/build.properties
+++ /dev/null
@@ -1,36 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2008 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:
-#     IBM Corporation - initial API and implementation
-# Martin Oberhuber (Wind River) - adapt for DSDP from o.e.emf.validation.releng
-###############################################################################
-# TODO: set correct source and target levels here
-javacSource=1.4
-javacTarget=1.4
-
-buildDirectory=${builder}/../eclipse
-buildType=I
-buildId=${buildId}
-buildLabel=${buildLabel}
-timestamp=0000
-collPlace=.
-collBase=.
-baseLocation=
-configs=*,*,*
-baseos=linux
-basews=gtk
-basearch=x86
-bootclasspath=${java.home}/lib/*.jar
-javacFailOnError=true
-javacVerbose=true
-javacDebugInfo=on
-zipargs=
-archivesFormat = *,*,*-antZip
-collectingFolder=eclipse
-archivePrefix=eclipse
-generateFeatureVersionSuffix=true
-\ No newline at end of file
diff --git a/releng/org.eclipse.tm.releng/builder/examples/customTargets.xml b/releng/org.eclipse.tm.releng/builder/examples/customTargets.xml
deleted file mode 100644
index b3cc22559..000000000
--- a/releng/org.eclipse.tm.releng/builder/examples/customTargets.xml
+++ /dev/null
@@ -1,186 +0,0 @@
-<project name="Build specific targets and properties" default="noDefault" basedir=".">
-
-	<!-- ===================================================================== -->
-	<!-- Run a given ${target} on all elements being built -->
-	<!-- ===================================================================== -->
-	<target name="allElements">
-		<ant antfile="${genericTargets}" target="${target}">
-			<property name="type" value="feature" />
-			<property name="id" value="org.eclipse.rse.examples" />
-		</ant>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Targets to assemble the built elements for particular configurations  -->
-	<!-- These generally call the generated assemble scripts (named in -->
-	<!-- ${assembleScriptName}) but may also add pre and post processing -->
-	<!-- Add one target for each root element and each configuration -->
-	<!-- ===================================================================== -->
-
-	<target name="assemble.org.eclipse.rse.examples">
-		<property name="archiveName" value="RSE-examples-${buildAlias}.zip" />
-		<ant antfile="${assembleScriptName}" />
-		<!-- ADD POST STEPS -->
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Check out map files from correct repository -->
-	<!-- Replace values for cvsRoot, package and mapVersionTag as desired. -->
-	<!-- ===================================================================== -->
-	<target name="checkLocal">
-		<available property="mapsLocal" file="${buildDirectory}/maps" />
-	</target>
-
-	<target name="getMapFiles" depends="checkLocal" unless="mapsLocal">
-
-		<!-- ***  change the repo info -->
-		<property name="mapCvsRoot" value=":${cvsReadProtocol}:${cvsReadUser}@${cvsHost}:${cvsRep}" />
-		<property name="mapVersionTag" value="HEAD" />
-		<!-- <property name="packagePath" value="org.eclipse.${projectName}/org.eclipse.${subprojectName2}.releng/maps"/> -->
-		<property name="packagePath" value="org.eclipse.${projectName}.${subprojectName2}/releng/org.eclipse.${projectName}.releng/maps"/>
-
-		<cvs cvsRsh="ssh" cvsRoot="${mapCvsRoot}" tag="${mapVersionTag}" 
-			package="${packagePath}" dest="${buildDirectory}/maps" />
-		<copy todir="${buildDirectory}/maps/CVS" overwrite="true">
-			<fileset dir="${buildDirectory}/maps/${packagePath}/CVS" />
-		</copy>
-		<copy todir="${buildDirectory}/maps" overwrite="true">
-			<fileset dir="${buildDirectory}/maps/${packagePath}" />
-		</copy>
-		<delete dir="${buildDirectory}/maps/org.eclipse.${projectName}" />
-
-		<!--tag the map files project-->
-		<antcall target="tagMapFiles" />
-	</target>
-
-	<target name="tagMapFiles" if="tagMaps">
-		<cvs cvsRsh="ssh" dest="${buildDirectory}/maps" command="tag v${timestamp}" />
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before setup -->
-	<!-- ===================================================================== -->
-	<target name="preSetup">
-		<mkdir dir="${buildDirectory}/${buildLabel}"/>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after setup but before starting the build proper -->
-	<!-- ===================================================================== -->
-	<target name="postSetup">
-		<!-- TODO: if your project requires more dependencies, add them here; if it does not require all of these, remove those not required -->
-		<echo message="Download, then unpack: Eclipse, EMF ..." />
-		<ant target="getDependency" antfile="${buildDirectory}/../org.eclipse.modeling.common.releng/scripts/getDependencies.xml">
-			<property name="url" value="${eclipseURL}" />
-			<property name="file" value="${eclipseFile}" />
-			<property name="isUnpackedFile" value="${buildDirectory}/plugins/org.eclipse.platform.doc.isv/plugin.xml" />
-		</ant>
-
-		<!-- Important: This must be the last dependency downloaded, because the
-				getDependency target strips versions from all plug-ins -->
-		<echo message="Download Orbit Bundles ..." />
-		<ant target="getBundle" antfile="${buildDirectory}/../org.eclipse.modeling.common.releng/scripts/getDependenciesHelper.xml">
-			<property name="url" value="${orbitURL}"/>
-			<property name="file" value="${orbitFile}"/>
-		</ant>
-		<echo message="Unpack selected jars ..." />
-		<unzip dest="${buildDirectory}/.." src="${downloadsDir}/${orbitFile}">
-			<patternset>
-				<include name="**/org.apache.commons.net*.jar"/>
-			</patternset>
-		</unzip>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before fetching the build elements -->
-	<!-- ===================================================================== -->
-	<target name="preFetch">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the fetch -->
-	<!-- ===================================================================== -->
-	<target name="postFetch">
-		<replace dir="${buildDirectory}/plugins" value="${timestamp}" token="@buildid@">
-			<include name="**/about.mappings" />
-		</replace>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before generating build scripts -->
-	<!-- ===================================================================== -->
-	<target name="preGenerate">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after generating the build scripts -->
-	<!-- ===================================================================== -->
-	<target name="postGenerate">
-		<antcall target="clean" />
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before assembling -->
-	<!-- ===================================================================== -->
-	<target name="preAssemble">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after assembling-->
-	<!-- ===================================================================== -->
-	<target name="postAssemble">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before running the build.xmls for the elements being built. -->
-	<!-- ===================================================================== -->
-	<target name="preProcess">
-		<replace dir="${buildDirectory}/plugins" value="${timestamp}" token="@build@">
-			<include name="**/about.mappings" />
-		</replace>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after running the build.xmls for the elements being built. -->
-	<!-- ===================================================================== -->
-	<target name="postProcess">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after everything is built and assembled -->
-	<!-- (e.g., testing, posting, emailing, ...) -->
-	<!-- ===================================================================== -->
-	<target name="postBuild">
-		<antcall target="gatherLogs" />
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Helper targets -->
-	<!-- ===================================================================== -->
-	<target name="gatherLogs">
-		<mkdir dir="${buildDirectory}/${buildLabel}/compilelogs" />
-		<antcall target="allElements">
-			<param name="target" value="gatherLogs" />
-		</antcall>
-
-		<unzip dest="${buildDirectory}/${buildLabel}/compilelogs" overwrite="true">
-			<fileset dir="${buildDirectory}/features/org.eclipse.rse.examples">
-				<include name="*.log.zip" />
-			</fileset>
-		</unzip>
-	</target>
-
-	<target name="clean" unless="noclean">
-		<antcall target="allElements">
-			<param name="target" value="cleanElement" />
-		</antcall>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Default target                                                        -->
-	<!-- ===================================================================== -->
-	<target name="noDefault">
-		<echo message="You must specify a target when invoking this file" />
-	</target>
-
-</project>
diff --git a/releng/org.eclipse.tm.releng/builder/runtime/build.properties b/releng/org.eclipse.tm.releng/builder/runtime/build.properties
deleted file mode 100644
index 60a9131e9..000000000
--- a/releng/org.eclipse.tm.releng/builder/runtime/build.properties
+++ /dev/null
@@ -1,36 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2008 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:
-#     IBM Corporation - initial API and implementation
-# Martin Oberhuber (Wind River) - adapt for DSDP from o.e.emf.validation.releng
-###############################################################################
-# TODO: set correct source and target levels here
-javacSource=1.4
-javacTarget=1.4
-
-buildDirectory=${builder}/../eclipse
-buildType=I
-buildId=${buildId}
-buildLabel=${buildLabel}
-timestamp=0000
-collPlace=.
-collBase=.
-baseLocation=
-configs=*,*,*
-baseos=linux
-basews=gtk
-basearch=x86
-bootclasspath=${java.home}/lib/*.jar
-javacFailOnError=true
-javacVerbose=true
-javacDebugInfo=on
-zipargs=
-archivesFormat = *,*,*-antZip
-collectingFolder=eclipse
-archivePrefix=eclipse
-generateFeatureVersionSuffix=true
diff --git a/releng/org.eclipse.tm.releng/builder/runtime/customTargets.xml b/releng/org.eclipse.tm.releng/builder/runtime/customTargets.xml
deleted file mode 100644
index e685f2ab7..000000000
--- a/releng/org.eclipse.tm.releng/builder/runtime/customTargets.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<project name="Build specific targets and properties" default="noDefault" basedir=".">
-
-	<!-- ===================================================================== -->
-	<!-- Run a given ${target} on all elements being built -->
-	<!-- ===================================================================== -->
-	<target name="allElements">
-		<ant antfile="${genericTargets}" target="${target}">
-			<property name="type" value="feature" />
-			<property name="id" value="org.eclipse.rse" />
-		</ant>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Targets to assemble the built elements for particular configurations  -->
-	<!-- These generally call the generated assemble scripts (named in -->
-	<!-- ${assembleScriptName}) but may also add pre and post processing -->
-	<!-- Add one target for each root element and each configuration -->
-	<!-- ===================================================================== -->
-
-	<target name="assemble.org.eclipse.rse">
-		<property name="archiveName" value="RSE-runtime-${buildAlias}.zip" />
-		<ant antfile="${assembleScriptName}" />
-		<!-- ADD POST STEPS -->
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Check out map files from correct repository -->
-	<!-- Replace values for cvsRoot, package and mapVersionTag as desired. -->
-	<!-- ===================================================================== -->
-	<target name="checkLocal">
-		<available property="mapsLocal" file="${buildDirectory}/maps" />
-	</target>
-
-	<target name="getMapFiles" depends="checkLocal" unless="mapsLocal">
-
-		<!-- ***  change the repo info -->
-		<property name="mapCvsRoot" value=":${cvsReadProtocol}:${cvsReadUser}@${cvsHost}:${cvsRep}" />
-		<property name="mapVersionTag" value="HEAD" />
-		<!-- <property name="packagePath" value="org.eclipse.${projectName}/org.eclipse.${subprojectName2}.releng/maps"/> -->
-		<property name="packagePath" value="org.eclipse.${projectName}.${subprojectName2}/releng/org.eclipse.${projectName}.releng/maps"/>
-		<cvs cvsRsh="ssh" cvsRoot="${mapCvsRoot}" tag="${mapVersionTag}" 
-			package="${packagePath}" dest="${buildDirectory}/maps" />
-		<copy todir="${buildDirectory}/maps/CVS" overwrite="true">
-			<fileset dir="${buildDirectory}/maps/${packagePath}/CVS" />
-		</copy>
-		<copy todir="${buildDirectory}/maps" overwrite="true">
-			<fileset dir="${buildDirectory}/maps/${packagePath}" />
-		</copy>
-		<delete dir="${buildDirectory}/maps/org.eclipse.${projectName}" />
-
-		<!--tag the map files project-->
-		<antcall target="tagMapFiles" />
-	</target>
-
-	<target name="tagMapFiles" if="tagMaps">
-		<cvs cvsRsh="ssh" dest="${buildDirectory}/maps" command="tag v${timestamp}" />
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before setup -->
-	<!-- ===================================================================== -->
-	<target name="preSetup">
-		<mkdir dir="${buildDirectory}/${buildLabel}" />
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after setup but before starting the build proper -->
-	<!-- ===================================================================== -->
-	<target name="postSetup">
-		<!-- TODO: if your project requires more dependencies, add them here; if it does not require all of these, remove those not required -->
-		<echo message="Download, then unpack: Eclipse, EMF ..." />
-		<ant target="getDependency" antfile="${buildDirectory}/../org.eclipse.modeling.common.releng/scripts/getDependencies.xml">
-			<property name="url" value="${eclipseURL}" />
-			<property name="file" value="${eclipseFile}" />
-			<property name="isUnpackedFile" value="${buildDirectory}/plugins/org.eclipse.platform.doc.isv/plugin.xml" />
-		</ant>
-
-		<!-- Important: This must be the last dependency downloaded, because the
-				getDependency target strips versions from all plug-ins -->
-		<echo message="Download Orbit Bundles ..." />
-		<ant target="getBundle" antfile="${buildDirectory}/../org.eclipse.modeling.common.releng/scripts/getDependenciesHelper.xml">
-			<property name="url" value="${orbitURL}"/>
-			<property name="file" value="${orbitFile}"/>
-		</ant>
-		<echo message="Unpack selected jars ..." />
-		<unzip dest="${buildDirectory}/.." src="${downloadsDir}/${orbitFile}">
-			<patternset>
-				<include name="**/org.apache.commons.net*.jar"/>
-			</patternset>
-		</unzip>
-	
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before fetching the build elements -->
-	<!-- ===================================================================== -->
-	<target name="preFetch">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the fetch -->
-	<!-- ===================================================================== -->
-	<target name="postFetch">
-		<replace dir="${buildDirectory}/plugins" value="${timestamp}" token="@buildid@">
-			<include name="**/about.mappings" />
-		</replace>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before generating build scripts -->
-	<!-- ===================================================================== -->
-	<target name="preGenerate">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after generating the build scripts -->
-	<!-- ===================================================================== -->
-	<target name="postGenerate">
-		<antcall target="clean" />
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before assembling -->
-	<!-- ===================================================================== -->
-	<target name="preAssemble">
-
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after assembling-->
-	<!-- ===================================================================== -->
-	<target name="postAssemble">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before running the build.xmls for the elements being built. -->
-	<!-- ===================================================================== -->
-	<target name="preProcess">
-		<replace dir="${buildDirectory}/plugins" value="${timestamp}" token="@build@">
-			<include name="**/about.mappings" />
-		</replace>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after running the build.xmls for the elements being built. -->
-	<!-- ===================================================================== -->
-	<target name="postProcess">
-
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after everything is built and assembled -->
-	<!-- (e.g., testing, posting, emailing, ...) -->
-	<!-- ===================================================================== -->
-	<target name="postBuild">
-		<antcall target="gatherLogs" />
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Helper targets -->
-	<!-- ===================================================================== -->
-	<target name="gatherLogs">
-		<mkdir dir="${buildDirectory}/${buildLabel}/compilelogs" />
-		<antcall target="allElements">
-			<param name="target" value="gatherLogs" />
-		</antcall>
-
-		<unzip dest="${buildDirectory}/${buildLabel}/compilelogs" overwrite="true">
-			<fileset dir="${buildDirectory}/features/org.eclipse.rse">
-				<include name="*.log.zip" />
-			</fileset>
-		</unzip>
-	</target>
-	<target name="clean" unless="noclean">
-		<antcall target="allElements">
-			<param name="target" value="cleanElement" />
-		</antcall>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Default target                                                        -->
-	<!-- ===================================================================== -->
-	<target name="noDefault">
-		<echo message="You must specify a target when invoking this file" />
-	</target>
-
-</project>
diff --git a/releng/org.eclipse.tm.releng/builder/sdk/build.properties b/releng/org.eclipse.tm.releng/builder/sdk/build.properties
deleted file mode 100644
index 60a9131e9..000000000
--- a/releng/org.eclipse.tm.releng/builder/sdk/build.properties
+++ /dev/null
@@ -1,36 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2008 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:
-#     IBM Corporation - initial API and implementation
-# Martin Oberhuber (Wind River) - adapt for DSDP from o.e.emf.validation.releng
-###############################################################################
-# TODO: set correct source and target levels here
-javacSource=1.4
-javacTarget=1.4
-
-buildDirectory=${builder}/../eclipse
-buildType=I
-buildId=${buildId}
-buildLabel=${buildLabel}
-timestamp=0000
-collPlace=.
-collBase=.
-baseLocation=
-configs=*,*,*
-baseos=linux
-basews=gtk
-basearch=x86
-bootclasspath=${java.home}/lib/*.jar
-javacFailOnError=true
-javacVerbose=true
-javacDebugInfo=on
-zipargs=
-archivesFormat = *,*,*-antZip
-collectingFolder=eclipse
-archivePrefix=eclipse
-generateFeatureVersionSuffix=true
diff --git a/releng/org.eclipse.tm.releng/builder/sdk/customTargets.xml b/releng/org.eclipse.tm.releng/builder/sdk/customTargets.xml
deleted file mode 100644
index cc15e33f5..000000000
--- a/releng/org.eclipse.tm.releng/builder/sdk/customTargets.xml
+++ /dev/null
@@ -1,186 +0,0 @@
-<project name="Build specific targets and properties" default="noDefault" basedir=".">
-
-	<!-- ===================================================================== -->
-	<!-- Run a given ${target} on all elements being built -->
-	<!-- ===================================================================== -->
-	<target name="allElements">
-		<ant antfile="${genericTargets}" target="${target}">
-			<property name="type" value="feature" />
-			<property name="id" value="org.eclipse.rse.sdk" />
-		</ant>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Targets to assemble the built elements for particular configurations  -->
-	<!-- These generally call the generated assemble scripts (named in -->
-	<!-- ${assembleScriptName}) but may also add pre and post processing -->
-	<!-- Add one target for each root element and each configuration -->
-	<!-- ===================================================================== -->
-
-	<target name="assemble.org.eclipse.rse.sdk">
-		<property name="archiveName" value="RSE-SDK-${buildAlias}.zip" />
-		<ant antfile="${assembleScriptName}" />
-		<!-- ADD POST STEPS -->
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Check out map files from correct repository -->
-	<!-- Replace values for cvsRoot, package and mapVersionTag as desired. -->
-	<!-- ===================================================================== -->
-	<target name="checkLocal">
-		<available property="mapsLocal" file="${buildDirectory}/maps" />
-	</target>
-
-	<target name="getMapFiles" depends="checkLocal" unless="mapsLocal">
-
-		<!-- ***  change the repo info -->
-		<property name="mapCvsRoot" value=":${cvsReadProtocol}:${cvsReadUser}@${cvsHost}:${cvsRep}" />
-
-		<property name="mapVersionTag" value="HEAD" />
-		<!-- <property name="packagePath" value="org.eclipse.${projectName}/org.eclipse.${subprojectName2}.releng/maps"/> -->
-		<property name="packagePath" value="org.eclipse.${projectName}.${subprojectName2}/releng/org.eclipse.${projectName}.releng/maps"/>
-
-		<cvs cvsRsh="ssh" cvsRoot="${mapCvsRoot}" tag="${mapVersionTag}" 
-			package="${packagePath}" dest="${buildDirectory}/maps" />
-		<copy todir="${buildDirectory}/maps/CVS" overwrite="true">
-			<fileset dir="${buildDirectory}/maps/${packagePath}/CVS" />
-		</copy>
-		<copy todir="${buildDirectory}/maps" overwrite="true">
-			<fileset dir="${buildDirectory}/maps/${packagePath}" />
-		</copy>
-		<delete dir="${buildDirectory}/maps/org.eclipse.${projectName}" />
-
-		<!--tag the map files project-->
-		<antcall target="tagMapFiles" />
-	</target>
-
-	<target name="tagMapFiles" if="tagMaps">
-		<cvs cvsRsh="ssh" dest="${buildDirectory}/maps" command="tag v${timestamp}" />
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before setup -->
-	<!-- ===================================================================== -->
-	<target name="preSetup">
-		<mkdir dir="${buildDirectory}/${buildLabel}"/>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after setup but before starting the build proper -->
-	<!-- ===================================================================== -->
-	<target name="postSetup">
-		<!-- TODO: if your project requires more dependencies, add them here; if it does not require all of these, remove those not required -->
-		<echo message="Download, then unpack: Eclipse, EMF ..." />
-		<ant target="getDependency" antfile="${buildDirectory}/../org.eclipse.modeling.common.releng/scripts/getDependencies.xml">
-			<property name="url" value="${eclipseURL}" />
-			<property name="file" value="${eclipseFile}" />
-			<property name="isUnpackedFile" value="${buildDirectory}/plugins/org.eclipse.platform.doc.isv/plugin.xml" />
-		</ant>
-
-		<!-- Important: This must be the last dependency downloaded, because the
-				getDependency target strips versions from all plug-ins -->
-		<echo message="Download Orbit Bundles ..." />
-		<ant target="getBundle" antfile="${buildDirectory}/../org.eclipse.modeling.common.releng/scripts/getDependenciesHelper.xml">
-			<property name="url" value="${orbitURL}"/>
-			<property name="file" value="${orbitFile}"/>
-		</ant>
-		<echo message="Unpack selected jars ..." />
-		<unzip dest="${buildDirectory}/.." src="${downloadsDir}/${orbitFile}">
-			<patternset>
-				<include name="**/org.apache.commons.net*.jar"/>
-			</patternset>
-		</unzip>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before fetching the build elements -->
-	<!-- ===================================================================== -->
-	<target name="preFetch">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the fetch -->
-	<!-- ===================================================================== -->
-	<target name="postFetch">
-		<replace dir="${buildDirectory}/plugins" value="${timestamp}" token="@buildid@">
-			<include name="**/about.mappings" />
-		</replace>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before generating build scripts -->
-	<!-- ===================================================================== -->
-	<target name="preGenerate">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after generating the build scripts -->
-	<!-- ===================================================================== -->
-	<target name="postGenerate">
-		<antcall target="clean" />
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before assembling -->
-	<!-- ===================================================================== -->
-	<target name="preAssemble">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after assembling-->
-	<!-- ===================================================================== -->
-	<target name="postAssemble">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before running the build.xmls for the elements being built. -->
-	<!-- ===================================================================== -->
-	<target name="preProcess">
-		<replace dir="${buildDirectory}/plugins" value="${timestamp}" token="@build@">
-			<include name="**/about.mappings" />
-		</replace>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after running the build.xmls for the elements being built. -->
-	<!-- ===================================================================== -->
-	<target name="postProcess">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after everything is built and assembled -->
-	<!-- (e.g., testing, posting, emailing, ...) -->
-	<!-- ===================================================================== -->
-	<target name="postBuild">
-		<antcall target="gatherLogs" />
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Helper targets -->
-	<!-- ===================================================================== -->
-	<target name="gatherLogs">
-		<mkdir dir="${buildDirectory}/${buildLabel}/compilelogs" />
-		<antcall target="allElements">
-			<param name="target" value="gatherLogs" />
-		</antcall>
-
-		<unzip dest="${buildDirectory}/${buildLabel}/compilelogs" overwrite="true">
-			<fileset dir="${buildDirectory}/features/org.eclipse.rse.sdk">
-				<include name="*.log.zip" />
-			</fileset>
-		</unzip>
-	</target>
-	<target name="clean" unless="noclean">
-		<antcall target="allElements">
-			<param name="target" value="cleanElement" />
-		</antcall>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Default target                                                        -->
-	<!-- ===================================================================== -->
-	<target name="noDefault">
-		<echo message="You must specify a target when invoking this file" />
-	</target>
-
-</project>
diff --git a/releng/org.eclipse.tm.releng/builder/terminal/build.properties b/releng/org.eclipse.tm.releng/builder/terminal/build.properties
deleted file mode 100644
index 60a9131e9..000000000
--- a/releng/org.eclipse.tm.releng/builder/terminal/build.properties
+++ /dev/null
@@ -1,36 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2008 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:
-#     IBM Corporation - initial API and implementation
-# Martin Oberhuber (Wind River) - adapt for DSDP from o.e.emf.validation.releng
-###############################################################################
-# TODO: set correct source and target levels here
-javacSource=1.4
-javacTarget=1.4
-
-buildDirectory=${builder}/../eclipse
-buildType=I
-buildId=${buildId}
-buildLabel=${buildLabel}
-timestamp=0000
-collPlace=.
-collBase=.
-baseLocation=
-configs=*,*,*
-baseos=linux
-basews=gtk
-basearch=x86
-bootclasspath=${java.home}/lib/*.jar
-javacFailOnError=true
-javacVerbose=true
-javacDebugInfo=on
-zipargs=
-archivesFormat = *,*,*-antZip
-collectingFolder=eclipse
-archivePrefix=eclipse
-generateFeatureVersionSuffix=true
diff --git a/releng/org.eclipse.tm.releng/builder/terminal/customTargets.xml b/releng/org.eclipse.tm.releng/builder/terminal/customTargets.xml
deleted file mode 100644
index f28b54a7a..000000000
--- a/releng/org.eclipse.tm.releng/builder/terminal/customTargets.xml
+++ /dev/null
@@ -1,177 +0,0 @@
-<project name="Build specific targets and properties" default="noDefault" basedir=".">
-
-	<!-- ===================================================================== -->
-	<!-- Run a given ${target} on all elements being built -->
-	<!-- ===================================================================== -->
-	<target name="allElements">
-		<ant antfile="${genericTargets}" target="${target}">
-			<property name="type" value="feature" />
-			<property name="id" value="org.eclipse.tm.terminal.sdk" />
-		</ant>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Targets to assemble the built elements for particular configurations  -->
-	<!-- These generally call the generated assemble scripts (named in -->
-	<!-- ${assembleScriptName}) but may also add pre and post processing -->
-	<!-- Add one target for each root element and each configuration -->
-	<!-- ===================================================================== -->
-
-	<target name="assemble.org.eclipse.tm.terminal.sdk">
-		<property name="archiveName" value="TM-terminal-${buildAlias}.zip" />
-		<ant antfile="${assembleScriptName}" />
-		<!-- ADD POST STEPS -->
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Check out map files from correct repository -->
-	<!-- Replace values for cvsRoot, package and mapVersionTag as desired. -->
-	<!-- ===================================================================== -->
-	<target name="checkLocal">
-		<available property="mapsLocal" file="${buildDirectory}/maps" />
-	</target>
-
-	<target name="getMapFiles" depends="checkLocal" unless="mapsLocal">
-
-		<!-- ***  change the repo info -->
-		<property name="mapCvsRoot" value=":${cvsReadProtocol}:${cvsReadUser}@${cvsHost}:${cvsRep}" />
-
-		<property name="mapVersionTag" value="HEAD" />
-		<!-- <property name="packagePath" value="org.eclipse.${projectName}/org.eclipse.${subprojectName2}.releng/maps"/> -->
-		<property name="packagePath" value="org.eclipse.${projectName}.${subprojectName2}/releng/org.eclipse.${projectName}.releng/maps"/>
-
-		<cvs cvsRsh="ssh" cvsRoot="${mapCvsRoot}" tag="${mapVersionTag}" 
-			package="${packagePath}" dest="${buildDirectory}/maps" />
-		<copy todir="${buildDirectory}/maps/CVS" overwrite="true">
-			<fileset dir="${buildDirectory}/maps/${packagePath}/CVS" />
-		</copy>
-		<copy todir="${buildDirectory}/maps" overwrite="true">
-			<fileset dir="${buildDirectory}/maps/${packagePath}" />
-		</copy>
-		<delete dir="${buildDirectory}/maps/org.eclipse.${projectName}" />
-
-		<!--tag the map files project-->
-		<antcall target="tagMapFiles" />
-	</target>
-
-	<target name="tagMapFiles" if="tagMaps">
-		<cvs cvsRsh="ssh" dest="${buildDirectory}/maps" command="tag v${timestamp}" />
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before setup -->
-	<!-- ===================================================================== -->
-	<target name="preSetup">
-		<mkdir dir="${buildDirectory}/${buildLabel}"/>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after setup but before starting the build proper -->
-	<!-- ===================================================================== -->
-	<target name="postSetup">
-		<!-- TODO: if your project requires more dependencies, add them here; if it does not require all of these, remove those not required -->
-		<echo message="Download, then unpack: Eclipse, EMF ..." />
-		<ant target="getDependency" antfile="${buildDirectory}/../org.eclipse.modeling.common.releng/scripts/getDependencies.xml">
-			<property name="url" value="${eclipseURL}" />
-			<property name="file" value="${eclipseFile}" />
-			<property name="isUnpackedFile" value="${buildDirectory}/plugins/org.eclipse.platform.doc.isv/plugin.xml" />
-		</ant>
-		<ant target="getDependency" antfile="${buildDirectory}/../org.eclipse.modeling.common.releng/scripts/getDependencies.xml">
-			<property name="url" value="${rxtxURL}" />
-			<property name="file" value="${rxtxFile}" />
-			<property name="isUnpackedFile" value="${buildDirectory}/plugins/gnu.io.rxtx.jar" />
-		</ant>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before fetching the build elements -->
-	<!-- ===================================================================== -->
-	<target name="preFetch">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the fetch -->
-	<!-- ===================================================================== -->
-	<target name="postFetch">
-		<replace dir="${buildDirectory}/plugins" value="${timestamp}" token="@buildid@">
-			<include name="**/about.mappings" />
-		</replace>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before generating build scripts -->
-	<!-- ===================================================================== -->
-	<target name="preGenerate">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after generating the build scripts -->
-	<!-- ===================================================================== -->
-	<target name="postGenerate">
-		<antcall target="clean" />
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before assembling -->
-	<!-- ===================================================================== -->
-	<target name="preAssemble">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after assembling-->
-	<!-- ===================================================================== -->
-	<target name="postAssemble">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before running the build.xmls for the elements being built. -->
-	<!-- ===================================================================== -->
-	<target name="preProcess">
-		<replace dir="${buildDirectory}/plugins" value="${timestamp}" token="@build@">
-			<include name="**/about.mappings" />
-		</replace>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after running the build.xmls for the elements being built. -->
-	<!-- ===================================================================== -->
-	<target name="postProcess">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after everything is built and assembled -->
-	<!-- (e.g., testing, posting, emailing, ...) -->
-	<!-- ===================================================================== -->
-	<target name="postBuild">
-		<antcall target="gatherLogs" />
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Helper targets -->
-	<!-- ===================================================================== -->
-	<target name="gatherLogs">
-		<mkdir dir="${buildDirectory}/${buildLabel}/compilelogs" />
-		<antcall target="allElements">
-			<param name="target" value="gatherLogs" />
-		</antcall>
-
-		<unzip dest="${buildDirectory}/${buildLabel}/compilelogs" overwrite="true">
-			<fileset dir="${buildDirectory}/features/org.eclipse.tm.terminal.sdk">
-				<include name="*.log.zip" />
-			</fileset>
-		</unzip>
-	</target>
-	<target name="clean" unless="noclean">
-		<antcall target="allElements">
-			<param name="target" value="cleanElement" />
-		</antcall>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Default target                                                        -->
-	<!-- ===================================================================== -->
-	<target name="noDefault">
-		<echo message="You must specify a target when invoking this file" />
-	</target>
-
-</project>
diff --git a/releng/org.eclipse.tm.releng/builder/tests/build.properties b/releng/org.eclipse.tm.releng/builder/tests/build.properties
deleted file mode 100644
index 60a9131e9..000000000
--- a/releng/org.eclipse.tm.releng/builder/tests/build.properties
+++ /dev/null
@@ -1,36 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2008 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:
-#     IBM Corporation - initial API and implementation
-# Martin Oberhuber (Wind River) - adapt for DSDP from o.e.emf.validation.releng
-###############################################################################
-# TODO: set correct source and target levels here
-javacSource=1.4
-javacTarget=1.4
-
-buildDirectory=${builder}/../eclipse
-buildType=I
-buildId=${buildId}
-buildLabel=${buildLabel}
-timestamp=0000
-collPlace=.
-collBase=.
-baseLocation=
-configs=*,*,*
-baseos=linux
-basews=gtk
-basearch=x86
-bootclasspath=${java.home}/lib/*.jar
-javacFailOnError=true
-javacVerbose=true
-javacDebugInfo=on
-zipargs=
-archivesFormat = *,*,*-antZip
-collectingFolder=eclipse
-archivePrefix=eclipse
-generateFeatureVersionSuffix=true
diff --git a/releng/org.eclipse.tm.releng/builder/tests/configs/local/chkpii_ignore_list.txt b/releng/org.eclipse.tm.releng/builder/tests/configs/local/chkpii_ignore_list.txt
deleted file mode 100644
index a4dc1c6c4..000000000
--- a/releng/org.eclipse.tm.releng/builder/tests/configs/local/chkpii_ignore_list.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-references/javadoc/*.html
-**/epl-v10.html
diff --git a/releng/org.eclipse.tm.releng/builder/tests/configs/local/customTest.xml b/releng/org.eclipse.tm.releng/builder/tests/configs/local/customTest.xml
deleted file mode 100644
index c1e666497..000000000
--- a/releng/org.eclipse.tm.releng/builder/tests/configs/local/customTest.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<project name="Customized testing instructions" default="customSetup">
-
-	<property name="buildConfigFile" value="${testDir}/../../build.cfg" />
-	<available file="${buildConfigFile}" type="file" property="buildConfigIsAvailable" />
-
-	<target name="loadbuildConfig" if="buildConfigIsAvailable">
-		<property file="${buildConfigFile}" />
-	</target>
-
-	<target name="customSetup">
-		<fail unless="buildConfigIsAvailable" message="ERROR! Can't find ${buildConfigFile}"/>
-		<antcall target="loadbuildConfig"/>
-			
-		<echo message="Unpack Eclipse SDK to ${testDir}..."/>
-		<echo message="customTest.xml: basedir = ${basedir}"/>
-		<property name="getTestDependencies.xml" value="${testDir}/../../org.eclipse.modeling.common.releng/scripts/getTestDependencies.xml"/>
-		<ant target="getTestDependency" antfile="${getTestDependencies.xml}">
-			<property name="basedir" value="${basedir}"/>
-			<property name="url" value="${eclipseURL}"/>
-			<property name="file" value="${eclipseFile}"/>
-			<property name="unpackDest" value="${testDir}"/>
-		</ant>
-		
-		<!-- TODO: if your project requires more dependencies for testing, add them here -->
-		<echo message="Copy EMF SDK + Eclipse SDK to ${executionDir}..."/>
-		<copy todir="${executionDir}">
-			<!--<fileset dir="${downloadsDir}" includes="${emfFile},${eclipseFile},${wtpFile},${orbitFile}"/>-->
-			<fileset dir="${downloadsDir}" includes="${emfFile},${eclipseFile},${orbitFile}"/>
-			<!--TODO: Main runtime is RSE, therefore need to copy TM-terminal and others to test as well-->
-			<fileset dir="${executionDir}/../../.." includes="TM-terminal-*.zip"/>
-		</copy>
-		<property name="shell" value="relengbuildgtk.sh"/>
-	
-		<!--copy the script which invokes the tests -->
-		<copy file="${tester}/${shell}" todir="${executionDir}"/>
-		<chmod file="${executionDir}/${shell}" perm="ugo+rx"/>		
-
-		<!--copy the testing.property files  -->
-		<copy file="${tester}/testing.properties" todir="${executionDir}"/>
-
-		<!-- at this point, we exit from this script and back into the parent script (presumably in pde or eclipse.releng?) -->
-		<echo message="Running ${shell} ..."/>
-	</target>
-</project>
diff --git a/releng/org.eclipse.tm.releng/builder/tests/configs/local/relengbuildgtk.sh b/releng/org.eclipse.tm.releng/builder/tests/configs/local/relengbuildgtk.sh
deleted file mode 100644
index 97221e5d8..000000000
--- a/releng/org.eclipse.tm.releng/builder/tests/configs/local/relengbuildgtk.sh
+++ /dev/null
@@ -1,278 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2008 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:
-#     IBM Corporation - initial API and implementation
-# Martin Oberhuber (Wind River) - adapt for DSDP from o.e.emf.validation.releng
-###############################################################################
-#!/bin/bash
-
-echo -n "[relengbuild] $0 started on: `date +%Y%m%d\ %H\:%M\:%S`";
-
-# environment variables
-PATH=.:/bin:/usr/bin:/usr/bin/X11:/usr/local/bin:/usr/X11R6/bin:`pwd`/../linux;export PATH
-
-export USERNAME=`whoami`
-echo " running as $USERNAME";
-echo " currently in dir: `pwd`";
-
-# fix for org.eclipse.swt.SWTError: No more handles [gtk_init_check() failed]
-# fix for Failed to invoke suite():org.eclipse.swt.SWTError: No more handles [gtk_init_check() failed]
-export CVS_RSH=ssh
-ulimit -c unlimited; # core file size          (blocks, -c) unlimited
-
-echo "Set JAVA_HIGH_ZIPFDS=500 & LANG=C";
-export JAVA_HIGH_ZIPFDS=500
-export LANG=C
-
-# configure X server thread for tests :: not yet working!
-echo "Start Xvfb on :42"
-Xvfb :42 -screen 0 1024x768x24 -ac & 
-sleep 40
-export DISPLAY=localhost:42.0
-xhost +
-
-#startkde &
-#sleep 40
-# xwd -silent -display :42 -root -out /tmp/snap.xwd; # save a snapshot
-#import -window root screenshot1.png  # save a snapshot
- 	  	 
-readPropertyOut="";
-readProperty ()
-{
-	readPropertyOut="";
-	file=$1
-	property=$2
-	readPropertyOut=$(grep $property $file | egrep -v "^#" | tail -1 | sed -e "s/$property=//");
-}
-
-if [[ ! $JAVA_HOME ]]; then
-	echo -n "[relengbuild] Get JAVA_HOME from build.cfg ... ";
-	buildcfg=$PWD/../../../build.cfg;
-	export JAVA_HOME=$(grep "JAVA_HOME=" $buildcfg | egrep -v "^#" | tail -1 | sed -e "s/JAVAHOME=//");
-	echo "$JAVA_HOME";
-fi
-
-Xflags="";
-Dflags="";
-
-# default target to run in org.eclipse.$subprojectName.releng/builder/tests/scripts/test.xml
-antTestTarget=all
-
-# process command line arguments
-while [ $# -gt 0 ]
-do
-	case "$1" in
-		-vmExecutable) vmExecutable="$2"; shift;;
-		-consolelog)   consolelog="$2";   shift;;
-		-X*) Xflags=$Xflags\ $1;;
-		-D*) Dflags=$Dflags\ $1;;
-	esac
-	shift
-done
-
-checkIfj9 ()
-{
-# given a series of -X flags, see if the string -Xj9 can be found
-  j9=$Xflags;
-  #echo "Xflags=$Xflags"
-  j9=${j9/\-Xj9/} # substring replacement
-  #echo "remaining: $j9"
-  if [ "$j9" != "$Xflags" ]; then # found it
-    j9="j9";
-  else
-    j9="";
-  fi
-}
-checkIfj9;
-
-defined=0;
-checkIfDefined ()
-{
-	if [ -f $1 ] ; then
-		defined=1;
-	else
-		defined=0;
-	fi
-}
-
-execCmd ()
-{
-	echo ""; echo "[relengbuild] [`date +%H\:%M\:%S`]"; 
-	echo "  $1" | perl -pe "s/ -/\n  -/g";
-	if [ "x$2" != "x" ]; then
-		$1 2>&1 | tee $2;
-	else
-		$1;
-	fi
-}
-
-doFunction ()
-{
-	cmd=$1;
-	params=$2
-	for pth in "." "/bin" "/usr/bin" "/usr/bin/X11" "/usr/local/bin" "/usr/X11R6/bin" "`pwd`/../linux" ; do
-		defined=0;
-		checkIfDefined $pth/$cmd
-		if [ $defined -eq 1 ] ; then
-			$cmd $params
-			sleep 3
-			break;
-		fi
-	done
-	if [ $defined -eq 0 ] ; then
-		echo "$cmd is not defined (command not found)";
-	fi
-}
-
-# these don't work on old build server, so not point wrapping them to say so when we can just omit
-# doFunction Xvfb ":42 -screen 0 1024x768x24 -ac & "
-# doFunction Xnest ":43 -display :42 -depth 24 & "
-# doFunction fvwm2 "-display localhost:43.0 & "
-#export DISPLAY=$HOSTNAME:43.0
-#ulimit -c unlimited
-
-getBuildID()
-{	# given $PWD: /home/www-data/build/dsdp/$projectName/$subprojectName/downloads/drops/1.1.0/N200702112049/testing/N200702112049/testing
-	# return N200702110400
-	buildID=$1; #echo "buildID=$buildID";
-	buildID=${buildID##*drops\/}; # trim up to drops/ (from start) (substring notation)
-	buildID=${buildID%%\/test*}; # trim off /test (to end) (substring notation)
-	buildID=${buildID##*\/}; # trim up to / (from start) (substring notation)
-}
-buildID=""; getBuildID $PWD; #echo buildID=$buildID;
-
-getBranch()
-{	# given $PWD: /home/www-data/build/dsdp/$projectName/$subprojectName/downloads/drops/1.1.0/N200702112049/testing/N200702112049/testing
-	# return 1.1.0
-	branch=$1; #echo "branch=$branch";
-	branch=${branch##*drops\/}; # trim up to drops/ (from start) (substring notation)
-	branch=${branch%%\/*}; # trim off / (to end) (substring notation)
-}
-branch=""; getBranch $PWD; #echo branch=$branch;
-
-############################# BEGIN RUN TESTS #############################  
-
-
-# operating system, windowing system and architecture variables
-# for *nix systems, os, ws and arch values must be specified
-Dflags=$Dflags" "-Dplatform=linux.gtk
-os=linux
-ws=gtk
-arch=x86
-
-# default value to determine if eclipse should be reinstalled between running of tests
-installmode="clean"
-
-#this value must be set when using rsh to execute this script, otherwise the script will execute from the user's home directory
-dir=.
-cd $dir
-workspaceDir="$dir/eclipse/workspace"
-
-# Replace the boot eclipse (The eclipse used to run the main test.xml, this will start another eclipse later)
-if [ -d $dir/eclipse ] ; then
-	rm -rf $dir/eclipse
-fi
-if [ -d $workspaceDir ] ; then
-	rm -rf $dir/workspace
-fi
-
-echo "[runtests] Currently in `pwd`:"
-# need conditional processing here: M3.0.2 = zip, I3.1.0 = tar.gz
-sdks=`find $dir -name "eclipse-SDK-*"`
-# get extension from file(s)
-for sdk in $sdks; do
-	sdk="eclipse"${sdk##*eclipse}; # trim up to eclipse (substring notation)
-	#echo -n "[runtests] Eclipse SDK $sdk is a";
-	ext=${sdk%%\.zip}; # trim off .zip (substring notation)
-	if [ "$ext" != "$sdk" ]; then # it's a zip
-		#echo " zip. Unpacking...";
-		unzip -qq -o $sdk
-	else
-		ext=${sdk%%\.tar\.gz}; # trim off .tar.gz (substring notation)
-		if [ "$ext" != "$sdk" ]; then # it's a tar.gz
-			#echo " tar.gz. Unpacking...";
-			tar -xzf $sdk
-		else
-			ext=${sdk%%\.tar\.Z}; # trim off .tar.Z (substring notation)
-			if [ "$ext" != "$sdk" ]; then # it's a tar.Z
-				#echo " tar.Z. Unpacking...";
-				tar -xZf $sdk
-			else
-				echo "[runtests] ERROR: Eclipse SDK $sdk is an UNKNOWN file type. Failure.";
-				exit 2
-			fi
-		fi
-	fi
-done
-
-J2SE15flags="";
-# TODO: if a 1.5 JDK and want source/target = 1.5, leave these in
-# TODO: if source/target = 1.4, remove these!
-if [ ${JAVA_HOME##*1.5*}"" = "" -o ${JAVA_HOME##*15*}"" = "" -o ${JAVA_HOME##*5.0*}"" = "" -o ${JAVA_HOME##*50*}"" = "" ]; then
-	# set J2SE-1.5 properties (-Dflags)
-	bootclasspath="."`find $JAVA_HOME/jre/lib -name "*.jar" -printf ":%p"`;
-	J2SE15flags=$J2SE15flags" -DJ2SE-1.5=$bootclasspath"
-	J2SE15flags=$J2SE15flags" -DbundleBootClasspath=$bootclasspath"
-	J2SE15flags=$J2SE15flags" -DjavacSource=1.5"
-	J2SE15flags=$J2SE15flags" -DjavacTarget=1.5"
-	J2SE15flags=$J2SE15flags" -DbundleJavacSource=1.5"
-	J2SE15flags=$J2SE15flags" -DbundleJavacTarget=1.5"
-fi
-
-# different ways to get the launcher and Main class
-if [[ -f eclipse/startup.jar ]]; then 
-  cpAndMain="eclipse/startup.jar org.eclipse.core.launcher.Main"; # up to M4_33
-elif [[ -f eclipse/plugins/org.eclipse.equinox.launcher.jar ]]; then
-  cpAndMain="eclipse/plugins/org.eclipse.equinox.launcher.jar org.eclipse.equinox.launcher.Main"; # M5_33
-else
-  cpAndMain=`find eclipse/ -name "org.eclipse.equinox.launcher_*.jar" | sort | head -1`" org.eclipse.equinox.launcher.Main"; 
-fi
-
-# run tests
-echo "[runtests] [`date +%H\:%M\:%S`] Launching Eclipse (installmode = $installmode with -enableassertions turned on) ..."
-execCmd "$JAVA_HOME/bin/java $Xflags -enableassertions -cp $cpAndMain -ws $ws -os $os -arch $arch \
--application org.eclipse.ant.core.antRunner -data $workspaceDir -file test.xml $antTestTarget \
-$Dflags -Dws=$ws -Dos=$os -Darch=$arch -D$installmode=true $J2SE15flags \
-$properties -logger org.apache.tools.ant.DefaultLogger" $consolelog;
-echo "[runtests] [`date +%H\:%M\:%S`] Eclipse test run completed. "
-
-#import -window root screenshot1.png  # save a snapshot
-
-############################# END RUN TESTS #############################  
-
-# supress errors by checking for the file first
-if [ -r /tmp/.X43-lock ] ; then
-	kill `cat /tmp/.X43-lock`
-fi
-if [ -r /tmp/.X42-lock ] ; then
-	kill `cat /tmp/.X42-lock`
-fi
-
-if [[ ! -d $PWD/results ]]; then
-	echo "[relengbuild] No test results found in $PWD/results!";
-	echo "[relengbuild] Creating 'noclean' file to prevent cleanup after build completes."
-	echo "1" > $PWD/../../../noclean;
-else
-# if the build failed for some reason, don't clean up!
-xmls=`find $PWD/results/xml -name "*.xml"`;
-testsFailed=1;
-for xml in $xmls; do
-	if [ $testsFailed -eq 1 ]; then
-		testsFailed=`cat $xml | grep -c "<testsuite errors=\"0\" failures=\"0\""`
-		if [ $testsFailed -lt 1 ]; then
-			echo "[relengbuild] Found test failure(s) in $xml!";
-			echo "[relengbuild] Creating 'noclean' file to prevent cleanup after build completes."
-			echo "1" > $PWD/../../../noclean;
-			break;
-		fi
-	fi
-done
-fi;
-
-echo "[relengbuild] relengbuildgtk.sh completed on: `date +%Y%m%d\ %H\:%M\:%S`"
-
diff --git a/releng/org.eclipse.tm.releng/builder/tests/configs/local/testing.properties b/releng/org.eclipse.tm.releng/builder/tests/configs/local/testing.properties
deleted file mode 100644
index 9dc29709e..000000000
--- a/releng/org.eclipse.tm.releng/builder/tests/configs/local/testing.properties
+++ /dev/null
@@ -1,57 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2008 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:
-#     IBM Corporation - initial API and implementation
-# Martin Oberhuber (Wind River) - adapt for DSDP from o.e.emf.validation.releng
-###############################################################################
-#which (sub)project?
-project=rse
-
-#target to call in test.xml:  runtests-local | runtests-remote
-testTarget=runtests-local
-
-#directory on test machine where automated testing framework will be installed
-testDir=${testBase}/${buildLabel}
-
-#name of zip file containing automated testing framework and JUnit test plug-ins
-testFramework=RSE-automated-tests-${buildAlias}.zip
-
-#directory where test scripts are launched
-executionDir=${testDir}/testing
-
-#name of runtime to install and test
-runtime=RSE-SDK-${buildAlias}.zip
-
-# leave this blank and it will be generated by genBuildDetails.sh 
-javaHome=%%JAVA_HOME%%
-vmExecutable=${javaHome}/bin/java
-
-#hack to override unneeded function in releng.basebuilder/plugins/org.eclipse.build.tools/scripts/test.xml
-vmUrl=
-vmDest=/dev/null
-vmInstallExecutable=${vmExecutable}
-vmInstallCommand=-version
-
-#eclipse platforms:  win32 | linux.motif | linux.gtk | aix.motif | hpux.motif |solaris.motif
-platform=${baseos}.${basews}
-
-#name of file that captures console output from running JUnit plug-in tests
-consolelog=${baseos}.${basews}_consolelog.txt
-
-#Works with IBM and Sun JDKs, 1.4+
-#name of script to execute
-testExecutable=bash
-
-#arguments to $(testExecutable) - .sh script + args
-args=${executionDir}/${shell} -vmExecutable ${vmExecutable} -consolelog ${consolelog} ${Xflags} ${Dflags} 
-
-#TODO: set vm-specific flags
-#Xflags=-Xms64M -Xmx192M
-Xflags=-Xms256M -Xmx256M
-Dflags=
-
diff --git a/releng/org.eclipse.tm.releng/builder/tests/customTargets.xml b/releng/org.eclipse.tm.releng/builder/tests/customTargets.xml
deleted file mode 100644
index 648f1745f..000000000
--- a/releng/org.eclipse.tm.releng/builder/tests/customTargets.xml
+++ /dev/null
@@ -1,274 +0,0 @@
-<project name="Build specific targets and properties" default="noDefault" basedir=".">
-
-<!-- ===================================================================== -->
-<!-- Run a given ${target} on all elements being built -->
-<!-- ===================================================================== -->
-<target name="allElements">
-	<ant antfile="${genericTargets}" target="${target}" >
-		<property name="type" value="feature" />
-		<property name="id" value="org.eclipse.rse.tests" />
-	</ant>
-	<ant antfile="${genericTargets}" target="${target}" >
-		<property name="type" value="feature" />
-		<property name="id" value="org.eclipse.tm.terminal.test" />
-	</ant>
-</target>
-
-<!-- ===================================================================== -->
-<!-- Targets to assemble the built elements for particular configurations  -->
-<!-- These generally call the generated assemble scripts (named in -->
-<!-- ${assembleScriptName}) but may also add pre and post processing -->
-<!-- Add one target for each root element and each configuration -->
-<!-- ===================================================================== -->
-
-<target name="assemble.org.eclipse.rse.tests">
-	<property name="archiveName" value="RSE-junit-tests-${buildAlias}.zip"/>
-	<ant antfile="${assembleScriptName}"/>
-<!-- ADD POST STEPS -->
-</target>
-<target name="assemble.org.eclipse.tm.terminal.test">
-	<property name="archiveName" value="TM-terminal-junit-tests-${buildAlias}.zip"/>
-	<ant antfile="${assembleScriptName}"/>
-<!-- ADD POST STEPS -->
-</target>
-
-
-<!-- ===================================================================== -->
-<!-- Check out map files from correct repository -->
-<!-- Replace values for cvsRoot, package and mapVersionTag as desired. -->
-<!-- ===================================================================== -->
-<target name="checkLocal">
-	<available property="mapsLocal" file="${buildDirectory}/maps" />
-</target>
-
-<target name="getMapFiles" depends="checkLocal" unless="mapsLocal">
-
-	<!-- ***  change the repo info -->
-	<property name="mapCvsRoot" value=":${cvsReadProtocol}:${cvsReadUser}@${cvsHost}:${cvsRep}" />
-	<property name="mapVersionTag" value="HEAD" />
-	<!-- <property name="packagePath" value="org.eclipse.${projectName}/org.eclipse.${subprojectName2}.releng/maps"/> -->
-	<property name="packagePath" value="org.eclipse.${projectName}.${subprojectName2}/releng/org.eclipse.${projectName}.releng/maps"/>
-
-	<cvs cvsRsh="ssh" cvsRoot="${mapCvsRoot}" tag="${mapVersionTag}" 
-		package="${packagePath}" dest="${buildDirectory}/maps" />
-	<copy todir="${buildDirectory}/maps/CVS" overwrite="true">
-		<fileset dir="${buildDirectory}/maps/${packagePath}/CVS" />
-	</copy>
-	<copy todir="${buildDirectory}/maps" overwrite="true">
-		<fileset dir="${buildDirectory}/maps/${packagePath}" />
-	</copy>
-	<delete dir="${buildDirectory}/maps/org.eclipse.${projectName}" />
-
-	<!--tag the map files project-->
-	<antcall target="tagMapFiles" />
-</target>
-
-<target name="tagMapFiles" if="tagMaps">
-	<cvs dest="${buildDirectory}/maps/org.eclipse.${subprojectName2}" command="tag v${timestamp}" />
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do before setup -->
-<!-- ===================================================================== -->
-<target name="preSetup">
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do after setup but before starting the build proper -->
-<!-- ===================================================================== -->
-<target name="postSetup">
-		<ant target="getDependency" antfile="${buildDirectory}/../org.eclipse.modeling.common.releng/scripts/getDependencies.xml">
-			<property name="url" value="${eclipseURL}" />
-			<property name="file" value="${eclipseFile}" />
-			<property name="isUnpackedFile" value="${buildDirectory}/plugins/org.eclipse.platform.doc.isv/plugin.xml" />
-		</ant>
-		<!-- Important: This must be the last dependency downloaded, because the
-					                getDependency target strips versions from all plug-ins -->
-		<ant target="getBundle" antfile="${buildDirectory}/../org.eclipse.modeling.common.releng/scripts/getDependenciesHelper.xml">
-			<property name="url" value="${orbitURL}" />
-			<property name="file" value="${orbitFile}" />
-		</ant>
-		<unzip dest="${buildDirectory}/.." src="${downloadsDir}/${orbitFile}">
-			<patternset>
-				<include name="**/org.apache.commons.net*.jar" />
-			</patternset>
-		</unzip>
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do before fetching the build elements -->
-<!-- ===================================================================== -->
-<target name="preFetch">
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do after the fetch -->
-<!-- ===================================================================== -->
-<target name="postFetch">
-	<replace dir="${buildDirectory}/plugins" value="${timestamp}" token="@buildid@">
-		<include name="**/about.mappings" />
-	</replace>
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do before generating build scripts -->
-<!-- ===================================================================== -->
-<target name="preGenerate">
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do after generating the build scripts -->
-<!-- ===================================================================== -->
-<target name="postGenerate">
-	<antcall target="clean" />
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do before assembling -->
-<!-- ===================================================================== -->
-<target name="preAssemble">
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do after assembling-->
-<!-- ===================================================================== -->
-<target name="postAssemble">
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do before running the build.xmls for the elements being built. -->
-<!-- ===================================================================== -->
-<target name="preProcess">
-	<replace dir="${buildDirectory}/plugins" value="${timestamp}" token="@build@">
-		<include name="**/about.mappings" />
-	</replace>
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do after running the build.xmls for the elements being built. -->
-<!-- ===================================================================== -->
-<target name="postProcess">
-	<condition property="logsAvailable">
-		<istrue value="${javacVerbose}"/> 
-	</condition>
-	<antcall target="gatherLogs" />
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do after everything is built and assembled -->
-<!-- (e.g., testing, posting, emailing, ...) -->
-<!-- ===================================================================== -->
-<target name="postBuild">
-	<antcall target="packageTestFramework" />	
-</target>
-
-<!-- ===================================================================== -->
-<!-- Helper targets -->
-<!-- ===================================================================== -->
-<target name="gatherLogs" if="logsAvailable">
-	<mkdir dir="${buildDirectory}/${buildLabel}/compilelogs" />
-	<antcall target="allElements">
-		<param name="target" value="gatherLogs" />
-	</antcall>
-
-	<unzip dest="${buildDirectory}/${buildLabel}/compilelogs" overwrite="true">
-		<fileset dir="${buildDirectory}/features/org.eclipse.rse.tests">
-			<include name="*.log.zip" />
-		</fileset>
-		<fileset dir="${buildDirectory}/features/org.eclipse.tm.terminal.test">
-			<include name="*.log.zip" />
-		</fileset>
-	</unzip>
-</target>
-
-<target name="clean" unless="noclean">
-	<antcall target="allElements">
-		<param name="target" value="cleanElement" />
-	</antcall>
-</target>
-
-<target name="packageTestFramework">
-	<!--package automated test framework used in RSE builds-->
-
-	<property name="workingDirectory" value="${buildDirectory}/test.assembly" />
-	<echo message="workingDirectory:  ${workingDirectory}"/>
-
-	<!--unzip the junit tests-->
-    <mkdir dir="${workingDirectory}/eclipse" />
-	<unzip dest="${workingDirectory}" overwrite="true">
-		<fileset dir="${buildDirectory}/${buildLabel}">
-			<include name="**/RSE-junit-tests*.zip"/>
-			<include name="**/TM-terminal-junit-tests*.zip"/>
-		</fileset>
-	</unzip>
-	
-	<!-- create top level testing directory-->    
-	<delete dir="${workingDirectory}/testing"/>
-    <mkdir dir="${workingDirectory}/testing" />
-	
-	<!--compile the tool used to generate the test.properties file, then run it.-->
-	<!--test.properties maps test plugin id's to the name of the plugin directory-->
-    
-    <!--eclipse.home is relative to the scripts directory in the org.eclipse.pde.build plugin.  Assume the plugins used in the classpath are in the same directory as org.eclipse.pde.build-->
-    <property name="eclipse.home" value="../../.." />
-
-    <generateTestProperties 
-            buildDirectory="${buildDirectory}" 
-            featureId="org.eclipse.rse.tests" 
-            outputFile="${workingDirectory}/testing/test.properties" 
-    /> 
-    <generateTestProperties 
-            buildDirectory="${buildDirectory}" 
-            featureId="org.eclipse.tm.terminal.test" 
-            outputFile="${workingDirectory}/testing/test2.properties" 
-    /> 
-
-
-	<!--load the property file created with the directory names for all test plugins-->
-	<property file="${workingDirectory}/testing/test.properties" />
-	<property file="${workingDirectory}/testing/test2.properties" />
-
-	<!-- Remove the plugin version number appended to the org.eclipse.test plugin directory.
-   	     This is so that contributors of test.xml's do not have to update their paths to 
-   	     library.xml in org.eclipse.test whenever its version is updated.
-   	 -->
-   	<move todir="${workingDirectory}/eclipse/plugins/org.eclipse.test">
-    		<fileset dir="${workingDirectory}/eclipse/plugins/${org.eclipse.test}" />
-  	</move>
-  	
-  	<!--the Ant move task leaves behind an empty directory-->
-  	<delete dir="${workingDirectory}/eclipse/plugins/${org.eclipse.test}" includeEmptyDirs="true" />
-	
- 	<!-- rezip the JUnit plugin tests -->
-	<zip destfile="${workingDirectory}/testing/RSE-junit-tests-${buildAlias}.zip">
-		 <zipfileset dir="${workingDirectory}/eclipse" prefix="eclipse"/>
-	</zip>
- 	
- 	<!--Copy scripts and doc used in the automated testing to the testing directory-->
-    <copy todir="${workingDirectory}/testing">
-     	<fileset dir="${buildDirectory}/plugins/org.eclipse.test" includes="testframework.html,JUNIT.XSL" />
-    </copy>
-    <copy todir="${workingDirectory}/testing">
-     	<fileset dir="${builderDirectory}/scripts" />
-    </copy>
-
-	<!--copy in the file containing the URL of the Eclipse build used for testing-->
-    <copy todir="${workingDirectory}/testing" file="${buildDirectory}/../build.cfg" />
-
-	<!--create zip file of the automated testing framework-->	
-	<zip destfile="${buildDirectory}/${buildLabel}/RSE-automated-tests-${buildAlias}.zip">
-		 <zipfileset dir="${workingDirectory}/testing" prefix="testing"/>
-	</zip>
-
-	<delete file="${buildDirectory}/${buildLabel}/RSE-junit-tests-${buildAlias}.zip"  />
-	<delete file="${buildDirectory}/${buildLabel}/TM-terminal-junit-tests-${buildAlias}.zip"  />
-</target>
-
-<!-- ===================================================================== -->
-<!-- Default target                                                        -->
-<!-- ===================================================================== -->
-<target name="noDefault">
-	<echo message="You must specify a target when invoking this file" />
-</target>
-
-</project>
diff --git a/releng/org.eclipse.tm.releng/builder/tests/scripts/readme.html b/releng/org.eclipse.tm.releng/builder/tests/scripts/readme.html
deleted file mode 100644
index 628cbca98..000000000
--- a/releng/org.eclipse.tm.releng/builder/tests/scripts/readme.html
+++ /dev/null
@@ -1,162 +0,0 @@
-<html>
-<head>
-<title>Instructions</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<body bgcolor="#FFFFFF" text="#000000">
-<font size="+2"> Automated Testing of DSDP Project Builds</font> 
-<p>last updated: November 9, 2005</p>
-<p><font size="+1">Description</font></p>
-<p>This document describes how to run the your project's JUnit test plugins from the command 
-  line. This is the same mechanism used in the builds.</p>
-<p>Click <a href="testframework.html">here</a> for a description of the testing 
-  framework, and how it can be used outside of the setup described here.</p>
-<p>If you simply wish to write and run JUnit tests interactively from an Eclipse 
-  workbench, try one of the links below:</p>
-<p><a href="http://dev.eclipse.org/viewcvs/index.cgi/%7Echeckout%7E/jdt-ui-home/plugins/org.eclipse.jdt.junit/index.html">JUnit 
-  Support in Eclipse</a><br>
-<a href="http://dev.eclipse.org:8080/help/content/help:/org.eclipse.jdt.doc.user/tasks/tasks-207.htm?resultof=%6a%75%6e%69%74%20&toc=%2Forg.eclipse.jdt.doc.user%2Ftoc.xml">Using 
-  JUnit</a></p>
-
-<p><font size="+1">Requirements</font></p>
-<p>1. All test machines must have a java runtime environment (version 1.3.1) installed and added to the path environment variable (see 
-  <a href="#vm">-vm</a> parameter below).<br>
-  2. <a href="http://www.info-zip.org/pub/infozip/UnZip.html">Info-ZIP UnZip</a> 
-  version 5.41 or later installed and added to the path.<br>
-  3. The Automated Test feature from a
-  <a href="http://www.eclipse.org/dsdp/tm">downloads</a>. 
-  This contains the test framework plugins and the JUnit test plugins to run.<br>
-  4. The zip file from the same build as the Automated Test feature.  You can use the RSE-*-SDK zip file instead of the individual files.<br>
-  5. An Eclipse SDK zip file. The URL and build name of the required builds 
-  are specified in the build.cfg file included in the Automated Test zip file.</p>
-<p><font size="+1">Setup</font></p>
-<p>1. Extract the RSE-*-automated-tests-&lt;buildid&gt;.zip. On Window, extract 
-  this file close to the root of the drive to prevent some path names from exceeding 
-  the 255 character limit. This will create a top-level directory &quot;<i>testing</i>&quot;.<br>
-  2. Place the Eclipse SDK zip file and the project's runtime in the <i>testing</i> directory. 
-  Do not unzip these files. (The test scripts will take care of this)<br>
-</p>
-<p><font size="+1">Running Tests</font></p>
-<p>1. cd to the <i>testing</i> directory<br>
-  2. Run the following script:</p>
-<p><b>runtests.sh [-os &lt;operating system&gt;] [-ws &lt;windowing system&gt;] [-arch 
-  &lt;architecture&gt;] [-noclean] [&lt;testTarget&gt;][-properties &lt;path&gt;][-vm 
-  &lt;path to java executable&gt;]</b></p>
-All parameters and targets are optional on windows systems. Just running &quot;runtests.sh&quot; 
-will run <b>ALL</b> tests on Windows, installing a clean Eclipse and your project's SDK between 
-each test target. On *nix systems, the os, ws and arch parameters must be specified. 
-<br>
-<br>
-Test results are placed in the <i>testing</i>/<i>results</i> directory in xml and html format.<br>
-<p><font size="+1"><a name="vm"></a>Parameters</font></p>
-<table width="90%" border="1">
-  <tr> 
-    <td>Parameter</td>
-    <td>Description</td>
-  </tr>
-  <tr> 
-    <td>-os &lt;operating system&gt;</td>
-    <td>The OS the tests are being run on. One of: aix, hpux, linux, qnx, solaris, 
-      win32. <b>Default win32</b></td>
-  </tr>
-  <tr> 
-    <td>-ws &lt;windowing system&gt;</td>
-    <td>The windowing system the tests are being run on. One of: motif, gtk, photon, 
-      win32. <b>Default win32</b></td>
-  </tr>
-  <tr> 
-    <td>-arch &lt;architecture&gt;</td>
-    <td>The architecture the tests are being run on. One of: ppc, PA_RISC, x86, 
-      sparc. <b>Default x86</b></td>
-  </tr>
-  <tr> 
-    <td>-noclean</td>
-    <td>Run tests without installing an Eclipse and GEF SDK and tests between 
-      test targets. Default is to re-install these between test targets.</td>
-  </tr>
-  <tr> 
-    <td>-properties</td>
-    <td>Used to reference a properties file containing additional Ant properties 
-      used in running tests.Can be used to pass additional vm arguments to the 
-      Java virtual machine running the tests by adding the entry &quot;extraVMargs=&lt;the 
-      args to pass to the vm&gt;&quot; to the specified properties file.</td>
-  </tr>
-  <tr>
-    <td>-vm</td>
-    <td>The full path to the java executable with which to run the tests. Use 
-      this to specify a specific virtual machine with which to run the tests. 
-      For example, &quot;-vm c:\sun131\jre\bin\java&quot;. Default set to &quot;java&quot; 
-      (i.e. java executable on system path). </td>
-  </tr>
-</table>
-  
-<p><font size="+1">Test Targets</font></p>
-<p>Specifies which ant target to run in the main test.xml. Typically this corresponds 
-  to a test project's tests. If you do not specify a test target then the <b>all</b> 
-  test target is run.</p>
-
-<table width="90%" border="1">
-  <tr> 
-    <td>all</td>
-    <td>Runs all the targets below.</td>
-  </tr>
-  <tr> 
-    <td>rse</td>
-    <td>Runs the JUnit tests located in the test plug-ins</td>
-  </tr>
-  <tr> 
-    <td>genHtml</td>
-    <td>Converts xml test results in the &quot;<i>testing</i>/<i>results</i>&quot; directory 
-      to html.</td>
-  </tr>
-</table>
-<p>&nbsp;</p>
-<p><font size="+1"><a name="appendixb"></a>Appendix A- Supported os, ws, and arch 
-  value combinations</font></p>
-<p>The following table contains the values that can be used with the -os, -ws, 
-  and -arch switches.</p>
-<table width="75%" border="1">
-  <tr> 
-    <td>Operating System (os)</td>
-    <td>Windowing System (ws)</td>
-    <td>Architecture (arch)</td>
-  </tr>
-  <tr> 
-    <td>aix</td>
-    <td>motif</td>
-    <td>ppc</td>
-  </tr>
-  <tr> 
-    <td>hpux</td>
-    <td>motif</td>
-    <td>PA_RISC</td>
-  </tr>
-  <tr> 
-    <td>linux</td>
-    <td>gtk</td>
-    <td>x86</td>
-  </tr>
-  <tr> 
-    <td>linux</td>
-    <td>motif</td>
-    <td>x86</td>
-  </tr>
-  <tr> 
-    <td height="24">qnx</td>
-    <td height="24">photon</td>
-    <td height="24">x86</td>
-  </tr>
-  <tr> 
-    <td>solaris</td>
-    <td>motif</td>
-    <td>sparc</td>
-  </tr>
-  <tr> 
-    <td>win32</td>
-    <td>win32</td>
-    <td>x86</td>
-  </tr>
-</table>
-</body>
-</html>
diff --git a/releng/org.eclipse.tm.releng/builder/tests/scripts/test.xml b/releng/org.eclipse.tm.releng/builder/tests/scripts/test.xml
deleted file mode 100644
index 0583e3d30..000000000
--- a/releng/org.eclipse.tm.releng/builder/tests/scripts/test.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<project name="Automated Testing" default="all"  basedir="." >
-
-	<!--properties file containing the plugin directory name including version number-->
-	<property file="test.properties" />
-	
-	<!-- urls and such from the build -->
-	<property file="${basedir}/../../../build.cfg" />
-
-	<!--default directory where test-eclipse will be installed-->
-	<property name="install" value="${basedir}/target" />
-	
-	<!--name that can be added to report name to identify which platform tests results come from-->
-	<property name="platform" value="" />
-
-	<!-- The root of the eclipse installation -->
-	<property name="eclipse-home" value="${install}/eclipse" />
-
-	<!-- The directory that will contain the xml and html results from the tests that are run -->
- 	<property name="results" value="${basedir}/results" />
-
-	<target name="setup" if="clean" description="Reinstall the test Eclipse installation if specified by user">
-		<delete dir="${install}" /><mkdir dir="${install}" />
-		
-		<!-- TODO: if your project requires more dependencies, add them here -->
-		<echo message="Download, then unpack: Eclipse, EMF ..." />
-		<property name="common.releng.dir" value="${basedir}/../../../org.eclipse.modeling.common.releng"/>
-		<property name="getTestDependencies.xml" value="${common.releng.dir}/scripts/getTestDependencies.xml"/>
-		<ant target="getTestDependency" antfile="${getTestDependencies.xml}" dir="${common.releng.dir}">
-			<property name="url" value="${eclipseURL}" />
-			<property name="file" value="${eclipseFile}" />
-			<property name="unpackDest" value="${install}"/>
-		</ant>
-		<ant target="getTestDependency" antfile="${getTestDependencies.xml}" dir="${common.releng.dir}">
-			<property name="url" value="${emfURL}" />
-			<property name="file" value="${emfFile}" />
-			<property name="unpackDest" value="${install}"/>
-		</ant>
-		<ant target="getTestDependency" antfile="${getTestDependencies.xml}" dir="${common.releng.dir}">
-			<property name="url" value="${orbitURL}" />
-			<property name="file" value="${orbitFile}" />
-			<property name="unpackDest" value="${install}"/>
-		</ant>
-
-		<property name="dir" location="."/>
-		<echo message="Unpack SDK + JUnit Tests (${dir}/RSE-*.zip) ..."/>		
-		<unzip dest="${install}" overwrite="true">
-		    <fileset dir="${dir}">
-		    	<include name="**/RSE-*.zip"/>
-		    	<include name="**/TM-terminal-*.zip"/>
-		    </fileset>
-		</unzip>
-	</target>
-
-	<target name="runtests" depends="setup" description="Runs ant on the test.xml for a specified plugin.  Requires a property value setting for testPlugin only if test.properties is not available.  The property testPlugin represents a directory name made up of the plugin id and plugin version.  This directory must contain a valid test.xml.">
-		<echo message="Running test.xml from jarfile ${eclipse-home}/plugins/${testPlugin} ... "/>
-		<ant antfile="${eclipse-home}/plugins/${testPlugin}/test.xml" dir="${eclipse-home}"/>
-		<copy file="${eclipse-home}/${report}.xml" tofile="${results}/xml/${report}_${platform}.xml" />
-	</target>
-
-	<target name="unjarPlugin" depends="setup">
-		<echo message="Unpack ${eclipse-home}/plugins/${testPlugin}.jar to ${eclipse-home}/plugins/${testPlugin} ... "/>
-		<move file="${eclipse-home}/plugins/${testPlugin}.jar" tofile="${eclipse-home}/plugins/${testPlugin}_.jar"/>
-		<unjar src="${eclipse-home}/plugins/${testPlugin}_.jar" dest="${eclipse-home}/plugins/${testPlugin}"/>
-		<delete file="${eclipse-home}/plugins/${testPlugin}_.jar"/>
-	</target>
-
-	<target name="dontUnjarPlugin" depends="setup">
-		<echo message="${eclipse-home}/plugins/${testPlugin} is not a jarred plugin. No unpack required!"/>
-	</target>
-
-	<target name="rse" description="Runs the test.xml of the rse.tests plugin">
-		<antcall target="dontUnjarPlugin">
-			<param name="testPlugin" value="${org.eclipse.rse.tests}" />
-		</antcall>	
-		<antcall target="runtests">
-			<param name="testPlugin" value="${org.eclipse.rse.tests}" />
-			<param name="report" value="org.eclipse.rse.tests" />
-		</antcall>
-
-		<!-- test if chkpii script exists before proceeding -->
-		<property name="common.releng.dir" value="${basedir}/../../../org.eclipse.modeling.common.releng"/>
-		<property name="chkpii.xml" value="${common.releng.dir}/scripts/chkpii.xml"/>
-		<available file="${chkpii.xml}" property="chkpiiXMLAvailable"/>
-		<antcall target="runChkpii"/>
-	</target>
-
-	<target name="terminal" description="Runs the test.xml of the tm.terminal.test plugin">
-		<antcall target="unjarPlugin">
-			<param name="testPlugin" value="${org.eclipse.tm.terminal.test}" />
-		</antcall>	
-		<antcall target="runtests">
-			<param name="testPlugin" value="${org.eclipse.tm.terminal.test}" />
-			<param name="report" value="org.eclipse.tm.terminal.test" />
-		</antcall>
-
-		<!-- test if chkpii script exists before proceeding -->
-		<property name="common.releng.dir" value="${basedir}/../../../org.eclipse.modeling.common.releng"/>
-		<property name="chkpii.xml" value="${common.releng.dir}/scripts/chkpii.xml"/>
-		<available file="${chkpii.xml}" property="chkpiiXMLAvailable"/>
-		<antcall target="runChkpii"/>
-	</target>
-
-	<target name="runChkpii" if="chkpiiXMLAvailable">
-		<ant target="chkpii" antfile="${chkpii.xml}" inheritall="true">
-			<property name="zipPattern" value="RSE-*.zip"/>
-		</ant>
-	</target>
-
-	<target name="all">
-		<antcall target="rse" />
-		<antcall target="terminal" />
-		<antcall target="genHtml" />
-	</target>
-	
-	<target name="genHtml" description="Generates HTML results with provided JUNIT.XSL provided">
-		<style style="JUNIT.XSL" basedir="${results}/xml" destdir="${results}/html" />
-	</target>
-</project>
diff --git a/releng/org.eclipse.tm.releng/maps/build.cfg b/releng/org.eclipse.tm.releng/maps/build.cfg
deleted file mode 100644
index 28178b1d3..000000000
--- a/releng/org.eclipse.tm.releng/maps/build.cfg
+++ /dev/null
@@ -1 +0,0 @@
-# this file's contents are generated
-\ No newline at end of file
diff --git a/releng/org.eclipse.tm.releng/maps/discovery.map b/releng/org.eclipse.tm.releng/maps/discovery.map
deleted file mode 100644
index c0dd848fe..000000000
--- a/releng/org.eclipse.tm.releng/maps/discovery.map
+++ /dev/null
@@ -1,10 +0,0 @@
-feature@org.eclipse.tm.discovery=v200902102200,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery-feature
-plugin@org.eclipse.rse.discovery=v20080402,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.rse.discovery
-plugin@org.eclipse.tm.discovery.doc.isv=v20080406,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.doc.isv
-plugin@org.eclipse.tm.discovery.engine=v200903051330,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.engine
-plugin@org.eclipse.tm.discovery.model=v20080331,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.model
-plugin@org.eclipse.tm.discovery.model.edit=v20080522,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.model.edit
-plugin@org.eclipse.tm.discovery.protocol.dnssd=v20080331,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.protocol.dnssd
-plugin@org.eclipse.tm.discovery.transport.udp=v20080331,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.transport.udp
-plugin@org.eclipse.tm.discovery.view=v20080522,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.view
-plugin@org.eclipse.tm.discovery.wizard=v20080529,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.wizard
-\ No newline at end of file
diff --git a/releng/org.eclipse.tm.releng/maps/rse.map b/releng/org.eclipse.tm.releng/maps/rse.map
deleted file mode 100644
index 6136bec58..000000000
--- a/releng/org.eclipse.tm.releng/maps/rse.map
+++ /dev/null
@@ -1,64 +0,0 @@
-!***************  PROJECT CONTRIBUTION  ******************************************************** 
-!*** Project's plugins, features and fragments
-feature@org.eclipse.rse=v200902011800,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse-feature
-feature@org.eclipse.rse.core=v200902102200,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.core-feature
-feature@org.eclipse.rse.dstore=v200902011800,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.dstore-feature
-feature@org.eclipse.rse.examples=v200902082200,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/examples/org.eclipse.rse.examples-feature
-feature@org.eclipse.rse.ftp=v200902082200,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.ftp-feature
-feature@org.eclipse.rse.local=v200812041630,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.local-feature
-feature@org.eclipse.rse.sdk=v200902082200,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.sdk-feature
-feature@org.eclipse.rse.ssh=v200902011800,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.ssh-feature
-feature@org.eclipse.rse.telnet=v200902102200,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.telnet-feature
-feature@org.eclipse.rse.terminals=v200902020100,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.terminals-feature
-feature@org.eclipse.rse.tests=v200902082200,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/tests/org.eclipse.rse.tests-feature
-feature@org.eclipse.rse.useractions=v200902102200,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.useractions-feature
-!!feature@org.eclipse.rse.useractions.wrapper=v20080609a,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.useractions.wrapper-feature
-!!feature@org.eclipse.tm.releng.master=v20080609,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/releng/org.eclipse.tm.releng.master-feature
-plugin@org.eclipse.dstore.core=v200903192345,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.dstore.core
-plugin@org.eclipse.dstore.doc.isv=v200902011800,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/doc/org.eclipse.dstore.doc.isv
-plugin@org.eclipse.dstore.extra=v200901191530,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.dstore.extra
-plugin@org.eclipse.rse=v200902082200,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse
-plugin@org.eclipse.rse.connectorservice.dstore=v200903192345,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.connectorservice.dstore
-plugin@org.eclipse.rse.connectorservice.local=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.connectorservice.local
-plugin@org.eclipse.rse.connectorservice.ssh=v200903192345,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.connectorservice.ssh
-plugin@org.eclipse.rse.connectorservice.telnet=v200903070130,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.connectorservice.telnet
-plugin@org.eclipse.rse.core=v200903192345,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.core
-plugin@org.eclipse.rse.doc.isv=v200902011800,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/doc/org.eclipse.rse.doc.isv
-plugin@org.eclipse.rse.doc.user=v200902011800,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/doc/org.eclipse.rse.doc.user
-plugin@org.eclipse.rse.dstore.security=v20080609,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.dstore.security
-plugin@org.eclipse.rse.efs=v200809041200,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.efs
-plugin@org.eclipse.rse.efs.ui=v200903192345,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.efs.ui
-plugin@org.eclipse.rse.examples.daytime=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/examples/org.eclipse.rse.examples.daytime
-plugin@org.eclipse.rse.examples.tutorial=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/examples/org.eclipse.rse.examples.tutorial
-plugin@org.eclipse.rse.files.ui=v200903192345,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.files.ui
-plugin@org.eclipse.rse.importexport=v200903192345,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.importexport
-plugin@org.eclipse.rse.processes.ui=v200902011800,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.processes.ui
-plugin@org.eclipse.rse.sdk=v200902011800,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.sdk
-plugin@org.eclipse.rse.services.dstore=v200903192345,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.dstore
-plugin@org.eclipse.rse.services.files.ftp=v200903070130,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.files.ftp
-plugin@org.eclipse.rse.services.local=v200812041630,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.local
-plugin@org.eclipse.rse.services.ssh=v200903192345,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.ssh
-plugin@org.eclipse.rse.services.telnet=v200903091037,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.telnet
-plugin@org.eclipse.rse.services=v200903192345,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services
-plugin@org.eclipse.rse.shells.ui=v200903192345,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.shells.ui
-plugin@org.eclipse.rse.subsystems.files.core=v200903192345,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.core
-plugin@org.eclipse.rse.subsystems.files.dstore=v200903051130,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.dstore
-plugin@org.eclipse.rse.subsystems.files.ftp=v200903192345,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.ftp
-plugin@org.eclipse.rse.subsystems.files.local=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.local
-plugin@org.eclipse.rse.subsystems.files.ssh=v200902011800,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.ssh
-plugin@org.eclipse.rse.subsystems.processes.core=v200902011800,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.processes.core
-plugin@org.eclipse.rse.subsystems.processes.dstore=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.processes.dstore
-plugin@org.eclipse.rse.subsystems.processes.local=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.processes.local
-plugin@org.eclipse.rse.subsystems.processes.shell.linux=v20080714,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.processes.shell.linux
-plugin@org.eclipse.rse.subsystems.shells.core=v200903051130,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.core
-plugin@org.eclipse.rse.subsystems.shells.dstore=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.dstore
-plugin@org.eclipse.rse.subsystems.shells.local=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.local
-plugin@org.eclipse.rse.subsystems.shells.ssh=v200902011800,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.ssh
-plugin@org.eclipse.rse.subsystems.shells.telnet=v200902011800,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.telnet
-plugin@org.eclipse.rse.subsystems.terminals.core=v200903051130,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.terminals.core
-plugin@org.eclipse.rse.subsystems.terminals.ssh=v200902011800,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.terminals.ssh
-plugin@org.eclipse.rse.terminals.ui=v200903051130,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.terminals.ui
-plugin@org.eclipse.rse.tests=v200903070130,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/tests/org.eclipse.rse.tests
-plugin@org.eclipse.rse.tests.framework=v200902020100,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/tests/org.eclipse.rse.tests.framework
-plugin@org.eclipse.rse.ui=v200903192345,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.ui
-plugin@org.eclipse.rse.useractions=v200902102200,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.useractions
-\ No newline at end of file
diff --git a/releng/org.eclipse.tm.releng/maps/terminal.map b/releng/org.eclipse.tm.releng/maps/terminal.map
deleted file mode 100644
index b954a0627..000000000
--- a/releng/org.eclipse.tm.releng/maps/terminal.map
+++ /dev/null
@@ -1,13 +0,0 @@
-feature@org.eclipse.tm.terminal=v200902011800,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal-feature
-feature@org.eclipse.tm.terminal.sdk=v200902082200,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.sdk-feature
-feature@org.eclipse.tm.terminal.serial=v200902011800,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.serial-feature
-feature@org.eclipse.tm.terminal.ssh=v200902011800,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.ssh-feature
-feature@org.eclipse.tm.terminal.telnet=v200902011800,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.telnet-feature
-feature@org.eclipse.tm.terminal.test=v200902082200,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.test-feature
-feature@org.eclipse.tm.terminal.view=v200902011800,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.view-feature
-plugin@org.eclipse.tm.terminal=v200903051130,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal
-plugin@org.eclipse.tm.terminal.serial=v200902011800,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.serial
-plugin@org.eclipse.tm.terminal.ssh=v200902011800,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.ssh
-plugin@org.eclipse.tm.terminal.telnet=v200903051130,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.telnet
-plugin@org.eclipse.tm.terminal.test=v200902011800,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.test
-plugin@org.eclipse.tm.terminal.view=v200902011800,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.view
-\ No newline at end of file
diff --git a/releng/org.eclipse.tm.releng/maps/testdrivers.map b/releng/org.eclipse.tm.releng/maps/testdrivers.map
deleted file mode 100644
index 6ef4354c7..000000000
--- a/releng/org.eclipse.tm.releng/maps/testdrivers.map
+++ /dev/null
@@ -1,6 +0,0 @@
-!***************  PROJECT CONTRIBUTION  ******************************************************** 
-
-!*** Special entries from eclipse
-
-plugin@org.eclipse.test=v20071108,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,
-fragment@org.eclipse.ant.optional.junit=v20070530,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,
diff --git a/releng/org.eclipse.tm.releng/maps/tmcore.map b/releng/org.eclipse.tm.releng/maps/tmcore.map
deleted file mode 100644
index 21ee4b064..000000000
--- a/releng/org.eclipse.tm.releng/maps/tmcore.map
+++ /dev/null
@@ -1,2 +0,0 @@
-plugin@org.apache.commons.net,2.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/I20090407030832/bundles/org.apache.commons.net_2.0.0.v200903061330.jar
-plugin@org.apache.commons.net.source,2.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/I20090407030832/bundles/org.apache.commons.net.source_2.0.0.v200903061330.jar
diff --git a/releng/org.eclipse.tm.releng/maps/wince.map b/releng/org.eclipse.tm.releng/maps/wince.map
deleted file mode 100644
index cab32a9db..000000000
--- a/releng/org.eclipse.tm.releng/maps/wince.map
+++ /dev/null
@@ -1,6 +0,0 @@
-feature@org.eclipse.rse.wince=v200902102200,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/wince/org.eclipse.rse.wince-feature
-!! feature@org.eclipse.rse.wince.wrapper=v20080609a,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.wince.wrapper-feature
-plugin@org.eclipse.rse.subsystems.wince=v200903051330,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/wince/org.eclipse.rse.subsystems.wince
-plugin@org.eclipse.tm.rapi=v200809301330,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/wince/org.eclipse.tm.rapi
-plugin@org.eclipse.tm.rapi.examples=v20080522,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/wince/org.eclipse.tm.rapi.examples
-plugin@org.eclipse.tm.rapi.tests=v20080522,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/wince/org.eclipse.tm.rapi.tests
-\ No newline at end of file
diff --git a/releng/org.eclipse.tm.releng/promoteToEclipse.rse.properties b/releng/org.eclipse.tm.releng/promoteToEclipse.rse.properties
deleted file mode 100644
index fc7e8448e..000000000
--- a/releng/org.eclipse.tm.releng/promoteToEclipse.rse.properties
+++ /dev/null
@@ -1,175 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2008 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:
-#     IBM Corporation - initial API and implementation
-# Martin Oberhuber (Wind River) - adapt for DSDP from o.e.emf.validation.releng
-###############################################################################
-## promoteToEclipse.*.properties
-## specific version of promoteToEclipse.sh properties
-##
-## NOTE:
-## You must rename this file to promoteToEclipse.$subprojectName.properties for it to be 
-## found when using the -sub flag; otherwise you'll have to use the -f flag to specify
-## a CUSTOM-named properties file
-
-# product being built (folder name prefix)
-projectName=tm
-subprojectName=rse
-projectNameVanity=`echo $projectName $subprojectName | tr "a-z" "A-Z"`; # or something else manually assigned
-
-# used to determine the actual name of the SDK zip (when builds are aliased)
-SDKfilenamepattern="RSE-SDK-*.zip"
-
-# the following two arrays must be the same size (or else the second one will default to blank)
-javadocModuleArray=( "RSE" ); # array, project-subproject, for the name of the zip scp'd to remote, eg. foo-bar-doc.zip
-# if "", create in $projectName/javadoc; if "/path", create in $projectName/$subprojectName/javadoc 
-javadocFolderArray=( "/$subprojectName" ); # array of path fragments
-# list of targets to use when executing fixJavadocs.sh
-javadocTargetArray=( "-sub $subprojectName" );
-
-# publisher of newsgroup announcements
-newsgroupPublisherEmail="TM Builder <moberhuber@build.eclipse.org>"
-newsgroup=eclipse.dsdp.tm
-# to thread posts under an existing post (or posts) enter the slash-escaped Message-ID for which this is a reply,
-# eg: <du7hic\$qos\$1@utils.eclipse.org>
-newsgroupThreadReferences=""
-
-# default eclipse.org, build server, mapfile server usernames
-user=$USER
-# if no value set here or by -userIES flag, default to -user flag or value in properties file
-userIES=
-
-# group permissions on eclipse.org so that anyone can change files
-eclipseUserGroup="dsdp-tm"admin
-eclipsePermsDir=2775
-eclipsePermsFile=664
-
-# group permissions on build box so that anyone can change files
-buildUserGroup="www"
-buildPermsDir=2775
-buildPermsFile=664
-
-# IES map file branch (required)
-branchIES=
-
-# IES map file template: use "buildIDactual" and "webPath" as placeholders
-IESmapfileArray=( 
-"RSE-runtime-buildIDactual.zip=webPath | | | runtime | $subprojectName" 
-"RSE-SDK-buildIDactual.zip=webPath     | | | sdk | $subprojectName" ); # array of lines
-
-### DEFAULT BEHAVIOUR OPTIONS ###
-
-# default setting for whether to do or skip the drop upload section: 0 = do, 1 = skip
-dodrop=1
-
-# default setting for whether to do or skip the javadoc section: 0 = do, 1 = skip
-dodocs=1
-
-# default setting for whether to do or skip the Update Manager jars section: 0 = do, 1 = skip
-UMjars=1
-
-#default buildID
-buildID=
-
-#default branch
-branch=1.0.0
-cvsbranch=HEAD
-
-#do RSS feed file update?
-RSS=1
-
-# do search cvs update?
-searchCVS=1
-# how long to block before giving up (in seconds, eg., 1200 for 20 mins wait)
-searchCVSTimeout=1200
-
-#do IES mapping file update?
-IES=0
-
-# debug output
-debug=0 ; # values can be 0,1,2
-
-#clean up /tmp folder?
-noclean=0;
-
-# compare drops folder after scp upload?
-noCompareDropsFolders=0 ; # default 0, do compare; set 1 to bypass or pass in querystring
-
-# compare UM folder after scp upload?
-noCompareUMFolders= ; # default 0, do compare; set 1 to bypass or pass in querystring
-
-# announce new build in newsgroup? (default 0)
-announce=0;
-
-### SERVER & PATH CONFIG OPTIONS ###
-
-#server on which builds occur (need to ssh to this box as $user@$buildServerFullName)
-buildServerFullName=`hostname`
-
-#server on which eclipse's production CVS is located (need to ssh to this box as $user@$eclipseServerFullName)
-eclipseServerFullName=dev.eclipse.org
-
-#server on which eclipse's production files are located (downloads, javadoc, etc.): ssh as $user@$downloadServerFullName)
-downloadServerFullName=download1.eclipse.org
-
-#paths on \$downloadServerFullName where files are published
-projectWWWDir=/home/data/httpd/download.eclipse.org/dsdp/$projectName
-#projectDropsDir=$projectWWWDir/$subprojectName/downloads/drops
-projectDropsDir=$projectWWWDir/downloads/drops
-
-#paths to build base, scripts, and drops on build server
-baseBuildDir=/home/www-data/build/dsdp/$projectName
-buildScriptsDir=/home/www-data/build/dsdp/scripts
-buildDropsDir=$baseBuildDir/$subprojectName/downloads/drops
-
-# path to website on build server 
-localWebDir=/var/www/html/dsdp/$projectName
-
-# urls 
-releaseNotesURL=http://www.eclipse.org/dsdp/$projectName/news/relnotes.php?project=$subprojectName
-downloadsURL=http://www.eclipse.org/dsdp/$projectName/downloads/?project=$subprojectName
-
-### ANT OPTIONS ###
-ANT=/opt/apache-ant-1.6/bin/ant
-
-### DEFAULT BEHAVIOUR AND JVM OPTIONS :: buildUpdate.sh ###
-
-# specify the correct java home & vm used to run the build
-javaHome=/opt/sun-java2-1.4
-vm=$javaHome/bin/java
-
-# zips to unpack for UM jar generation
-filePrefixesToUnzipArray=( "RSE-SDK-" "RSE-automated-tests-" "RSE-examples-" );
-
-# ant script and target to be executed
-antScript=org.eclipse.releng.generators/buildProductUpdateJars.xml
-target=run
-
-# default operations
-builder=1 # get builder packages from cvs
-promote=0 # don't promote by default
-skipjars=0 # when promoting, upload all jars (don't skip)
-cleanup=1 # delete temp stuff when done
-
-# compare UM folder after scp upload?
-noCompareUMFolders=0 ; # default 0, do compare; set 1 to bypass or pass in querystring
-
-# do 4-part jars?
-no4thPart=0;
-
-# where to get releng.generators.ProductUpdateBuilder, jars & ant scripts
-relengGeneratorsCVSPath=releng-common/tools/updates/org.eclipse.releng.generators
-
-# use a default value for basebuilderBranch? 0 = no, 1 = yes
-useDefaultBasebuilderBranch=0
-
-# See http://wiki.eclipse.org/Modeling_Project_Releng/Releasing#Contributing_To_Ganymede_Update_Site
-# pattern to use when searching for features to include in coordsite; defaults to ".*eclipse/features/org.eclipse..*(${subprojectName}|${subprojectName}.sdk)_.*\/$" 
-coordsiteFeaturePattern=""
-# pattern to use when setting feature to include in coordsite's main feature ('Models and Model Development'); all other matching features will go in 'Enabling Features'
-coordsiteMainFeaturePattern=""
diff --git a/releng/org.eclipse.tm.releng/repoInfo.properties b/releng/org.eclipse.tm.releng/repoInfo.properties
deleted file mode 100644
index c1ae539a0..000000000
--- a/releng/org.eclipse.tm.releng/repoInfo.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2008 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:
-#     IBM Corporation - initial API and implementation
-# Martin Oberhuber (Wind River) - adapt for DSDP from o.e.emf.validation.releng
-###############################################################################
-cvsHost=dev.eclipse.org
-cvsReadProtocol=pserver
-cvsWriteProtocol=ext
-cvsReadUser=anonymous
-cvsWriteUser=moberhuber
-cvsWriteRelengUser=moberhuber
-cvsRep=/cvsroot/dsdp
diff --git a/releng/org.eclipse.tm.releng/templateFiles/rse.map.template b/releng/org.eclipse.tm.releng/templateFiles/rse.map.template
deleted file mode 100644
index 00a57167a..000000000
--- a/releng/org.eclipse.tm.releng/templateFiles/rse.map.template
+++ /dev/null
@@ -1,10 +0,0 @@
-!***************  PROJECT CONTRIBUTION  ******************************************************** 
-
-!*** Special entries from eclipse
-
-plugin@org.eclipse.test=v20070226,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,
-fragment@org.eclipse.ant.optional.junit=v20050226,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,
-
-!*** Project's plugins, features and fragments
-
-@entries@
diff --git a/releng/org.eclipse.tm.releng/templateFiles/testManifest.xml.template b/releng/org.eclipse.tm.releng/templateFiles/testManifest.xml.template
deleted file mode 100644
index bc431c548..000000000
--- a/releng/org.eclipse.tm.releng/templateFiles/testManifest.xml.template
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0"?>
-<topLevel>
-	<zipTypes>
-		<zipType name="projruntime">
-			<platform 
-				id="projRUN" 
-				name="All" 
-				fileName='&lt;a href="RSE-runtime-@build@.zip"&gt;RSE-runtime-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@RSE-runtime-@build@.zip.size@ - checksum:&lt;a href="RSE-runtime-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
-			</platform>
-		</zipType>
-		<zipType name="projsdk">
-			<platform 
-				id="projSRC" 
-				name="All" 
-				fileName='&lt;a href="RSE-SDK-@build@.zip"&gt;RSE-SDK-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@RSE-SDK-@build@.zip.size@ - checksum:&lt;a href="RSE-SDK-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
-			</platform>
-		</zipType>
-		<zipType name="projtests">
-			<platform 
-				id="T" 
-				name="All" 
-				fileName='&lt;a href="RSE-automated-tests-@build@.zip"&gt;RSE-automated-tests-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@RSE-automated-tests-@build@.zip.size@ - checksum:&lt;a href="RSE-automated-tests-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
-			</platform>
-		</zipType>
-		<zipType name="projexamples">
-			<platform 
-				id="EX" 
-				name="All" 
-				fileName='&lt;a href="RSE-examples-@build@.zip"&gt;RSE-examples-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@RSE-examples-@build@.zip.size@ - checksum:&lt;a href="RSE-examples-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
-			</platform>
-		</zipType>
-	</zipTypes>
-
-	<logFiles>
-		<logFile name="org.eclipse.rse.tests_linux.gtk.xml">
-			<effectedFile id="SDK"></effectedFile>
-			<effectedFile id="projRUN"></effectedFile>
-		</logFile>
-	
-	<!-- Comment out for now until we get tests on various platforms.
-		<logFile name="org.eclipse.rse.tests_win32.xml">
-			<effectedFile id="SDK"></effectedFile>
-			<effectedFile id="projRUN"></effectedFile>
-		</logFile>
-	-->	
-	
-@entries@
-
-	</logFiles>
-</topLevel>
diff --git a/releng/org.eclipse.tm.releng/testManifest.xml b/releng/org.eclipse.tm.releng/testManifest.xml
deleted file mode 100644
index 663d28f4c..000000000
--- a/releng/org.eclipse.tm.releng/testManifest.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-<topLevel>
-	<zipTypes>
-		<zipType name="projruntime">
-			<platform 
-				id="projRUN" 
-				name="All" 
-				fileName='&lt;a href="RSE-runtime-@build@.zip"&gt;RSE-runtime-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@RSE-runtime-@build@.zip.size@ - checksum:&lt;a href="RSE-runtime-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
-			</platform>
-		</zipType>
-		<zipType name="projsdk">
-			<platform 
-				id="projSRC" 
-				name="All" 
-				fileName='&lt;a href="RSE-SDK-@build@.zip"&gt;RSE-SDK-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@RSE-SDK-@build@.zip.size@ - checksum:&lt;a href="RSE-SDK-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
-			</platform>
-		</zipType>
-		<zipType name="projtests">
-			<platform 
-				id="T" 
-				name="All" 
-				fileName='&lt;a href="RSE-automated-tests-@build@.zip"&gt;RSE-automated-tests-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@RSE-automated-tests-@build@.zip.size@ - checksum:&lt;a href="RSE-automated-tests-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
-			</platform>
-		</zipType>
-		<zipType name="projexamples">
-			<platform 
-				id="EX" 
-				name="All" 
-				fileName='&lt;a href="RSE-examples-@build@.zip"&gt;RSE-examples-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@RSE-examples-@build@.zip.size@ - checksum:&lt;a href="RSE-examples-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
-			</platform>
-		</zipType>
-	</zipTypes>
-
-	<logFiles>
-		<logFile name="org.eclipse.rse.tests_linux.gtk.xml">
-			<effectedFile id="SDK"></effectedFile>
-			<effectedFile id="projRUN"></effectedFile>
-		</logFile>
-	
-	<!-- Comment out for now until we get tests on various platforms.
-		<logFile name="org.eclipse.rse.tests_win32.xml">
-			<effectedFile id="SDK"></effectedFile>
-			<effectedFile id="projRUN"></effectedFile>
-		</logFile>
-	-->	
-	
-   <logFile name="plugins/org.eclipse.rse.examples_*/*.bin.log">
-      <effectedFile id="EX"></effectedFile>
-   </logFile>
-   <logFile name="plugins/org.eclipse.rse_*/*.bin.log">
-      <effectedFile id="SDK"></effectedFile>
-      <effectedFile id="projRUN"></effectedFile>
-   </logFile>
-   <logFile name="plugins/org.eclipse.rse.tests_*/*.bin.log">
-      <effectedFile id="T"></effectedFile>
-   </logFile>
-
-	</logFiles>
-</topLevel>
diff --git a/releng/readme.txt b/releng/readme.txt
deleted file mode 100644
index 78336b3a8..000000000
--- a/releng/readme.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Use the "releng" folder for projects containing instructions and scripts for 
-building RSE and the DSDP-TM Core components.
-All projects should be named "org.eclipse.rse.releng<.*>".
diff --git a/rse/doc/readme.txt b/rse/doc/readme.txt
deleted file mode 100644
index 4b45b5127..000000000
--- a/rse/doc/readme.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Use the "doc" folder for plugin projects containing documentation.
-All projects should be named "org.eclipse.rse.doc.*".
-\ No newline at end of file
diff --git a/rse/examples/readme.txt b/rse/examples/readme.txt
deleted file mode 100644
index 5193a00e2..000000000
--- a/rse/examples/readme.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Use the "examples" folder for plugin projects containing examples.
-All projects should be named "org.eclipse.rse.examples.*".
-\ No newline at end of file
diff --git a/rse/features/org.eclipse.rse-feature/.project b/rse/features/org.eclipse.rse-feature/.project
deleted file mode 100644
index fc4435d95..000000000
--- a/rse/features/org.eclipse.rse-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.rse-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/rse/features/org.eclipse.rse-feature/build.properties b/rse/features/org.eclipse.rse-feature/build.properties
deleted file mode 100644
index e0c4ed859..000000000
--- a/rse/features/org.eclipse.rse-feature/build.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-################################################################################
-# Copyright (c) 2006, 2007 Wind River Systems, Inc.
-# 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: 
-# Martin Oberhuber - initial API and implementation 
-################################################################################
-bin.includes = feature.xml,\
-               license.html,\
-               feature.properties,\
-               epl-v10.html,\
-               eclipse_update_120.jpg
-#generate.feature@org.eclipse.rse.core.source=org.eclipse.rse.core
-#generate.feature@org.eclipse.rse.dstore.source=org.eclipse.rse.dstore
-#generate.feature@org.eclipse.rse.ftp.source=org.eclipse.rse.ftp
-#generate.feature@org.eclipse.rse.local.source=org.eclipse.rse.local
-#generate.feature@org.eclipse.rse.ssh.source=org.eclipse.rse.ssh
diff --git a/rse/features/org.eclipse.rse-feature/eclipse_update_120.jpg b/rse/features/org.eclipse.rse-feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/rse/features/org.eclipse.rse-feature/eclipse_update_120.jpg
+++ /dev/null
diff --git a/rse/features/org.eclipse.rse-feature/epl-v10.html b/rse/features/org.eclipse.rse-feature/epl-v10.html
deleted file mode 100644
index 9321f4082..000000000
--- a/rse/features/org.eclipse.rse-feature/epl-v10.html
+++ /dev/null
@@ -1,256 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-
-
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Eclipse Public License - Version 1.0</title>
-
-<style type="text/css">
-  body {
-    size: 8.5in 11.0in;
-    margin: 0.25in 0.5in 0.25in 0.5in;
-    tab-interval: 0.5in;
-    }
-  p {  	
-    margin-left: auto;
-    margin-top:  0.5em;
-    margin-bottom: 0.5em;
-    }
-  p.list {
-  	margin-left: 0.5in;
-    margin-top:  0.05em;
-    margin-bottom: 0.05em;
-    }
-  </style></head><body lang="EN-US">
-
-<p align="center"><b>Eclipse Public License - v 1.0</b></p>
-
-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.</p>
-
-<p><b>1. DEFINITIONS</b></p>
-
-<p>"Contribution" means:</p>
-
-<p class="list">a) in the case of the initial Contributor, the initial
-code and documentation distributed under this Agreement, and</p>
-<p class="list">b) in the case of each subsequent Contributor:</p>
-<p class="list">i) changes to the Program, and</p>
-<p class="list">ii) additions to the Program;</p>
-<p class="list">where such changes and/or additions to the Program
-originate from and are distributed by that particular Contributor. A
-Contribution 'originates' from a Contributor if it was added to the
-Program by such Contributor itself or anyone acting on such
-Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii)
-are not derivative works of the Program.</p>
-
-<p>"Contributor" means any person or entity that distributes
-the Program.</p>
-
-<p>"Licensed Patents" mean patent claims licensable by a
-Contributor which are necessarily infringed by the use or sale of its
-Contribution alone or when combined with the Program.</p>
-
-<p>"Program" means the Contributions distributed in accordance
-with this Agreement.</p>
-
-<p>"Recipient" means anyone who receives the Program under
-this Agreement, including all Contributors.</p>
-
-<p><b>2. GRANT OF RIGHTS</b></p>
-
-<p class="list">a) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works
-of, publicly display, publicly perform, distribute and sublicense the
-Contribution of such Contributor, if any, and such derivative works, in
-source code and object code form.</p>
-
-<p class="list">b) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell,
-offer to sell, import and otherwise transfer the Contribution of such
-Contributor, if any, in source code and object code form. This patent
-license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor,
-such addition of the Contribution causes such combination to be covered
-by the Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.</p>
-
-<p class="list">c) Recipient understands that although each Contributor
-grants the licenses to its Contributions set forth herein, no assurances
-are provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility to
-secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow Recipient
-to distribute the Program, it is Recipient's responsibility to acquire
-that license before distributing the Program.</p>
-
-<p class="list">d) Each Contributor represents that to its knowledge it
-has sufficient copyright rights in its Contribution, if any, to grant
-the copyright license set forth in this Agreement.</p>
-
-<p><b>3. REQUIREMENTS</b></p>
-
-<p>A Contributor may choose to distribute the Program in object code
-form under its own license agreement, provided that:</p>
-
-<p class="list">a) it complies with the terms and conditions of this
-Agreement; and</p>
-
-<p class="list">b) its license agreement:</p>
-
-<p class="list">i) effectively disclaims on behalf of all Contributors
-all warranties and conditions, express and implied, including warranties
-or conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;</p>
-
-<p class="list">ii) effectively excludes on behalf of all Contributors
-all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;</p>
-
-<p class="list">iii) states that any provisions which differ from this
-Agreement are offered by that Contributor alone and not by any other
-party; and</p>
-
-<p class="list">iv) states that source code for the Program is available
-from such Contributor, and informs licensees how to obtain it in a
-reasonable manner on or through a medium customarily used for software
-exchange.</p>
-
-<p>When the Program is made available in source code form:</p>
-
-<p class="list">a) it must be made available under this Agreement; and</p>
-
-<p class="list">b) a copy of this Agreement must be included with each
-copy of the Program.</p>
-
-<p>Contributors may not remove or alter any copyright notices contained
-within the Program.</p>
-
-<p>Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.</p>
-
-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
-
-<p>Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use of
-the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create
-potential liability for other Contributors. Therefore, if a Contributor
-includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and
-indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses")
-arising from claims, lawsuits and other legal actions brought by a third
-party against the Indemnified Contributor to the extent caused by the
-acts or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In
-order to qualify, an Indemnified Contributor must: a) promptly notify
-the Commercial Contributor in writing of such claim, and b) allow the
-Commercial Contributor to control, and cooperate with the Commercial
-Contributor in, the defense and any related settlement negotiations. The
-Indemnified Contributor may participate in any such claim at its own
-expense.</p>
-
-<p>For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.</p>
-
-<p><b>5. NO WARRANTY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED 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. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable laws,
-damage to or loss of data, programs or equipment, and unavailability or
-interruption of operations.</p>
-
-<p><b>6. DISCLAIMER OF LIABILITY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
-
-<p><b>7. GENERAL</b></p>
-
-<p>If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.</p>
-
-<p>If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.</p>
-
-<p>All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.</p>
-
-<p>Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.</p>
-
-<p>This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No party
-to this Agreement will bring a legal action under this Agreement more
-than one year after the cause of action arose. Each party waives its
-rights to a jury trial in any resulting litigation.</p>
-
-</body></html>
-\ No newline at end of file
diff --git a/rse/features/org.eclipse.rse-feature/feature.properties b/rse/features/org.eclipse.rse-feature/feature.properties
deleted file mode 100644
index 554011874..000000000
--- a/rse/features/org.eclipse.rse-feature/feature.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2009 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:
-#     IBM Corporation - initial API and implementation
-# Martin Oberhuber (Wind River) - ongoing maintenance
-###############################################################################
-
-# NLS_MESSAGEFORMAT_NONE
-# NLS_ENCODING=UTF-8
-
-# "featureName" property - name of the feature
-featureName=Remote System Explorer End-User Runtime
-
-# "description" property - description of the feature
-description=An integrated framework and toolkit for seamless working \
-on remote systems through SSH, FTP or dstore protocols.
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org - DSDP
-
-# "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management Updates
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2000, 2009 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-This product includes software developed by the\n\
-Apache Software Foundation http://www.apache.org/
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/rse/features/org.eclipse.rse-feature/feature.xml b/rse/features/org.eclipse.rse-feature/feature.xml
deleted file mode 100644
index db7ebf196..000000000
--- a/rse/features/org.eclipse.rse-feature/feature.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Copyright (c) 2005, 2009 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:
-         IBM Corporation - initial API and implementation
- -->
-
-<feature
-      id="org.eclipse.rse"
-      label="%featureName"
-      version="3.1.2.qualifier"
-      provider-name="%providerName"
-      plugin="org.eclipse.rse"
-      image="eclipse_update_120.jpg">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/>
-      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/>
-   </url>
-
-   <includes
-         id="org.eclipse.rse.core"
-         version="0.0.0"
-         search-location="both"/>
-
-   <includes
-         id="org.eclipse.rse.dstore"
-         version="0.0.0"
-         search-location="both"/>
-
-   <includes
-         id="org.eclipse.rse.ftp"
-         version="0.0.0"
-         search-location="both"/>
-
-   <includes
-         id="org.eclipse.rse.local"
-         version="0.0.0"
-         search-location="both"/>
-
-   <includes
-         id="org.eclipse.rse.ssh"
-         version="0.0.0"
-         search-location="both"/>
-
-   <includes
-         id="org.eclipse.rse.telnet"
-         version="0.0.0"
-         search-location="both"/>
-
-   <includes
-         id="org.eclipse.rse.terminals"
-         version="0.0.0"
-         search-location="both"/>
-
-   <plugin
-         id="org.eclipse.rse"
-         download-size="7"
-         install-size="8"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/rse/features/org.eclipse.rse-feature/license.html b/rse/features/org.eclipse.rse-feature/license.html
deleted file mode 100644
index c6af966b6..000000000
--- a/rse/features/org.eclipse.rse-feature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/rse/features/org.eclipse.rse.core-feature/.project b/rse/features/org.eclipse.rse.core-feature/.project
deleted file mode 100644
index 5e404d986..000000000
--- a/rse/features/org.eclipse.rse.core-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.rse.core-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/rse/features/org.eclipse.rse.core-feature/build.properties b/rse/features/org.eclipse.rse.core-feature/build.properties
deleted file mode 100644
index 92101e808..000000000
--- a/rse/features/org.eclipse.rse.core-feature/build.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 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:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = feature.xml,\
-               license.html,\
-               feature.properties,\
-               epl-v10.html
diff --git a/rse/features/org.eclipse.rse.core-feature/epl-v10.html b/rse/features/org.eclipse.rse.core-feature/epl-v10.html
deleted file mode 100644
index 9321f4082..000000000
--- a/rse/features/org.eclipse.rse.core-feature/epl-v10.html
+++ /dev/null
@@ -1,256 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-
-
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Eclipse Public License - Version 1.0</title>
-
-<style type="text/css">
-  body {
-    size: 8.5in 11.0in;
-    margin: 0.25in 0.5in 0.25in 0.5in;
-    tab-interval: 0.5in;
-    }
-  p {  	
-    margin-left: auto;
-    margin-top:  0.5em;
-    margin-bottom: 0.5em;
-    }
-  p.list {
-  	margin-left: 0.5in;
-    margin-top:  0.05em;
-    margin-bottom: 0.05em;
-    }
-  </style></head><body lang="EN-US">
-
-<p align="center"><b>Eclipse Public License - v 1.0</b></p>
-
-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.</p>
-
-<p><b>1. DEFINITIONS</b></p>
-
-<p>"Contribution" means:</p>
-
-<p class="list">a) in the case of the initial Contributor, the initial
-code and documentation distributed under this Agreement, and</p>
-<p class="list">b) in the case of each subsequent Contributor:</p>
-<p class="list">i) changes to the Program, and</p>
-<p class="list">ii) additions to the Program;</p>
-<p class="list">where such changes and/or additions to the Program
-originate from and are distributed by that particular Contributor. A
-Contribution 'originates' from a Contributor if it was added to the
-Program by such Contributor itself or anyone acting on such
-Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii)
-are not derivative works of the Program.</p>
-
-<p>"Contributor" means any person or entity that distributes
-the Program.</p>
-
-<p>"Licensed Patents" mean patent claims licensable by a
-Contributor which are necessarily infringed by the use or sale of its
-Contribution alone or when combined with the Program.</p>
-
-<p>"Program" means the Contributions distributed in accordance
-with this Agreement.</p>
-
-<p>"Recipient" means anyone who receives the Program under
-this Agreement, including all Contributors.</p>
-
-<p><b>2. GRANT OF RIGHTS</b></p>
-
-<p class="list">a) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works
-of, publicly display, publicly perform, distribute and sublicense the
-Contribution of such Contributor, if any, and such derivative works, in
-source code and object code form.</p>
-
-<p class="list">b) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell,
-offer to sell, import and otherwise transfer the Contribution of such
-Contributor, if any, in source code and object code form. This patent
-license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor,
-such addition of the Contribution causes such combination to be covered
-by the Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.</p>
-
-<p class="list">c) Recipient understands that although each Contributor
-grants the licenses to its Contributions set forth herein, no assurances
-are provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility to
-secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow Recipient
-to distribute the Program, it is Recipient's responsibility to acquire
-that license before distributing the Program.</p>
-
-<p class="list">d) Each Contributor represents that to its knowledge it
-has sufficient copyright rights in its Contribution, if any, to grant
-the copyright license set forth in this Agreement.</p>
-
-<p><b>3. REQUIREMENTS</b></p>
-
-<p>A Contributor may choose to distribute the Program in object code
-form under its own license agreement, provided that:</p>
-
-<p class="list">a) it complies with the terms and conditions of this
-Agreement; and</p>
-
-<p class="list">b) its license agreement:</p>
-
-<p class="list">i) effectively disclaims on behalf of all Contributors
-all warranties and conditions, express and implied, including warranties
-or conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;</p>
-
-<p class="list">ii) effectively excludes on behalf of all Contributors
-all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;</p>
-
-<p class="list">iii) states that any provisions which differ from this
-Agreement are offered by that Contributor alone and not by any other
-party; and</p>
-
-<p class="list">iv) states that source code for the Program is available
-from such Contributor, and informs licensees how to obtain it in a
-reasonable manner on or through a medium customarily used for software
-exchange.</p>
-
-<p>When the Program is made available in source code form:</p>
-
-<p class="list">a) it must be made available under this Agreement; and</p>
-
-<p class="list">b) a copy of this Agreement must be included with each
-copy of the Program.</p>
-
-<p>Contributors may not remove or alter any copyright notices contained
-within the Program.</p>
-
-<p>Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.</p>
-
-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
-
-<p>Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use of
-the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create
-potential liability for other Contributors. Therefore, if a Contributor
-includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and
-indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses")
-arising from claims, lawsuits and other legal actions brought by a third
-party against the Indemnified Contributor to the extent caused by the
-acts or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In
-order to qualify, an Indemnified Contributor must: a) promptly notify
-the Commercial Contributor in writing of such claim, and b) allow the
-Commercial Contributor to control, and cooperate with the Commercial
-Contributor in, the defense and any related settlement negotiations. The
-Indemnified Contributor may participate in any such claim at its own
-expense.</p>
-
-<p>For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.</p>
-
-<p><b>5. NO WARRANTY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED 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. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable laws,
-damage to or loss of data, programs or equipment, and unavailability or
-interruption of operations.</p>
-
-<p><b>6. DISCLAIMER OF LIABILITY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
-
-<p><b>7. GENERAL</b></p>
-
-<p>If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.</p>
-
-<p>If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.</p>
-
-<p>All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.</p>
-
-<p>Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.</p>
-
-<p>This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No party
-to this Agreement will bring a legal action under this Agreement more
-than one year after the cause of action arose. Each party waives its
-rights to a jury trial in any resulting litigation.</p>
-
-</body></html>
-\ No newline at end of file
diff --git a/rse/features/org.eclipse.rse.core-feature/feature.properties b/rse/features/org.eclipse.rse.core-feature/feature.properties
deleted file mode 100644
index 20b219ebb..000000000
--- a/rse/features/org.eclipse.rse.core-feature/feature.properties
+++ /dev/null
@@ -1,141 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2009 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:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# NLS_MESSAGEFORMAT_NONE
-# NLS_ENCODING=UTF-8
-
-# "featureName" property - name of the feature
-featureName=RSE Core
-
-# "description" property - description of the feature
-description=Remote System Explorer (RSE) core including \
-system and subsystem definition, basic service APIs, and \
-user documentation.
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org - DSDP
-
-# "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management Updates
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved.\n\
-\n\
-This program and the accompanying materials are made available under the terms\n\
-of the Eclipse Public License v1.0 which accompanies this distribution, and is\n\
-available at http://www.eclipse.org/legal/epl-v10.html\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/rse/features/org.eclipse.rse.core-feature/feature.xml b/rse/features/org.eclipse.rse.core-feature/feature.xml
deleted file mode 100644
index 304898b26..000000000
--- a/rse/features/org.eclipse.rse.core-feature/feature.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Copyright (c) 2005, 2009 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:
-         IBM Corporation - initial API and implementation
- -->
-
-<feature
-      id="org.eclipse.rse.core"
-      label="%featureName"
-      version="3.1.1.qualifier"
-      provider-name="%providerName"
-      plugin="org.eclipse.rse.core">
-
-   <description>
-      %description
-   </description>
-
-   <copyright url="http://www.eclipse.org/legal/epl-v10.html">
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/>
-      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/>
-   </url>
-
-   <requires>
-      <import plugin="org.eclipse.compare"/>
-      <import plugin="org.eclipse.core.filesystem"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.jface"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.search"/>
-      <import plugin="org.eclipse.swt"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.eclipse.ui.forms"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.ui.views"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.rse.core"
-         download-size="41"
-         install-size="133"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rse.doc.user"
-         download-size="159"
-         install-size="193"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rse.efs"
-         download-size="7"
-         install-size="14"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rse.efs.ui"
-         download-size="7"
-         install-size="14"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rse.importexport"
-         download-size="51"
-         install-size="147"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rse.files.ui"
-         download-size="111"
-         install-size="407"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rse.processes.ui"
-         download-size="22"
-         install-size="61"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rse.services"
-         download-size="57"
-         install-size="183"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rse.shells.ui"
-         download-size="40"
-         install-size="135"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rse.subsystems.files.core"
-         download-size="32"
-         install-size="98"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rse.subsystems.processes.core"
-         download-size="7"
-         install-size="21"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rse.subsystems.processes.shell.linux"
-         download-size="8"
-         install-size="22"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rse.subsystems.shells.core"
-         download-size="16"
-         install-size="56"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rse.ui"
-         download-size="548"
-         install-size="1677"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/rse/features/org.eclipse.rse.core-feature/license.html b/rse/features/org.eclipse.rse.core-feature/license.html
deleted file mode 100644
index f5a16251a..000000000
--- a/rse/features/org.eclipse.rse.core-feature/license.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-(&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-	
-<ul>
-	<li>The top-level (root) directory</li>
-
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-	
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/rse/features/org.eclipse.rse.core-feature/sourceTemplateFeature/epl-v10.html b/rse/features/org.eclipse.rse.core-feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 9321f4082..000000000
--- a/rse/features/org.eclipse.rse.core-feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,256 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-
-
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Eclipse Public License - Version 1.0</title>
-
-<style type="text/css">
-  body {
-    size: 8.5in 11.0in;
-    margin: 0.25in 0.5in 0.25in 0.5in;
-    tab-interval: 0.5in;
-    }
-  p {  	
-    margin-left: auto;
-    margin-top:  0.5em;
-    margin-bottom: 0.5em;
-    }
-  p.list {
-  	margin-left: 0.5in;
-    margin-top:  0.05em;
-    margin-bottom: 0.05em;
-    }
-  </style></head><body lang="EN-US">
-
-<p align="center"><b>Eclipse Public License - v 1.0</b></p>
-
-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.</p>
-
-<p><b>1. DEFINITIONS</b></p>
-
-<p>"Contribution" means:</p>
-
-<p class="list">a) in the case of the initial Contributor, the initial
-code and documentation distributed under this Agreement, and</p>
-<p class="list">b) in the case of each subsequent Contributor:</p>
-<p class="list">i) changes to the Program, and</p>
-<p class="list">ii) additions to the Program;</p>
-<p class="list">where such changes and/or additions to the Program
-originate from and are distributed by that particular Contributor. A
-Contribution 'originates' from a Contributor if it was added to the
-Program by such Contributor itself or anyone acting on such
-Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii)
-are not derivative works of the Program.</p>
-
-<p>"Contributor" means any person or entity that distributes
-the Program.</p>
-
-<p>"Licensed Patents" mean patent claims licensable by a
-Contributor which are necessarily infringed by the use or sale of its
-Contribution alone or when combined with the Program.</p>
-
-<p>"Program" means the Contributions distributed in accordance
-with this Agreement.</p>
-
-<p>"Recipient" means anyone who receives the Program under
-this Agreement, including all Contributors.</p>
-
-<p><b>2. GRANT OF RIGHTS</b></p>
-
-<p class="list">a) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works
-of, publicly display, publicly perform, distribute and sublicense the
-Contribution of such Contributor, if any, and such derivative works, in
-source code and object code form.</p>
-
-<p class="list">b) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell,
-offer to sell, import and otherwise transfer the Contribution of such
-Contributor, if any, in source code and object code form. This patent
-license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor,
-such addition of the Contribution causes such combination to be covered
-by the Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.</p>
-
-<p class="list">c) Recipient understands that although each Contributor
-grants the licenses to its Contributions set forth herein, no assurances
-are provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility to
-secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow Recipient
-to distribute the Program, it is Recipient's responsibility to acquire
-that license before distributing the Program.</p>
-
-<p class="list">d) Each Contributor represents that to its knowledge it
-has sufficient copyright rights in its Contribution, if any, to grant
-the copyright license set forth in this Agreement.</p>
-
-<p><b>3. REQUIREMENTS</b></p>
-
-<p>A Contributor may choose to distribute the Program in object code
-form under its own license agreement, provided that:</p>
-
-<p class="list">a) it complies with the terms and conditions of this
-Agreement; and</p>
-
-<p class="list">b) its license agreement:</p>
-
-<p class="list">i) effectively disclaims on behalf of all Contributors
-all warranties and conditions, express and implied, including warranties
-or conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;</p>
-
-<p class="list">ii) effectively excludes on behalf of all Contributors
-all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;</p>
-
-<p class="list">iii) states that any provisions which differ from this
-Agreement are offered by that Contributor alone and not by any other
-party; and</p>
-
-<p class="list">iv) states that source code for the Program is available
-from such Contributor, and informs licensees how to obtain it in a
-reasonable manner on or through a medium customarily used for software
-exchange.</p>
-
-<p>When the Program is made available in source code form:</p>
-
-<p class="list">a) it must be made available under this Agreement; and</p>
-
-<p class="list">b) a copy of this Agreement must be included with each
-copy of the Program.</p>
-
-<p>Contributors may not remove or alter any copyright notices contained
-within the Program.</p>
-
-<p>Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.</p>
-
-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
-
-<p>Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use of
-the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create
-potential liability for other Contributors. Therefore, if a Contributor
-includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and
-indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses")
-arising from claims, lawsuits and other legal actions brought by a third
-party against the Indemnified Contributor to the extent caused by the
-acts or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In
-order to qualify, an Indemnified Contributor must: a) promptly notify
-the Commercial Contributor in writing of such claim, and b) allow the
-Commercial Contributor to control, and cooperate with the Commercial
-Contributor in, the defense and any related settlement negotiations. The
-Indemnified Contributor may participate in any such claim at its own
-expense.</p>
-
-<p>For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.</p>
-
-<p><b>5. NO WARRANTY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED 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. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable laws,
-damage to or loss of data, programs or equipment, and unavailability or
-interruption of operations.</p>
-
-<p><b>6. DISCLAIMER OF LIABILITY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
-
-<p><b>7. GENERAL</b></p>
-
-<p>If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.</p>
-
-<p>If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.</p>
-
-<p>All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.</p>
-
-<p>Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.</p>
-
-<p>This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No party
-to this Agreement will bring a legal action under this Agreement more
-than one year after the cause of action arose. Each party waives its
-rights to a jury trial in any resulting litigation.</p>
-
-</body></html>
-\ No newline at end of file
diff --git a/rse/features/org.eclipse.rse.core-feature/sourceTemplateFeature/feature.properties b/rse/features/org.eclipse.rse.core-feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index f76dc526c..000000000
--- a/rse/features/org.eclipse.rse.core-feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2009 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:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=RSE Core Source
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org - DSDP
-
-# "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management Updates
-
-# "description" property - description of the feature
-description=Remote System Explorer (RSE) core including \
-system and subsystem definition, \
-basic service APIs, and \
-user documentation.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved.\n\
-\n\
-This program and the accompanying materials are made available under the terms\n\
-of the Eclipse Public License v1.0 which accompanies this distribution, and is\n\
-available at http://www.eclipse.org/legal/epl-v10.html\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/rse/features/org.eclipse.rse.core-feature/sourceTemplateFeature/license.html b/rse/features/org.eclipse.rse.core-feature/sourceTemplateFeature/license.html
deleted file mode 100644
index c6af966b6..000000000
--- a/rse/features/org.eclipse.rse.core-feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/about.html b/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index e7b57cfff..000000000
--- a/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/about.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2007</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) 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 <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files (&quot;Source Zips&quot;) that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in &quot;about.html&quot; files (&quot;Abouts&quot;) located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/about.ini b/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index fbbb9f83d..000000000
--- a/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/about.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=dsdp32.png
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-\ No newline at end of file
diff --git a/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/about.mappings b/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index bddaab431..000000000
--- a/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
-\ No newline at end of file
diff --git a/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/about.properties b/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index bbd0b6564..000000000
--- a/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2009 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:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=RSE Core Source\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright IBM Corporation and others 2000, 2009.  All rights reserved.\n\
-Visit http://www.eclipse.org/dsdp/tm
diff --git a/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/build.properties b/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index 368ee86fb..000000000
--- a/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-#  Copyright (c) 2000, 2009 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:
-#     IBM Corporation - initial API and implementation
-#     Martin Oberhuber (Wind River) - Use eclipse32.png feature image
-###############################################################################
-bin.includes = about.html, about.ini, about.mappings, about.properties, dsdp32.png, plugin.properties, plugin.xml, src/, META-INF/
-sourcePlugin = true
diff --git a/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/dsdp32.png b/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/dsdp32.png
deleted file mode 100644
index 3077b1220..000000000
--- a/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/dsdp32.png
+++ /dev/null
diff --git a/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/plugin.properties b/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index 3cb3aa296..000000000
--- a/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2009 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:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-pluginName=RSE Core Source
-providerName=Eclipse.org - DSDP
diff --git a/rse/features/org.eclipse.rse.sdk-feature/.project b/rse/features/org.eclipse.rse.sdk-feature/.project
deleted file mode 100644
index 18a5f73e2..000000000
--- a/rse/features/org.eclipse.rse.sdk-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.rse.sdk-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/rse/features/org.eclipse.rse.sdk-feature/build.properties b/rse/features/org.eclipse.rse.sdk-feature/build.properties
deleted file mode 100644
index 4e25b4191..000000000
--- a/rse/features/org.eclipse.rse.sdk-feature/build.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-################################################################################
-# Copyright (c) 2006, 2009 Wind River Systems, Inc.
-# 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: 
-# Martin Oberhuber - initial API and implementation 
-################################################################################
-bin.includes = feature.xml,\
-               license.html,\
-               feature.properties,\
-               epl-v10.html,\
-               eclipse_update_120.jpg
-generate.feature@org.eclipse.rse.core.source=org.eclipse.rse.core,exclude@org.eclipse.rse.doc.user
-generate.feature@org.eclipse.rse.dstore.source=org.eclipse.rse.dstore
-generate.feature@org.eclipse.rse.ftp.source=org.eclipse.rse.ftp
-generate.feature@org.eclipse.rse.local.source=org.eclipse.rse.local
-generate.feature@org.eclipse.rse.ssh.source=org.eclipse.rse.ssh
-generate.feature@org.eclipse.rse.telnet.source=org.eclipse.rse.telnet
-generate.feature@org.eclipse.rse.terminals.source=org.eclipse.rse.terminals
diff --git a/rse/features/org.eclipse.rse.sdk-feature/eclipse_update_120.jpg b/rse/features/org.eclipse.rse.sdk-feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/rse/features/org.eclipse.rse.sdk-feature/eclipse_update_120.jpg
+++ /dev/null
diff --git a/rse/features/org.eclipse.rse.sdk-feature/epl-v10.html b/rse/features/org.eclipse.rse.sdk-feature/epl-v10.html
deleted file mode 100644
index 9321f4082..000000000
--- a/rse/features/org.eclipse.rse.sdk-feature/epl-v10.html
+++ /dev/null
@@ -1,256 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-
-
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Eclipse Public License - Version 1.0</title>
-
-<style type="text/css">
-  body {
-    size: 8.5in 11.0in;
-    margin: 0.25in 0.5in 0.25in 0.5in;
-    tab-interval: 0.5in;
-    }
-  p {  	
-    margin-left: auto;
-    margin-top:  0.5em;
-    margin-bottom: 0.5em;
-    }
-  p.list {
-  	margin-left: 0.5in;
-    margin-top:  0.05em;
-    margin-bottom: 0.05em;
-    }
-  </style></head><body lang="EN-US">
-
-<p align="center"><b>Eclipse Public License - v 1.0</b></p>
-
-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.</p>
-
-<p><b>1. DEFINITIONS</b></p>
-
-<p>"Contribution" means:</p>
-
-<p class="list">a) in the case of the initial Contributor, the initial
-code and documentation distributed under this Agreement, and</p>
-<p class="list">b) in the case of each subsequent Contributor:</p>
-<p class="list">i) changes to the Program, and</p>
-<p class="list">ii) additions to the Program;</p>
-<p class="list">where such changes and/or additions to the Program
-originate from and are distributed by that particular Contributor. A
-Contribution 'originates' from a Contributor if it was added to the
-Program by such Contributor itself or anyone acting on such
-Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii)
-are not derivative works of the Program.</p>
-
-<p>"Contributor" means any person or entity that distributes
-the Program.</p>
-
-<p>"Licensed Patents" mean patent claims licensable by a
-Contributor which are necessarily infringed by the use or sale of its
-Contribution alone or when combined with the Program.</p>
-
-<p>"Program" means the Contributions distributed in accordance
-with this Agreement.</p>
-
-<p>"Recipient" means anyone who receives the Program under
-this Agreement, including all Contributors.</p>
-
-<p><b>2. GRANT OF RIGHTS</b></p>
-
-<p class="list">a) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works
-of, publicly display, publicly perform, distribute and sublicense the
-Contribution of such Contributor, if any, and such derivative works, in
-source code and object code form.</p>
-
-<p class="list">b) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell,
-offer to sell, import and otherwise transfer the Contribution of such
-Contributor, if any, in source code and object code form. This patent
-license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor,
-such addition of the Contribution causes such combination to be covered
-by the Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.</p>
-
-<p class="list">c) Recipient understands that although each Contributor
-grants the licenses to its Contributions set forth herein, no assurances
-are provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility to
-secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow Recipient
-to distribute the Program, it is Recipient's responsibility to acquire
-that license before distributing the Program.</p>
-
-<p class="list">d) Each Contributor represents that to its knowledge it
-has sufficient copyright rights in its Contribution, if any, to grant
-the copyright license set forth in this Agreement.</p>
-
-<p><b>3. REQUIREMENTS</b></p>
-
-<p>A Contributor may choose to distribute the Program in object code
-form under its own license agreement, provided that:</p>
-
-<p class="list">a) it complies with the terms and conditions of this
-Agreement; and</p>
-
-<p class="list">b) its license agreement:</p>
-
-<p class="list">i) effectively disclaims on behalf of all Contributors
-all warranties and conditions, express and implied, including warranties
-or conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;</p>
-
-<p class="list">ii) effectively excludes on behalf of all Contributors
-all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;</p>
-
-<p class="list">iii) states that any provisions which differ from this
-Agreement are offered by that Contributor alone and not by any other
-party; and</p>
-
-<p class="list">iv) states that source code for the Program is available
-from such Contributor, and informs licensees how to obtain it in a
-reasonable manner on or through a medium customarily used for software
-exchange.</p>
-
-<p>When the Program is made available in source code form:</p>
-
-<p class="list">a) it must be made available under this Agreement; and</p>
-
-<p class="list">b) a copy of this Agreement must be included with each
-copy of the Program.</p>
-
-<p>Contributors may not remove or alter any copyright notices contained
-within the Program.</p>
-
-<p>Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.</p>
-
-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
-
-<p>Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use of
-the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create
-potential liability for other Contributors. Therefore, if a Contributor
-includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and
-indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses")
-arising from claims, lawsuits and other legal actions brought by a third
-party against the Indemnified Contributor to the extent caused by the
-acts or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In
-order to qualify, an Indemnified Contributor must: a) promptly notify
-the Commercial Contributor in writing of such claim, and b) allow the
-Commercial Contributor to control, and cooperate with the Commercial
-Contributor in, the defense and any related settlement negotiations. The
-Indemnified Contributor may participate in any such claim at its own
-expense.</p>
-
-<p>For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.</p>
-
-<p><b>5. NO WARRANTY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED 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. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable laws,
-damage to or loss of data, programs or equipment, and unavailability or
-interruption of operations.</p>
-
-<p><b>6. DISCLAIMER OF LIABILITY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
-
-<p><b>7. GENERAL</b></p>
-
-<p>If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.</p>
-
-<p>If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.</p>
-
-<p>All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.</p>
-
-<p>Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.</p>
-
-<p>This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No party
-to this Agreement will bring a legal action under this Agreement more
-than one year after the cause of action arose. Each party waives its
-rights to a jury trial in any resulting litigation.</p>
-
-</body></html>
-\ No newline at end of file
diff --git a/rse/features/org.eclipse.rse.sdk-feature/feature.properties b/rse/features/org.eclipse.rse.sdk-feature/feature.properties
deleted file mode 100644
index 9271ba811..000000000
--- a/rse/features/org.eclipse.rse.sdk-feature/feature.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2009 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:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# NLS_MESSAGEFORMAT_NONE
-# NLS_ENCODING=UTF-8
-
-# "featureName" property - name of the feature
-featureName=Remote System Explorer Extender SDK
-
-# "description" property - description of the feature
-description=Install this if you plan to develop applications or tools \
-based on RSE. This SDK contains runtimes, documentation and sources \
-for the core RSE frameworks, SSH, FTP or dstore protocols. 
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org - DSDP
-
-# "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management Updates
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2000, 2009 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-This product includes software developed by the\n\
-Apache Software Foundation http://www.apache.org/
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/rse/features/org.eclipse.rse.sdk-feature/feature.xml b/rse/features/org.eclipse.rse.sdk-feature/feature.xml
deleted file mode 100644
index 06996c848..000000000
--- a/rse/features/org.eclipse.rse.sdk-feature/feature.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Copyright (c) 2005, 2009 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:
-         IBM Corporation - initial API and implementation
- -->
-
-<feature
-      id="org.eclipse.rse.sdk"
-      label="%featureName"
-      version="3.1.2.qualifier"
-      provider-name="%providerName"
-      image="eclipse_update_120.jpg">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/>
-      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/>
-   </url>
-
-   <includes
-         id="org.eclipse.rse"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.rse.core.source"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.rse.dstore.source"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.rse.ftp.source"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.rse.local.source"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.rse.ssh.source"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.rse.telnet.source"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.rse.terminals.source"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.rse.sdk"
-         download-size="7"
-         install-size="8"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rse.doc.isv"
-         download-size="6630"
-         install-size="11610"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.dstore.doc.isv"
-         download-size="339"
-         install-size="684"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/rse/features/org.eclipse.rse.sdk-feature/license.html b/rse/features/org.eclipse.rse.sdk-feature/license.html
deleted file mode 100644
index c6af966b6..000000000
--- a/rse/features/org.eclipse.rse.sdk-feature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/rse/features/org.eclipse.rse.terminals-feature/.project b/rse/features/org.eclipse.rse.terminals-feature/.project
deleted file mode 100644
index 568aec99d..000000000
--- a/rse/features/org.eclipse.rse.terminals-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.rse.terminals-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/rse/features/org.eclipse.rse.terminals-feature/build.properties b/rse/features/org.eclipse.rse.terminals-feature/build.properties
deleted file mode 100644
index 45ee56b37..000000000
--- a/rse/features/org.eclipse.rse.terminals-feature/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-################################################################################
-# Copyright (c) 2006, 2008 Wind River Systems, Inc. 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: 
-# Martin Oberhuber - initial API and implementation 
-################################################################################
-bin.includes = feature.xml,\
-               feature.properties,\
-               license.html,\
-               epl-v10.html,\
-               eclipse_update_120.jpg
-             
-\ No newline at end of file
diff --git a/rse/features/org.eclipse.rse.terminals-feature/eclipse_update_120.jpg b/rse/features/org.eclipse.rse.terminals-feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/rse/features/org.eclipse.rse.terminals-feature/eclipse_update_120.jpg
+++ /dev/null
diff --git a/rse/features/org.eclipse.rse.terminals-feature/epl-v10.html b/rse/features/org.eclipse.rse.terminals-feature/epl-v10.html
deleted file mode 100644
index 9321f4082..000000000
--- a/rse/features/org.eclipse.rse.terminals-feature/epl-v10.html
+++ /dev/null
@@ -1,256 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-
-
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Eclipse Public License - Version 1.0</title>
-
-<style type="text/css">
-  body {
-    size: 8.5in 11.0in;
-    margin: 0.25in 0.5in 0.25in 0.5in;
-    tab-interval: 0.5in;
-    }
-  p {  	
-    margin-left: auto;
-    margin-top:  0.5em;
-    margin-bottom: 0.5em;
-    }
-  p.list {
-  	margin-left: 0.5in;
-    margin-top:  0.05em;
-    margin-bottom: 0.05em;
-    }
-  </style></head><body lang="EN-US">
-
-<p align="center"><b>Eclipse Public License - v 1.0</b></p>
-
-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.</p>
-
-<p><b>1. DEFINITIONS</b></p>
-
-<p>"Contribution" means:</p>
-
-<p class="list">a) in the case of the initial Contributor, the initial
-code and documentation distributed under this Agreement, and</p>
-<p class="list">b) in the case of each subsequent Contributor:</p>
-<p class="list">i) changes to the Program, and</p>
-<p class="list">ii) additions to the Program;</p>
-<p class="list">where such changes and/or additions to the Program
-originate from and are distributed by that particular Contributor. A
-Contribution 'originates' from a Contributor if it was added to the
-Program by such Contributor itself or anyone acting on such
-Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii)
-are not derivative works of the Program.</p>
-
-<p>"Contributor" means any person or entity that distributes
-the Program.</p>
-
-<p>"Licensed Patents" mean patent claims licensable by a
-Contributor which are necessarily infringed by the use or sale of its
-Contribution alone or when combined with the Program.</p>
-
-<p>"Program" means the Contributions distributed in accordance
-with this Agreement.</p>
-
-<p>"Recipient" means anyone who receives the Program under
-this Agreement, including all Contributors.</p>
-
-<p><b>2. GRANT OF RIGHTS</b></p>
-
-<p class="list">a) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works
-of, publicly display, publicly perform, distribute and sublicense the
-Contribution of such Contributor, if any, and such derivative works, in
-source code and object code form.</p>
-
-<p class="list">b) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell,
-offer to sell, import and otherwise transfer the Contribution of such
-Contributor, if any, in source code and object code form. This patent
-license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor,
-such addition of the Contribution causes such combination to be covered
-by the Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.</p>
-
-<p class="list">c) Recipient understands that although each Contributor
-grants the licenses to its Contributions set forth herein, no assurances
-are provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility to
-secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow Recipient
-to distribute the Program, it is Recipient's responsibility to acquire
-that license before distributing the Program.</p>
-
-<p class="list">d) Each Contributor represents that to its knowledge it
-has sufficient copyright rights in its Contribution, if any, to grant
-the copyright license set forth in this Agreement.</p>
-
-<p><b>3. REQUIREMENTS</b></p>
-
-<p>A Contributor may choose to distribute the Program in object code
-form under its own license agreement, provided that:</p>
-
-<p class="list">a) it complies with the terms and conditions of this
-Agreement; and</p>
-
-<p class="list">b) its license agreement:</p>
-
-<p class="list">i) effectively disclaims on behalf of all Contributors
-all warranties and conditions, express and implied, including warranties
-or conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;</p>
-
-<p class="list">ii) effectively excludes on behalf of all Contributors
-all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;</p>
-
-<p class="list">iii) states that any provisions which differ from this
-Agreement are offered by that Contributor alone and not by any other
-party; and</p>
-
-<p class="list">iv) states that source code for the Program is available
-from such Contributor, and informs licensees how to obtain it in a
-reasonable manner on or through a medium customarily used for software
-exchange.</p>
-
-<p>When the Program is made available in source code form:</p>
-
-<p class="list">a) it must be made available under this Agreement; and</p>
-
-<p class="list">b) a copy of this Agreement must be included with each
-copy of the Program.</p>
-
-<p>Contributors may not remove or alter any copyright notices contained
-within the Program.</p>
-
-<p>Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.</p>
-
-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
-
-<p>Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use of
-the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create
-potential liability for other Contributors. Therefore, if a Contributor
-includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and
-indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses")
-arising from claims, lawsuits and other legal actions brought by a third
-party against the Indemnified Contributor to the extent caused by the
-acts or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In
-order to qualify, an Indemnified Contributor must: a) promptly notify
-the Commercial Contributor in writing of such claim, and b) allow the
-Commercial Contributor to control, and cooperate with the Commercial
-Contributor in, the defense and any related settlement negotiations. The
-Indemnified Contributor may participate in any such claim at its own
-expense.</p>
-
-<p>For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.</p>
-
-<p><b>5. NO WARRANTY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED 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. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable laws,
-damage to or loss of data, programs or equipment, and unavailability or
-interruption of operations.</p>
-
-<p><b>6. DISCLAIMER OF LIABILITY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
-
-<p><b>7. GENERAL</b></p>
-
-<p>If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.</p>
-
-<p>If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.</p>
-
-<p>All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.</p>
-
-<p>Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.</p>
-
-<p>This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No party
-to this Agreement will bring a legal action under this Agreement more
-than one year after the cause of action arose. Each party waives its
-rights to a jury trial in any resulting litigation.</p>
-
-</body></html>
-\ No newline at end of file
diff --git a/rse/features/org.eclipse.rse.terminals-feature/feature.properties b/rse/features/org.eclipse.rse.terminals-feature/feature.properties
deleted file mode 100644
index 6cc7968eb..000000000
--- a/rse/features/org.eclipse.rse.terminals-feature/feature.properties
+++ /dev/null
@@ -1,139 +0,0 @@
-################################################################################
-# Copyright (c) 2006, 2009 Wind River Systems, Inc. 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: 
-# Martin Oberhuber - initial API and implementation 
-################################################################################
-
-# NLS_MESSAGEFORMAT_NONE
-# NLS_ENCODING=UTF-8
-
-# "featureName" property - name of the feature
-featureName=RSE Terminals UI
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org - DSDP
-
-# "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management Updates
-
-# "description" property - description of the feature
-description=A Terminal View Integration for RSE Shell and Terminal Services. Includes Source.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2002, 2009 MontaVista Software, Inc. and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/rse/features/org.eclipse.rse.terminals-feature/feature.xml b/rse/features/org.eclipse.rse.terminals-feature/feature.xml
deleted file mode 100644
index dfed25f4b..000000000
--- a/rse/features/org.eclipse.rse.terminals-feature/feature.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Copyright (c) 2005, 2009 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:
-         IBM Corporation - initial API and implementation
- -->
-
-<feature
-      id="org.eclipse.rse.terminals"
-      label="%featureName"
-      version="1.0.2.qualifier"
-      provider-name="%providerName"
-      plugin="org.eclipse.rse.terminals.ui"
-      image="eclipse_update_120.jpg">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/>
-      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/>
-   </url>
-
-   <includes
-         id="org.eclipse.tm.terminal"
-         version="0.0.0"
-         search-location="self"/>
-
-   <requires>
-      <import plugin="org.eclipse.core.expressions"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.ui.views"/>
-      <import plugin="org.eclipse.rse.services" version="3.1.0" match="compatible"/>
-      <import plugin="org.eclipse.rse.services.ssh" version="3.0.0" match="equivalent"/>
-      <import plugin="org.eclipse.rse.core" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.rse.ui" version="3.1.0" match="compatible"/>
-      <import plugin="org.eclipse.rse.connectorservice.ssh" version="2.1.0" match="compatible"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.rse.subsystems.terminals.core"
-         download-size="7"
-         install-size="15"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rse.subsystems.terminals.ssh"
-         download-size="7"
-         install-size="11"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rse.terminals.ui"
-         download-size="24"
-         install-size="51"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/rse/features/org.eclipse.rse.terminals-feature/license.html b/rse/features/org.eclipse.rse.terminals-feature/license.html
deleted file mode 100644
index c6af966b6..000000000
--- a/rse/features/org.eclipse.rse.terminals-feature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplateFeature/epl-v10.html b/rse/features/org.eclipse.rse.terminals-feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 9321f4082..000000000
--- a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,256 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-
-
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Eclipse Public License - Version 1.0</title>
-
-<style type="text/css">
-  body {
-    size: 8.5in 11.0in;
-    margin: 0.25in 0.5in 0.25in 0.5in;
-    tab-interval: 0.5in;
-    }
-  p {  	
-    margin-left: auto;
-    margin-top:  0.5em;
-    margin-bottom: 0.5em;
-    }
-  p.list {
-  	margin-left: 0.5in;
-    margin-top:  0.05em;
-    margin-bottom: 0.05em;
-    }
-  </style></head><body lang="EN-US">
-
-<p align="center"><b>Eclipse Public License - v 1.0</b></p>
-
-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.</p>
-
-<p><b>1. DEFINITIONS</b></p>
-
-<p>"Contribution" means:</p>
-
-<p class="list">a) in the case of the initial Contributor, the initial
-code and documentation distributed under this Agreement, and</p>
-<p class="list">b) in the case of each subsequent Contributor:</p>
-<p class="list">i) changes to the Program, and</p>
-<p class="list">ii) additions to the Program;</p>
-<p class="list">where such changes and/or additions to the Program
-originate from and are distributed by that particular Contributor. A
-Contribution 'originates' from a Contributor if it was added to the
-Program by such Contributor itself or anyone acting on such
-Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii)
-are not derivative works of the Program.</p>
-
-<p>"Contributor" means any person or entity that distributes
-the Program.</p>
-
-<p>"Licensed Patents" mean patent claims licensable by a
-Contributor which are necessarily infringed by the use or sale of its
-Contribution alone or when combined with the Program.</p>
-
-<p>"Program" means the Contributions distributed in accordance
-with this Agreement.</p>
-
-<p>"Recipient" means anyone who receives the Program under
-this Agreement, including all Contributors.</p>
-
-<p><b>2. GRANT OF RIGHTS</b></p>
-
-<p class="list">a) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works
-of, publicly display, publicly perform, distribute and sublicense the
-Contribution of such Contributor, if any, and such derivative works, in
-source code and object code form.</p>
-
-<p class="list">b) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell,
-offer to sell, import and otherwise transfer the Contribution of such
-Contributor, if any, in source code and object code form. This patent
-license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor,
-such addition of the Contribution causes such combination to be covered
-by the Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.</p>
-
-<p class="list">c) Recipient understands that although each Contributor
-grants the licenses to its Contributions set forth herein, no assurances
-are provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility to
-secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow Recipient
-to distribute the Program, it is Recipient's responsibility to acquire
-that license before distributing the Program.</p>
-
-<p class="list">d) Each Contributor represents that to its knowledge it
-has sufficient copyright rights in its Contribution, if any, to grant
-the copyright license set forth in this Agreement.</p>
-
-<p><b>3. REQUIREMENTS</b></p>
-
-<p>A Contributor may choose to distribute the Program in object code
-form under its own license agreement, provided that:</p>
-
-<p class="list">a) it complies with the terms and conditions of this
-Agreement; and</p>
-
-<p class="list">b) its license agreement:</p>
-
-<p class="list">i) effectively disclaims on behalf of all Contributors
-all warranties and conditions, express and implied, including warranties
-or conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;</p>
-
-<p class="list">ii) effectively excludes on behalf of all Contributors
-all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;</p>
-
-<p class="list">iii) states that any provisions which differ from this
-Agreement are offered by that Contributor alone and not by any other
-party; and</p>
-
-<p class="list">iv) states that source code for the Program is available
-from such Contributor, and informs licensees how to obtain it in a
-reasonable manner on or through a medium customarily used for software
-exchange.</p>
-
-<p>When the Program is made available in source code form:</p>
-
-<p class="list">a) it must be made available under this Agreement; and</p>
-
-<p class="list">b) a copy of this Agreement must be included with each
-copy of the Program.</p>
-
-<p>Contributors may not remove or alter any copyright notices contained
-within the Program.</p>
-
-<p>Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.</p>
-
-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
-
-<p>Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use of
-the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create
-potential liability for other Contributors. Therefore, if a Contributor
-includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and
-indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses")
-arising from claims, lawsuits and other legal actions brought by a third
-party against the Indemnified Contributor to the extent caused by the
-acts or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In
-order to qualify, an Indemnified Contributor must: a) promptly notify
-the Commercial Contributor in writing of such claim, and b) allow the
-Commercial Contributor to control, and cooperate with the Commercial
-Contributor in, the defense and any related settlement negotiations. The
-Indemnified Contributor may participate in any such claim at its own
-expense.</p>
-
-<p>For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.</p>
-
-<p><b>5. NO WARRANTY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED 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. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable laws,
-damage to or loss of data, programs or equipment, and unavailability or
-interruption of operations.</p>
-
-<p><b>6. DISCLAIMER OF LIABILITY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
-
-<p><b>7. GENERAL</b></p>
-
-<p>If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.</p>
-
-<p>If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.</p>
-
-<p>All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.</p>
-
-<p>Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.</p>
-
-<p>This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No party
-to this Agreement will bring a legal action under this Agreement more
-than one year after the cause of action arose. Each party waives its
-rights to a jury trial in any resulting litigation.</p>
-
-</body></html>
-\ No newline at end of file
diff --git a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplateFeature/feature.properties b/rse/features/org.eclipse.rse.terminals-feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index daa86fae8..000000000
--- a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,145 +0,0 @@
-################################################################################
-# Copyright (c) 2006, 2009 Wind River Systems, Inc. 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: 
-# Martin Oberhuber - initial API and implementation 
-################################################################################
-
-# NLS_MESSAGEFORMAT_NONE
-# NLS_ENCODING=UTF-8
-
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=RSE Terminals UI Source
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org - DSDP
-
-# "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management Updates
-
-# "description" property - description of the feature
-description=A Terminal View Integration for RSE Shell and Terminal Services.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2002, 2009 MontaVista Software, Inc. and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplateFeature/license.html b/rse/features/org.eclipse.rse.terminals-feature/sourceTemplateFeature/license.html
deleted file mode 100644
index c6af966b6..000000000
--- a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/about.html b/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index aa029c699..000000000
--- a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/about.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>March 27, 2008</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) 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 <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files (&quot;Source Zips&quot;) that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in &quot;about.html&quot; files (&quot;Abouts&quot;) located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/about.ini b/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index fbbb9f83d..000000000
--- a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/about.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=dsdp32.png
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-\ No newline at end of file
diff --git a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/about.mappings b/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index bddaab431..000000000
--- a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
-\ No newline at end of file
diff --git a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/about.properties b/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index f3d2801cc..000000000
--- a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,29 +0,0 @@
-################################################################################
-# Copyright (c) 2006, 2009 Wind River Systems, Inc. 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: 
-# Martin Oberhuber - initial API and implementation 
-################################################################################
-
-# NLS_MESSAGEFORMAT_NONE
-# NLS_ENCODING=UTF-8
-
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=RSE Terminals UI Source\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright MontaVista Software, Inc. and others 2002, 2009.  All rights reserved.\n\
-Visit http://www.eclipse.org/dsdp/tm
diff --git a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/build.properties b/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index 377be2b46..000000000
--- a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2008, 2009 Wind River Systems, Inc. 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:
-# Martin Oberhuber (Wind River) - initial API and implementation
-###############################################################################
-bin.includes = about.html, about.ini, about.mappings, about.properties, dsdp32.png, plugin.properties, plugin.xml, src/, META-INF/
-sourcePlugin = true
diff --git a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/dsdp32.png b/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/dsdp32.png
deleted file mode 100644
index 3077b1220..000000000
--- a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/dsdp32.png
+++ /dev/null
diff --git a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/plugin.properties b/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index c2d48ccb1..000000000
--- a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-################################################################################
-# Copyright (c) 2006, 2009 Wind River Systems, Inc. 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: 
-# Martin Oberhuber - initial API and implementation 
-################################################################################
-
-# NLS_MESSAGEFORMAT_NONE
-# NLS_ENCODING=UTF-8
-
-pluginName=RSE Terminals UI Source
-providerName=Eclipse.org - DSDP
diff --git a/rse/features/readme.txt b/rse/features/readme.txt
deleted file mode 100644
index b1491292b..000000000
--- a/rse/features/readme.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Use the "features" folder for feature projects.
-All projects should be named "org.eclipse.rse.**-feature".
diff --git a/rse/plugins/org.eclipse.rse.ui/.classpath b/rse/plugins/org.eclipse.rse.ui/.classpath
deleted file mode 100644
index e36b0554b..000000000
--- a/rse/plugins/org.eclipse.rse.ui/.classpath
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="model"/>
-	<classpathentry kind="src" path="UI"/>
-	<classpathentry kind="src" path="subsystems"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
-		<accessrules>
-			<accessrule kind="accessible" pattern="org/eclipse/rse/**"/>
-			<accessrule kind="discouraged" pattern="**/internal/**"/>
-		</accessrules>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/rse/plugins/org.eclipse.rse.ui/.cvsignore b/rse/plugins/org.eclipse.rse.ui/.cvsignore
deleted file mode 100644
index ba077a403..000000000
--- a/rse/plugins/org.eclipse.rse.ui/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/rse/plugins/org.eclipse.rse.ui/.options b/rse/plugins/org.eclipse.rse.ui/.options
deleted file mode 100644
index 561d2db3f..000000000
--- a/rse/plugins/org.eclipse.rse.ui/.options
+++ /dev/null
@@ -1 +0,0 @@
-org.eclipse.rse.ui/debug = true
diff --git a/rse/plugins/org.eclipse.rse.ui/.project b/rse/plugins/org.eclipse.rse.ui/.project
deleted file mode 100644
index 00484ef09..000000000
--- a/rse/plugins/org.eclipse.rse.ui/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.rse.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/rse/plugins/org.eclipse.rse.ui/.settings/.api_filters b/rse/plugins/org.eclipse.rse.ui/.settings/.api_filters
deleted file mode 100644
index 2027e2021..000000000
--- a/rse/plugins/org.eclipse.rse.ui/.settings/.api_filters
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.rse.ui" version="2">
-    <resource path="subsystems/org/eclipse/rse/core/subsystems/SubSystem.java" type="org.eclipse.rse.core.subsystems.SubSystem">
-        <filter id="574619656">
-            <message_arguments>
-                <message_argument value="ISystemFilterPoolReferenceManagerProvider"/>
-                <message_argument value="SubSystem"/>
-            </message_arguments>
-        </filter>
-        <filter id="574619656">
-            <message_arguments>
-                <message_argument value="ISubSystem"/>
-                <message_argument value="SubSystem"/>
-            </message_arguments>
-        </filter>
-    </resource>
-</component>
diff --git a/rse/plugins/org.eclipse.rse.ui/.settings/org.eclipse.core.resources.prefs b/rse/plugins/org.eclipse.rse.ui/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 5abac8507..000000000
--- a/rse/plugins/org.eclipse.rse.ui/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Thu Aug 06 17:28:09 CEST 2009
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/rse/plugins/org.eclipse.rse.ui/.settings/org.eclipse.jdt.core.prefs b/rse/plugins/org.eclipse.rse.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 138063a1c..000000000
--- a/rse/plugins/org.eclipse.rse.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,71 +0,0 @@
-#Fri Mar 28 14:14:24 CET 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.4
diff --git a/rse/plugins/org.eclipse.rse.ui/HelpContexts.xml b/rse/plugins/org.eclipse.rse.ui/HelpContexts.xml
deleted file mode 100644
index 5b6b53f97..000000000
--- a/rse/plugins/org.eclipse.rse.ui/HelpContexts.xml
+++ /dev/null
@@ -1,944 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, 2008 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
-
-Initial Contributors:
-The following IBM employees contributed to the Remote System Explorer
-component that contains this file: David McKnight, Kushal Munir, 
-Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
-Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
-
-Contributors:
-Martin Oberhuber (Wind River) - [174945] split importexport icons from rse.ui
-Kevin Doyle		 (IBM)		  - [212940] Added help for Remote Monitor
-David Dykstal (IBM) - [231630] adding help for services property page
-David Dykstal (IBM) - [232317] adding help for datastore preferences page
-David Dykstal (IBM) - [232585] adding help for service subsystem wizard page
-David Dykstal (IBM) - [244950] fix broken links due to ".htm" extension
--->
-<?NLS TYPE="org.eclipse.help.contexts"?>
-<contexts>
-   <context id="ServicesPropertyPage">
-      <description>This page displays properties that configure the underlying services used by this subsystem.
-Select the configuration to be used for this subsystem and then edit the properties for each available service in that configuration.</description>
-   </context>
-   <context id="ServiceSubsystemWizardPage">
-      <description>This wizard page displays the properties of the underlying services used by this subsystem.
-
-Select the configuration to be used for this subsystem and then edit the properties for each available service in that configuration.</description>
-   </context>
-
-<!-- System types table in RS preferences -->
-<context id="systype_preferences">
-	<description>Click in the columns to change the enablement state or default user ID for a given system type. Disabled system types do not appear in the New Connection wizard. Default user IDs are used when connecting to a remote system of that type.</description>
-</context>
-
-<!-- PULLDOWN ACTION: New Connection action...   -->
-<context id="actn0000">
-<description>Open a wizard to create a new connection to a remote system.</description>
-</context>
-<!-- CONNECTION ACTION: MoveUp Connection action...-->
-<context id="actn0001">
-<description>Move the selected connections up within its profile. This is disabled if the first connection is selected. Connection order is a local preference not shared by the team.</description>
-</context>	
-<!-- CONNECTION ACTION: MoveDown Connection action...-->
-<context id="actn0002">
-<description>Move a connection down within its profile. This is disabled if the last connection is selected.  Connection order is a local preference not shared by the team.</description>
-</context>
-
-<!-- TEAM VIEW -->
-<context id="teamview">
-<description>Use this view to work with the team-sharable artifacts from the Remote System Explorer: connection, filters, user actions and compile commands. These are contained in profiles. Use this view to see the sharable artifacts by profile, and share those artifacts using the popup menu of the root node. </description>
-<topic href="../org.eclipse.rse.doc.user/concepts/cprofile.html" label="Remote System Explorer Profiles" />
-</context>
-<!-- TEAM VIEW ACTION: New Profile action...   -->
-<context id="actn0003">
-<description>Open a wizard to create a new profile for partitioning your connections, filters, user actions and compile commands.</description>
-<topic href="../org.eclipse.rse.doc.user/concepts/cprofile.html" label="Remote System Explorer Profiles" />
-</context>	
-<!-- TEAM VIEW ACTION: Active profile action...   -->
-<context id="actnactp">
-<description>Toggle this profile between active and not active. The Remote Systems view only shows connections, filters, user actions and compile commands from active profiles.
-</description>
-<topic href="../org.eclipse.rse.doc.user/concepts/cprofile.html" label="Remote System Explorer Profiles" />
-</context>
-<!-- TEAM VIEW ACTION: Make Active profile action...   -->
-<context id="ActionMakeActive">
-<description>Make all the selected profiles active, such that their connections, filters, user actions and compile commands are visible in the Remote Systems view.
-</description>
-<topic href="../org.eclipse.rse.doc.user/concepts/cprofile.html" label="Remote System Explorer Profiles" />
-</context>
-<!-- TEAM VIEW ACTION: Make Inactive profile action...   -->
-<context id="ActionMakeInactive">
-<description>Make all the selected profiles inactive, such that their  connections, filters, user actions and compile commands are not visible in the Remote Systems view.
-</description>
-<topic href="../org.eclipse.rse.doc.user/concepts/cprofile.html" label="Remote System Explorer Profiles" />
-</context>
-
-<!-- TEAM VIEW ACTION: Rename profile action...   -->
-<context id="actnrnpr">
-<description>Rename selected profile.
-<topic href="../org.eclipse.rse.doc.user/concepts/cprofile.html" label="Remote System Explorer Profiles" />
-</description>
-</context>
-<!-- TEAM VIEW ACTION: Delete profiles action...   -->
-<context id="actndlpr">
-<description>Delete selected profiles, including all of their connections, filters, user actions and compile commands.</description>
-<topic href="../org.eclipse.rse.doc.user/concepts/cprofile.html" label="Remote System Explorer Profiles" />
-</context>
-<!-- TEAM VIEW ACTION: Duplicate profile action...   -->
-<context id="actndupr">
-<description>Copy selected profile, including all its connections, filters, user actions and compile commands.
-</description>
-<topic href="../org.eclipse.rse.doc.user/concepts/cprofile.html" label="Remote System Explorer Profiles" />
-</context>
-
-<!-- PULLDOWN ACTION: Work with profiles action...-->
-<context id="actnwwpr">
-<description>Switch to the Team view, where you can create, delete, copy, rename and activate profiles</description>
-<topic href="../org.eclipse.rse.doc.user/concepts/cprofile.html" label="Remote System Explorer Profiles" />
-</context>
-<!-- PULLDOWN ACTION: Qualify connections action...-->
-<context id="actn0008">
-<description>Show connections and filter pools in the Remote Systems view prefixed by profile name. This is recommended if two profiles have connections or filter pools with the same names.</description>
-</context>
-<!-- PULLDOWN ACTION: Reload-RSE action...   -->
-<context id="actn0009">
-<description>Use this action after receiving Remote System Explorer files from the team repository, such as after a synchronize action. It reloads the contents of the Remote System Explore from the workspace, processing the new files.</description>
-</context>
-<!-- PULLDOWN ACTION: Default userID action...   -->
-<context id="actn0010">
-<description>Set as the default user ID for a given system type when creating a new connection, or change it for existing connections that inherit the user ID.</description>
-</context>
-<!-- PULLDOWN ACTION: Preferences cascading action...   -->
-<!-- FIXME this one is OBSOLETE, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=186769 -->
-<context id="actnpref">
-<description>Go directly to a preference page. Saves drilling down via Windows->Preferences.</description>
-</context>
-<!-- PULLDOWN ACTION: Preferences->RSE cascaded action...   -->
-<context id="aprefrse">
-<description>Go directly to the main preference page for the Remote System Explorer. From there, you can also access the subpages. 
-</description>
-</context>
-<!-- PULLDOWN ACTION: Preferences->LPEX cascaded action...   -->
-<context id="apreflpx">
-<description>Go directly to the main preference page for the LPEX editor. From there, you can also access the subpages. </description>
-</context>
-<!-- PULLDOWN ACTION: Show filter pools action...   -->
-<context id="actn0011">
-<description>Specify whether to show filter pools when subsystems are expanded in the Remote Systems view. Filter pools allow you to partition filters into named groups for easier management.</description>
-</context>
-<!-- PULLDOWN ACTION: Restore State action...   -->
-<context id="aprefres">
-<description>Select this to restore the Remote Systems tree view to its previous expanded state the next time you start the workbench.  Previous selections and active connections are also restored.  This preference increases the amount of time needed to start the Remote System Explorer, but improves productivity overall since you do not need to reconfigure the view.
-</description>
-</context>
-<!-- PULLDOWN ACTION: Team Synch action...   -->
-<context id="actn0013">
-<description>All your connections, filters, and user-defined actions can be shared by your team. Use this to synchronize your latest changes with those of the team. Only valid if a team repository has been identified within the team properties.
-</description>
-</context>
-<!-- PULLDOWN ACTION: Team Properties action...   -->
-<context id="actn0014">
-<description>All your connections, filters, and user-defined actions can be shared by your team. Use this to identify the remote repository that will centrally host the Remote Systems Connections project containing all the Remote Systems information.
-</description>
-</context>
-<!-- CONNECTION ACTION: Create Another Connection action...   -->
-<context id="actn0015">
-<description>Open a wizard to create a new connection to a remote system. By default, the values are used from the selected connection.
-</description>
-</context>
-<!-- CONNECTION ACTION: Open in New Perspective action...   -->
-<context id="actn0016">
-<description>Open a new instance of the Remote Systems view, within its own perspective page. Its contents will start with those of the child of the selected resource.
-</description>
-</context>
-<!-- CONNECTION ACTION: Refresh action...   -->
-<context id="actn0017">
-<description>Refresh the contents of the current selection. If the node is expanded, all children are re-retrieved successively.
-</description>
-</context>
-<!-- CONNECTION ACTION: Rename action...   -->
-<context id="actn0018">
-<description>Open a dialog for renaming the currently selected resources.
-</description>
-</context>
-<!-- CONNECTION ACTION: Copy action...   -->
-<context id="actn0019">
-<description>Copy this connection and resources to the same profile, or a different profile.
-</description>
-</context>
-<!-- CONNECTION ACTION: Move action...   -->
-<context id="actn0020">
-<description>Move this connection to a different profile.
-</description>
-</context>
-<!-- CONNECTION ACTION: Delete action...   -->
-<context id="actn0021">
-<description>Permanently delete the selected resources.
-</description>
-</context>
-<!-- CONNECTION ACTION: Disconnect All action...   -->
-<context id="actn0022"><description>Ask each subsystem to disconnect from the remote system. Disabled unless at least one subsystem is currently connected.
-</description>
-</context>
-<!-- SUBSYSTEM ACTION:  New Filter Pool action...   -->
-<context id="actn0040"><description>Open a wizard to create a new filter pool in any profile, and a reference to the new pool in this subsystem.
-</description>
-</context>
-<!-- SUBSYSTEM ACTION:  New Filter Pool Reference action...   -->
-<context id="actn0041"><description>Add a reference to an existing filter pool to this subsystem. Multiple subsystems can reference the same pool, and subsystems can contain multiple filter pool references.
-</description>
-</context>
-<!-- SUBSYSTEM ACTION:  New Filter action...   -->
-<context id="actn0042"><description>Open a wizard to create a new filter in the selected or default filter pool.
-</description>
-</context>
-
-<!-- ACTION:  Remote Servers cascading action...   -->
-<context id="actnsrsv"><description>For remotely starting or stopping servers (or daemons) on this remote system.
-</description>
-</context>
-<!-- ACTION:  Start action cascaded from an action underneath the Remote Servers cascading action...   -->
-<context id="actnstsv"><description>Start this remote server or daemon.</description></context>
-<!-- ACTION:  Stop action cascaded from an action underneath the Remote Servers cascading action...   -->
-<context id="actnspsv"><description>Stop this remote server or daemon.</description></context>
-
-<!-- SUBSYSTEM ACTION:  Select Filter Pools action...   -->
-<context id="actn0043"><description>Select the filter pools referenced by this subsystem.
-</description>
-</context>
-<!-- SUBSYSTEM ACTION:  WorkWith Filter Pools action...   -->
-<context id="actn0044"><description>Work with all filter pools in all active profiles for this subsystem type.
-</description>
-</context>
-<!-- SUBSYSTEM ACTION:  WorkWith User Actions action...   -->
-<context id="actn0045"><description>Work with user-defined actions that appear in the pop-up menu of remote system objects for subsystems of this subsystem type.
-</description>
-</context>
-<!-- SUBSYSTEM ACTION:  Work With Named Types action...   -->
-<context id="actn0046"><description>Work with named types that group one or more resource types into named collections.
-</description>
-</context>
-<!-- SUBSYSTEM ACTION:  Connect action...   -->
-<context id="actn0047"><description>Connect this subsystem's service to the remote system identified by the parent connection. This is disabled if already connected.
-</description>
-</context>
-<!-- SUBSYSTEM ACTION:  Disconnect action...   -->
-<context id="actn0048"><description>Disconnect this subsystem's service from the remote system identified by the parent connection. This is disabled if not connected.
-</description>
-</context>
-<!-- SUBSYSTEM ACTION:  Clear Password Cache action...   -->
-<context id="actn0049"><description>Clear the password retained in memory after this subsystem is disconnected. This is disabled if not connected, or there is no password cached in memory.
-</description>
-</context>
-<!-- FILTERPOOL ACTION: Copy action...   -->
-<context id="actn0060"><description>Copy this filter pool, and all of its filters, to another profile, or copy and rename to the same profile.
-</description>
-</context>
-<!-- FILTERPOOL ACTION: Move action...   -->
-<context id="actn0061"><description>Move this filter pool to another profile.
-</description>
-</context>
-<!-- FILTERPOOL ACTION: Remove Reference action...   -->
-<context id="actn0062"><description>Remove this subsystem's reference to this filter pool. This action does not delete the filter pool.
-</description>
-</context>
-<!-- FILTERPOOL ACTION: Move Up action...   -->
-<context id="actn0063"><description>Move the selected filter pool references up within this subsystem. This is disabled if first filter pool reference is selected.
-</description>
-</context>
-<!-- FILTERPOOL ACTION: Move Down action...   -->
-<context id="actn0064"><description>Move the selected filter pool references down within this subsystem. This is disabled if the last filter pool reference is selected.
-</description>
-</context>
-<!-- FILTER ACTION: New Filter String action...   -->
-<context id="actn0080"><description>Open a wizard to create a new filter string within the selected filter.
-</description>
-</context>
-<!-- FILTER ACTION: Change Filter action...   -->
-<context id="acfr0000"><description>Change this filter by adding, editing, removing or re-ordering filter strings within it</description>
-</context>
-<!-- FILTER ACTION:     New Filter String action...   -->
-<context id="actn0082"><description>Copy the selected filters to a different filter pool, or copy and rename in the same pool.
-</description>
-</context>
-<!-- FILTER ACTION:     New Filter String action...   -->
-<context id="actn0083"><description>Move the selected filters to a different filter pool.
-</description>
-</context>
-<!-- FILTER ACTION:     New Filter String action...   -->
-<context id="actn0084"><description>Move the selected filters up within their filter. This is disabled if the first filter is selected.
-</description>
-</context>
-<!-- FILTER ACTION:     New Filter String action...   -->
-<context id="actn0085"><description>Move the selected filters down within their filter pool. This is disabled if the last filter is selected.
-</description>
-</context>
-<!-- FILTERSTRING ACTION: Change action...   -->
-<context id="actn0090"><description>Edit this filter string.
-</description>
-</context>
-<!-- FILTERSTRING ACTION: Copy action...   -->
-<context id="actn0091"><description>Copy the selected filter strings to a different filter.
-</description>
-</context>
-<!-- FILTERSTRING ACTION: Move action...   -->
-<context id="actn0092"><description>Move the selected filter strings to a different filter.
-</description>
-</context>
-<!-- FILTERSTRING ACTION: Move Up action...   -->
-<context id="actn0093"><description>Move the selected filter strings up within their filter. This is disabled if the first filter string is selected.
-</description>
-</context>
-<!-- FILTERSTRING ACTION: Move Down action...   -->
-<context id="actn0094"><description>Move the selected filter strings down within their filter. This is disabled if the last filter string is selected.
-</description>
-</context>
-<!-- PROMPTABLE OBJECT ACTION: Run action...   -->
-<context id="actn0100"><description>Run the selected prompt to open a wizard to create a new object. </description>
-</context>
-<!-- REMOTE FILE ACTION: Copy action...   -->
-<context id="actn0110"><description>Copy the selected folders or files. You will be prompted for the target folder, and for a new name if a folder or file name is already in use in that target folder.
-</description>
-</context>
-<!-- REMOTE FILE ACTION: Move action...   -->
-<context id="actn0111"><description>Move the selected folders or files. You will be prompted for the target folder, and for a new name if a folder or file name is already in use in that target folder.
-</description>
-</context>
-<!-- REMOTE FILE ACTION:  New Filter From Folder action...   -->
-<context id="actn0112"><description>Open a wizard to create a new filter from the selected folder.
-</description>
-</context>
-<!-- SUBSYSTEM ACTION:  Launch Shell action...   -->
-<context id="actn0113"><description>Launch a command shell on the remote host.  The Remote Shell view will allow you to interact with the remote shell.
-</description>
-</context>
-<!-- REMOTE FILE ACTION:  Run Command action...   -->
-<context id="actn0114"><description>Run a command on the remote host.  You will be prompted for the command to run on the host.
-</description>
-</context>
-<!-- REMOTE FILE ACTION:  Search action...   -->
-<context id="actn0115"><description>Search files and file contents within the selected folder.  You will be prompted with the Remote Search dialog.
-</description>
-</context>
-<!-- REMOTE RESOURCE ACTION:  Copy to clipboard action...   -->
-<context id="actn0116"><description>Copy the selected resource to the system clipboard.
-</description>
-</context>
-<!-- REMOTE RESOURCE ACTION:  Paste from clipboard action...   -->
-<context id="actn0117"><description>Paste the contents of the system clipboard into the selected resource.
-</description>
-</context>
-<!-- CASCADING COMPILE PROMPT ACTION: Compile -->
-<context id="ccpa0000"><description>Select a command to compile this resource with. The command will first be prompted, then run.
-</description></context>
-<!-- CASCADING COMPILE NOPROMPT ACTION: Compile -->
-<context id="ccna0000"><description>Select a command to compile this resource with. The command will be run without prompting.
-</description></context>
-<!-- SINGLE COMPILE ACTION: PROMPT...   -->
-<context id="scpa0000"><description>Compile the selected resource with this compile command. The command is prompted first, then run.
-</description></context>
-<!-- SINGLE COMPILE ACTION: NO PROMPT...   -->
-<context id="scna0000"><description>Compile the selected resource with this compile command. The command is not prompted.
-</description></context>
-<!-- WORK WITH COMPILE COMMANDS ACTION...   -->
-<context id="actnwwcc"><description>Work with commands for compiling selected resources.
-</description></context>
-
-<!-- Duplicate Profile dialog...   -->
-<context id="drnp0000">
-<description>Specify a new, unique name for the profile. Profiles can be unique to a person and specific to a task, such as <b>Release 1</b>.
-</description>
-</context>	
-<context id="drnp0002"><description>Specify the name for the copied profile.
-</description>
-</context>	
-<context id="drnp0003"><description>Specify if the new copied profile is to be made active. If active, its connections are visible.
-</description>
-</context>
-<!-- New Profile wizard...   -->
-<context id="wnpr0000">
-<description>This wizard will guide you through the creation of a new profile to hold connections and filters. Profiles are folders that hold connections and filter pools. They enable team support by allowing you to decide which connections will be private and which will be shared. Team members only see connections within the profiles they make active.
-</description>
-</context>	
-<context id="wnpr0001"><description>Specify a name for the profile. This might be a personal name that is unique within the team, or a name such as <b>Release 1</b>.
-</description>
-</context>	
-<context id="wnpr0002"><description>If you do not make this profile active, its connections will not be visible. If you want to share the profile, inform other team members to make it active after team synchronization.
-</description>
-</context>
-<!-- New Connection wizard page 1 (name profile)...   -->
-<context id="wncp0000">
-<description>This is your first connection. Connections are grouped into profiles to facilitate team sharing. Specify the name for your personal profile to contain connections unique to you. The default is your local machine hostname.
-</description>
-</context>
-<!-- New Connection wizard page 2 (connection properties)...   -->
-<context id="wncc0000">
-<description>Specify the information needed to create a connection to a remote system.
-</description>
-</context>	
-<context id="ccon0001"><description>Select a profile to contain this connection.
-</description>
-</context>	
-<context id="ccon0002"><description>Arbitrary name for this connection.  It must be unique to this profile.
-</description>
-</context>	
-<context id="ccon0003"><description>Operating system type of the remote host.
-</description>
-</context>	
-<context id="ccon0004"><description>Hostname or IP address of the remote host.
-</description>
-</context>	
-<context id="ccon0005"><description>Default user ID that is used by subsystems that do not have a specific user ID. If the arrow is to the left, the user ID comes from the preferences settings for this system type, and can only be changed. Changing it affects all connections that inherit this user ID. If you toggle the arrow to the right, the user ID will be set locally for this connection and not inherited from the preferences setting.
-</description>
-</context>	
-<context id="ccon0006"><description>A brief description of the connection.
-</description>
-</context>
-<!-- Default User Id dialog...   -->
-<context id="ddid0000">
-<description>Set the default user ID for all connections to systems of the selected type. This can be overridden within a particular connection or connection subsystem.
-</description>
-</context>
-<!-- Single Resource Rename dialog...   -->
-<context id="drns0000">
-<description>Specify the new name for the selected resource.
-</description>
-</context>
-<context id="drns0001">
-<description>Indicate whether to overwrite the existing resource or specify a unique name.
-</description>
-</context>
-
-<!-- Single Profile Rename dialog...   -->
-<context id="drnsprfl">
-<description>Specify the new name for the selected profile.
-</description>
-</context>
-<!-- Multiple Resource Rename dialog...   -->
-<context id="drnm0000">
-<description>Specify the new name for each of the selected resources. Use the <b>Tab</b> key to move to the next resource name.
-</description>
-</context>
-<!-- Multiple Profile Rename dialog...   -->
-<context id="drnmprfl">
-<description>Specify the new name for each of the selected profiles. Use the <b>Tab</b> key to move to the next profile name.
-</description>
-</context>
-
-<!-- Work With History dialog...   -->
-<context id="dwwh0000">
-<description>Delete or re-order the items in the drop-down list. The items all represent previously-typed or selected values for this drop-down list.
-</description>
-</context>
-<!-- Copy/Move Collision dialog...   -->
-<context id="dccc0000">
-<description>Select the target profile. The connection's profile is preselected. If you select the existing parent profile, you will be asked to rename the connection.
-</description>
-</context>
-<!-- Delete Confirmation dialog...   -->
-<context id="ddlt0000">
-<description>Confirm that you want to delete the selected resources that are listed. Select <b>Delete</b> to confirm the deletion. Select <b>Cancel</b> if you decide not to delete the resources.
-</description>
-</context>
-<!-- Delete Profile Confirmation dialog...   -->
-<context id="ddltprfl">
-<description>Confirm that you want to delete the selected profiles that are listed, including their connections, filters and user actions. Select <b>Delete</b> to confirm the deletion. Select <b>Cancel</b> if you decide not to delete the profiles.
-</description>
-</context>
-<!-- Copy Connection dialog...   -->
-<context id="dccn0000">
-<description>Select the target profile. The connection's profile is preselected. If you select the existing parent profile, you will be asked to rename the connection.
-</description>
-</context>
-<!-- Move Connection dialog...   -->
-<context id="dmcn0000">
-<description>Select the target profile. The connection's profile is excluded.
-</description>
-</context>
-<!-- Select Filter Pools dialog...   -->	
-<context id="dsfp0000">
-<description>Select the filter pools to reference in this subsystem. All filters from the referenced pools will be available when the subsystem is expanded.
-</description>
-</context>
-<!-- Work With Filter Pools dialog...   -->
-<context id="dwfp0000">
-<description>Create, delete, rename, copy, and move filter pools. The filter pools for each active profile are listed under that profile. Select a profile or filter pool to enable the toolbar actions. The actions are also available in the pop-up menu.
-</description>
-</context>
-<!-- Copy Filter Pool dialog...   -->
-<context id="dcfp0000">
-<description>Select the target profile. The filter pool's profile is preselected. If you select the existing parent profile, you will be asked to rename the filter pool.
-</description>
-</context>
-<!-- Move Filter Pool dialog...   -->
-<context id="dmfp0000">
-<description>Select the target profile. The filter pool's profile is excluded.
-</description>
-</context>
-<!-- Copy Filter dialog...   -->
-<context id="dcfr0000">
-<description>Select the target filter pool within a profile. If you select the existing parent filter pool, you will be asked to rename the filter.
-</description>
-</context>
-<!-- Move Filter dialog...   -->
-<context id="dmfr0000">
-<description>Select the target filter pool within a profile.
-</description>
-</context>
-<!-- CHANGE FILTER DIALOG...   -->
-<context id="dufr0000">
-<description>Use this dialog to change your filter. Filters can contain one or more filter strings. In the Remote Systems view, when a filter is expanded, the results of resolving all the strings are concatenated together. Use this dialog to add additional strings, and to order, delete or change the strings. Use the context menu on a string for additional actions.</description>
-</context>
-<!-- CHANGE FILTER DIALOG ACTION:  Delete...   -->
-<context id="dufr1000"><description>Delete the selected filter string. You will be asked to confirm your action.</description></context>
-<!-- CHANGE FILTER  DIALOG ACTION:  Copy   -->
-<context id="dufr2000"><description>Copy the selected filter string to the clipboard. The copy can be pasted to create a new filter string.</description></context>
-<!-- CHANGE FILTER  DIALOG ACTION:  Paste   -->
-<context id="dufr3000"><description>Paste a copy of a filter string from the clipboard.</description></context>
-<!-- CHANGE FILTER  DIALOG ACTION:  Move Up   -->
-<context id="dufr4000"><description>Move the selected filter string up in the list.</description></context>
-<!-- CHANGE FILTER  DIALOG ACTION:  Move Down  -->
-<context id="dufr5000"><description>Move the selected filter string down in the list.</description></context>
-
-<!-- Copy Filter String dialog...   -->
-<context id="dcfs0000">
-<description>Select the target filter within a profile and filter pool.
-</description>
-</context>
-<!-- Move Filter String dialog...   -->
-<context id="dmfs0000">
-<description>Select the target filter within a profile and filter pool.
-</description>
-</context>
-<!-- Remote Shell View...   -->
-<context id="cmdv0000">
-<description>This view shows the commands that have been run on remote systems, along with the resulting messages.
-</description>
-</context>
-<!-- Remote Monitor View...   -->
-<context id="mntr0000">
-<description>This view lets you view the contents and properties of remote objects and configure polling options to refresh remote objects every 5 to 200 seconds. 
-</description>
-</context>
-<!-- Connection Properties Page...   -->
-<context id="pcon0000">
-<description>Browse or update information about the selected connection.
-</description>
-</context>
-<!-- SubSystem Properties Page...   -->
-<context id="psub0000">
-<description>Browse or update information about the selected subsystem.
-</description>
-</context>
-<!-- FilterPool Properties Page 1...   -->
-<context id="pfp10000">
-<description>Browse information about the selected filter pool reference. Subsystems contain references to filter pools that physically exist within profiles. Multiple subsystems can reference the same filter pool.
-</description>
-</context>
-<!-- FilterPool Properties Page 2...   -->
-<context id="pfp20000">
-<description>Browse information about the filter pool being referenced. Subsystems contain references to filter pools that physically exist within profiles. Multiple subsystems can reference the same filter pool.
-</description>
-</context>
-<!-- Filter Properties Page ...   -->
-<context id="pflr0000">
-<description>Browse information about the selected filter.
-</description>
-</context>
-<!-- FilterString Properties Page 1...   -->
-<context id="pfls0000">
-<description>Browse information about the selected filter string.</description>
-</context>
-<!-- New Filter Pool Wizard...   -->
-<context id="wnfp0000">
-<description>Specify the name and parent profile for the new filter pool. Profiles own filter pools, while subsystems reference them.
-</description>
-</context>
-<!-- New Filter Wizard...   -->
-<context id="wnfr0000">
-<description>Specify a unique name for the filter, and click <b>Add</b> to create one or more filter strings. When this filter is expanded, the filter strings will be resolved and the results listed in the tree.
-</description>
-</context>
-<context id="nfp20000">
-<description>On this page, specify a unique name for the filter, and whether it is unique for this connection or will appear in all applicable connections. For the latter, you also specify what filter pool to contain the filter.
-</description>
-</context>
-<!-- Copy Remote Files Dialog...   -->
-<context id="dcrf0000">
-<description>Select the folder where you want to copy the selected folders or files. The folder they exist in is pre-selected. If you leave this as the default, you will be prompted for new names for the copied folders and files.
-</description>
-</context>
-<!-- Move Remote Files Dialog...   -->
-<context id="dmrf0000">
-<description>Select the folder where you want to move the selected folders or files. The folder they exist in is pre-selected. If you leave this as the default, you will be prompted for new names for the moved folders and files.
-</description>
-</context>	
-<context id="pwdp0000">
-<description>Specify the user ID and password used to log onto the remote system.
-</description>
-</context>	
-<context id="rsep0000">
-<description>Specify the settings used by the Remote System Explorer.
-</description>
-</context>	
-<context id="sysv0000">
-<description>This view lets you create connections to remote systems and work with them.
-</description>
-</context>	
-<context id="ufwf0000">
-<description>This wizard will guide you through the creation of a new file.
-</description>
-</context>
-<context id="ufwr0000">
-<description>This wizard will guide you through the creation of a new folder.
-</description>
-</context>
-<context id="ufaf0000">
-<description>This command creates a new file.
-</description>
-</context>
-<context id="ufar0000">
-<description>This command creates a new folder resource.
-</description>
-</context>
-<context id="ufac0000">
-<description>This command copies an object to another location.
-</description>
-</context>
-<context id="ufam0000">
-<description>This command moves an object to another location.
-</description>
-</context>
-<context id="ufpf0000">
-<description>Specify options for the Files System.
-</description>
-</context>
-<!-- ============================================ -->	
-<!-- File filter string wizard, dialog, form...   -->
-<!-- ============================================ -->	
-<!-- New File Filter String Wizard... -->
-<context id="ffsw0000">
-<description>This wizard will guide you through the creation of a filter string for listing files.
-</description>
-</context>
-<!-- Update File Filter String Dialog... -->
-<context id="ffsd0000">
-<description>This dialog updates your filter string that are used for listing files.
-</description>
-</context>
-<!-- New/Update File Filter String controls... -->
-<context id="ffsd0001">
-<description> Type or select the fully-qualified folder of the files that you want to list.
-</description>
-</context>
-<context id="ffsd0002">
-<description>Select this to list all files, or all files whose name meets a generic pattern.
-</description>
-</context>
-<context id="ffsd0003">
-<description>Specify a simple file name or a generic name pattern, containing up to 2 wildcard characters <b>*</b>. For example, <b>abc*def*</b>. Specify <b>*</b> to list all files.
-</description>
-</context>
-<context id="ffsd0004">
-<description>Select this to list all files that match one or more file types.
-</description>
-</context>
-<context id="ffsd0005">
-<description>Click <b>Select</b> to choose one or more file types to restrict. Only files of the selected types will be shown for this filter string.
-</description>
-</context>
-<context id="ffsd0006">
-<description>Select this to list only matching files within the given folder. Deselect this to list all folders within the given folder.
-</description>
-</context>
-<context id="ffsd0007">
-<description>Select this to test the filter string and see the list of files that match its criteria.
-</description>
-</context>
-<!-- PULLDOWN ACTION: Collapse-all action...   -->
-<context id="actn0023">
-<description>Collapses all currently expanded resources in the Remote Systems view.
-</description>
-</context>
-<!-- PULLDOWN ACTION: Collapse action...   -->
-<context id="actn0024">
-<description>Collapses all selected resources in the view.
-</description>
-</context>
-<!-- PULLDOWN ACTION: Expand action...   -->
-<context id="actn0025"><description>Expands all selected resources in the view.</description></context>
-
-<!-- WORK WITH USER DEFINED ACTIONS DIALOG...   -->
-<context id="wwua0000"><description>Use this dialog to create or edit user actions that appear in the User Actions pop-up menu for remote objects. Each active profile can contain unique actions, and all applicable actions from all active profiles are shown in the User Actions menu.
-The list on the left shows the existing user actions: 
-- To <b>create</b> a new action, select the "New" node at the top of the list, enter information in the edit pane on the right, and press the <b>Create</b> button.
-- To <b>edit</b> an existing action, select the action in the list, update the information in the edit pane on the right, and press the <b>Apply</b> button.
-- To copy, paste, delete or re-order existing actions, use the pop-up menu.
-</description>
-<topic label="Working with user actions" href="../org.eclipse.rse.doc.user/tasks/tworkuseract.html" />
-</context>
-
-
-<!-- WORK WITH NAMED TYPES DIALOG...   -->
-<context id="wwnt0000"><description>Use this dialog to create or edit named types, which are named collections of resource types. These named types make it easier to identify resources which match one or more resource types.
-The list on the left shows the existing named types:
-- To <b>create</b> a new type, select the "New" node at the top of the list, enter information in the edit pane on the right, and press the <b>Create</b> button.
-- To <b>edit</b> an existing type, select the type in the list, update the information in the edit pane on the right, and press the <b>Apply</b> button.
-- To copy, paste, delete or re-order existing types, use the pop-up menu.  
-Supplied types cannot be edited, but you can create a new type based on them by using copy and paste.
-</description></context>
-<context id="wwnt0002"><description>Enter a comma-separated list of file extensions or file names. For file names that have no extension, such as "makefile", specify ".null" for the extension, as in "makefile.null".</description></context>
-
-<!-- USER DEFINED ACTIONS DIALOG ACTION:  Delete...   -->
-<context id="udad0000"><description>Delete the selected action or type. You will be asked to confirm your action.</description></context>
-<!-- USER DEFINED ACTIONS DIALOG ACTION:  Copy   -->
-<context id="udac0000"><description>Copy the selected action or type to the clipboard.</description></context>
-<!-- USER DEFINED ACTIONS DIALOG ACTION:  Paste   -->
-<context id="udap0000"><description>Paste an action or type from the clipboard. You will be asked for a new name.</description></context>
-<!-- USER DEFINED ACTIONS DIALOG ACTION:  Move Up   -->
-<context id="udmu0000"><description>Move the selected action or type up in the list.</description></context>
-<!-- USER DEFINED ACTIONS DIALOG ACTION:  Move Down  -->
-<context id="udmd0000"><description>Move the selected action or type down in the list.</description></context>
-<!-- USER DEFINED ACTIONS DIALOG ACTION:  Restore Defaults  -->
-<context id="udrd0000"><description>Restore the action or type to its original values.</description></context>
-
-<!-- WORK WITH COMPILE COMMANDS DIALOG...   -->
-<context id="wwcc0000"><description>Use this dialog to create or edit compile commands that appear in the Compile pop-up menu for remote resources. Each active profile can contain unique compile commands, and all applicable commands from all active profiles are shown in the Compile menu.
-The list on the left shows the existing compile commands: 
-- To <b>create</b> a new compile command, select the "New" node at the top of the list, enter information in the edit pane on the right, and press the <b>Create</b> button.
-- To <b>edit</b> an existing compile command, select the command in the list, update the information in the edit pane on the right, and press the <b>Apply</b> button.
-- To copy, paste, delete or re-order existing compile commands, use the pop-up menu.
-</description>
-</context>
-<!-- WORK WITH COMPILE COMMANDS DIALOG ACTION:  Delete...   -->
-<context id="wwcc1000"><description>Delete the selected compile command. You will be asked to confirm your action.</description></context>
-<!-- WORK WITH COMPILE COMMANDS DIALOG ACTION:  Copy   -->
-<context id="wwcc2000"><description>Copy the selected compile command to the clipboard. The copy can be pasted to create a new compile command.</description></context>
-<!-- WORK WITH COMPILE COMMANDS DIALOG ACTION:  Paste   -->
-<context id="wwcc3000"><description>Paste a copy of a compile command from the clipboard.</description></context>
-<!-- WORK WITH COMPILE COMMANDS DIALOG ACTION:  Move Up   -->
-<context id="wwcc4000"><description>Move the selected compile command up in the list.</description></context>
-<!-- WORK WITH COMPILE COMMANDS DIALOG ACTION:  Move Down  -->
-<context id="wwcc5000"><description>Move the selected compile command down in the list.</description></context>
-<!-- WORK WITH COMPILE COMMANDS DIALOG ACTION:  Restore Defaults  -->
-<context id="wwcc6000"><description>Restore the compile command to its original values.</description></context>
-
-<!-- Save password dialogs -->
-<context id="pwdi0000">
-<description>Use the password information preference page to add, change, and remove stored passwords for remote systems.  The stored passwords are used whenever a password is required to connect to the remote system.</description>
-<topic label="Changing your saved password for a remote host connection" href="../org.eclipse.rse.doc.user/tasks/tbeginpass.html" /> 
-</context>
-<context id="pwdi0001">
-<description>Type the password information for the remote system and click <b>OK</b> to save the information or <b>Cancel</b> to exit without saving.</description>
-<topic label="Changing your saved password for a remote host connection" href="../org.eclipse.rse.doc.user/tasks/tbeginpass.html" /> 
-</context>
-<context id="pwdi0002">
-<description>Modify the saved password information for the remote system and click <b>OK</b> to update the saved information or <b>Cancel</b>  to exit without updating.</description>
-<topic label="Changing your saved password for a remote host connection" href="../org.eclipse.rse.doc.user/tasks/tbeginpass.html" /> 
-</context>
-
-<!-- SubSystem property page -->
-<context id="psubs0000">
-<description>Use the subsystem property page to see and edit common information about the subsystem:
-<b>Vendor:</b> - the company who created this subsystem
-<b>Name:</b> - the name of this subsystem, as shown in the Remote Systems view
-<b>Parent connection:</b> - the connection that owns this subsystem
-<b>Parent profile:</b> - the system profile that owns the connection
-<b>Port:</b> - the port used for the communication between this client, and the remote server for this subsystem
-<b>User ID:</b> - the user ID to use to signon to the remote server
-</description>
-</context>
-
-<!-- Environment variables property page -->
-<context id="envv0000">
-<description>Use the environment variables property page to specify environment variables for the remote system.  These environment variables will be set when the remote system is connected.  Any changes made to the environment variables while connected, will not be set on the remote system until it is disconnected and reconnected.</description>
-</context>
-<context id="envv0001">
-<description>Type the name and value for the new environment variable.  Click <b>OK</b> to add the new environment variable or <b>Cancel</b> to exit without adding it.</description>
-</context>
-<context id="envv0002">
-<description>Modify the name or value for the environment variable.  Click <b>OK</b> to update the existing environment variable or <b>Cancel</b> to exit without modifying.</description>
-</context>
-
-<!-- Server launcher property page -->
-<context id="srln0000">
-<description>Use the server launcher settings property page to specify how to connect to a remote server on the remote system.  To connect to a remote Linux, Unix or Windows host you must first install the Remote System Explorer server on the remote host.</description>
-<topic label="Connecting to a remote Linux or UNIX host" href="../org.eclipse.rse.doc.user/tasks/tbeginlinux.html" />
-<topic label="Connecting to a remote Windows host" href="../org.eclipse.rse.doc.user/tasks/tbeginwindows.html" />
-</context>
-<context id="srln0001">
-<description>Indicate that a connection should be established with a server on the remote system using the remote daemon to start the server.  To use this option, the remote daemon must be running on the remote system.</description>
-</context>
-<context id="srln0002">
-<description>Indicate that a connection should be established with a server on the remote system using the REXEC service to start the server.  To use this option, the REXEC service must be running on the remote system.</description>
-</context>
-<context id="srln0003">
-<description>Indicate that a connection should be established with a server that is already running on some known port.  To use this option, the server needs to be started up before attempting to connect in the Remote System Explorer.</description>
-</context>
-<context id="srln0004">
-<description>Specify the location of the server installed on the host.  REXEC uses this location to determine where to run the startup script from.</description>
-</context>
-<context id="srln0005">
-<description>Specify the name of the command or script that REXEC needs to run to invoke the server installed on the host.</description>
-</context>
-
-
-
-<!-- Installing remote server -->
-<context id="rsrv0000">
-<description>To connect to a remote Linux, Unix or Windows host you must first install the Remote System Explorer server on the remote host.</description>
-<topic label="Connecting to a remote Linux or UNIX host" href="../org.eclipse.rse.doc.user/tasks/tbeginlinux.html" />
-<topic label="Connecting to a remote Windows host" href="../org.eclipse.rse.doc.user/tasks/tbeginwindows.html" />
-</context>
-
-
-<!-- Universal Command Dialog -->
-<context id="cmdi0000">
-<description>Specify a command to run on the remote system.</description>
-</context>
-
-<!-- Remote Search Dialog -->
-<context id="rsdi0000">
-<description>Specify a search string and optionally limit the search to a subset of files by specifying file name patterns. Leave the search string empty to search for files only.</description>
-<topic label="Search for text and files on remote servers" href="../org.eclipse.rse.doc.user/tasks/tmanagesearch.html"/>
-</context>
-<context id="rsac0000">
-<description>Opens Remote Search dialog page for text and file searching on remote systems.</description>
-</context>
-
-
-
-<!-- Generic Position To Dialog -->
-<context id="gnpt0000">
-<description>Specify a name filter to use in locating objects in the view.</description>
-</context>
-
-<!-- Generic Subset Dialog -->
-<context id="gnss0000">
-<description>Specify a set of property filters to use as criteria in populating the table.</description>
-</context>
-
-<!-- Generic Table Customization Dialog -->
-<context id="gntc0000">
-<description>Specify the list of columns and the order in which to display them in the table.</description>
-</context>
-
-<!-- Remote System Details View -->
-<context id="sysd0000">
-<description>This view lets you view the contents and properties of remote objects.</description>
-</context>	
-
-<!-- Remote Search View -->
-<context id="srch0000">
-<description>This view shows you the results of a remote file search.</description>
-</context>
-
-<context id="search_cancel">
-<description>This action cancels the search operation. If the search is not complete, partial results may be shown in
-the view.</description>
-</context>
-
-<context id="search_remove_selected">
-<description>This action removes the selected matches from the view. If files are selected in the view, then all
-selected matches in that file will also be removed from the view.</description>
-</context>
-
-<context id="search_remove_all">
-<description>This action removes all matches from the view.</description>
-</context>
-
-<context id="search_history">
-<description>This action will bring up results for a previous search in the view.</description>
-</context>
-
-<context id="search_clear_history">
-<description>This action will remove the results of all searches from the view.</description>
-</context>	
-
-<!-- Remote Shell View -->
-<context id="ucmd0000">
-<description>This view allows you to run and view shell commands.</description>
-</context>	
-
-<!-- Remote Scratchpad View -->
-<context id="scrp0000">
-<description>Drag and drop objects here from other Remote System Explorer views to work with them in isolation.</description>
-</context>	
-
-<!-- Remote Error List View -->
-<context id="uerr0000">
-<description>This view shows you errors, warnings and informational messages resulting from a compile command.</description>
-</context>	
-
-<!-- Save Conflict Dialog -->
-<context id="scdl0000">
-<description>You are about to save your changes to a file on the remote system that has been modified since you started editing.  Choose whether you want to overwrite the remote file, replace your changes with those of the file on the remote system, save your changes to another remote file or cancel the save.</description>
-</context>
-
-<!-- Local Changes Pending Dialog -->
-<context id="lcdl0000">
-<description>You have made changes to this file during a previous editing session that have not been saved on the remote system.  If you open the remote file, you will lose all pending changes.  Choose whether you want to replace your changes with the remote file, keep your changes or cancel the operation.  You will be able to save your file to a different location without overwriting the remote file if you choose to keep your pending changes.</description>
-</context>
-
-<context id="ecth0000">
-<description>Select this option to enable the help to work in the CODE tools, and VisualAge RPG tools. It uncompresses the html help files for these tools.
-</description>
-</context>
-
-<!-- file cache preference page -->
-<context id="fchp0000">
-<description>This is the RSE file cache preference page.
-
-Remote files are cached locally when RSE is used for editing. Use the <b>Maximum cache size</b> settings to specify a limit to the amount of disk space used for this cache.
-
-Click the <b>Clear Cached Files</b> button to remove all cached files. Clearing the cache will close any editors open for these files.
-</description>
-</context>
-
-<!-- Work offline support -->
-<context id="wofa0000">
-<description>The Work Offline action toggles the connection between offline and online modes.  In offline mode information is retrieved from the cache if available and supported by the connection type.  If the action currently has a check mark beside it then the connection is offline and selecting this action will put the connection in online mode so it can be connected to the remote system.</description>
-</context>
-<context id="wofp0000">
-<description>Select the Work Offline property to set the connection offline.  In offline mode the connection cannot be connected to the remote system.  Information is retrieved from the cache if available and supported by the connection type.</description>
-</context>
-
-<!-- SSL support -->
-<context id="ssls0000">
-<description>This is the RSE SSL preference page.
-From here you can manage the certificates that the RSE client uses when connecting to a server that is configured to use SSL.
-</description>
-</context>
-<context id="ssls0001">
-<description>Use the server connection security property page to indicate whether the server you are connecting to is running in SSL mode.
-</description>
-</context>
-
-<!-- RSE logging -->
-<context id="rsel0000">
-<description>This page allows you to specify the Remote System Explorer logging preferences.
-
-You can specify what severity of messages you wish to log - from informational messages, to warnings, to errors. If it is available, the debug setting provides the most detail.
-
-Messages are logged to the .log file in the .metadata folder of the workspace.
-</description>
-</context>
-<context id="ActionImportConnectionDefinitions">
-   <description>This action imports connection definitions that have been exported from another workbench. A file selection dialog is displayed, and the specified file containing the connection definitions is imported. New connections will appear in the workspace. If a connection by that name already exists in the workspace, the connection being imported will be renamed.</description>
-</context>
-<context id="ActionExportConnectionDefinitions">
-   <description>This action exports connection definitions to a file. A file selection dialog is displayed, and you specify the directory and file name into which to export the selected connections and their filters. You may then import the connections into another workbench using the import action.</description>
-</context>
-<context id="DStorePreferencePage">
-   <description>The DataStore preference page allows you to set various parameters associated with DataStore protocol.
-
-You may set the timeout value used to establish the initial connection as well as the &quot;keepalive&quot; characteristics of the underlying connection.
-
-You may also show or suppress warnings if the server and client versions of the protocol are not exactly matched.</description>
-</context>
-
-</contexts>
diff --git a/rse/plugins/org.eclipse.rse.ui/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index ba7e5c2eb..000000000
--- a/rse/plugins/org.eclipse.rse.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,60 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.rse.ui;singleton:=true
-Bundle-Version: 3.1.1.qualifier
-Bundle-Activator: org.eclipse.rse.ui.RSEUIPlugin
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.expressions,
- org.eclipse.core.resources,
- org.eclipse.jface.text,
- org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui.forms,
- org.eclipse.ui.ide,
- org.eclipse.ui.views,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.rse.services;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.rse.core;bundle-version="[3.0.0,4.0.0)"
-Import-Package: com.ibm.icu.lang,
- com.ibm.icu.text,
- com.ibm.icu.util
-Bundle-ActivationPolicy: lazy
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.rse.core.subsystems,
- org.eclipse.rse.internal.ui;x-friends:="org.eclipse.rse.connectorservice.dstore,org.eclipse.rse.processes.ui",
- org.eclipse.rse.internal.ui.actions;x-internal:=true,
- org.eclipse.rse.internal.ui.dialogs;x-internal:=true,
- org.eclipse.rse.internal.ui.filters;x-internal:=true,
- org.eclipse.rse.internal.ui.filters.dialogs;x-internal:=true,
- org.eclipse.rse.internal.ui.logging;x-internal:=true,
- org.eclipse.rse.internal.ui.propertypages;x-internal:=true,
- org.eclipse.rse.internal.ui.subsystems;x-internal:=true,
- org.eclipse.rse.internal.ui.view;x-internal:=true,
- org.eclipse.rse.internal.ui.view.monitor;x-internal:=true,
- org.eclipse.rse.internal.ui.view.scratchpad;x-internal:=true,
- org.eclipse.rse.internal.ui.view.search;x-internal:=true,
- org.eclipse.rse.internal.ui.view.team;x-internal:=true,
- org.eclipse.rse.internal.ui.widgets;x-internal:=true,
- org.eclipse.rse.ui,
- org.eclipse.rse.ui.actions,
- org.eclipse.rse.ui.dialogs,
- org.eclipse.rse.ui.filters,
- org.eclipse.rse.ui.filters.actions,
- org.eclipse.rse.ui.filters.dialogs,
- org.eclipse.rse.ui.internal.model;x-internal:=true,
- org.eclipse.rse.ui.messages,
- org.eclipse.rse.ui.model,
- org.eclipse.rse.ui.open,
- org.eclipse.rse.ui.operations,
- org.eclipse.rse.ui.propertypages,
- org.eclipse.rse.ui.subsystems,
- org.eclipse.rse.ui.validators,
- org.eclipse.rse.ui.view,
- org.eclipse.rse.ui.widgets,
- org.eclipse.rse.ui.widgets.services,
- org.eclipse.rse.ui.wizards,
- org.eclipse.rse.ui.wizards.newconnection,
- org.eclipse.rse.ui.wizards.registries
-Bundle-Vendor: %providerName
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/DefaultUIInteractionProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/DefaultUIInteractionProvider.java
deleted file mode 100644
index e715cde09..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/DefaultUIInteractionProvider.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2008 Wind River Systems, Inc. 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:
- * Martin Oberhuber (Wind River) - [190231] initial API and implementation
- * Martin Oberhuber (Wind River) - brought in methods from SubSystem (c) IBM
- * Martin Oberhuber (Wind River) - [236355] [api] Add an IRSEInteractionProvider#eventExec() method
- *******************************************************************************/
-package org.eclipse.rse.internal.ui;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.rse.core.IRSEInteractionProvider;
-import org.eclipse.rse.core.IRSERunnableWithProgress;
-import org.eclipse.rse.services.clientserver.messages.SystemMessage;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.SystemBasePlugin;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * A Default Interaction Provider that runs in the Eclipse / SWT UI. Meant to
- * provide the same functionality as it was there before UI / Non-UI Splitting.
- * <p>
- * <strong>EXPERIMENTAL</strong>. This class or interface has been added as
- * part of a work in progress. There is no guarantee that this API will work or
- * that it will remain the same. Please do not use this API without consulting
- * with the <a href="http://www.eclipse.org/dsdp/tm/">Target Management</a>
- * team.
- * </p>
- *
- * @since org.eclipse.rse.ui 3.0
- */
-public class DefaultUIInteractionProvider implements IRSEInteractionProvider {
-
-	private Shell shell = null;
-
-	private class NullRunnableContext implements IRunnableContext {
-		public void run(boolean fork, boolean cancelable, IRunnableWithProgress runnable) throws InvocationTargetException, InterruptedException {
-			IProgressMonitor monitor = new NullProgressMonitor();
-			runnable.run(monitor);
-		}
-	}
-
-	/**
-	 * Get the progress monitor dialog for this operation. We try to use one for
-	 * all phases of a single operation, such as connecting and resolving.
-	 *
-	 * @deprecated this is scheduled to be removed since we want to avoid UI
-	 *             components in SubSystem.
-	 */
-	protected IRunnableContext getRunnableContext(/* Shell rshell */) {
-		if (Display.getCurrent() == null) {
-			return new NullRunnableContext();
-		}
-		// for wizards and dialogs use the specified context that was placed in
-		// the registry
-		IRunnableContext irc = RSEUIPlugin.getTheSystemRegistryUI().getRunnableContext();
-		if (irc != null) {
-			SystemBasePlugin.logInfo("Got runnable context from system registry"); //$NON-NLS-1$
-			return irc;
-		} else {
-			// for other cases, use statusbar
-			IWorkbenchWindow win = SystemBasePlugin.getActiveWorkbenchWindow();
-			if (win != null) {
-				Shell winShell = getActiveWorkbenchShell();
-				if (winShell != null && !winShell.isDisposed() && winShell.isVisible()) {
-					SystemBasePlugin.logInfo("Using active workbench window as runnable context"); //$NON-NLS-1$
-					shell = winShell;
-					return win;
-					// dwd } else {
-					// dwd win = null;
-				}
-			}
-			// dwd if (shell == null || shell.isDisposed() ||
-			// !shell.isVisible()) {
-			// dwd SystemBasePlugin.logInfo("Using progress monitor dialog with
-			// given shell as parent");
-			// dwd shell = rshell;
-			// dwd }
-			// dwd IRunnableContext dlg = new ProgressMonitorDialog(rshell);
-			IRunnableContext dlg = new ProgressMonitorDialog(shell);
-			return dlg;
-		}
-	}
-
-	/**
-	 * Helper/convenience method. Return shell of active window.
-	 */
-	public static Shell getActiveWorkbenchShell() {
-		Shell result = null;
-		if (PlatformUI.isWorkbenchRunning()) {
-			try {
-				IWorkbenchWindow window = getActiveWorkbenchWindow();
-				if (window != null) {
-					result = window.getShell();
-				}
-			} catch (Exception e) {
-				return null;
-			}
-		} else // workbench has not been loaded yet!
-		{
-			return null;
-		}
-		return result;
-	}
-
-	/**
-	 * Helper/convenience method. Return active window
-	 */
-	public static IWorkbenchWindow getActiveWorkbenchWindow() {
-		return RSEUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow();
-	}
-
-	public void runInDefaultContext(boolean fork, boolean cancellable, IRSERunnableWithProgress runnable) throws InvocationTargetException,
-			InterruptedException {
-		// TODO Auto-generated method stub
-	}
-
-	private Display getDefaultDisplay() {
-		Display d = Display.getCurrent();
-		if (d == null) {
-			d = SystemBasePlugin.getActiveWorkbenchShell().getDisplay();
-			if (d == null) {
-				d = Display.getDefault();
-			}
-		}
-		return d;
-	}
-
-	public void asyncExec(final Runnable runnable) {
-		getDefaultDisplay().asyncExec(runnable);
-	}
-
-	public void eventExec(final Runnable runnable) {
-		if (Display.getCurrent() != null) {
-			runnable.run();
-		} else {
-			asyncExec(runnable);
-		}
-	}
-
-	public void flushRunnableQueue() {
-		Display d = Display.getCurrent();
-		if (d == null) {
-			getDefaultDisplay().syncExec(new Runnable() {
-				public void run() {
-					flushRunnableQueue();
-				}
-			});
-		} else {
-			while (d.readAndDispatch()) {
-				// flush the event queue
-			}
-		}
-	}
-
-	public IProgressMonitor getDefaultProgressMonitor() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public void showMessage(SystemMessage msg) {
-		// TODO Auto-generated method stub
-
-	}
-
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/GenericMessages.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/GenericMessages.java
deleted file mode 100644
index 790b829c0..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/GenericMessages.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David McKnight   (IBM)        - [216252] [api][nls] Resource Strings specific to subsystems should be moved from rse.ui into files.ui / shells.ui / processes.ui where possible
- * David McKnight   (IBM)        - [220309] [nls] Some GenericMessages and SubSystemResources should move from UI to Core
- * David McKnight   (IBM)        - [223103] [cleanup] fix broken externalized strings
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-public class GenericMessages extends NLS
-{
-	private static String BUNDLE_NAME = "org.eclipse.rse.internal.ui.GenericMessages";//$NON-NLS-1$
-
-	public static String ResourceNavigator_goto;
-	
-
-	public static String TransferOperation_message;
-
-	
-
-	public static String TypesFiltering_title;
-	public static String TypesFiltering_message;
-	public static String TypesFiltering_otherExtensions;
-	public static String TypesFiltering_typeDelimiter;
-
-
-	public static String FileExtension_extensionEmptyMessage;
-	public static String FileExtension_fileNameInvalidMessage;
-	
-	public static String RSEQuery_task;
-	
-	public static String Error;
-	public static String Question;
-	public static String Warning;
-	public static String Information;
-	
-		
-	static {
-		// load message values from bundle file
-		NLS.initializeMessages(BUNDLE_NAME, GenericMessages.class);
-	}
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/GenericMessages.properties b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/GenericMessages.properties
deleted file mode 100644
index 905cc019d..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/GenericMessages.properties
+++ /dev/null
@@ -1,44 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2008 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
-#
-# Initial Contributors:
-# The following IBM employees contributed to the Remote System Explorer
-# component that contains this file: David McKnight, Kushal Munir, 
-# Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
-# Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
-# 
-# Contributors:
-# David McKnight   (IBM)        - [216252] [api][nls] Resource Strings specific to subsystems should be moved from rse.ui into files.ui / shells.ui / processes.ui where possible
-# David McKnight   (IBM)        - [220309] [nls] Some GenericMessages and SubSystemResources should move from UI to Core
-# David McKnight   (IBM)        - [223103] [cleanup] fix broken externalized strings
-###############################################################################
-
-# NLS_MESSAGEFORMAT_VAR
-# NLS_ENCODING=UTF-8
-
-ResourceNavigator_goto = Goto
-
-# ==============================================================================
-# Editors
-# ==============================================================================
-
-TypesFiltering_title = Select Types
-TypesFiltering_message = Reduce selection to only files of &type(s):
-TypesFiltering_otherExtensions = &Other Extensions:
-TypesFiltering_typeDelimiter = ,
-
-FileExtension_extensionEmptyMessage = The file extension cannot be empty
-FileExtension_fileNameInvalidMessage = The file name cannot include the wild card character (*) in the current location
-
-TransferOperation_message = Transfer Operation
-
-RSEQuery_task = RSE Query
-
-Error=Error
-Question=Question
-Warning=Warning
-Information=Information
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/PreferencesMapper.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/PreferencesMapper.java
deleted file mode 100644
index 5aa5c8148..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/PreferencesMapper.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2007 IBM Corporation. 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:
- * David Dykstal (IBM) - initial API and implementation
- ********************************************************************************/
-package org.eclipse.rse.internal.ui;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-
-/**
- * The PreferencesMapper provides an implementation of IPreferenceStore over a "lower level"
- * Preferences store. This is a relatively straightforward delegation.
- * 
- * This class is internal and may not be used or subclassed by users of RSE. This should be used
- * only within RSE as a means of exploiting field editors on preferences that are stored
- * in {@link Preferences}.
- * 
- * @see Preferences
- * @see IPreferenceStore
- */
-public class PreferencesMapper implements IPreferenceStore {
-	
-	private Preferences preferences = null;
-	private boolean listening = true;
-	private Map listeners = new HashMap();
-	
-	private class MyPropertyChangeListener implements org.eclipse.core.runtime.Preferences.IPropertyChangeListener {
-
-		private IPropertyChangeListener containedListener = null;
-		
-		public MyPropertyChangeListener(IPropertyChangeListener containedListener) {
-			this.containedListener = containedListener;
-		}
-		
-		public void propertyChange(org.eclipse.core.runtime.Preferences.PropertyChangeEvent event) {
-			if (listening) {
-				String property = event.getProperty();
-				Object oldValue = event.getOldValue();
-				Object newValue = event.getNewValue();
-				PropertyChangeEvent newEvent = new PropertyChangeEvent(this, property, oldValue, newValue);
-				containedListener.propertyChange(newEvent);
-			}
-		}
-		
-	}
-	
-	public PreferencesMapper(Preferences preferences) {
-		this.preferences = preferences;
-	}
-
-	public void addPropertyChangeListener(IPropertyChangeListener listener) {
-		if (!listeners.containsKey(listener)) {
-			MyPropertyChangeListener l = new MyPropertyChangeListener(listener);
-			listeners.put(listener, l);
-			preferences.addPropertyChangeListener(l);
-		}
-	}
-
-	public boolean contains(String name) {
-		return preferences.contains(name);
-	}
-
-	public void firePropertyChangeEvent(String name, Object oldValue, Object newValue) {
-		for (Iterator z = listeners.keySet().iterator(); z.hasNext();) {
-			IPropertyChangeListener listener = (IPropertyChangeListener) z.next();
-			PropertyChangeEvent e = new PropertyChangeEvent(this, name, oldValue, newValue);
-			listener.propertyChange(e);
-		}
-	}
-
-	public boolean getBoolean(String name) {
-		return preferences.getBoolean(name);
-	}
-
-	public boolean getDefaultBoolean(String name) {
-		return preferences.getDefaultBoolean(name);
-	}
-
-	public double getDefaultDouble(String name) {
-		return preferences.getDefaultDouble(name);
-	}
-
-	public float getDefaultFloat(String name) {
-		return preferences.getDefaultFloat(name);
-	}
-
-	public int getDefaultInt(String name) {
-		return preferences.getDefaultInt(name);
-	}
-
-	public long getDefaultLong(String name) {
-		return preferences.getDefaultLong(name);
-	}
-
-	public String getDefaultString(String name) {
-		return preferences.getDefaultString(name);
-	}
-
-	public double getDouble(String name) {
-		return preferences.getDouble(name);
-	}
-
-	public float getFloat(String name) {
-		return preferences.getFloat(name);
-	}
-
-	public int getInt(String name) {
-		return preferences.getInt(name);
-	}
-
-	public long getLong(String name) {
-		return preferences.getLong(name);
-	}
-
-	public String getString(String name) {
-		return null;
-	}
-
-	public boolean isDefault(String name) {
-		return preferences.isDefault(name);
-	}
-
-	public boolean needsSaving() {
-		return preferences.needsSaving();
-	}
-
-	public void putValue(String name, String value) {
-		listening = false;
-		preferences.setValue(name, value);
-		listening = true;
-	}
-
-	public void removePropertyChangeListener(IPropertyChangeListener listener) {
-		Object candidate = listeners.get(listener);
-		if (candidate instanceof MyPropertyChangeListener) {
-			MyPropertyChangeListener l = (MyPropertyChangeListener) candidate;
-			preferences.removePropertyChangeListener(l);
-		}
-		listeners.remove(listener);
-	}
-
-	public void setDefault(String name, double value) {
-		preferences.setDefault(name, value);
-	}
-
-	public void setDefault(String name, float value) {
-		preferences.setDefault(name, value);
-	}
-
-	public void setDefault(String name, int value) {
-		preferences.setDefault(name, value);
-	}
-
-	public void setDefault(String name, long value) {
-		preferences.setDefault(name, value);
-	}
-
-	public void setDefault(String name, String defaultObject) {
-		preferences.setDefault(name, defaultObject);
-	}
-
-	public void setDefault(String name, boolean value) {
-		preferences.setDefault(name, value);
-	}
-
-	public void setToDefault(String name) {
-		preferences.setToDefault(name);
-	}
-
-	public void setValue(String name, double value) {
-		preferences.setValue(name, value);
-	}
-
-	public void setValue(String name, float value) {
-		preferences.setValue(name, value);
-	}
-
-	public void setValue(String name, int value) {
-		preferences.setValue(name, value);
-	}
-
-	public void setValue(String name, long value) {
-		preferences.setValue(name, value);
-	}
-
-	public void setValue(String name, String value) {
-		preferences.setValue(name, value);
-	}
-
-	public void setValue(String name, boolean value) {
-		preferences.setValue(name, value);
-	}
-
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/RSESystemTypeAdapterFactory.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/RSESystemTypeAdapterFactory.java
deleted file mode 100644
index 8fe72b89e..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/RSESystemTypeAdapterFactory.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * Martin Oberhuber (Wind River) - [186779] Fix IRSESystemType.getAdapter()
- ********************************************************************************/
-package org.eclipse.rse.internal.ui;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.core.runtime.IAdapterManager;
-import org.eclipse.rse.core.IRSESystemType;
-import org.eclipse.rse.ui.RSESystemTypeAdapter;
-
-public class RSESystemTypeAdapterFactory implements IAdapterFactory {
-
-	private RSESystemTypeAdapter adapter = new RSESystemTypeAdapter();
-
-	public Class[] getAdapterList() 
-	{
-	    return new Class[] {RSESystemTypeAdapter.class};		
-	}
-	
-	/**
-	 * Called by our plugin's startup method to register our adaptable object types 
-	 * with the platform. We prefer to do it here to isolate/encapsulate all factory
-	 * logic in this one place.
-	 */
-	public void registerWithManager(IAdapterManager manager)
-	{
-		manager.registerAdapters(this, IRSESystemType.class);
-	}
-
-	public Object getAdapter(Object adaptableObject, Class adapterType) {
-		if (adaptableObject instanceof IRSESystemType) {
-			return adapter;
-		}
-		else {
-			return null;
-		}
-	}
-
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/RSEUIInitJob.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/RSEUIInitJob.java
deleted file mode 100644
index a3d4e1d62..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/RSEUIInitJob.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*********************************************************************************
- * Copyright (c) 2008 IBM Corporation. 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:
- * David Dykstal (IBM) - [197167] initial contribution.
- *********************************************************************************/
-
-package org.eclipse.rse.internal.ui;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.rse.core.RSECorePlugin;
-import org.eclipse.rse.core.SystemResourceManager;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.SystemBasePlugin;
-
-public class RSEUIInitJob extends Job {
-
-	public RSEUIInitJob() {
-		super("RSE_UI_INIT"); //$NON-NLS-1$
-	}
-
-	public IStatus run(IProgressMonitor monitor) {
-		IStatus status = Status.OK_STATUS;
-		try {
-			RSECorePlugin.waitForInitCompletion();
-		} catch (InterruptedException e) {
-			String message = "UI Initialization interrupted"; //$NON-NLS-1$
-			status = new Status(IStatus.INFO, RSEUIPlugin.PLUGIN_ID, message);
-			SystemBasePlugin.logInfo(message);
-		}
-		// listen for project change events if a project is being used
-		IProject remoteSystemsProject = SystemResourceManager.getRemoteSystemsProject(false);
-		if (remoteSystemsProject.exists()) {
-			SystemResourceListener listener = SystemResourceListener.getListener(remoteSystemsProject);
-			SystemResourceManager.startResourceEventListening(listener);
-		}
-		return status;
-	}
-
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/SystemProfileForm.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/SystemProfileForm.java
deleted file mode 100644
index d968b8368..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/SystemProfileForm.java
+++ /dev/null
@@ -1,263 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2007 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.rse.core.model.ISystemProfile;
-import org.eclipse.rse.services.clientserver.messages.SystemMessage;
-import org.eclipse.rse.ui.SystemWidgetHelpers;
-import org.eclipse.rse.ui.dialogs.SystemPromptDialog;
-import org.eclipse.rse.ui.messages.ISystemMessageLine;
-import org.eclipse.rse.ui.validators.ISystemValidator;
-import org.eclipse.rse.ui.validators.ValidatorFactory;
-import org.eclipse.rse.ui.validators.ValidatorProfileName;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-
-
-/**
- * A reusable form for prompting for profile information,
- *  in new or update mode.
- * <p>
- * May be used to populate a dialog or a wizard page.
- */
-
-public class SystemProfileForm 
-	   implements Listener
-{
-
-	// GUI widgets
-	protected Label profileLabel;
-	protected Control verbiage;	
-	//protected Combo profileCombo;
-	protected Text  profileName;
-	protected ISystemMessageLine msgLine;
-	// validators
-	protected ISystemValidator nameValidator;	
-	protected Object caller;
-	protected boolean callerInstanceOfWizardPage, callerInstanceOfSystemPromptDialog;
-	
-	// max lengths
-	protected static final int profileNameLength = ValidatorProfileName.MAX_PROFILENAME_LENGTH;
-	// state
-	protected ISystemProfile profile;
-	private boolean showVerbiage = true;
-	private SystemMessage errorMessage = null;
-    
-	/**
-	 * Constructor.
-	 * @param msgLine A GUI widget capable of writing error messages to.
-	 * @param caller The wizardpage or dialog hosting this form.
-	 * @param profile The existing profile being updated, or null for New action.
-	 * @param showVerbiage Specify true to show first-time-user verbiage.
-	 */
-	public SystemProfileForm(ISystemMessageLine msgLine, Object caller, ISystemProfile profile, boolean showVerbiage)
-	{
-		this.msgLine = msgLine;
-		this.caller = caller;
-		this.profile = profile;
-		this.showVerbiage = showVerbiage;
-		callerInstanceOfWizardPage = (caller instanceof WizardPage);
-		callerInstanceOfSystemPromptDialog = (caller instanceof SystemPromptDialog);	
-		nameValidator = ValidatorFactory.getProfileNameValidator(profile.getName());
-	}
-	
-	/**
-	 * Often the message line is null at the time of instantiation, so we have to call this after
-	 *  it is created.
-	 */
-	public void setMessageLine(ISystemMessageLine msgLine)
-	{
-		this.msgLine = msgLine;
-	}
-
-	/**
-	 * Call this to specify a validator for the profile name. It will be called per keystroke.
-	 * If not specified, a default is used.
-	 */
-	public void setNameValidators(ISystemValidator v)
-	{
-		nameValidator = v;
-	}
-	/**
-	 * Call to initialize the profile name in create mode. Must be called after createContents
-	 */
-	public void setProfileName(String name)
-	{
-		if ((name != null) && (profileName != null))
-		  profileName.setText(name);
-	}
-             
-	/**
-	 * CreateContents is the one method that must be overridden from the parent class.
-	 * In this method, we populate an SWT container with widgets and return the container
-	 *  to the caller (JFace). This is used as the contents of this page.
-	 * @param parent The parent composite
-	 */
-	public Control createContents(Composite parent)
-	{
-		// Inner composite
-		int nbrColumns = 2;
-		Composite composite_prompts = SystemWidgetHelpers.createComposite(parent, nbrColumns);
-
-		// VERBIAGE LABEL
-		if (showVerbiage)
-		{
-		  verbiage = SystemWidgetHelpers.createVerbiage(
-			 composite_prompts, SystemResources.RESID_PROFILE_PROFILENAME_VERBIAGE, nbrColumns, false, 200);
-	      SystemWidgetHelpers.createLabel(composite_prompts, "", nbrColumns); // dummy line for spacing //$NON-NLS-1$
-		}
-   
-        // NAME PROMPT
-		String temp = SystemWidgetHelpers.appendColon(SystemResources.RESID_PROFILE_PROFILENAME_LABEL);
-		profileLabel = SystemWidgetHelpers.createLabel(composite_prompts, temp);
-		profileName  = SystemWidgetHelpers.createTextField(
-			composite_prompts,this,
-			SystemResources.RESID_PROFILE_PROFILENAME_TIP);			
-	    profileName.setTextLimit(profileNameLength);
-	    
-	    if (profile != null)
-	      profileName.setText(profile.getName());
-	            
-		profileName.setFocus();
-		  		  
-		
-		// add keystroke listeners...
-		profileName.addModifyListener(
-			new ModifyListener() {
-				public void modifyText(ModifyEvent e) {
-					validateNameInput();
-				}
-			}
-		);
-		return composite_prompts;
-	}
-	
-	/**
-	 * Return control to recieve initial focus
-	 */
-	public Control getInitialFocusControl()
-	{
-		return profileName;
-	}
-	
-	/**
-	 * Default implementation to satisfy Listener interface. Does nothing.
-	 */
-	public void handleEvent(Event evt) {}
-	
-	/**
-	 * Verifies all input.
-	 * @return true if there are no errors in the user input
-	 */
-	public boolean verify() 
-	{
-		SystemMessage errMsg = null;
-		Control controlInError = null;
-		if (msgLine != null)
-		{
-			msgLine.clearErrorMessage();
-		}
-		errMsg = validateNameInput();
-		if (errMsg != null)
-		{
-			controlInError = profileName;
-		  	controlInError.setFocus();
-		  	showErrorMessage(errMsg);
-		}
-		return (errMsg == null);
-	}
-    
-	// --------------------------------- //
-	// METHODS FOR EXTRACTING USER DATA ... 
-	// --------------------------------- //
-	/**
-	 * Return user-entered profile Name.
-	 * Call this after finish ends successfully.
-	 */
-	public String getProfileName()
-	{
-		return profileName.getText().trim();
-	}    
-    /**
-     * Display error message or clear error message
-     */
-	private void showErrorMessage(SystemMessage msg)
-	{
-		if (msgLine != null)
-		  if (msg != null)
-		    msgLine.setErrorMessage(msg);
-		  else
-		    msgLine.clearErrorMessage();
-		else
-		  System.out.println("MSGLINE NULL. TRYING TO WRITE MSG " + msg); //$NON-NLS-1$
-	}
-    
-	// ---------------------------------------------
-	// METHODS FOR VERIFYING INPUT PER KEYSTROKE ...
-	// ---------------------------------------------
-  	/**
-	 * This hook method is called whenever the text changes in the input field.
-	 * The default implementation delegates the request to an <code>ISystemValidator</code> object.
-	 * If the <code>ISystemValidator</code> reports an error the error message is displayed
-	 * in the Dialog's message line.
-	 * @see #setNameValidators(ISystemValidator)
-	 */
-	protected SystemMessage validateNameInput() 
-	{			
-	    errorMessage= null;
-	    errorMessage= nameValidator.validate(profileName.getText().trim());
-		showErrorMessage(errorMessage);
-		setPageComplete();		
-		return errorMessage;		
-	}
-	
-	/**
-	 * This method can be called by the dialog or wizard page host, to decide whether to enable
-	 * or disable the next, final or ok buttons. It returns true if the minimal information is
-	 * available and is correct.
-	 */
-	public boolean isPageComplete()
-	{
-		boolean pageComplete = false;
-		if (errorMessage == null)
-		  pageComplete = (getProfileName().length() > 0);
-		return pageComplete;
-	}
-	
-	/**
-	 * Inform caller of page-complete status of this form
-	 */
-	public void setPageComplete()
-	{
-		boolean complete = isPageComplete();
-		if (callerInstanceOfWizardPage)
-		{			
-		  ((WizardPage)caller).setPageComplete(complete);
-		}
-		else if (callerInstanceOfSystemPromptDialog)
-		{
-		  ((SystemPromptDialog)caller).setPageComplete(complete);
-		}		
-	}	
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/SystemPropertyResources.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/SystemPropertyResources.java
deleted file mode 100644
index 7f24142dd..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/SystemPropertyResources.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- *  David McKnight   (IBM)        - [223103] [cleanup] fix broken externalized strings
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-public class SystemPropertyResources extends NLS
-{
-	private static String BUNDLE_NAME = "org.eclipse.rse.internal.ui.SystemPropertyResources";//$NON-NLS-1$
-
-//	 ------------------------------
-	// PROPERTY SHEET VALUES
-	// ------------------------------
-	// PROPERTY SHEET VALUES: GENERIC
-
-	public static String RESID_PROPERTY_NAME_LABEL;
-	public static String RESID_PROPERTY_NAME_TOOLTIP;
-
-	public static String RESID_PROPERTY_TYPE_LABEL; 
-	public static String RESID_PROPERTY_TYPE_TOOLTIP;
-
-	public static String RESID_PROPERTY_FILTERTYPE_VALUE;
-
-	public static String RESID_TERM_NOTAPPLICABLE;
-	public static String RESID_TERM_NOTAVAILABLE;
-
-	public static String RESID_PORT_DYNAMICSELECT;
-	public static String RESID_PROPERTY_INHERITED;
-	
-	static {
-		// load message values from bundle file
-		NLS.initializeMessages(BUNDLE_NAME, SystemPropertyResources.class);
-	}
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/SystemPropertyResources.properties b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/SystemPropertyResources.properties
deleted file mode 100644
index 71fc1b2bf..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/SystemPropertyResources.properties
+++ /dev/null
@@ -1,36 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2008 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
-#
-# Initial Contributors:
-# The following IBM employees contributed to the Remote System Explorer
-# component that contains this file: David McKnight, Kushal Munir, 
-# Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
-# Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
-# 
-# Contributors:
-# Martin Oberhuber (Wind River) - [195399] Improve String display for default port 0
-# David McKnight   (IBM)        - [223103] [cleanup] fix broken externalized strings
-###############################################################################
-
-##############################################################
-# PROPERTY VALUES...
-##############################################################
-
-# NLS_MESSAGEFORMAT_VAR
-# NLS_ENCODING=UTF-8
-
-RESID_PROPERTY_NAME_LABEL=Name
-RESID_PROPERTY_NAME_TOOLTIP=Name of resources
-RESID_PROPERTY_TYPE_LABEL=Type
-RESID_PROPERTY_TYPE_TOOLTIP=Type of resource
-
-RESID_TERM_NOTAPPLICABLE=Not applicable
-RESID_TERM_NOTAVAILABLE=Not available
-RESID_PORT_DYNAMICSELECT={0} (Default or first available)
-RESID_PROPERTY_INHERITED=(Inherited)
-
-RESID_PROPERTY_FILTERTYPE_VALUE=Remote system filter
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/SystemResourceListener.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/SystemResourceListener.java
deleted file mode 100644
index 7f8c69717..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/SystemResourceListener.java
+++ /dev/null
@@ -1,819 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2007 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
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core
- * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
- * Martin Oberhuber (Wind River) - [168870] refactor org.eclipse.rse.core package of the UI plugin
- * David Dykstal (IBM) - [191130] log exception instead of printing, do not log if project is not available
- ********************************************************************************/
-
-package org.eclipse.rse.internal.ui;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.rse.core.ISystemResourceListener;
-import org.eclipse.rse.core.RSECorePlugin;
-import org.eclipse.rse.core.SystemResourceManager;
-import org.eclipse.rse.core.events.ISystemModelChangeEvents;
-import org.eclipse.rse.core.model.ISystemRegistry;
-import org.eclipse.rse.internal.core.RemoteSystemsProject;
-import org.eclipse.rse.internal.core.model.SystemModelChangeEvent;
-import org.eclipse.rse.internal.ui.view.SystemPerspectiveHelpers;
-import org.eclipse.rse.internal.ui.view.SystemPerspectiveLayout;
-import org.eclipse.rse.internal.ui.view.SystemView;
-import org.eclipse.rse.internal.ui.view.SystemViewPart;
-import org.eclipse.rse.internal.ui.view.team.SystemTeamViewPart;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.SystemBasePlugin;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IViewReference;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-
-
-/**
- * This class manages listening for resource changes within our project.
- * Normally, we do not care about such changes. However, after a team synchronize,
- * we do.
- */
-public class SystemResourceListener implements ISystemResourceListener, Runnable
-{
-    private boolean debug = true;
-    private boolean fullDebug = debug && true;
-    private static SystemResourceListener inst = null;
-    private IProject remoteSystemsProject = null;
-    private boolean ignoreEvents = true;
-    private boolean ensureEventsOnMode = false;
-    private boolean sawSyncEvent = false;
-    private boolean changesPending = false;
-    private int addRmvListenerCount;
-    private Vector listeners;
-    private IWorkbenchPage primaryRSEPerspective = null;
-    private IViewPart[] primaryRSEViews = null;
-
-    private int runAction = 0;
-    private static final int CLOSE_PERSPECTIVES = 1;
-    private static final int CLOSE_EDITORS = 2;
-    private static final int CLOSE_VIEWS = 3;
-    private static final int RSE_RESTART = 4;
-    private static final int OPEN_VIEWS = 5;
-    private static final int FIRE_EVENT = 99;
-    
-    SystemResourceListener(IProject remoteSystemsProject)
-    {
-        this.remoteSystemsProject = remoteSystemsProject;
-    }
-
-    /**
-     * Return singleton
-     */
-    public static SystemResourceListener getListener(IProject remoteSystemsProject)
-    {
-        if (inst == null)
-            inst = new SystemResourceListener(remoteSystemsProject);
-        return inst;
-    }
-
-    /**
-     * Register a listener for resource change events on objects in our remote system project.
-     * No attempt is made to filter the events, they are simply passed on and the listener can
-     * decide if the event applies to them or not.
-     * <p>
-     * However, the event will only be fired if a change is made to that resource outside of the
-     * normal activities of the Remote Systems Framework, and only for resources within the
-     * Remote Systems Connection project.
-     */
-    public void addResourceChangeListener(IResourceChangeListener l)
-    {
-    	if (listeners == null)
-    	{
-    		listeners = new Vector();
-    		listeners.add(l);
-    	}
-        else if (!listeners.contains(l))
-            listeners.add(l);
-    }
-    /**
-     * Remove a listener for resource change events on object in our remote system project.
-     */
-    public void removeResourceChangeListener(IResourceChangeListener l)
-    {
-        if ((listeners!=null) && listeners.contains(l))
-            listeners.remove(l);
-    }
-
-    /**
-     * Turn off event listening. Please call this before do anything that modifies resources and
-     * turn it on again after.
-     */
-    public void turnOffResourceEventListening()
-    {
-        // Always turn off, even though may already be off, if nested block
-
-        ignoreEvents = true;
-
-        //remoteSystemsProject.getWorkspace().removeResourceChangeListener(listener);
-
-        --addRmvListenerCount;
-
-        // May have nested blocks of turnOff/ turnOn calls,
-        // so don't want to issue this warning.
-
-        //if (addRmvListenerCount != 0)
-
-        // Safeguard:  Dont expect many levels of nesting.  Diagnose.
-
-        //  1 nested level for now??
-
-        if (addRmvListenerCount < -1)
-            SystemBasePlugin.logWarning("LISTENER TURNED OFF OUT-OF-SEQUENCE ERROR: " + addRmvListenerCount); //$NON-NLS-1$
-    }
-
-    /**
-     * Turn off event listening. Please call this after modifying resources.
-     */
-    public void turnOnResourceEventListening()
-    {
-
-        // May have nested blocks of turnOff/ turnOn calls.
-        // Normally, expect (addRmvListenerCount) to equal 1 before it is turned Off,
-        // then equal 0 when off.  But may go below zero if nested off/on's occur.
-
-        ++addRmvListenerCount;
-
-        if (addRmvListenerCount > 0)
-        {
-
-            ignoreEvents = false;
-            sawSyncEvent = false;
-            //remoteSystemsProject.getWorkspace().addResourceChangeListener(listener, IResourceChangeEvent.POST_CHANGE | IResourceChangeEvent.POST_AUTO_BUILD);    	
-
-            if (addRmvListenerCount != 1)
-                SystemBasePlugin.logWarning("LISTENER TURNED ON OUT-OF-SEQUENCE ERROR: " + addRmvListenerCount); //$NON-NLS-1$
-        }
-
-    }
-
-    /**
-     * Ensure event listening is on. Called at start of team synch action to be safe.
-     */
-    public void ensureOnResourceEventListening()
-    {
-        SystemBasePlugin.logInfo("INSIDE ENSUREONRESOURCEEVENTLISTENING"); //$NON-NLS-1$
-        if (ignoreEvents)
-        {
-            SystemBasePlugin.logWarning("RESOURCE LISTENER WAS TURNED OFF. IT WAS FORCED ON"); //$NON-NLS-1$
-            turnOnResourceEventListening();
-        }
-        ensureEventsOnMode = true; // we can add debug statements conditioned by this so we don't stop until team synch action is run
-    }
-
-    /**
-     * @see IResourceChangeListener#resourceChanged(IResourceChangeEvent)
-     */
-    public void resourceChanged(IResourceChangeEvent event)
-    {
-        Object source = event.getSource();
-        if (ignoreEvents || !(event.getSource() instanceof IWorkspace))
-        {
-            return;
-        }
-
-        if (fullDebug)
-        {
-            int type = event.getType();
-            String sType = getTypeString(type);
-            SystemBasePlugin.logInfo("RESOURCE CHANGED EVENT: eventType=" + sType + ", eventSource=" + event.getSource()); //$NON-NLS-1$ //$NON-NLS-2$
-        }
-        if (ensureEventsOnMode)
-        {
-            ensureEventsOnMode = true; // set breakpoint here
-        }
-
-        IResource resource = event.getResource();
-        IResourceDelta delta = event.getDelta();
-        if ((resource == null) && (delta != null))
-            resource = delta.getResource();
-
-        // ATTEMPT TO FILTER OUT UNWANTED EVENTS...
-        if (resource != null)
-        {
-            if (resource.getProject() != null)
-            {
-                if (!resource.getProject().getName().equals(remoteSystemsProject.getName()))
-                {
-                    if (fullDebug)
-                        SystemBasePlugin.logInfo("EVENT FILTERED OUT BY PROJECT NAME"); //$NON-NLS-1$
-                    return;
-                }
-            }
-            else if (resource.getType() == IResource.PROJECT)
-            {
-                if (!resource.getName().equals(remoteSystemsProject.getName()))
-                {
-                    if (fullDebug)
-                        SystemBasePlugin.logInfo("EVENT FILTERED OUT BY PROJECT NAME"); //$NON-NLS-1$
-                    return;
-                }
-                try
-                {
-                    if (!(((IProject) resource).hasNature(RemoteSystemsProject.ID)))
-                    {
-                        if (fullDebug)
-                            SystemBasePlugin.logInfo("EVENT FILTERED OUT BY PROJECT NATURE"); //$NON-NLS-1$
-                        return;
-                    }
-                }
-                catch (Exception exc)
-                {
-                }
-            }
-            //else
-            //  RSEUIPlugin.logWarning("IN RESOURCeListener, RESOURCE AND PROJECT ARE NULL, UNABLE TO FILTER THE EVENT");
-        }
-        else
-        {
-            //if (resource == null)
-            //  RSEUIPlugin.logWarning("IN RESOURCeListener, RESOURCE IS NULL, UNABLE TO FILTER THE EVENT");
-        }
-
-        if (delta != null)
-        {
-            if (preScanForIgnore(delta))
-            {
-                if (fullDebug)
-                    SystemBasePlugin.logInfo("EVENT FILTERED OUT IN PRESCAN"); //$NON-NLS-1$
-                return;
-            }
-        }
-
-        if (fullDebug)
-        {
-            SystemBasePlugin.logInfo("*** RESOURCE CHANGE EVENT ALLOWED IN ***"); //$NON-NLS-1$
-        	//(new Exception("Stack Trace")).fillInStackTrace().printStackTrace();
-        }
-
-        /*
-        Exception exc = new Exception("Stack Trace");
-        exc.fillInStackTrace();
-        exc.printStackTrace();
-         */
-
-        if (debug)
-        {
-            int type = event.getType();
-            String sType = getTypeString(type);
-            if (!fullDebug)
-                SystemBasePlugin.logInfo("RESOURCE CHANGED EVENT: eventType=" + sType + ", eventSource=" + source); //$NON-NLS-1$ //$NON-NLS-2$
-            //RSEUIPlugin.logInfo("RESOURCE DELTA:"); //$NON-NLS-1$
-        }
-        boolean ignored = false;
-        if (delta != null)
-        {
-            //previousResource = null;
-            //ignored = !processDelta("", delta); //$NON-NLS-1$		
-
-            // OK, LET'S DO IT!
-            if (sawSyncEvent)
-            {
-                sawSyncEvent = false;
-                // code to reload moved to reloadRSE() method. Must be called explicitly now!
-            }
-            changesPending = true;
-        }
-        if (!ignored)
-        {
-        	fireResourceChangeEvent(event);
-        }
-    }
-    
-    /**
-     * Fire resource change events to interested listeners.
-     * This is simply a propogation of the eclipse resource event, once we know it applies to us.
-     */
-    protected void fireResourceChangeEvent(IResourceChangeEvent event)
-    {
-         if (listeners == null)
-           return;
-         // inform all listeners...
-         for (int idx = 0; idx < listeners.size(); idx++)
-         {
-                IResourceChangeListener l = (IResourceChangeListener) listeners.elementAt(idx);
-                l.resourceChanged(event);
-         }
-    }
-
-    /**
-     * Prescan for unrelated events.
-     * @return true if event filtered out
-     */
-    protected boolean preScanForIgnore(IResourceDelta delta)
-    {
-        if (delta == null)
-            return true; // not sure when we'd get this
-        IResourceDelta[] subdeltas = delta.getAffectedChildren();
-        if (subdeltas.length > 0)
-        {
-            IResource resource = subdeltas[0].getResource();
-            int resType = 0;
-            if (resource != null)
-              resType = resource.getType();
-            int flags = subdeltas[0].getFlags();
-            if (debug)
-            {
-              if (debug)
-                SystemBasePlugin.logInfo("...In preScanForIgnore. Kind = "+getKindString(delta.getKind())); //$NON-NLS-1$
-              if (resource == null)
-                SystemBasePlugin.logInfo("......resource is null"); //$NON-NLS-1$
-              else
-                SystemBasePlugin.logInfo("......resource is: "+resource.getName() + ", type is: " + getResourceTypeString(resType)); //$NON-NLS-1$ //$NON-NLS-2$
-              if (flags == IResourceDelta.SYNC)
-                SystemBasePlugin.logInfo("......flags == SYNC"); //$NON-NLS-1$
-              else
-                SystemBasePlugin.logInfo("......flags == "+flags); //$NON-NLS-1$
-            }
-
-            if (flags == IResourceDelta.SYNC) // apparently we no longer get this in 2.0!
-            {
-                sawSyncEvent = true;
-                return true;
-            }
-            if ((resource !=null) && (resType == IResource.ROOT))
-              return true; // someone created a new project?
-            if ((resource != null) && (resType == IResource.PROJECT))
-            {
-            	if (!resource.getName().equals(remoteSystemsProject.getName()))
-            	  return true;
-                // [191130] the event can be ignored if the project cannot be accessed
-            	if (!resource.isAccessible()) return true;
-                try
-                {
-                    if (!(((IProject) resource).hasNature(RemoteSystemsProject.ID)))
-                        return true;
-					}
-                catch (CoreException exc)
-                {
-                	RSECorePlugin.getDefault().getLogger().logError("Exception trying to test the natures of the project that fired a resource change event", exc); //$NON-NLS-1$
-				}
-			}
-        }
-        return false;
-    }
-    
-    private String getResourceTypeString(int type)
-    {
-    	switch (type)
-    	{
-    		case IResource.ROOT : return "root"; //$NON-NLS-1$
-    		case IResource.PROJECT : return "project"; //$NON-NLS-1$
-    		case IResource.FOLDER : return "folder"; //$NON-NLS-1$
-    		case IResource.FILE : return "file"; //$NON-NLS-1$
-    	}
-    	return "unknown: "+Integer.toString(type); //$NON-NLS-1$
-    }
-
-    /**
-     * Process all deltas.
-     * Currently not used.
-     * WILL FLESH OUT IN A FUTURE RELEASE AND TRY TO AVOID THE ATOM BOMB APPROACH WE TAKE NOW
-     */
-    protected boolean processDelta(String indent, IResourceDelta delta)
-    {
-        int kind = delta.getKind();
-        int flags = delta.getFlags();
-        if ((kind == IResourceDelta.CHANGED) && (flags == IResourceDelta.SYNC))
-            return false;
-        boolean processKids = true;
-        IResource resource = delta.getResource();
-        String kindString = null;
-        String pre = null;
-        if (debug)
-        {
-            kindString = getKindString(kind);
-            pre = kindString + ": " + indent; //$NON-NLS-1$
-            SystemBasePlugin.logInfo(pre + delta + ": flags: " + getKindString(flags)); //$NON-NLS-1$
-        }
-        if (resource == null)
-            return true;
-        int resourceType = resource.getType();
-        switch (kind)
-        {
-            case IResourceDelta.ADDED :
-                break;
-            case IResourceDelta.CHANGED :
-                if (debug)
-                    SystemBasePlugin.logInfo(pre + "resource type: " + resourceType); //$NON-NLS-1$
-                if (resourceType == IResource.PROJECT)
-                {
-                    try
-                    {
-                        if (!(((IProject) resource).hasNature(RemoteSystemsProject.ID)))
-                        {
-                            if (debug)
-                                SystemBasePlugin.logInfo("EVENT DELTA FILTERED OUT BY PROJECT NATURE"); //$NON-NLS-1$
-                            return false;
-                        }
-                    }
-                    catch (Exception exc)
-                    {
-                    }
-                }
-                break;
-            case IResourceDelta.CONTENT :
-            case IResourceDelta.REPLACED :
-                break;
-            case IResourceDelta.REMOVED :
-                break;
-            default :
-                if (debug)
-                    SystemBasePlugin.logInfo(kindString + " DELTA IGNORED"); //$NON-NLS-1$
-        }
-        boolean stop = false;
-        if (processKids)
-        {
-            IResourceDelta[] subdeltas = delta.getAffectedChildren();
-            for (int i = 0; !stop && (i < subdeltas.length); i++)
-                stop = !processDelta(indent + "   ", subdeltas[i]); //$NON-NLS-1$
-        }
-        return !stop;
-    }
-
-    public static String getKindString(int kind)
-    {
-        String kindString = "Unknown: " + Integer.toString(kind); //$NON-NLS-1$
-        switch (kind)
-        {
-            case IResourceDelta.ADDED :
-                kindString = "ADDED"; //$NON-NLS-1$
-                break;
-            case IResourceDelta.ADDED_PHANTOM :
-                kindString = "ADDED_PHANTOM"; //$NON-NLS-1$
-                break;
-            case IResourceDelta.ALL_WITH_PHANTOMS :
-                kindString = "ALL_WITH_PHANTOMS"; //$NON-NLS-1$
-                break;
-            case IResourceDelta.CHANGED :
-                kindString = "CHANGED"; //$NON-NLS-1$
-                break;
-            case IResourceDelta.CONTENT :
-                kindString = "CONTENT"; //$NON-NLS-1$
-                break;
-            case IResourceDelta.DESCRIPTION :
-                kindString = "DESCRIPTION"; //$NON-NLS-1$
-                break;
-            case IResourceDelta.MARKERS :
-                kindString = "ADDED"; //$NON-NLS-1$
-                break;
-            case IResourceDelta.MOVED_FROM :
-                kindString = "MOVED_FROM"; //$NON-NLS-1$
-                break;
-            case IResourceDelta.MOVED_TO :
-                kindString = "MOVED_TO"; //$NON-NLS-1$
-                break;
-            case IResourceDelta.NO_CHANGE :
-                kindString = "NO_CHANGE"; //$NON-NLS-1$
-                break;
-            case IResourceDelta.OPEN :
-                kindString = "OPEN"; //$NON-NLS-1$
-                break;
-            case IResourceDelta.REMOVED :
-                kindString = "REMOVED"; //$NON-NLS-1$
-                break;
-            case IResourceDelta.REMOVED_PHANTOM :
-                kindString = "REMOVED_PHANTOM"; //$NON-NLS-1$
-                break;
-            case IResourceDelta.REPLACED :
-                kindString = "REPLACED"; //$NON-NLS-1$
-                break;
-            case IResourceDelta.SYNC :
-                kindString = "SYNC"; //$NON-NLS-1$
-                break;
-            case IResourceDelta.TYPE :
-                kindString = "TYPE"; //$NON-NLS-1$
-                break;
-        }
-        return kindString;
-    }
-
-    public static String getTypeString(int type)
-    {
-        String typeString = "Unknown: " + Integer.toString(type); //$NON-NLS-1$
-        switch (type)
-        {
-            case IResourceChangeEvent.POST_CHANGE :
-                typeString = "POST_CHANGE"; //$NON-NLS-1$
-                break;
-            case IResourceChangeEvent.POST_BUILD:
-                typeString = "POST_BUILD"; //$NON-NLS-1$
-                break;
-            case IResourceChangeEvent.PRE_DELETE :
-                typeString = "PRE_DELETE"; //$NON-NLS-1$
-                break;
-            case IResourceChangeEvent.PRE_CLOSE :
-                typeString = "PRE_CLOSE"; //$NON-NLS-1$
-                break;
-            case IResourceChangeEvent.PRE_BUILD :
-                typeString = "PRE_BUILD"; //$NON-NLS-1$
-                break;
-        }
-        return typeString;
-    }
-
-    /**
-     * Close all non-primary system view perspectives
-     */
-    private void closeRSEPerspectives()
-    {
-        primaryRSEPerspective = null;
-        primaryRSEViews = null;
-        IWorkbenchPage[] rsePages = getRSEPerspectives();
-        IWorkbench wb = PlatformUI.getWorkbench();
-        if (wb == null)
-            SystemBasePlugin.logInfo("PlatformUI.getWorkbench() returned null!!"); //$NON-NLS-1$
-        else
-        {
-            IWorkbenchWindow wbw = wb.getActiveWorkbenchWindow();
-            if (wbw == null)
-                SystemBasePlugin.logInfo("Active workbench window is null"); //$NON-NLS-1$
-            if ((primaryRSEPerspective != null) && (wbw != null) && (wbw.getActivePage() != primaryRSEPerspective))
-                wbw.setActivePage(primaryRSEPerspective);
-        }
-        // close non-primary rse perspectives...
-        if ((rsePages != null) && (rsePages.length > 0))
-        {
-            for (int idx = 0; idx < rsePages.length; idx++)
-            {
-                IWorkbenchPage rsePage = rsePages[idx];
-                rsePage.close();
-            }
-        }
-        // for primary rse perspective...
-        if (primaryRSEPerspective != null)
-        {
-            Vector v = new Vector();
-            IViewReference[] views = primaryRSEPerspective.getViewReferences();
-            // scan for, and record, all non SystemView views
-            if (views != null)
-            {
-                for (int idx = 0; idx < views.length; idx++)
-                    if (!(views[idx].getView(false) instanceof SystemViewPart) &&
-                        !(views[idx].getView(false) instanceof SystemTeamViewPart))
-                        v.addElement(views[idx].getView(false));
-            }
-            primaryRSEViews = new IViewPart[v.size()];
-            for (int idx = 0; idx < v.size(); idx++)
-                primaryRSEViews[idx] = (IViewPart) v.elementAt(idx);
-            // ok, now we have those secondary views... what to do with them??
-        }
-    }
-
-    /**
-     * Return primary RSE View
-     */
-    private SystemView getRSEView()
-    {
-    	return SystemPerspectiveHelpers.findRSEView();
-    	/*
-        SystemRegistry sr = RSECorePlugin.getTheSystemRegistry();
-        IWorkbench wb = PlatformUI.getWorkbench();
-        IWorkbenchWindow[] wbWindows = wb.getWorkbenchWindows();
-        for (int idx = 0; idx < wbWindows.length; idx++)
-        {
-            IWorkbenchPage[] pages = wbWindows[idx].getPages();
-            if (pages != null)
-                for (int jdx = 0; jdx < pages.length; jdx++)
-                    if ((pages[jdx].getPerspective().getId().equals(SystemPerspectiveLayout.ID)))
-                    {
-                        SystemView sv = getSystemView(pages[jdx]);
-                        if ((sv != null) && (sv.getInput() == sr))
-                            return sv;
-                    }
-        }
-        return null;
-        */
-    }
-
-    /**
-     * Find all Remote System Explorer perspectives
-     * @return an array of all non-primary RSE perspectives, plus primaryRSEPerpsective set for the primary one.
-     */
-    private IWorkbenchPage[] getRSEPerspectives()
-    {
-        ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry();
-        IWorkbench wb = PlatformUI.getWorkbench();
-        IWorkbenchWindow[] wbWindows = wb.getWorkbenchWindows();
-        Vector v = new Vector();
-        for (int idx = 0; idx < wbWindows.length; idx++)
-        {
-            IWorkbenchPage[] pages = wbWindows[idx].getPages();
-            if (pages != null)
-                for (int jdx = 0; jdx < pages.length; jdx++)
-                    if ((pages[jdx].getPerspective().getId().equals(SystemPerspectiveLayout.ID)))
-                    {
-                        SystemView sv = getSystemView(pages[jdx]);
-                        if ((sv != null) && !(sv.getInput() == sr)) // not the primary perspective
-                            v.addElement(pages[jdx]);
-                        else if (sv != null)
-                            primaryRSEPerspective = pages[jdx];
-                    }
-        }
-        IWorkbenchPage[] ourPages = new IWorkbenchPage[v.size()];
-        for (int idx = 0; idx < ourPages.length; idx++)
-            ourPages[idx] = (IWorkbenchPage) v.elementAt(idx);
-        return ourPages;
-    }
-
-    /**
-     * Get RSE view for a given perspective page
-     */
-    private SystemView getSystemView(IWorkbenchPage page)
-    {
-        IViewReference[] views = page.getViewReferences();
-        if (views != null)
-            for (int idx = 0; idx < views.length; idx++)
-                if (views[idx].getView(false) instanceof SystemViewPart)
-                    return ((SystemViewPart) views[idx].getView(false)).getSystemView();
-        return null;
-    }
-
-    /**
-     * IRunnable run method
-     */
-    public void run()
-    {
-        if (runAction == CLOSE_PERSPECTIVES)
-        {
-            closeRSEPerspectives();
-        }
-        else if (runAction == CLOSE_EDITORS)
-        {
-            closeEditors();
-        }
-        else if (runAction == CLOSE_VIEWS)
-        {
-            closeViews();
-        }
-        else if (runAction == RSE_RESTART)
-        {
-            RSEUIPlugin.getDefault().restart();
-        }
-        else if (runAction == OPEN_VIEWS)
-        {
-            openViews();
-        }
-        else if (runAction == FIRE_EVENT)
-        {
-            RSECorePlugin.getTheSystemRegistry().fireEvent(
-              new SystemModelChangeEvent(ISystemModelChangeEvents.SYSTEM_RESOURCE_ALL_RELOADED, ISystemModelChangeEvents.SYSTEM_RESOURCETYPE_ALL, "dummy")); //$NON-NLS-1$
-        }
-
-    }
-
-    /**
-     * Close active editors in RSE views. You may prompt the user to save or discard pending changes, but
-     *  you cannot cancel the operation... the editor must be closed one way or the other.
-     */
-    protected void closeEditors()
-    {
-        // todo
-    }
-
-    /**
-     * Close active view in RSE perspective. You may either close the view or set its input to null, whichever is
-     *  appropriate. This is called prior to refreshing from disk. If you close the view, sets its array entry to null.
-     */
-    protected void closeViews()
-    {
-        // close views in primary RSE perspective
-        if (primaryRSEViews != null)
-        {
-            for (int idx = 0; idx < primaryRSEViews.length; idx++)
-            {
-            }
-        }
-    }
-    /**
-     * Open views in RSE perspective. You may either close the view or set its input to null, whichever is
-     *  appropriate. This is called prior to refreshing from disk.
-     */
-    protected void openViews()
-    {
-        // re-open views in primary RSE perspective
-        if (primaryRSEViews != null)
-        {
-            for (int idx = 0; idx < primaryRSEViews.length; idx++)
-            {
-                if (primaryRSEViews[idx] != null)
-                {
-                }
-            }
-        }
-
-    }
-    
-    /**
-     * Return true if changes are pending and hence a reloadRSE is in order
-     */
-    public static boolean changesPending()
-    {
-    	 SystemResourceListener us = null;
-    	 if (inst == null)
-    	    us = getListener(SystemResourceManager.getRemoteSystemsProject(false));
-    	 else
-    	    us = inst;
-
-    	 return us.changesPending;
-    }
-    
-    /**
-     * Re-load the whole RSE from the workspace. This is to be called after a team synchronization.
-     */
-    public static void reloadRSE()
-    {
-    	 SystemResourceListener us = null;
-    	 if (inst == null)
-    	    us = getListener(SystemResourceManager.getRemoteSystemsProject(false));
-    	 else
-    	    us = inst;
-    	    
-         Display d = Display.getCurrent();
-         if (d == null)
-           d = Display.getDefault();
-         if (d == null)
-         {
-           SystemBasePlugin.logInfo("Hmm, can't get the display"); //$NON-NLS-1$
-           SystemView sv = us.getRSEView();
-           if (sv != null)
-             d = sv.getShell().getDisplay();
-           else
-             SystemBasePlugin.logInfo("Hmm, really can't get the display"); //$NON-NLS-1$
-         }
-         
-         // here is the idea:
-         //  0. Close all open editors. Currently a no-op
-         //  1. Close all non-primary RSE perspectives
-         //     -- For the primary (last one found with SystemRegistry as the input) RSE perspective, leave it open
-         //  2. Close all non-primary views from the primary RSE perspective. Currently, a no-op
-         //  3. Reload the model.
-         //  4. Re-open non-primary views in primary RSE perspective. Currently a no-op
-         //  5. Give model change listeners (eg, views) an opportunity to re-load themselves if they need to
-
-         us.runAction = CLOSE_EDITORS;
-         if (d != null)
-           d.syncExec(us);
-         else
-           us.run();
-
-         us.runAction = CLOSE_PERSPECTIVES;
-         if (d != null)
-           d.syncExec(us);
-         else
-           us.run();
-
-         us.runAction = CLOSE_VIEWS;
-         if (d != null)
-           d.syncExec(us);
-         else
-           us.run();
-
-         us.runAction = RSE_RESTART;
-         if (d != null)
-           d.syncExec(us);
-         else
-           us.run();
-
-         us.runAction = OPEN_VIEWS;
-         if (d != null)
-           d.syncExec(us);
-         else
-           us.run();
-           
-         us.changesPending = false;
-         
-         us.runAction = FIRE_EVENT;         
-         if (d != null)
-           d.syncExec(us);
-         else
-           us.run();
-    }
-
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/SystemResources.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/SystemResources.java
deleted file mode 100644
index 959da53ae..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/SystemResources.java
+++ /dev/null
@@ -1,1057 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [181066] NLS missing messages with DAEMON and Shells
- * Martin Oberhuber (Wind River) - [185552] Remove remoteSystemsViewPreferencesActions extension point
- * David McKnight   (IBM)        - [210229] table refresh needs unique table-specific tooltip-text
- * David McKnight   (IBM)        - [216252] [nls] Resource Strings specific to subsystems should be moved from rse.ui into files.ui / shells.ui / processes.ui where possible
- * David McKnight   (IBM)        - [223103] [cleanup] fix broken externalized strings
- * Rupen Mardirossian (IBM)      - [210682] Added BUTTON_OVERWRITE_ALL & and tooltip, also added some verbiage for new SystemCopyDialog.	
- * Xuan Chen        (IBM)        - [222263] Need to provide a PropertySet Adapter for System Team View
- * David Dykstal (IBM) - [210242] Credentials dialog should look different if password is not supported or optional
- * David Dykstal (IBM) - [216858] Need the ability to Import/Export RSE connections for sharing
- * David Dykstal (IBM) - [231943] Make "true" and "false" translatable on SystemTypeFieldEditor
- * David Dykstal (IBM) - [188150] adding "go up one level" tooltip
- * David Dykstal (IBM) - [233678] title string is constructed by concatenation, should be substituted
- * David McKnight (IBM) - [248922]  [dnd] Remote to local overwrite copy does not work
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-
-/**
- * Constants used throughout the System plugin.
- */
-public class SystemResources extends NLS 
-{
-	private static String BUNDLE_NAME = "org.eclipse.rse.internal.ui.SystemResources";//$NON-NLS-1$
-
-	// Buttons
-	// *** NOT GOOD TO USE BUTTONS. BETTER TO USE ACTIONS WITH THEIR
-	// .label,.tooltip and .description ASSOCIATIONS
-	// THESE BUTTON LABELS ARE USED IN SYSTEMPROMPTDIALOG
-	public static String BUTTON_BROWSE;
-	public static String BUTTON_TEST;
-	public static String BUTTON_CLOSE;
-	public static String BUTTON_ADD;
-	public static String BUTTON_CREATE_LABEL;
-	public static String BUTTON_CREATE_TOOLTIP;
-
-	public static String BUTTON_CANCEL_ALL;
-	public static String BUTTON_CANCEL_ALL_TOOLTIP;
-	public static String BUTTON_OVERWRITE_ALL;
-	public static String BUTTON_OVERWRITE_ALL_TOOLTIP;
-
-	// THESE TERMS ARE USED POTENTIALLY ANYWHERE
-	public static String TERM_YES;
-	public static String TERM_NO;
-
-	public static String TERM_TRUE;
-	public static String TERM_FALSE;
-
-
-	public static String TERM_ALL;
-
-	public static String RESID_MSGLINE_TIP;
-	
-	// ----------------------------------------
-	// GENERIC/COMMON WIZARD AND DIALOG STRINGS
-	// ----------------------------------------
-	// GENERIC MULTI-SELECT RENAME DIALOG...
-	public static String RESID_RENAME_TITLE;
-	public static String RESID_RENAME_SINGLE_TITLE;
-	public static String RESID_RENAME_VERBIAGE;
-	public static String RESID_RENAME_COLHDG_OLDNAME;
-	public static String RESID_RENAME_COLHDG_NEWNAME;
-	public static String RESID_RENAME_COLHDG_TYPE;
-
-	// SPECIALIZED PROMPTS FOR GENERIC RENAME DIALOG...
-	public static String RESID_MULTI_RENAME_PROFILE_VERBIAGE;
-
-	// GENERIC SINGLE-SELECT RENAME DIALOG...
-
-	public static String RESID_SIMPLE_RENAME_PROMPT_LABEL;
-
-
-	public static String RESID_SIMPLE_RENAME_RESOURCEPROMPT_LABEL;
-	public static String RESID_SIMPLE_RENAME_RESOURCEPROMPT_TOOLTIP; 
-	public static String RESID_SIMPLE_RENAME_RADIO_OVERWRITE_LABEL;
-	public static String RESID_SIMPLE_RENAME_RADIO_OVERWRITE_TOOLTIP;
-	public static String RESID_SIMPLE_RENAME_RADIO_RENAME_LABEL;
-	public static String RESID_SIMPLE_RENAME_RADIO_RENAME_TOOLTIP;
-
-	// SPECIALIZED PROMPTS FOR GENERIC RENAME DIALOG...
-	public static String RESID_SIMPLE_RENAME_PROFILE_PROMPT_LABEL;
-
-	public static String RESID_SIMPLE_RENAME_PROFILE_PROMPT_TIP;
-
-	// GENERIC DELETE DIALOG...
-	public static String RESID_DELETE_TITLE;
-
-	public static String RESID_DELETE_PROMPT;
-
-	public static String RESID_DELETE_PROMPT_SINGLE;
-
-
-	public static String RESID_DELETE_WARNING_LABEL;
-	public static String RESID_DELETE_WARNING_TOOLTIP;
-
-
-	public static String RESID_DELETE_COLHDG_OLDNAME;
-
-	public static String RESID_DELETE_COLHDG_TYPE;
-
-	public static String RESID_DELETE_BUTTON;
-
-	// SPECIALIZED PROMPTS FOR GENERIC DELETE DIALOG...
-	public static String RESID_DELETE_PROFILES_PROMPT;
-
-	// GENERIC COPY DIALOG...
-	public static String RESID_COPY_TITLE;
-	public static String RESID_COPY_SINGLE_TITLE;
-	public static String RESID_COPY_PROMPT;
-	public static String RESID_COPY_TARGET_PROFILE_PROMPT;
-	public static String RESID_COPY_TARGET_FILTERPOOL_PROMPT;
-
-
-	// GENERIC MOVE DIALOG...
-	public static String RESID_MOVE_TITLE;
-	public static String RESID_MOVE_SINGLE_TITLE;
-	public static String RESID_MOVE_PROMPT;
-	public static String RESID_MOVE_TARGET_PROFILE_PROMPT;
-	public static String RESID_MOVE_TARGET_FILTERPOOL_PROMPT;
-
-	// GENERIC RESOURCE NAME COLLISION DIALOG...
-	public static String RESID_COLLISION_RENAME_TITLE;
-	public static String RESID_COLLISION_RENAME_VERBIAGE;
-	public static String RESID_COLLISION_RENAME_LABEL; 
-	public static String RESID_COLLISION_COPY_VERBIAGE;
-	public static String RESID_COLLISION_COPY_COLHDG_OLDNAME;
-
-
-	// -------------------------
-	// WIZARD AND DIALOG STRINGS
-	// -------------------------
-	// NEW PROFILE WIZARD...
-	public static String RESID_NEWPROFILE_TITLE;
-	public static String RESID_NEWPROFILE_PAGE1_TITLE;
-	public static String RESID_NEWPROFILE_PAGE1_DESCRIPTION;
-	public static String RESID_NEWPROFILE_NAME_LABEL; 
-	public static String RESID_NEWPROFILE_NAME_TOOLTIP; 
-	public static String RESID_NEWPROFILE_MAKEACTIVE_LABEL; 
-	public static String RESID_NEWPROFILE_MAKEACTIVE_TOOLTIP;
-	public static String RESID_NEWPROFILE_VERBIAGE;
-
-	// RENAME DEFAULT PROFILE WIZARD PAGE...
-	public static String RESID_PROFILE_PROFILENAME_LABEL;
-	public static String RESID_PROFILE_PROFILENAME_TIP;
-	public static String RESID_PROFILE_PROFILENAME_VERBIAGE;
-
-
-	// COPY SYSTEM PROFILE DIALOG...
-	public static String RESID_COPY_PROFILE_TITLE;
-
-	public static String RESID_COPY_PROFILE_PROMPT_LABEL; 
-	public static String RESID_COPY_PROFILE_PROMPT_TOOLTIP;
-
-	// NEW SYSTEM CONNECTION WIZARD...
-	public static String RESID_NEWCONN_PROMPT_LABEL;
-	public static String RESID_NEWCONN_PROMPT_VALUE;
-	public static String RESID_NEWCONN_EXPANDABLEPROMPT_VALUE;
-	public static String RESID_NEWCONN_TITLE;
-	public static String RESID_NEWCONN_PAGE1_TITLE;
-	public static String RESID_NEWCONN_PAGE1_REMOTE_TITLE;
-	public static String RESID_NEWCONN_PAGE1_LOCAL_TITLE;
-	public static String RESID_NEWCONN_PAGE1_DESCRIPTION;
-	public static String RESID_NEWCONN_MAIN_PAGE_TITLE;
-	public static String RESID_NEWCONN_MAIN_PAGE_DESCRIPTION;
-	public static String RESID_NEWCONN_SUBSYSTEMPAGE_FILES_DESCRIPTION;
-	public static String RESID_NEWCONN_SUBSYSTEMPAGE_FILES_TITLE;
-	public static String RESID_NEWCONN_SUBSYSTEMPAGE_FILES_VERBIAGE1;
-	public static String RESID_NEWCONN_SUBSYSTEMPAGE_FILES_VERBIAGE2;
-	public static String RESID_NEWCONN_SUBSYSTEMPAGE_DESCRIPTION;
-
-	
-	public static String RESID_CONNECTION_TYPE_LABEL;
-	public static String RESID_CONNECTION_TYPE_VALUE;
-	public static String RESID_CONNECTION_SYSTEMTYPE_LABEL;
-	public static String RESID_CONNECTION_SYSTEMTYPE_TIP;
-	public static String RESID_CONNECTION_SYSTEMTYPE_READONLY_TIP;
-
-	public static String RESID_CONNECTION_CONNECTIONNAME_LABEL;
-	public static String RESID_CONNECTION_CONNECTIONNAME_TIP;
-
-	public static String RESID_CONNECTION_HOSTNAME_LABEL;
-	public static String RESID_CONNECTION_HOSTNAME_TIP;
-
-
-	public static String RESID_CONNECTION_VERIFYHOSTNAME_LABEL;
-	public static String RESID_CONNECTION_VERIFYHOSTNAME_TOOLTIP;
-
-	public static String RESID_CONNECTION_DEFAULTUSERID_LABEL;
-	public static String RESID_CONNECTION_DEFAULTUSERID_TIP;
-	public static String RESID_CONNECTION_DEFAULTUSERID_INHERITBUTTON_TIP;
-
-	public static String RESID_CONNECTION_PORT_LABEL;
-	public static String RESID_CONNECTION_PORT_TIP;
-
-	public static String RESID_CONNECTION_DAEMON_PORT_LABEL;
-	public static String RESID_CONNECTION_DAEMON_PORT_TIP;
-
-
-	public static String RESID_CONNECTION_DESCRIPTION_LABEL;
-	public static String RESID_CONNECTION_DESCRIPTION_TIP;
-
-	public static String RESID_CONNECTION_PROFILE_LABEL;
-	public static String RESID_CONNECTION_PROFILE_TIP;
-
-	public static String RESID_CONNECTION_PROFILE_READONLY_TIP;
-
-
-
-	// NEW FILTER POOL WIZARD...
-	public static String RESID_NEWFILTERPOOL_TITLE;
-
-	public static String RESID_NEWFILTERPOOL_PAGE1_TITLE;
-
-	public static String RESID_NEWFILTERPOOL_PAGE1_DESCRIPTION;
-
-	// WIDGETS FOR THIS WIZARD...
-	public static String RESID_FILTERPOOLNAME_LABEL;
-	public static String RESID_FILTERPOOLNAME_TIP;
-
-	public static String RESID_FILTERPOOLMANAGERNAME_LABEL;
-	public static String RESID_FILTERPOOLMANAGERNAME_TIP;
-
-	// SELECT FILTER POOLS DIALOG...
-	public static String RESID_SELECTFILTERPOOLS_TITLE;
-
-	public static String RESID_SELECTFILTERPOOLS_PROMPT;
-
-	// WORK WITH FILTER POOLS DIALOG...
-	public static String RESID_WORKWITHFILTERPOOLS_TITLE;
-
-	public static String RESID_WORKWITHFILTERPOOLS_PROMPT;
-
-	// NEW SYSTEM FILTER WIZARD...
-	public static String RESID_NEWFILTER_TITLE;
-
-	public static String RESID_NEWFILTER_PAGE_TITLE;
-
-	// MAIN PAGE (page 1) OF NEW FILTER WIZARD...
-	public static String RESID_NEWFILTER_PAGE1_DESCRIPTION;
-
-
-	// NAME PAGE (page 2) OF NEW FILTER WIZARD...
-	public static String RESID_NEWFILTER_PAGE2_DESCRIPTION;
-
-	public static String RESID_NEWFILTER_PAGE2_NAME_VERBIAGE;
-
-	public static String RESID_NEWFILTER_PAGE2_POOL_VERBIAGE;
-
-	public static String RESID_NEWFILTER_PAGE2_POOL_VERBIAGE_TIP;
-
-	public static String RESID_NEWFILTER_PAGE2_PROFILE_VERBIAGE;
-
-	public static String RESID_NEWFILTER_PAGE2_NAME_LABEL; 
-	public static String RESID_NEWFILTER_PAGE2_NAME_TOOLTIP; 
-
-	public static String RESID_NEWFILTER_PAGE2_PROFILE_LABEL; 
-	public static String RESID_NEWFILTER_PAGE2_PROFILE_TOOLTIP;
-
-	public static String RESID_NEWFILTER_PAGE2_POOL_LABEL;
-	public static String RESID_NEWFILTER_PAGE2_POOL_TOOLTIP;
-
-	public static String RESID_NEWFILTER_PAGE2_UNIQUE_LABEL; 
-	public static String RESID_NEWFILTER_PAGE2_UNIQUE_TOOLTIP; 
-
-	// INFO PAGE (page 3) OF NEW FILTER WIZARD...
-	public static String RESID_NEWFILTER_PAGE3_DESCRIPTION;
-	public static String RESID_NEWFILTER_PAGE3_STRINGS_VERBIAGE;
-	public static String RESID_NEWFILTER_PAGE3_POOLS_VERBIAGE;
-
-
-	// CHANGE SYSTEM FILTER DIALOG...
-	public static String RESID_CHGFILTER_TITLE;
-	public static String RESID_CHGFILTER_LIST_NEWITEM;
-	public static String RESID_CHGFILTER_NAME_LABEL;
-	public static String RESID_CHGFILTER_NAME_TOOLTIP;
-	public static String RESID_CHGFILTER_POOL_LABEL;
-	public static String RESID_CHGFILTER_POOL_TOOLTIP;
-	public static String RESID_CHGFILTER_LIST_LABEL;
-	public static String RESID_CHGFILTER_LIST_TOOLTIP;
-	public static String RESID_CHGFILTER_FILTERSTRING_LABEL;
-	public static String RESID_CHGFILTER_FILTERSTRING_TOOLTIP;
-	public static String RESID_CHGFILTER_NEWFILTERSTRING_LABEL;
-	public static String RESID_CHGFILTER_NEWFILTERSTRING_TOOLTIP;
-	public static String RESID_CHGFILTER_BUTTON_TEST_LABEL;
-	public static String RESID_CHGFILTER_BUTTON_TEST_TOOLTIP;
-	public static String RESID_CHGFILTER_BUTTON_APPLY_LABEL;
-	public static String RESID_CHGFILTER_BUTTON_APPLY_TOOLTIP;
-	public static String RESID_CHGFILTER_BUTTON_REVERT_LABEL;
-	public static String RESID_CHGFILTER_BUTTON_REVERT_TOOLTIP;
-
-	// CREATE UNNAMED FILTER DIALOG...
-	public static String RESID_CRTFILTER_TITLE;
-
-
-	// NEW SYSTEM FILTER STRING WIZARD...
-
-	public static String RESID_FILTERSTRING_STRING_LABEL;
-	public static String RESID_FILTERSTRING_STRING_TIP;
-
-
-	// TEST SYSTEM FILTER STRING DIALOG...
-	public static String RESID_TESTFILTERSTRING_TITLE;
-
-	public static String RESID_TESTFILTERSTRING_PROMPT_LABEL; 
-	public static String RESID_TESTFILTERSTRING_PROMPT_TOOLTIP;
-
-
-	// WORK WITH HISTORY DIALOG...
-	public static String RESID_WORKWITHHISTORY_TITLE;
-	public static String RESID_WORKWITHHISTORY_VERBIAGE;
-	public static String RESID_WORKWITHHISTORY_PROMPT;
-	public static String RESID_WORKWITHHISTORY_BUTTON_TIP;
-
-	// PROMPT FOR PASSWORD DIALOG...
-	public static String RESID_PASSWORD_TITLE;
-
-	public static String RESID_PASSWORD_LABEL;
-	public static String RESID_PASSWORD_LABEL_OPTIONAL;
-	public static String RESID_PASSWORD_TIP;
-	
-	public static String RESID_PASSWORD_SYSTEMTYPE_LABEL;
-	public static String RESID_PASSWORD_HOSTNAME_LABEL;
-
-	public static String RESID_PASSWORD_USERID_LABEL;
-	public static String RESID_PASSWORD_USERID_TIP;
-
-	public static String RESID_PASSWORD_USERID_ISPERMANENT_LABEL;
-	public static String RESID_PASSWORD_USERID_ISPERMANENT_TIP;
-
-	public static String RESID_PASSWORD_SAVE_LABEL;
-	public static String RESID_PASSWORD_SAVE_TOOLTIP;
-	
-	// CHANGE PASSWORD DIALOG
-	public static String RESID_CHANGE_PASSWORD_TITLE;
-	public static String RESID_CHANGE_PASSWORD_NEW_LABEL;
-	public static String RESID_CHANGE_PASSWORD_NEW_TOOLTIP;
-	public static String RESID_CHANGE_PASSWORD_OLD_LABEL;
-	public static String RESID_CHANGE_PASSWORD_OLD_TOOLTIP;
-	public static String RESID_CHANGE_PASSWORD_CONFIRM_LABEL;
-	public static String RESID_CHANGE_PASSWORD_CONFIRM_TOOLTIP;
-
-	// TABLE VIEW DIALOGS
-	public static String RESID_TABLE_POSITIONTO_LABEL;
-	public static String RESID_TABLE_POSITIONTO_ENTRY_TOOLTIP;
-
-	public static String RESID_TABLE_SUBSET_LABEL;
-	public static String RESID_TABLE_SUBSET_ENTRY_TOOLTIP;
-	
-	public static String RESID_TABLE_PRINTLIST_TITLE;
-
-	// TABLE view column selection
-	public static String RESID_TABLE_SELECT_COLUMNS_LABEL;
-	public static String RESID_TABLE_SELECT_COLUMNS_TOOLTIP;
-	
-	public static String RESID_TABLE_SELECT_COLUMNS_ADD_LABEL;
-	public static String RESID_TABLE_SELECT_COLUMNS_ADD_TOOLTIP;
-	
-	public static String RESID_TABLE_SELECT_COLUMNS_REMOVE_LABEL;
-	public static String RESID_TABLE_SELECT_COLUMNS_REMOVE_TOOLTIP;
-	
-	public static String RESID_TABLE_SELECT_COLUMNS_UP_LABEL;
-	public static String RESID_TABLE_SELECT_COLUMNS_UP_TOOLTIP;
-	
-	public static String RESID_TABLE_SELECT_COLUMNS_DOWN_LABEL;
-	public static String RESID_TABLE_SELECT_COLUMNS_DOWN_TOOLTIP;
-	
-	public static String RESID_TABLE_SELECT_COLUMNS_AVAILABLE_LABEL;
-
-	public static String RESID_TABLE_SELECT_COLUMNS_DISPLAYED_LABEL;
-	public static String RESID_TABLE_SELECT_COLUMNS_DESCRIPTION_LABEL;
-
-	// MONITOR VIEW DIALGOS
-	public static String RESID_MONITOR_POLL_INTERVAL_LABEL;
-	public static String RESID_MONITOR_POLL_INTERVAL_TOOLTIP;
-	public static String RESID_MONITOR_POLL_LABEL;
-	public static String RESID_MONITOR_POLL_TOOLTIP;
-	public static String RESID_MONITOR_POLL_CONFIGURE_POLLING_LABEL;
-	public static String RESID_MONITOR_POLL_CONFIGURE_POLLING_EXPAND_TOOLTIP;
-	public static String RESID_MONITOR_POLL_CONFIGURE_POLLING_COLLAPSE_TOOLTIP;
-
-	// TEAM VIEW
-	public static String RESID_TEAMVIEW_SUBSYSFACTORY_VALUE;
-	public static String RESID_TEAMVIEW_CATEGORY_VALUE;
-	public static String RESID_TEAMVIEW_PROPERTYSET_VALUE;
-
-	public static String RESID_TEAMVIEW_CATEGORY_CONNECTIONS_LABEL;
-	public static String RESID_TEAMVIEW_CATEGORY_CONNECTIONS_TOOLTIP;
-
-	public static String RESID_TEAMVIEW_CATEGORY_FILTERPOOLS_LABEL;
-	public static String RESID_TEAMVIEW_CATEGORY_FILTERPOOLS_TOOLTIP;
-	
-	public static String RESID_TEAMVIEW_CATEGORY_PROPERTYSET_LABEL;
-	public static String RESID_TEAMVIEW_CATEGORY_PROPERTYSET_TOOLTIP;
-
-	// ------------------------------
-	// REUSABLE WIDGET STRINGS...
-	// ------------------------------
-	// SELECT MULTIPLE REMOTE FILES WIDGET...
-	public static String RESID_SELECTFILES_SELECTTYPES_BUTTON_ROOT_LABEL;
-	public static String RESID_SELECTFILES_SELECTTYPES_BUTTON_ROOT_TOOLTIP;
-
-	public static String RESID_SELECTFILES_SELECTALL_BUTTON_ROOT_LABEL;
-	public static String RESID_SELECTFILES_SELECTALL_BUTTON_ROOT_TOOLTIP;
-
-	public static String RESID_SELECTFILES_DESELECTALL_BUTTON_ROOT_LABEL;
-	public static String RESID_SELECTFILES_DESELECTALL_BUTTON_ROOT_TOOLTIP;
-
-
-
-	public static String RESID_SYSTEMREGISTRY_CONNECTIONS;
-
-	// SUBSYSTEM PROPERTIES PAGE...
-	public static String RESID_SUBSYSTEM_TYPE_LABEL;
-	public static String RESID_SUBSYSTEM_TYPE_VALUE;
-	public static String RESID_SUBSYSTEM_VENDOR_LABEL;
-	public static String RESID_SUBSYSTEM_NAME_LABEL;
-	public static String RESID_SUBSYSTEM_CONNECTION_LABEL;
-	public static String RESID_SUBSYSTEM_PROFILE_LABEL;
-
-	public static String RESID_SUBSYSTEM_PORT_LABEL;
-	public static String RESID_SUBSYSTEM_PORT_TIP;
-	public static String RESID_SUBSYSTEM_PORT_INHERITBUTTON_TIP;
-
-	public static String RESID_SUBSYSTEM_USERID_LABEL;
-	public static String RESID_SUBSYSTEM_USERID_TIP;
-
-	public static String RESID_SUBSYSTEM_USERID_INHERITBUTTON_TIP;
-
-	public static String RESID_SUBSYSTEM_SSL_LABEL;
-	public static String RESID_SUBSYSTEM_SSL_TIP;
-	
-	public static String RESID_SUBSYSTEM_AUTODETECT_LABEL;
-	public static String RESID_SUBSYSTEM_AUTODETECT_TIP;
-	
-	public static String RESID_SUBSYSTEM_SSL_ALERT_LABEL;
-	public static String RESID_SUBSYSTEM_SSL_ALERT_TIP;
-	
-	public static String RESID_SUBSYSTEM_NONSSL_ALERT_LABEL;
-	public static String RESID_SUBSYSTEM_NONSSL_ALERT_TIP;
-
-	public static String RESID_SUBSYSTEM_ENVVAR_DESCRIPTION;
-	public static String RESID_SUBSYSTEM_ENVVAR_TOOLTIP;
-
-	public static String RESID_SUBSYSTEM_ENVVAR_NAME_TITLE;
-	public static String RESID_SUBSYSTEM_ENVVAR_NAME_LABEL;
-	public static String RESID_SUBSYSTEM_ENVVAR_NAME_TOOLTIP;
-
-	public static String RESID_SUBSYSTEM_ENVVAR_VALUE_TITLE;
-	public static String RESID_SUBSYSTEM_ENVVAR_VALUE_LABEL;
-	public static String RESID_SUBSYSTEM_ENVVAR_VALUE_TOOLTIP;
-
-	public static String RESID_SUBSYSTEM_ENVVAR_ADD_TOOLTIP;
-	public static String RESID_SUBSYSTEM_ENVVAR_REMOVE_TOOLTIP;
-	public static String RESID_SUBSYSTEM_ENVVAR_CHANGE_TOOLTIP;
-
-	public static String RESID_SUBSYSTEM_ENVVAR_MOVEUP_LABEL;
-	public static String RESID_SUBSYSTEM_ENVVAR_MOVEUP_TOOLTIP;
-	public static String RESID_SUBSYSTEM_ENVVAR_MOVEDOWN_LABEL;
-	public static String RESID_SUBSYSTEM_ENVVAR_MOVEDOWN_TOOLTIP;
-
-	public static String RESID_SUBSYSTEM_ENVVAR_ADD_TITLE;
-	public static String RESID_SUBSYSTEM_ENVVAR_CHANGE_TITLE;
-
-	// COMMON PROPERTIES PAGE UI...
-	public static String RESID_PP_PROPERTIES_TYPE_LABEL; 
-	public static String RESID_PP_PROPERTIES_TYPE_TOOLTIP;
-
-	// FILTER POOL PROPERTIES PAGE...
-	public static String RESID_FILTERPOOL_TYPE_VALUE;
-
-	public static String RESID_FILTERPOOL_NAME_LABEL; 
-	public static String RESID_FILTERPOOL_NAME_TOOLTIP; 
-
-	public static String RESID_FILTERPOOL_PROFILE_LABEL;
-	public static String RESID_FILTERPOOL_PROFILE_TOOLTIP;
-
-	public static String RESID_FILTERPOOL_REFERENCECOUNT_LABEL;
-	public static String RESID_FILTERPOOL_REFERENCECOUNT_TOOLTIP; 
-
-	public static String RESID_FILTERPOOL_RELATEDCONNECTION_LABEL; 
-	public static String RESID_FILTERPOOL_RELATEDCONNECTION_TOOLTIP; 
-
-	// FILTER POOL REFERENCE PROPERTIES PAGE...
-	public static String RESID_FILTERPOOLREF_TYPE_VALUE;
-
-	public static String RESID_FILTERPOOLREF_NAME_LABEL; 
-	public static String RESID_FILTERPOOLREF_NAME_TOOLTIP; 
-
-	public static String RESID_FILTERPOOLREF_SUBSYSTEM_LABEL; 
-	public static String RESID_FILTERPOOLREF_SUBSYSTEM_TOOLTIP;
-
-	public static String RESID_FILTERPOOLREF_CONNECTION_LABEL;
-	public static String RESID_FILTERPOOLREF_CONNECTION_TOOLTIP;
-
-	public static String RESID_FILTERPOOLREF_PROFILE_LABEL;
-	public static String RESID_FILTERPOOLREF_PROFILE_TOOLTIP;
-
-	// FILTER PROPERTIES PAGE...
-	public static String RESID_PP_FILTER_TYPE_VALUE;
-
-	public static String RESID_PP_FILTER_TYPE_PROMPTABLE_VALUE;
-	public static String RESID_PP_FILTER_TYPE_PROMPTABLE_TOOLTIP;
-
-	
-	public static String RESID_PP_FILTER_NAME_LABEL; 
-	public static String RESID_PP_FILTER_NAME_TOOLTIP; 
-
-	public static String RESID_PP_FILTER_STRINGCOUNT_LABEL;
-	public static String RESID_PP_FILTER_STRINGCOUNT_TOOLTIP;
-
-	public static String RESID_PP_FILTER_FILTERPOOL_LABEL;
-	public static String RESID_PP_FILTER_FILTERPOOL_TOOLTIP;
-
-	public static String RESID_PP_FILTER_PROFILE_LABEL;
-	public static String RESID_PP_FILTER_PROFILE_TOOLTIP;
-
-	public static String RESID_PP_FILTER_ISCONNECTIONPRIVATE_LABEL;
-	public static String RESID_PP_FILTER_ISCONNECTIONPRIVATE_TOOLTIP;
-
-	// FILTER STRING PROPERTIES PAGE...
-	public static String RESID_PP_FILTERSTRING_TYPE_VALUE;
-
-
-	public static String RESID_PP_FILTERSTRING_FILTER_LABEL; 
-	public static String RESID_PP_FILTERSTRING_FILTER_TOOLTIP; 
-
-	public static String RESID_PP_FILTERSTRING_FILTERPOOL_LABEL;
-	public static String RESID_PP_FILTERSTRING_FILTERPOOL_TOOLTIP; 
-
-
-	public static String RESID_PP_FILTERSTRING_PROFILE_LABEL;
-	public static String RESID_PP_FILTERSTRING_PROFILE_TOOLTIP;
-
-	// SUBSYSTEM FACTORY PROPERTIES PAGE...
-	public static String RESID_PP_SUBSYSFACTORY_ID_LABEL;
-	public static String RESID_PP_SUBSYSFACTORY_ID_TOOLTIP; 
-
-	public static String RESID_PP_SUBSYSFACTORY_VENDOR_LABEL; 
-	public static String RESID_PP_SUBSYSFACTORY_VENDOR_TOOLTIP; 
-
-	public static String RESID_PP_SUBSYSFACTORY_TYPES_LABEL;
-	public static String RESID_PP_SUBSYSFACTORY_TYPES_TOOLTIP;
-
-	public static String RESID_PP_SUBSYSFACTORY_VERBIAGE;
-
-	// REMOTE SERVER LAUNCH PROPERTIES PAGE...
-	public static String RESID_PROP_SERVERLAUNCHER_MEANS;
-	public static String RESID_PROP_SERVERLAUNCHER_RADIO_DAEMON;
-	public static String RESID_PROP_SERVERLAUNCHER_RADIO_REXEC;
-	public static String RESID_PROP_SERVERLAUNCHER_RADIO_NONE;
-	public static String RESID_PROP_SERVERLAUNCHER_RADIO_DAEMON_TOOLTIP;
-	public static String RESID_PROP_SERVERLAUNCHER_RADIO_REXEC_TOOLTIP;
-	public static String RESID_PROP_SERVERLAUNCHER_RADIO_NONE_TOOLTIP;
-	public static String RESID_PROP_SERVERLAUNCHER_PATH;
-	public static String RESID_PROP_SERVERLAUNCHER_PATH_TOOLTIP;
-	public static String RESID_PROP_SERVERLAUNCHER_INVOCATION;
-	public static String RESID_PROP_SERVERLAUNCHER_INVOCATION_TOOLTIP;
-
-	
-	
-
-	// ---------------------------
-	// RE-USABLE WIDGET STRINGS...
-	// ---------------------------
-	
-	// WIDGETS IN SYSTEMCONNECTIONCOMBO.JAVA
-	public static String WIDGET_CONNECTION_LABEL;
-	public static String WIDGET_CONNECTION_TOOLTIP;
-
-	public static String WIDGET_BUTTON_NEWCONNECTION_LABEL;
-	public static String WIDGET_BUTTON_NEWCONNECTION_TOOLTIP;
-
-	// -------------------------
-	// PREFERENCES...
-	// -------------------------
-	public static String RESID_PREF_ROOT_PAGE;
-
-	public static String RESID_PREF_SYSTYPE_COLHDG_NAME;
-	public static String RESID_PREF_SYSTYPE_COLHDG_ENABLED;
-	public static String RESID_PREF_SYSTYPE_COLHDG_DESC;
-	public static String RESID_PREF_SYSTYPE_COLHDG_USERID;
-
-	//
-	// Signon Information Preferences Page
-	//
-
-	public static String RESID_PREF_SIGNON_HOSTNAME_TITLE;
-	public static String RESID_PREF_SIGNON_HOSTNAME_LABEL;
-	public static String RESID_PREF_SIGNON_HOSTNAME_TOOLTIP;
-
-	public static String RESID_PREF_SIGNON_SYSTYPE_TITLE;
-	public static String RESID_PREF_SIGNON_SYSTYPE_LABEL;
-	public static String RESID_PREF_SIGNON_SYSTYPE_TOOLTIP;
-
-	public static String RESID_PREF_SIGNON_USERID_TITLE;
-	public static String RESID_PREF_SIGNON_USERID_LABEL;
-	public static String RESID_PREF_SIGNON_USERID_TOOLTIP;
-
-	public static String RESID_PREF_SIGNON_PASSWORD_LABEL;
-	public static String RESID_PREF_SIGNON_PASSWORD_TOOLTIP;
-
-	public static String RESID_PREF_SIGNON_PASSWORD_VERIFY_LABEL;
-	public static String RESID_PREF_SIGNON_PASSWORD_VERIFY_TOOLTIP;
-
-	public static String RESID_PREF_SIGNON_ADD_LABEL;
-	public static String RESID_PREF_SIGNON_ADD_TOOLTIP;
-
-	public static String RESID_PREF_SIGNON_REMOVE_LABEL;
-	public static String RESID_PREF_SIGNON_REMOVE_TOOLTIP;
-
-	public static String RESID_PREF_SIGNON_CHANGE_LABEL;
-	public static String RESID_PREF_SIGNON_CHANGE_TOOLTIP;
-
-	public static String RESID_PREF_SIGNON_ADD_DIALOG_TITLE;
-
-	public static String RESID_PREF_SIGNON_CHANGE_DIALOG_TITLE;
-
-
-	// Offline constants (yantzi:3.0)
-	public static String RESID_OFFLINE_LABEL;
-	public static String RESID_OFFLINE_WORKOFFLINE_LABEL;
-	public static String RESID_OFFLINE_WORKOFFLINE_TOOLTIP;
-
-	// -------------------------------------------
-	// remote search view constants
-	// -------------------------------------------
-
-	// Remove selected matches action
-	public static String RESID_SEARCH_REMOVE_SELECTED_MATCHES_LABEL;
-	public static String RESID_SEARCH_REMOVE_SELECTED_MATCHES_TOOLTIP;
-
-	// Remove all matches action
-	public static String RESID_SEARCH_REMOVE_ALL_MATCHES_LABEL;
-	public static String RESID_SEARCH_REMOVE_ALL_MATCHES_TOOLTIP;
-
-	// Clear history action
-	public static String RESID_SEARCH_CLEAR_HISTORY_LABEL;
-	public static String RESID_SEARCH_CLEAR_HISTORY_TOOLTIP;
-
-	/** ******************************************* */
-	/* Generated Vars */
-	/** ******************************************* */
-	public static String RESID_PREF_USERID_PERTYPE_PREFIX_LABEL;
-	public static String RESID_PREF_USERID_PERTYPE_PREFIX_TOOLTIP;
-
-	public static String RESID_PREF_SHOWFILTERPOOLS_PREFIX_LABEL;
-	public static String RESID_PREF_SHOWFILTERPOOLS_PREFIX_TOOLTIP;
-
-	public static String RESID_PREF_SHOWNEWCONNECTIONPROMPT_PREFIX_LABEL;
-	public static String RESID_PREF_SHOWNEWCONNECTIONPROMPT_PREFIX_TOOLTIP;
-
-	public static String RESID_PREF_QUALIFYCONNECTIONNAMES_PREFIX_LABEL;
-	public static String RESID_PREF_QUALIFYCONNECTIONNAMES_PREFIX_TOOLTIP;
-
-	public static String RESID_PREF_REMEMBERSTATE_PREFIX_LABEL;
-	public static String RESID_PREF_REMEMBERSTATE_PREFIX_TOOLTIP;
-
-
-	public static String RESID_PREF_RESTOREFROMCACHE_PREFIX_LABEL;
-	public static String RESID_PREF_RESTOREFROMCACHE_PREFIX_TOOLTIP;
-	
-
-	
-	//
-	// Actions
-	//
-	// Browse with menu item
-	public static String ACTION_CASCADING_BROWSEWITH_LABEL;
-	public static String ACTION_CASCADING_BROWSEWITH_TOOLTIP;
-
-	// Compare with menu item
-	public static String ACTION_CASCADING_COMPAREWITH_LABEL;
-	public static String ACTION_CASCADING_COMPAREWITH_TOOLTIP;
-
-
-	// Replace with menu item
-	public static String ACTION_CASCADING_REPLACEWITH_LABEL;
-	public static String ACTION_CASCADING_REPLACEWITH_TOOLTIP;
-	
-	public static String ACTION_RENAME_LABEL;
-	public static String ACTION_RENAME_TOOLTIP;
-
-
-	public static String ACTION_NEWFILE_LABEL;
-	public static String ACTION_NEWFILE_TOOLTIP;
-
-	public static String ACTION_CASCADING_NEW_LABEL;
-	public static String ACTION_CASCADING_NEW_TOOLTIP;
-
-	public static String ACTION_CASCADING_GOTO_LABEL;
-	public static String ACTION_CASCADING_GOTO_TOOLTIP;
-
-	public static String ACTION_CASCADING_GOINTO_LABEL;
-	public static String ACTION_CASCADING_GOINTO_TOOLTIP;
-
-	public static String ACTION_CASCADING_OPEN_LABEL;
-	public static String ACTION_CASCADING_OPEN_TOOLTIP;
-
-	public static String ACTION_CASCADING_OPENWITH_LABEL;
-	public static String ACTION_CASCADING_OPENWITH_TOOLTIP;
-
-	public static String ACTION_CASCADING_WORKWITH_LABEL;
-	public static String ACTION_CASCADING_WORKWITH_TOOLTIP;
-
-	public static String ACTION_CASCADING_REMOTESERVERS_LABEL;
-	public static String ACTION_CASCADING_REMOTESERVERS_TOOLTIP;
-
-	public static String ACTION_REMOTESERVER_START_LABEL;
-	public static String ACTION_REMOTESERVER_START_TOOLTIP;
-	
-	public static String ACTION_REMOTESERVER_STOP_LABEL;
-	public static String ACTION_REMOTESERVER_STOP_TOOLTIP;
-
-	public static String ACTION_CASCADING_EXPAND_TO_LABEL;
-	public static String ACTION_CASCADING_EXPAND_TO_TOOLTIP;
-
-	public static String ACTION_CASCADING_VIEW_LABEL;
-	public static String ACTION_CASCADING_VIEW_TOOLTIP;
-
-	public static String ACTION_CASCADING_PREFERENCES_LABEL;
-	//FIXME This one is OBSOLETE with https://bugs.eclipse.org/bugs/show_bug.cgi?id=186769
-	public static String ACTION_CASCADING_PREFERENCES_TOOLTIP;
-
-	public static String ACTION_CASCADING_PULLDOWN_LABEL;
-	public static String ACTION_CASCADING_PULLDOWN_TOOLTIP;
-
-	public static String ACTION_CASCADING_FILTERPOOL_NEWREFERENCE_LABEL;
-	public static String ACTION_CASCADING_FILTERPOOL_NEWREFERENCE_TOOLTIP;
-
-	public static String ACTION_TEAM_RELOAD_LABEL;
-	public static String ACTION_TEAM_RELOAD_TOOLTIP;
-
-	public static String ACTION_PROFILE_MAKEACTIVE_LABEL;
-	public static String ACTION_PROFILE_MAKEACTIVE_TOOLTIP;
-
-	public static String ACTION_PROFILE_MAKEINACTIVE_LABEL;
-	public static String ACTION_PROFILE_MAKEINACTIVE_TOOLTIP;
-
-	public static String ACTION_PROFILE_COPY_LABEL;
-	public static String ACTION_PROFILE_COPY_TOOLTIP;
-
-	public static String ACTION_NEWPROFILE_LABEL;
-	public static String ACTION_NEWPROFILE_TOOLTIP;
-
-	public static String ACTION_NEW_PROFILE_LABEL;
-	public static String ACTION_NEW_PROFILE_TOOLTIP;
-
-	public static String ACTION_QUALIFY_CONNECTION_NAMES_LABEL;
-	public static String ACTION_QUALIFY_CONNECTION_NAMES_TOOLTIP;
-
-	public static String ACTION_RESTORE_STATE_PREFERENCE_LABEL;
-	public static String ACTION_RESTORE_STATE_PREFERENCE_TOOLTIP;
-
-	public static String ACTION_PREFERENCE_SHOW_FILTERPOOLS_LABEL;
-	public static String ACTION_PREFERENCE_SHOW_FILTERPOOLS_TOOLTIP;
-
-	public static String ACTION_SHOW_PREFERENCEPAGE_LABEL;
-	public static String ACTION_SHOW_PREFERENCEPAGE_TOOLTIP;
-
-	public static String ACTION_NEWCONN_LABEL;
-	public static String ACTION_NEWCONN_TOOLTIP;
-
-	public static String ACTION_ANOTHERCONN_LABEL;
-	public static String ACTION_ANOTHERCONN_TOOLTIP;
-
-	public static String ACTION_TESTFILTERSTRING_LABEL;
-	public static String ACTION_TESTFILTERSTRING_TOOLTIP;
-
-	public static String ACTION_NEWFILTER_LABEL;
-	public static String ACTION_NEWFILTER_TOOLTIP;
-
-	public static String ACTION_UPDATEFILTER_LABEL;
-	public static String ACTION_UPDATEFILTER_TOOLTIP;
-
-	public static String ACTION_NEWFILTERPOOL_LABEL;
-	public static String ACTION_NEWFILTERPOOL_TOOLTIP;
-
-	public static String ACTION_RMVFILTERPOOLREF_LABEL;
-	public static String ACTION_RMVFILTERPOOLREF_TOOLTIP;
-
-	public static String ACTION_SELECTFILTERPOOLS_LABEL;
-	public static String ACTION_SELECTFILTERPOOLS_TOOLTIP;
-
-	public static String ACTION_WORKWITH_FILTERPOOLS_LABEL;
-	public static String ACTION_WORKWITH_FILTERPOOLS_TOOLTIP;
-
-	public static String ACTION_WORKWITH_WWFILTERPOOLS_LABEL;
-	public static String ACTION_WORKWITH_WWFILTERPOOLS_TOOLTIP;
-
-	public static String ACTION_WORKWITH_PROFILES_LABEL;
-	public static String ACTION_WORKWITH_PROFILES_TOOLTIP;
-
-	public static String ACTION_RUN_LABEL;
-	public static String ACTION_RUN_TOOLTIP;
-
-	public static String ACTION_REFRESH_ALL_LABEL;
-	public static String ACTION_REFRESH_ALL_TOOLTIP;
-
-	public static String ACTION_REFRESH_LABEL;
-	public static String ACTION_REFRESH_TOOLTIP;
-
-	public static String ACTION_REFRESH_TABLE_LABLE;
-	public static String ACTION_REFRESH_TABLE_TOOLTIP;
-
-	public static String ACTION_DELETE_LABEL;
-	public static String ACTION_DELETE_TOOLTIP;
-
-	public static String ACTION_CLEAR_LABEL;
-	public static String ACTION_CLEAR_TOOLTIP;
-
-	public static String ACTION_CLEAR_ALL_LABEL;
-	public static String ACTION_CLEAR_ALL_TOOLTIP;
-
-	public static String ACTION_CLEAR_SELECTED_LABEL;
-	public static String ACTION_CLEAR_SELECTED_TOOLTIP;
-
-	public static String ACTION_MOVEUP_LABEL;
-	public static String ACTION_MOVEUP_TOOLTIP;
-
-	public static String ACTION_MOVEDOWN_LABEL;
-	public static String ACTION_MOVEDOWN_TOOLTIP;
-	public static String ACTION_MOVEUPLEVEL_TOOLTIP;
-	public static String ACTION_GOUPLEVEL_TOOLTIP;
-
-	public static String ACTION_CONNECT_LABEL;
-	public static String ACTION_CONNECT_TOOLTIP;
-
-	public static String ACTION_CLEARPASSWORD_LABEL;
-	public static String ACTION_CLEARPASSWORD_TOOLTIP;
-
-	public static String ACTION_DISCONNECT_LABEL;
-	public static String ACTION_DISCONNECT_TOOLTIP;
-
-	public static String ACTION_DISCONNECTALLSUBSYSTEMS_LABEL;
-	public static String ACTION_DISCONNECTALLSUBSYSTEMS_TOOLTIP;
-
-	public static String ACTION_CONNECT_ALL_LABEL;
-	public static String ACTION_CONNECT_ALL_TOOLTIP;
-
-	public static String ACTION_CLEARPASSWORD_ALL_LABEL;
-	public static String ACTION_CLEARPASSWORD_ALL_TOOLTIP;
-
-	public static String ACTION_SET_LABEL;
-	public static String ACTION_SET_TOOLTIP;
-
-	public static String ACTION_HISTORY_DELETE_LABEL;
-	public static String ACTION_HISTORY_DELETE_TOOLTIP;
-
-	public static String ACTION_HISTORY_CLEAR_LABEL;
-	public static String ACTION_HISTORY_CLEAR_TOOLTIP;
-
-	public static String ACTION_HISTORY_MOVEUP_LABEL;
-	public static String ACTION_HISTORY_MOVEUP_TOOLTIP;
-
-	public static String ACTION_HISTORY_MOVEDOWN_LABEL;
-	public static String ACTION_HISTORY_MOVEDOWN_TOOLTIP;
-
-	public static String ACTION_HISTORY_MOVEFORWARD_LABEL;
-	public static String ACTION_HISTORY_MOVEFORWARD_TOOLTIP;
-
-	public static String ACTION_HISTORY_MOVEBACKWARD_LABEL;
-	public static String ACTION_HISTORY_MOVEBACKWARD_TOOLTIP;
-	
-	public static String ACTION_COPY_LABEL;	
-	public static String ACTION_COPY_TOOLTIP;
-
-	public static String ACTION_CUT_LABEL;	
-	public static String ACTION_CUT_TOOLTIP;
-	
-	public static String ACTION_UNDO_LABEL;
-	public static String ACTION_UNDO_TOOLTIP;
-	
-	public static String ACTION_PASTE_LABEL;
-	public static String ACTION_PASTE_TOOLTIP;
-
-	public static String ACTION_COPY_CONNECTION_LABEL;
-	public static String ACTION_COPY_CONNECTION_TOOLTIP;
-
-	public static String ACTION_COPY_FILTERPOOL_LABEL;
-	public static String ACTION_COPY_FILTERPOOL_TOOLTIP;
-
-	public static String ACTION_COPY_FILTER_LABEL;
-	public static String ACTION_COPY_FILTER_TOOLTIP;
-
-	public static String ACTION_COPY_FILTERSTRING_LABEL;
-	public static String ACTION_COPY_FILTERSTRING_TOOLTIP;
-
-	public static String ACTION_MOVE_LABEL;
-	public static String ACTION_MOVE_TOOLTIP;
-
-	public static String ACTION_MOVE_CONNECTION_LABEL;
-	public static String ACTION_MOVE_CONNECTION_TOOLTIP;
-
-	public static String ACTION_MOVE_FILTERPOOL_LABEL;
-	public static String ACTION_MOVE_FILTERPOOL_TOOLTIP;
-
-	public static String ACTION_MOVE_FILTER_LABEL;
-	public static String ACTION_MOVE_FILTER_TOOLTIP;
-
-	public static String ACTION_MOVE_FILTERSTRING_LABEL;
-	public static String ACTION_MOVE_FILTERSTRING_TOOLTIP;
-
-	public static String ACTION_TABLE_LABEL;
-	public static String ACTION_TABLE_TOOLTIP;
-	
-	public static String ACTION_MONITOR_LABEL;
-	public static String ACTION_MONITOR_TOOLTIP;
-
-	public static String ACTION_SEARCH_LABEL;
-	public static String ACTION_SEARCH_TOOLTIP;
-
-	public static String ACTION_CANCEL_SEARCH_LABEL;
-	public static String ACTION_CANCEL_SEARCH_TOOLTIP;
-
-	public static String ACTION_LOCK_LABEL;
-	public static String ACTION_LOCK_TOOLTIP;
-
-	public static String ACTION_UNLOCK_LABEL;
-	public static String ACTION_UNLOCK_TOOLTIP;
-	
-
-	public static String ACTION_POSITIONTO_LABEL;
-	public static String ACTION_POSITIONTO_TOOLTIP;
-
-	public static String ACTION_SUBSET_LABEL;
-	public static String ACTION_SUBSET_TOOLTIP;
-
-	public static String ACTION_PRINTLIST_LABEL;
-	public static String ACTION_PRINTLIST_TOOLTIP;
-
-	public static String ACTION_SELECTCOLUMNS_LABEL;
-	public static String ACTION_SELECTCOLUMNS_TOOLTIP;
-
-	public static String ACTION_OPENEXPLORER_DIFFPERSP2_LABEL;
-	public static String ACTION_OPENEXPLORER_DIFFPERSP2_TOOLTIP;
-
-	public static String ACTION_EXPAND_SELECTED_LABEL;
-	public static String ACTION_EXPAND_SELECTED_TOOLTIP;
-
-	public static String ACTION_COLLAPSE_SELECTED_LABEL;
-	public static String ACTION_COLLAPSE_SELECTED_TOOLTIP;
-
-	public static String ACTION_COLLAPSE_ALL_LABEL;
-	public static String ACTION_COLLAPSE_ALL_TOOLTIP;
-
-	public static String ACTION_EXPAND_ALL_LABEL;
-	public static String ACTION_EXPAND_ALL_TOOLTIP;
-	
-	public static String ACTION_SELECT_ALL_LABEL;
-	public static String ACTION_SELECT_ALL_TOOLTIP;
-
-	public static String ACTION_SELECT_INPUT_LABEL;
-	public static String ACTION_SELECT_INPUT_DLG;
-	public static String ACTION_SELECT_INPUT_TOOLTIP;
-
-	
-	
-	// services and connector services property pages
-	public static String RESID_PROPERTIES_SERVICES_NAME;
-	public static String RESID_PROPERTIES_SERVICES_LABEL;
-	public static String RESID_PROPERTIES_SERVICES_TOOLTIP;
-	public static String RESID_PROPERTIES_DESCRIPTION_LABEL;
-	public static String RESID_PROPERTIES_FACTORIES_LABEL;
-	public static String RESID_PROPERTIES_FACTORIES_TOOLTIP;
-	public static String RESID_PROPERTIES_PROPERTIES_LABEL;
-	public static String RESID_PROPERTIES_PROPERTIES_TOOLTIP;
-
-
-	// Services form
-	public static String RESID_SERVICESFORM_CONFIGURATION_TOOLTIP;
-	public static String RESID_SERVICESFORM_SERVICES_TOOLTIP;
-	public static String RESID_SERVICESFORM_CONNECTORSERVICES_TOOLTIP;
-	public static String RESID_SERVICESFORM_PROPERTIES_TOOLTIP;
-	
-	// Do not show again message
-	public static String RESID_DO_NOT_SHOW_MESSAGE_AGAIN_LABEL;
-	public static String RESID_DO_NOT_SHOW_MESSAGE_AGAIN_TOOLTIP;
-	
-	public static String RESID_EXPORT_CONNECTION_ACTIONS_TOOLTIP;
-
-	public static String RESID_EXPORT_CONNECTIONS_ACTION_LABEL;
-
-	// Encoding
-	public static String RESID_HOST_ENCODING_GROUP_LABEL;
-	public static String RESID_HOST_ENCODING_SETTING_NOTE;
-	public static String RESID_HOST_ENCODING_SETTING_MSG;
-	public static String RESID_HOST_ENCODING_REMOTE_LABEL;
-	public static String RESID_HOST_ENCODING_REMOTE_ENCODING_LABEL;
-	public static String RESID_HOST_ENCODING_REMOTE_TOOLTIP;
-	public static String RESID_HOST_ENCODING_OTHER_LABEL;
-	public static String RESID_HOST_ENCODING_OTHER_TOOLTIP;
-	public static String RESID_HOST_ENCODING_ENTER_TOOLTIP;
-
-	public static String RESID_IMPORT_CONNECTION_ACTION_LABEL;
-
-	public static String RESID_IMPORT_CONNECTION_ACTION_TOOLTIP;
-
-	public static String RESID_IMPORT_CONNECTION_LABEL_LONG;
-	
-	public static String SystemExportConnectionAction_CoreExceptionFound;
-
-	public static String SystemExportConnectionAction_Error;
-
-	public static String SystemExportConnectionAction_ExportJobName;
-
-	public static String SystemExportConnectionAction_OverwriteFileCondition;
-
-	public static String SystemExportConnectionAction_UnexpectedException;
-
-	public static String SystemExportConnectionAction_Warning;
-
-	public static String SystemExportConnectionAction_WriteProtectedFileCondition;
-
-	public static String SystemImportConnectionAction_CoreExceptionFound;
-
-	public static String SystemImportConnectionAction_Error;
-
-	public static String SystemImportConnectionAction_FileNotFoundCondition;
-
-	public static String SystemImportConnectionAction_FileNotReadableCondition;
-
-	public static String SystemImportConnectionAction_ImportJobName;
-
-	public static String SystemImportConnectionAction_UnexpectedException;
-
-	public static String SystemTableViewPart_title;
-
-	public static String SystemTypeFieldEditor_false;
-
-	public static String SystemTypeFieldEditor_true;
-	
-	
-	// collision dialog when copying from RSE resources to Eclipse resources
-	public static String RESID_COLLISION_DUPLICATE_RESOURCE_TITLE;
-	public static String RESID_COLLISION_OVERWRITE_RESOURCE_MESSAGE;
-
-	static {
-		// load message values from bundle file
-		NLS.initializeMessages(BUNDLE_NAME, SystemResources.class);
-	}
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/SystemResources.properties b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/SystemResources.properties
deleted file mode 100644
index d73c50a7a..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/SystemResources.properties
+++ /dev/null
@@ -1,1099 +0,0 @@
-################################################################################
-# Copyright (c) 2000, 2008 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
-# 
-# Initial Contributors:
-# The following IBM employees contributed to the Remote System Explorer
-# component that contains this file: David McKnight, Kushal Munir, 
-# Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
-# Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
-# 
-# Contributors:
-# Martin Oberhuber (Wind River) - [185552] Remove remoteSystemsViewPreferencesActions extension point
-# David McKnight   (IBM)        - [210229] table refresh needs unique table-specific tooltip-text
-# Kevin Doyle	   (IBM)		- [212944] New Profile dialog should have title "New Profile"
-# David McKnight   (IBM)        - [216252] [nls] Resource Strings specific to subsystems should be moved from rse.ui into files.ui / shells.ui / processes.ui where possible
-# David Dykstal (IBM) - [181331] new filter wizard title should be "New Filter"
-# David Dykstal (IBM) - [142452] copy operations for connections, filterpools, and filters should be named "Copy..."
-# David McKnight   (IBM)        - [223103] [cleanup] fix broken externalized strings
-# Rupen Mardirossian (IBM)		- [210692] Define strings for SystemCopyDialog
-# Xuan Chen        (IBM)        - [222263] Need to provide a PropertySet Adapter for System Team View
-# David Dykstal (IBM) - [197018] Last Page of New Filter Wizard mentions Change Action 
-# David Dykstal (IBM) - [210242] Credentials dialog should look different if password is not supported or optional
-# David Dykstal (IBM) - [216858] Need the ability to Import/Export RSE connections for sharing
-# David Dykstal (IBM) - [231943] Make true and false translatable on SystemTypeFieldEditor
-# David Dykstal (IBM) - [188150] adding "go up one level" tooltip
-# David Dykstal (IBM) - [233678] title string is constructed by concatenation, should be substituted
-# David McKnight (IBM) - [248922]  [dnd] Remote to local overwrite copy does not work
-# David McKnight (IBM) - [287066] TVT35:TCT635: PLK: dots at ends of tooltips
-################################################################################
-
-# NLS_MESSAGEFORMAT_VAR
-# NLS_ENCODING=UTF-8
-
-##############################################################
-# Button values. Mnemonics will be assigned automatically, don't set them here.
-##############################################################
-BUTTON_BROWSE=Browse...
-BUTTON_CLOSE=Close
-BUTTON_TEST=Test
-BUTTON_ADD=Add
-BUTTON_CREATE_LABEL=Create
-BUTTON_CREATE_TOOLTIP=Press to create the new resource
-BUTTON_CANCEL_ALL = Cancel All
-BUTTON_CANCEL_ALL_TOOLTIP = Cancel for all
-BUTTON_OVERWRITE_ALL = Overwrite All
-BUTTON_OVERWRITE_ALL_TOOLTIP = Overwrite for all
-
-TERM_YES=Yes
-TERM_NO=No
-TERM_TRUE=True
-TERM_FALSE=False
-TERM_ALL=All
-
-#=============================================================
-# RE-USABLE COMPOSITE WIDGETS
-#=============================================================
-# RE-USABLE CONNECTION-SELECTION COMPOSITE WIDGETS
-WIDGET_CONNECTION_LABEL=Connection:
-WIDGET_CONNECTION_TOOLTIP=Select remote system connection
-WIDGET_BUTTON_NEWCONNECTION_LABEL=New...
-WIDGET_BUTTON_NEWCONNECTION_TOOLTIP=Create a new remote system connection
-
-
-#=============================================================
-# MESSAGE LINE MRI
-#=============================================================
-RESID_MSGLINE_TIP=Press to see additional message details
-
-##############################################################
-# Preference pages
-##############################################################
-RESID_PREF_ROOT_PAGE=Remote Systems
-RESID_PREF_USERID_PERTYPE_PREFIX_LABEL=System type information
-RESID_PREF_USERID_PERTYPE_PREFIX_TOOLTIP=Set enablement state and default user ID for the selected system type. Press F1 for details.
-#RESID_PREF_USERID_PERTYPE_SYSTEMTYPES_LABEL=System Types
-#RESID_PREF_USERID_PERTYPE_USERID_LABEL=User ID
-RESID_PREF_SHOWFILTERPOOLS_PREFIX_LABEL=Show filter pools in Remote Systems view
-RESID_PREF_SHOWFILTERPOOLS_PREFIX_TOOLTIP=Show filter pools when expanding subsystems
-RESID_PREF_SHOWNEWCONNECTIONPROMPT_PREFIX_LABEL=Show "New Connection" prompt in Remote Systems view
-RESID_PREF_SHOWNEWCONNECTIONPROMPT_PREFIX_TOOLTIP=Show the prompt for a new connection in the Remote Systems view
-RESID_PREF_QUALIFYCONNECTIONNAMES_PREFIX_LABEL=Show connection names prefixed by profile name
-RESID_PREF_QUALIFYCONNECTIONNAMES_PREFIX_TOOLTIP=Select this if two connections or filter pools have the same name across different profiles
-RESID_PREF_REMEMBERSTATE_PREFIX_LABEL=Re-open Remote Systems view to previous state
-RESID_PREF_REMEMBERSTATE_PREFIX_TOOLTIP=Re-expand previously expanded connections when starting up
-RESID_PREF_RESTOREFROMCACHE_PREFIX_LABEL=Use cached information to restore the Remote Systems view
-RESID_PREF_RESTOREFROMCACHE_PREFIX_TOOLTIP=If cached information is available then it is used to restore the Remote Systems view instead of connecting to the remote system
-RESID_PREF_SYSTYPE_COLHDG_NAME=System Type
-RESID_PREF_SYSTYPE_COLHDG_ENABLED=Enabled
-RESID_PREF_SYSTYPE_COLHDG_DESC=Description
-RESID_PREF_SYSTYPE_COLHDG_USERID=Default User ID
-
-##############################################################
-# Miscellaneous Actions that appear as either buttons and/or menu items.
-# Actions use the following keys:
-#  xxx.label=Text shown on button or menu item
-#  xxx.tooltip=Short help shown in hover help box
-##############################################################
-# Style popup menu (cascading) on common Work-With lists...
-# labels...
-#MENUITEM_WWSTYLE_LABEL=Style
-#MENUITEM_WWSTYLE_NEXT_LABEL=Next style
-#MENUITEM_WWSTYLE_1_LABEL=1. Entry field and buttons on side
-#MENUITEM_WWSTYLE_2_LABEL=2. Entry field and buttons on top
-#MENUITEM_WWSTYLE_3_LABEL=3. No entry field and buttons on top
-#MENUITEM_WWSTYLE_4_LABEL=4. No entry field and no buttons
-#MENUITEM_WWSTYLE_5_LABEL=5. No entry field and buttons on side
-#MENUITEM_WWSTYLE_6_LABEL=6. No entry field, Add buttons on top, other buttons on side
-# descriptions...
-#MENUITEM_WWSTYLE_DESCRIPTION=Switch to another style of work-with list
-#MENUITEM_WWSTYLE_NEXT_DESCRIPTION=Switch to the next style of work-with list
-#MENUITEM_WWSTYLE_1_DESCRIPTION=Switch to style 1
-#MENUITEM_WWSTYLE_2_DESCRIPTION=Switch to style 2
-#MENUITEM_WWSTYLE_3_DESCRIPTION=Switch to style 3
-#MENUITEM_WWSTYLE_4_DESCRIPTION=Switch to style 4
-#MENUITEM_WWSTYLE_5_DESCRIPTION=Switch to style 5
-#MENUITEM_WWSTYLE_6_DESCRIPTION=Switch to style 6
-
-##############################################################
-# Wizard and dialog resources
-##############################################################
-
-#=============================================================
-# SINGLE-SELECT RENAME DIALOG...
-#=============================================================
-RESID_RENAME_SINGLE_TITLE=Rename Resource
-RESID_SIMPLE_RENAME_PROMPT_LABEL=New name
-RESID_SIMPLE_RENAME_RESOURCEPROMPT_LABEL=Resource type:
-RESID_SIMPLE_RENAME_RESOURCEPROMPT_TOOLTIP=Type of object being renamed
-RESID_SIMPLE_RENAME_RADIO_OVERWRITE_LABEL =Overwrite
-RESID_SIMPLE_RENAME_RADIO_OVERWRITE_TOOLTIP =Replace the existing file with the new one.
-RESID_SIMPLE_RENAME_RADIO_RENAME_LABEL =Rename
-RESID_SIMPLE_RENAME_RADIO_RENAME_TOOLTIP =Rename the file to something else.
-
-
-# SPECIALIZED PROMPTS FOR SPECIFIC TYPES OF RESOURCES...
-RESID_SIMPLE_RENAME_PROFILE_PROMPT_LABEL=New profile name:
-RESID_SIMPLE_RENAME_PROFILE_PROMPT_TIP=Enter unique new name for this profile
-
-
-
-
-#=============================================================
-# MULTI-SELECT RENAME DIALOG...
-#=============================================================
-RESID_RENAME_TITLE=Rename Resources
-RESID_RENAME_VERBIAGE=Enter a unique new name for each resource. You can Tab between the names.
-#column headings...
-RESID_RENAME_COLHDG_OLDNAME=Resource
-RESID_RENAME_COLHDG_NEWNAME=New name
-RESID_RENAME_COLHDG_TYPE=Resource Type
-# SPECIALIZED PROMPTS FOR SPECIFIC TYPES OF RESOURCES...
-RESID_MULTI_RENAME_PROFILE_VERBIAGE=Enter unique new names for each profile
-
-#=============================================================
-# GENERIC DELETE DIALOG...
-#=============================================================
-RESID_DELETE_TITLE=Delete Confirmation
-RESID_DELETE_PROMPT=Delete selected resources?
-RESID_DELETE_PROMPT_SINGLE=Delete selected resource?
-RESID_DELETE_COLHDG_OLDNAME=Resource
-RESID_DELETE_COLHDG_TYPE=Resource Type
-RESID_DELETE_BUTTON=Delete
-RESID_DELETE_WARNING_LABEL=WARNING! Remote objects are permanently deleted!
-RESID_DELETE_WARNING_TOOLTIP=You are confirming permanent deletion of the selected resource(s) from the remote system. This action cannot be undone
-
-# SPECIALIZED PROMPTS FOR SPECIFIC TYPES OF RESOURCES...
-RESID_DELETE_PROFILES_PROMPT=Delete selected profiles, including their connections, filters and user actions?
-
-
-#=============================================================
-# GENERIC COPY DIALOG...
-#=============================================================
-RESID_COPY_SINGLE_TITLE=Copy Resource
-RESID_COPY_TITLE=Copy Resources
-RESID_COPY_PROMPT=Select the copy destination
-RESID_COPY_TARGET_PROFILE_PROMPT=Select the active profile to copy into
-RESID_COPY_TARGET_FILTERPOOL_PROMPT=Select the filter pool to copy into
-
-#=============================================================
-# GENERIC MOVE DIALOG...
-#=============================================================
-RESID_MOVE_SINGLE_TITLE=Move Resource
-RESID_MOVE_TITLE=Move Resources
-RESID_MOVE_PROMPT=Select the move destination
-RESID_MOVE_TARGET_PROFILE_PROMPT=Select the active profile to move into
-RESID_MOVE_TARGET_FILTERPOOL_PROMPT=Select the filter pool to move into
-
-#=============================================================
-# GENERIC COPY/MOVE NAME-COLLISION DIALOG...
-#=============================================================
-RESID_COLLISION_RENAME_TITLE=Duplicate Name Collision
-RESID_COLLISION_RENAME_VERBIAGE=A resource named "{0}" already exists.
-RESID_COLLISION_RENAME_LABEL=Rename to
-RESID_COLLISION_COPY_VERBIAGE=The following resources already exist.  Would you like to overwrite all of the existing resources or cancel the operation?
-RESID_COLLISION_COPY_COLHDG_OLDNAME=Resource
-
-
-#=============================================================
-# NEW PROFILE WIZARD...
-#=============================================================
-RESID_NEWPROFILE_TITLE=New Profile
-RESID_NEWPROFILE_PAGE1_TITLE=Remote System Profile
-RESID_NEWPROFILE_PAGE1_DESCRIPTION=Define profile to hold connections
-RESID_NEWPROFILE_VERBIAGE=Profiles enable team support. They contain all the connections, filters, user actions and compile commands. Whenever these items are created, you are prompted for the profile to create them in. Whenever they are shown, the total from all active profiles are shown. By default, team members only have active their own profiles and the Team profile. 
-RESID_NEWPROFILE_NAME_LABEL=Name
-RESID_NEWPROFILE_NAME_TOOLTIP=Unique profile name
-RESID_NEWPROFILE_MAKEACTIVE_LABEL=Make active
-RESID_NEWPROFILE_MAKEACTIVE_TOOLTIP=Show connections in this profile
-
-#======================================================================
-# NEW CONNECTION PROMPT ("New Connection..." SPECIAL CONNECTION IN RSE)
-#======================================================================
-RESID_NEWCONN_PROMPT_LABEL=New Connection
-RESID_NEWCONN_PROMPT_VALUE=A prompt for a new connection
-RESID_NEWCONN_EXPANDABLEPROMPT_VALUE=An expandable prompt for a new connection
-
-#=============================================================
-# NEW CONNECTION WIZARD...
-#=============================================================
-RESID_NEWCONN_TITLE=New Connection
-RESID_NEWCONN_PAGE1_TITLE=Remote System Connection
-RESID_NEWCONN_PAGE1_LOCAL_TITLE=Local System Connection
-RESID_NEWCONN_PAGE1_REMOTE_TITLE=Remote &1 System Connection
-RESID_NEWCONN_PAGE1_DESCRIPTION=Define connection information
-RESID_NEWCONN_MAIN_PAGE_TITLE=Select Remote System Type
-RESID_NEWCONN_MAIN_PAGE_DESCRIPTION=Please select the system type of the remote system to connect.
-
-#=============================================================
-# NEW CONNECTION WIZARD INFORMATION PAGE FOR UNIX/LINUX/WINDOWS
-#=============================================================
-RESID_NEWCONN_SUBSYSTEMPAGE_DESCRIPTION=Define subsystem information
-RESID_NEWCONN_SUBSYSTEMPAGE_FILES_TITLE=Communications Server
-RESID_NEWCONN_SUBSYSTEMPAGE_FILES_DESCRIPTION=How to install server support
-RESID_NEWCONN_SUBSYSTEMPAGE_FILES_VERBIAGE1=To connect to your remote system, you must first copy and expand the supplied Java server code jar file on that system, and either manually start that server or the supplied daemon. You will find the instructions for this in the Help. 
-RESID_NEWCONN_SUBSYSTEMPAGE_FILES_VERBIAGE2=If you manually start the communications server, you will need to set the port number property for this connection. To do this, expand your newly created connection in the Remote System Explorer perspective. Right click on the Files subsystem and select Properties. You can specify the port to match the port you specified or were assigned for the server.
-
-#=============================================================
-# RENAME PROFILE PAGE...
-#=============================================================
-RESID_PROFILE_PROFILENAME_LABEL=Profile
-RESID_PROFILE_PROFILENAME_TIP=New name for the profile
-RESID_PROFILE_PROFILENAME_VERBIAGE=Welcome to Remote Systems. Connections can be sharable by the team or private to you. Enter a profile name to uniquely identify you from your team members. You will decide for each new connection whether it is owned by the team profile or your profile.
-
-#=============================================================
-# DUPLICATE PROFILE DIALOG...
-#=============================================================
-RESID_COPY_PROFILE_TITLE=Duplicate Profile
-RESID_COPY_PROFILE_PROMPT_LABEL=New profile name
-RESID_COPY_PROFILE_PROMPT_TOOLTIP=Enter a unique name for the new profile
-
-
-#=============================================================
-# UPDATE CONNECTION DIALOG...
-#=============================================================
-RESID_CONNECTION_TYPE_LABEL=Resource type
-RESID_CONNECTION_TYPE_VALUE=Connection to remote system
-
-RESID_CONNECTION_SYSTEMTYPE_LABEL=System type
-RESID_CONNECTION_SYSTEMTYPE_TIP=Operating system type of the remote host
-
-RESID_CONNECTION_SYSTEMTYPE_READONLY_TIP=Operating system type of the remote host
-
-RESID_CONNECTION_CONNECTIONNAME_LABEL=Connection name
-RESID_CONNECTION_CONNECTIONNAME_TIP=Arbitrary name for this connection, unique to this profile
-
-RESID_CONNECTION_HOSTNAME_LABEL=Host name
-RESID_CONNECTION_HOSTNAME_TIP=Hostname or IP address of target system
-
-
-RESID_CONNECTION_DEFAULTUSERID_LABEL=Default User ID
-RESID_CONNECTION_DEFAULTUSERID_TIP=Default user ID for subsystems that don't specify a user ID
-RESID_CONNECTION_DEFAULTUSERID_INHERITBUTTON_TIP=Inherit from preferences, or set locally for this connection
-
-RESID_CONNECTION_PORT_LABEL=Port
-RESID_CONNECTION_PORT_TIP=Port number used to do the connection
-
-RESID_CONNECTION_DAEMON_PORT_LABEL=Daemon Port
-RESID_CONNECTION_DAEMON_PORT_TIP=Port number used to connect to the daemon that launches Remote System Explorer servers
-
-RESID_CONNECTION_DESCRIPTION_LABEL=Description
-RESID_CONNECTION_DESCRIPTION_TIP=Commentary description of the connection
-
-RESID_CONNECTION_PROFILE_LABEL=Parent profile
-RESID_CONNECTION_PROFILE_TIP=Select profile to contain this connection
-RESID_CONNECTION_PROFILE_READONLY_TIP=The profile containing this connection
-
-RESID_CONNECTION_VERIFYHOSTNAME_LABEL=Verify host name
-RESID_CONNECTION_VERIFYHOSTNAME_TOOLTIP=Verify a host of the given name or IP address exists
-
-
-
-#=============================================================
-# SYSTEMREGISTRY PROPERTY PAGE DIALOG...
-#=============================================================
-RESID_SYSTEMREGISTRY_CONNECTIONS=Connections
-
-#=============================================================
-# SUBSYSTEM PROPERTY PAGE DIALOG...
-#=============================================================
-RESID_SUBSYSTEM_NAME_LABEL=Name
-RESID_SUBSYSTEM_TYPE_LABEL=Resource type
-RESID_SUBSYSTEM_TYPE_VALUE=Subsystem
-RESID_SUBSYSTEM_VENDOR_LABEL=Vendor
-RESID_SUBSYSTEM_CONNECTION_LABEL=Parent connection
-RESID_SUBSYSTEM_PROFILE_LABEL=Parent profile
-RESID_SUBSYSTEM_PORT_LABEL=Port
-RESID_SUBSYSTEM_PORT_TIP=Port number to connect with
-RESID_SUBSYSTEM_PORT_INHERITBUTTON_TIP=Use first available port, or explicitly set the port number
-RESID_SUBSYSTEM_USERID_LABEL=User ID
-RESID_SUBSYSTEM_USERID_TIP=User ID to connect with
-RESID_SUBSYSTEM_USERID_INHERITBUTTON_TIP=Inherit user ID from connection, or set locally for this subsystem
-
-# Communications property page
-RESID_SUBSYSTEM_SSL_LABEL=Use SSL for network communications
-RESID_SUBSYSTEM_SSL_TIP=Use Secure Sockets Layer (SSL) for communicating with the server
-RESID_SUBSYSTEM_AUTODETECT_LABEL=Auto-detect SSL
-RESID_SUBSYSTEM_AUTODETECT_TIP=Automatically detect whether or not the server uses SSL. On some systems this may cause a longer connection time.
-RESID_SUBSYSTEM_SSL_ALERT_LABEL=Alert me when connecting using SSL
-RESID_SUBSYSTEM_SSL_ALERT_TIP=Show a confirmation dialog when the Secure Sockets Layer (SSL) is used for connecting with the RSE server
-RESID_SUBSYSTEM_NONSSL_ALERT_LABEL=Alert me when connecting insecurely
-RESID_SUBSYSTEM_NONSSL_ALERT_TIP=Show a confirmation dialog when no security layer is used for connecting with the RSE server
-
-# Single signon (Kerberos) Properties Page
-
-# Environment Properties Page
-RESID_SUBSYSTEM_ENVVAR_DESCRIPTION= Specify the environment variables that will be set when a connection is established:
-RESID_SUBSYSTEM_ENVVAR_TOOLTIP= The environment variables that will be set when a connection is established
-
-RESID_SUBSYSTEM_ENVVAR_NAME_TITLE= Name
-RESID_SUBSYSTEM_ENVVAR_NAME_LABEL= Name:
-RESID_SUBSYSTEM_ENVVAR_NAME_TOOLTIP= Enter a name for the environment variable
-
-RESID_SUBSYSTEM_ENVVAR_VALUE_TITLE= Value
-RESID_SUBSYSTEM_ENVVAR_VALUE_LABEL= Value:
-RESID_SUBSYSTEM_ENVVAR_VALUE_TOOLTIP= Enter a value for the environment variable
-
-
-RESID_SUBSYSTEM_ENVVAR_ADD_TOOLTIP= Add a new environment variable
-RESID_SUBSYSTEM_ENVVAR_REMOVE_TOOLTIP= Remove the selected environment variable
-RESID_SUBSYSTEM_ENVVAR_CHANGE_TOOLTIP= Change the selected environment variable
-RESID_SUBSYSTEM_ENVVAR_MOVEUP_LABEL= Move Up
-RESID_SUBSYSTEM_ENVVAR_MOVEUP_TOOLTIP= Move the selected environment variable(s) up in the list
-RESID_SUBSYSTEM_ENVVAR_MOVEDOWN_LABEL= Move Down
-RESID_SUBSYSTEM_ENVVAR_MOVEDOWN_TOOLTIP= Move the selected environment variable(s) down in the list
-
-# Add / Change Environment Variable Dialog
-RESID_SUBSYSTEM_ENVVAR_ADD_TITLE= Add Environment Variable
-RESID_SUBSYSTEM_ENVVAR_CHANGE_TITLE= Change Environment Variable
-
-#=============================================================
-# PROPERTY PAGE DIALOG...
-#=============================================================
-RESID_PROP_SERVERLAUNCHER_MEANS=Indicate how the remote server should be launched
-RESID_PROP_SERVERLAUNCHER_RADIO_DAEMON=Remote daemon
-RESID_PROP_SERVERLAUNCHER_RADIO_REXEC=REXEC
-RESID_PROP_SERVERLAUNCHER_RADIO_NONE=Connect to running server
-RESID_PROP_SERVERLAUNCHER_RADIO_DAEMON_TOOLTIP=Launch the server using a daemon running on the host
-RESID_PROP_SERVERLAUNCHER_RADIO_REXEC_TOOLTIP=Launch the server using REXEC
-RESID_PROP_SERVERLAUNCHER_RADIO_NONE_TOOLTIP=Manually launch the server and then connect to it from RSE
-RESID_PROP_SERVERLAUNCHER_PATH=Path to installed server on host
-RESID_PROP_SERVERLAUNCHER_PATH_TOOLTIP=Specify where the installed server is located on the host.
-RESID_PROP_SERVERLAUNCHER_INVOCATION=Server launch command
-RESID_PROP_SERVERLAUNCHER_INVOCATION_TOOLTIP=Specify the name of the command that invokes the server
-
-#=============================================================
-# NEW FILTERPOOL WIZARD...
-#=============================================================
-RESID_NEWFILTERPOOL_TITLE=New Filter Pool
-RESID_NEWFILTERPOOL_PAGE1_TITLE=System Filter Pool
-RESID_NEWFILTERPOOL_PAGE1_DESCRIPTION=Define a new pool for filters
-#WIDGETS ON NEW FILTER POOL WIZARD
-RESID_FILTERPOOLNAME_LABEL=Pool name
-RESID_FILTERPOOLNAME_TIP=Enter unique name for the pool within profile
-RESID_FILTERPOOLMANAGERNAME_LABEL=Profile
-RESID_FILTERPOOLMANAGERNAME_TIP=Select profile to contain this pool
-
-#=============================================================
-# COMMON PROPERTIES PAGE WIDGETS...
-#=============================================================
-RESID_PP_PROPERTIES_TYPE_LABEL=Resource type
-RESID_PP_PROPERTIES_TYPE_TOOLTIP=What type of artifact is this?
-
-
-#=============================================================
-# FILTERPOOL PROPERTIES PAGE...
-#=============================================================
-RESID_FILTERPOOL_TYPE_VALUE=Filter pool
-
-RESID_FILTERPOOL_NAME_LABEL=Name
-RESID_FILTERPOOL_NAME_TOOLTIP=Name of this filter pool
-
-RESID_FILTERPOOL_PROFILE_LABEL=Parent profile
-RESID_FILTERPOOL_PROFILE_TOOLTIP=Profile that owns this filter pool
-
-RESID_FILTERPOOL_REFERENCECOUNT_LABEL=Reference count
-RESID_FILTERPOOL_REFERENCECOUNT_TOOLTIP=How many connections show the filters in this pool?
-
-RESID_FILTERPOOL_RELATEDCONNECTION_LABEL=Related connection
-RESID_FILTERPOOL_RELATEDCONNECTION_TOOLTIP=Name of the single connection this pool is private to
-
-#=============================================================
-# FILTERPOOL REFERENCE PROPERTIES PAGE...
-#=============================================================
-RESID_FILTERPOOLREF_TYPE_VALUE=Reference to filter pool
-
-RESID_FILTERPOOLREF_NAME_LABEL=Name
-RESID_FILTERPOOLREF_NAME_TOOLTIP=Name of the referenced filter pool
-
-RESID_FILTERPOOLREF_SUBSYSTEM_LABEL=Parent subsystem
-RESID_FILTERPOOLREF_SUBSYSTEM_TOOLTIP=The subsystem which contains this reference
-
-RESID_FILTERPOOLREF_CONNECTION_LABEL=Parent connection
-RESID_FILTERPOOLREF_CONNECTION_TOOLTIP=The connection which owns the subsystem containing this reference
-
-RESID_FILTERPOOLREF_PROFILE_LABEL=Parent profile
-RESID_FILTERPOOLREF_PROFILE_TOOLTIP=The profile which owns the connection containing the subsystem with this reference
-
-#=============================================================
-# FILTER PROPERTIES PAGE...
-#=============================================================
-RESID_PP_FILTER_TYPE_VALUE=Filter
-RESID_PP_FILTER_TYPE_PROMPTABLE_VALUE=Prompting filter
-RESID_PP_FILTER_TYPE_PROMPTABLE_TOOLTIP=Whether this is a filter that prompts the user when its expanded
-
-RESID_PP_FILTER_NAME_LABEL=Name
-RESID_PP_FILTER_NAME_TOOLTIP=The name of this filter
-
-RESID_PP_FILTER_STRINGCOUNT_LABEL=Number of filter strings
-RESID_PP_FILTER_STRINGCOUNT_TOOLTIP=The number of filter strings contained in this filter
-
-RESID_PP_FILTER_FILTERPOOL_LABEL=Parent filter pool
-RESID_PP_FILTER_FILTERPOOL_TOOLTIP=The filter pool which contains this filter
-
-RESID_PP_FILTER_PROFILE_LABEL=Parent profile
-RESID_PP_FILTER_PROFILE_TOOLTIP=The profile which contains the filter pool with this filter
-
-RESID_PP_FILTER_ISCONNECTIONPRIVATE_LABEL=Connection private
-RESID_PP_FILTER_ISCONNECTIONPRIVATE_TOOLTIP=Whether this is a filter contained in a filter pool that is private to a single connection
-
-
-#=============================================================
-# FILTERSTRING PROPERTIES PAGE...
-#=============================================================
-RESID_PP_FILTERSTRING_TYPE_VALUE==Filter string
-	
-RESID_PP_FILTERSTRING_FILTER_LABEL=Parent filter
-RESID_PP_FILTERSTRING_FILTER_TOOLTIP=The filter that contains this filter string
-
-RESID_PP_FILTERSTRING_FILTERPOOL_LABEL=Parent filter pool
-RESID_PP_FILTERSTRING_FILTERPOOL_TOOLTIP=The filter pool that contains the filter with this filter string
-
-RESID_PP_FILTERSTRING_PROFILE_LABEL=Parent profile
-RESID_PP_FILTERSTRING_PROFILE_TOOLTIP=The profile that contains the filter pool with this filter string's filter
-
-#=============================================================
-# SUBSYSTEMFACTORY PROPERTIES PAGE...
-#=============================================================
-RESID_PP_SUBSYSFACTORY_VERBIAGE=A subsystem factory is responsible for creating and owning subsystem instances, one per connection typically. They may also contain, per profile, team-sharable artifacts.
-
-RESID_PP_SUBSYSFACTORY_ID_LABEL=Identifier
-RESID_PP_SUBSYSFACTORY_ID_TOOLTIP=Unique identifier for this subsystem factory
-
-RESID_PP_SUBSYSFACTORY_VENDOR_LABEL=Vendor
-RESID_PP_SUBSYSFACTORY_VENDOR_TOOLTIP=Vendor who created this subsystem factory
-
-RESID_PP_SUBSYSFACTORY_TYPES_LABEL=System types
-RESID_PP_SUBSYSFACTORY_TYPES_TOOLTIP=System types supported by this factory
-
-#=============================================================
-# NEW FILTER WIZARD...
-#=============================================================
-RESID_NEWFILTER_TITLE=New Filter
-RESID_NEWFILTER_PAGE_TITLE=Filter
-# PAGE 1 OF NEW FILTER WIZARD...
-RESID_NEWFILTER_PAGE1_DESCRIPTION=Create a new filter 
-# PAGE 2 OF NEW FILTER WIZARD...
-RESID_NEWFILTER_PAGE2_DESCRIPTION=Name the new filter
-RESID_NEWFILTER_PAGE2_NAME_VERBIAGE=Filters are saved for easy re-use. Specify a unique name for this filter. This name will appear in the Remote Systems view, and will be expandable.
-RESID_NEWFILTER_PAGE2_POOL_VERBIAGE=Filters are created in filter pools, which are re-usable in multiple connections. Select the pool to create this filter in. The pool names are qualified by their profile name.
-RESID_NEWFILTER_PAGE2_PROFILE_VERBIAGE=Select a profile to own the new filter. This determines if it is unique to you, or sharable by the team. It will be placed in the default filter pool for that profile.
-RESID_NEWFILTER_PAGE2_POOL_VERBIAGE_TIP=Tip: too many filters? Turn on "Show filter pools in Remote Systems view". Select Preferences from the Window pulldown, then Remote Systems
-
-# PAGE 3 OF NEW FILTER WIZARD...
-RESID_NEWFILTER_PAGE3_DESCRIPTION=Additional Information
-RESID_NEWFILTER_PAGE3_STRINGS_VERBIAGE=Tip: Filters can contain multiple filter strings, although this wizard only prompts for one. To add more filter strings, select the filter in the Remote Systems view and select Properties from its pop-up menu.
-RESID_NEWFILTER_PAGE3_POOLS_VERBIAGE=Tip: Too many filters? Turn on "Show filter pools in Remote Systems view." Select Preferences from the Window pulldown, then Remote Systems.
-
-#=============================================================
-# CHANGE SYSTEM FILTER DIALOG...
-#=============================================================
-RESID_CHGFILTER_TITLE=Change System Filter
-RESID_CHGFILTER_LIST_NEWITEM=New filter string
-RESID_CHGFILTER_NAME_LABEL=Filter name:
-RESID_CHGFILTER_NAME_TOOLTIP=Name for this filter. A filter is a named collection of filter strings
-RESID_CHGFILTER_POOL_LABEL=Parent filter pool:
-RESID_CHGFILTER_POOL_TOOLTIP=Filter pool in which this filter exists
-RESID_CHGFILTER_LIST_LABEL=Filter strings:
-RESID_CHGFILTER_LIST_TOOLTIP=Strings to filter by. Use the pop-up menu for additional actions
-RESID_CHGFILTER_FILTERSTRING_LABEL=Selected filter string:
-RESID_CHGFILTER_FILTERSTRING_TOOLTIP=Edit the filter string and press Apply to change it in the list
-RESID_CHGFILTER_NEWFILTERSTRING_LABEL=New filter string:
-RESID_CHGFILTER_NEWFILTERSTRING_TOOLTIP=Specify the new filter string, then press Create to add it to this filter
-RESID_CHGFILTER_BUTTON_TEST_LABEL=Test
-RESID_CHGFILTER_BUTTON_TEST_TOOLTIP=Press to test the currently selected filter string
-RESID_CHGFILTER_BUTTON_APPLY_LABEL=Apply
-RESID_CHGFILTER_BUTTON_APPLY_TOOLTIP=Press to apply the changes to the currently selected filter string
-RESID_CHGFILTER_BUTTON_REVERT_LABEL=Revert
-RESID_CHGFILTER_BUTTON_REVERT_TOOLTIP=Press to revert to the last saved values for the currently selected filter string
-
-#=============================================================
-# CREATE UNNAMED FILTER DIALOG...
-#=============================================================
-RESID_CRTFILTER_TITLE=Create Filter
-
-
-#=============================================================
-# NEW FILTER STRING ACTION AND WIZARD...
-#=============================================================
-RESID_FILTERSTRING_STRING_LABEL=Filter string:
-RESID_FILTERSTRING_STRING_TIP=Enter a filter string
-
-
-#=============================================================
-# TEST FILTER STRING DIALOG...
-#=============================================================
-RESID_TESTFILTERSTRING_TITLE=Test Filter String
-RESID_TESTFILTERSTRING_PROMPT_LABEL=Filter string:
-RESID_TESTFILTERSTRING_PROMPT_TOOLTIP=Filter string being tested
-
-
-#=============================================================
-# PROMPT FOR PASSWORD DIALOG...
-#=============================================================
-RESID_PASSWORD_TITLE = Enter Password
-RESID_PASSWORD_LABEL = Password
-RESID_PASSWORD_LABEL_OPTIONAL=Password (optional)
-RESID_PASSWORD_TIP = Enter password for connecting to this host
-RESID_PASSWORD_SYSTEMTYPE_LABEL=System type
-RESID_PASSWORD_HOSTNAME_LABEL=Host name
-RESID_PASSWORD_USERID_LABEL = User ID
-RESID_PASSWORD_USERID_TIP = Enter user ID for connecting to this host
-RESID_PASSWORD_USERID_ISPERMANENT_LABEL = Save user ID
-RESID_PASSWORD_USERID_ISPERMANENT_TIP = Save the user ID for later use when connecting to this host
-RESID_PASSWORD_SAVE_LABEL = Save password
-RESID_PASSWORD_SAVE_TOOLTIP = Save the password for later use when connecting to this host with this user ID
-
-#=============================================================
-# CHANGE PASSWORD DIALOG...
-#=============================================================
-RESID_CHANGE_PASSWORD_TITLE=Change password
-RESID_CHANGE_PASSWORD_NEW_LABEL=New password:
-RESID_CHANGE_PASSWORD_NEW_TOOLTIP=Enter your new password
-RESID_CHANGE_PASSWORD_OLD_LABEL=Old password:
-RESID_CHANGE_PASSWORD_OLD_TOOLTIP=Enter your old password
-RESID_CHANGE_PASSWORD_CONFIRM_LABEL=Re-enter to confirm:
-RESID_CHANGE_PASSWORD_CONFIRM_TOOLTIP=Enter your new password again to confirm it
-
-#=============================================================
-# SELECT FILTER POOL DIALOG...
-#=============================================================
-RESID_SELECTFILTERPOOLS_TITLE=Select Filter Pools
-RESID_SELECTFILTERPOOLS_PROMPT=Select filter pools to include in this connection
-
-#=============================================================
-# WORK WITH FILTER POOLS DIALOG...
-#=============================================================
-RESID_WORKWITHFILTERPOOLS_TITLE=Work With Filter Pools
-RESID_WORKWITHFILTERPOOLS_PROMPT=Work with filter pools
-
-#=============================================================
-# WORK WITH HISTORY DIALOG...
-#=============================================================
-RESID_WORKWITHHISTORY_TITLE=Work With History
-RESID_WORKWITHHISTORY_VERBIAGE=Remove or re-order history for this GUI control
-RESID_WORKWITHHISTORY_PROMPT=History
-RESID_WORKWITHHISTORY_BUTTON_TIP=Bring up the Work With History dialog
-
-#=============================================================
-# Team View
-#=============================================================
-RESID_TEAMVIEW_SUBSYSFACTORY_VALUE=SubSystem factory
-RESID_TEAMVIEW_CATEGORY_VALUE=Category
-RESID_TEAMVIEW_PROPERTYSET_VALUE=Property set
-
-
-RESID_TEAMVIEW_CATEGORY_CONNECTIONS_LABEL=Connections
-RESID_TEAMVIEW_CATEGORY_CONNECTIONS_TOOLTIP=Lists all connections in this profile
-
-RESID_TEAMVIEW_CATEGORY_FILTERPOOLS_LABEL=Filter pools
-RESID_TEAMVIEW_CATEGORY_FILTERPOOLS_TOOLTIP=Lists all filter pools and filters in this profile, per subsystem type that contains them.
-
-RESID_TEAMVIEW_CATEGORY_PROPERTYSET_LABEL=Property sets
-RESID_TEAMVIEW_CATEGORY_PROPERTYSET_TOOLTIP=Lists all property sets in this profile
-
-#=============================================================
-# Specific actions. All actions support:
-#   .label for button/menu-item text
-#   .tooltip for hover help on pushbuttons
-#=============================================================
-##############################################################
-# ACTION LABELS AND DESCRIPTIONS...
-##############################################################
-ACTION_CASCADING_NEW_LABEL=New
-ACTION_CASCADING_NEW_TOOLTIP=Create a new resource
-
-ACTION_CASCADING_GOTO_LABEL=Go To
-ACTION_CASCADING_GOTO_TOOLTIP=Replace view with previous contents
-
-ACTION_CASCADING_GOINTO_LABEL=Go Into
-ACTION_CASCADING_GOINTO_TOOLTIP=Replace view with children of selected resource. Use Go To to return
-
-ACTION_CASCADING_OPEN_LABEL=Open
-ACTION_CASCADING_OPEN_TOOLTIP=Open in editor
-
-ACTION_CASCADING_OPENWITH_LABEL=Open With
-ACTION_CASCADING_OPENWITH_TOOLTIP=Open new view
-
-ACTION_CASCADING_WORKWITH_LABEL=Work With
-ACTION_CASCADING_WORKWITH_TOOLTIP=Work with resources
-
-ACTION_CASCADING_REMOTESERVERS_LABEL=Remote Servers
-ACTION_CASCADING_REMOTESERVERS_TOOLTIP=Start or stop a server/daemon on the remote system
-ACTION_REMOTESERVER_START_LABEL=Start
-ACTION_REMOTESERVER_START_TOOLTIP=Start this server/daemon on the remote system
-ACTION_REMOTESERVER_STOP_LABEL=Stop
-ACTION_REMOTESERVER_STOP_TOOLTIP=Stop this server/daemon on the remote system
-
-ACTION_CASCADING_EXPAND_TO_LABEL=Expand To
-ACTION_CASCADING_EXPAND_TO_TOOLTIP=Expand children with subsetting criteria
-
-ACTION_CASCADING_VIEW_LABEL=View
-ACTION_CASCADING_VIEW_TOOLTIP=Set viewing options
-
-ACTION_CASCADING_PREFERENCES_LABEL=Preferences
-ACTION_CASCADING_PREFERENCES_TOOLTIP=Go to the appropriate preferences page
-
-ACTION_CASCADING_PULLDOWN_LABEL=Profile actions
-ACTION_CASCADING_PULLDOWN_TOOLTIP=Remote system profile actions
-
-ACTION_CASCADING_FILTERPOOL_NEWREFERENCE_LABEL=Filter Pool Reference
-ACTION_CASCADING_FILTERPOOL_NEWREFERENCE_TOOLTIP=Add new reference to existing filter pool
-
-ACTION_TEAM_RELOAD_LABEL=Reload Remote System Explorer
-ACTION_TEAM_RELOAD_TOOLTIP=Reload the Remote System Explorer contents, after synchronizing with a shared repository
-
-ACTION_PROFILE_MAKEACTIVE_LABEL=Make Active
-ACTION_PROFILE_MAKEACTIVE_TOOLTIP=Make the selected profile(s) active, so its connections, filters and so on are visible in the Remote Systems view.
-
-ACTION_PROFILE_MAKEINACTIVE_LABEL=Make Inactive
-ACTION_PROFILE_MAKEINACTIVE_TOOLTIP=Make the selected profile(s) inactive, so its connections, filters and so on are not visible in the Remote Systems view.
-
-ACTION_PROFILE_COPY_LABEL=Duplicate...
-ACTION_PROFILE_COPY_TOOLTIP=Create a copy of this profile, with a new name. Copies all connections, filters, user actions and compile commands.
-
-ACTION_NEWPROFILE_LABEL=Profile...
-ACTION_NEWPROFILE_TOOLTIP=Create a new profile
-
-ACTION_NEW_PROFILE_LABEL=New Profile...
-ACTION_NEW_PROFILE_TOOLTIP=Create a new profile
-
-ACTION_QUALIFY_CONNECTION_NAMES_LABEL=Qualify Connection Names
-ACTION_QUALIFY_CONNECTION_NAMES_TOOLTIP=Show connection and filter pool names qualified by their profile name
-
-ACTION_RESTORE_STATE_PREFERENCE_LABEL=Restore Previous State
-ACTION_RESTORE_STATE_PREFERENCE_TOOLTIP=If selected, the tree is re-expanded to its previous state, upon startup
-
-ACTION_PREFERENCE_SHOW_FILTERPOOLS_LABEL=Show Filter Pools
-ACTION_PREFERENCE_SHOW_FILTERPOOLS_TOOLTIP=Show filter pools when expanding subsystems
-
-ACTION_SHOW_PREFERENCEPAGE_LABEL=Remote Systems...
-ACTION_SHOW_PREFERENCEPAGE_TOOLTIP=Go to the Remote Systems primary preferences page
-
-ACTION_NEWCONN_LABEL=New Connection...
-ACTION_NEWCONN_TOOLTIP=Define a connection to remote system
-
-ACTION_ANOTHERCONN_LABEL=Connection...
-ACTION_ANOTHERCONN_TOOLTIP=Define another connection to the same or another remote system
-
-ACTION_UPDATEFILTER_LABEL=Change...
-ACTION_UPDATEFILTER_TOOLTIP=Change this filter's name or contents
-
-ACTION_TESTFILTERSTRING_LABEL=Test
-ACTION_TESTFILTERSTRING_TOOLTIP=Test this filter string by resolving it
-
-ACTION_NEWFILTER_LABEL=Filter...
-ACTION_NEWFILTER_TOOLTIP=Create new filter for this filter pool
-
-ACTION_NEWFILTERPOOL_LABEL=Filter Pool...
-ACTION_NEWFILTERPOOL_TOOLTIP=Create new pool to hold filters
-
-ACTION_RMVFILTERPOOLREF_LABEL=Remove Reference
-ACTION_RMVFILTERPOOLREF_TOOLTIP=Remove filter pool reference
-
-ACTION_SELECTFILTERPOOLS_LABEL=Select Filter Pools...
-ACTION_SELECTFILTERPOOLS_TOOLTIP=Add or remove filter pool references
-
-
-RESID_NEWFILTER_PAGE2_NAME_LABEL=Filter name:
-RESID_NEWFILTER_PAGE2_NAME_TOOLTIP=Enter a unique name for this filter, to show in the Remote Systems view
-RESID_NEWFILTER_PAGE2_PROFILE_LABEL=Owner profile:
-RESID_NEWFILTER_PAGE2_PROFILE_TOOLTIP=Select the profile whose default filter pool is to contain the new filter
-RESID_NEWFILTER_PAGE2_POOL_LABEL=Parent filter pool:
-RESID_NEWFILTER_PAGE2_POOL_TOOLTIP=Select the filter pool in which this filter will be created
-RESID_NEWFILTER_PAGE2_UNIQUE_LABEL=Only create filter in this connection
-RESID_NEWFILTER_PAGE2_UNIQUE_TOOLTIP=Select to create filter in this connection only, de-select to create filter in all applicable connections
-
-
-ACTION_WORKWITH_FILTERPOOLS_LABEL=Filter Pools...
-ACTION_WORKWITH_FILTERPOOLS_TOOLTIP=Create or manage filter pools
-
-ACTION_WORKWITH_WWFILTERPOOLS_LABEL=Work With Filter Pools...
-ACTION_WORKWITH_WWFILTERPOOLS_TOOLTIP=Create or manage filter pools
-
-
-ACTION_WORKWITH_PROFILES_LABEL=Work With Profiles
-ACTION_WORKWITH_PROFILES_TOOLTIP=Switch to the Team view to work with profiles
-
-ACTION_RUN_LABEL=Run
-ACTION_RUN_TOOLTIP=Run this prompt. Same as expanding it
-
-
-ACTION_REFRESH_ALL_LABEL=Refresh All
-ACTION_REFRESH_ALL_TOOLTIP=Refresh all resource information
-
-ACTION_REFRESH_LABEL=Re&fresh
-ACTION_REFRESH_TOOLTIP=Refresh information of selected resource
-
-ACTION_REFRESH_TABLE_LABLE=Refresh
-ACTION_REFRESH_TABLE_TOOLTIP=Refresh the contents of the table
-
-
-ACTION_DELETE_LABEL=Delete...
-ACTION_DELETE_TOOLTIP=Prompts for confirmation to delete selected resources
-
-ACTION_RENAME_LABEL=Rena&me...
-ACTION_RENAME_TOOLTIP=Rename selected resources
-
-ACTION_NEWFILE_LABEL=File
-ACTION_NEWFILE_TOOLTIP=Create a new File
-
-ACTION_CLEAR_LABEL=Clear
-ACTION_CLEAR_TOOLTIP=Clear the default value for the selected key
-
-ACTION_CLEAR_ALL_LABEL=Remove All From View
-ACTION_CLEAR_ALL_TOOLTIP=Remove all items from the view
-
-ACTION_CLEAR_SELECTED_LABEL=Remove Selected From View
-ACTION_CLEAR_SELECTED_TOOLTIP=Remove the selection from the view
-
-ACTION_MOVEUP_LABEL=Move Up
-ACTION_MOVEUP_TOOLTIP=Move selected resources up by one
-
-ACTION_MOVEDOWN_LABEL=Move Down
-ACTION_MOVEDOWN_TOOLTIP=Move selected resources down by one
-
-ACTION_MOVEUPLEVEL_TOOLTIP=Move selected resources up one level
-
-ACTION_GOUPLEVEL_TOOLTIP=Go up one level
-
-ACTION_CONNECT_LABEL=Connect...
-ACTION_CONNECT_TOOLTIP=Connect to remote subsystem
-
-ACTION_CLEARPASSWORD_LABEL=Clear Password
-ACTION_CLEARPASSWORD_TOOLTIP=Clear password from memory and disk
-
-ACTION_DISCONNECT_LABEL=Disconnect
-ACTION_DISCONNECT_TOOLTIP=Disconnect from remote subsystem
-
-ACTION_DISCONNECTALLSUBSYSTEMS_LABEL=Disconnect
-ACTION_DISCONNECTALLSUBSYSTEMS_TOOLTIP=Disconnect all subsystems
-
-ACTION_CONNECT_ALL_LABEL=Connect
-ACTION_CONNECT_ALL_TOOLTIP=Connect all subsystems
-
-ACTION_CLEARPASSWORD_ALL_LABEL=Clear Passwords
-ACTION_CLEARPASSWORD_ALL_TOOLTIP=Clear passwords from memory and disk for all subsystems
-
-ACTION_SET_LABEL=Set
-ACTION_SET_TOOLTIP=Set the default value for the selected key
-
-ACTION_HISTORY_DELETE_LABEL=Remove
-ACTION_HISTORY_DELETE_TOOLTIP=Remove this item from the history
-
-ACTION_HISTORY_CLEAR_LABEL=Clear
-ACTION_HISTORY_CLEAR_TOOLTIP=Clear all items in this widget's history
-
-ACTION_HISTORY_MOVEUP_LABEL=Move Up
-ACTION_HISTORY_MOVEUP_TOOLTIP=Move selected item up in history
-
-ACTION_HISTORY_MOVEDOWN_LABEL=Move Down
-ACTION_HISTORY_MOVEDOWN_TOOLTIP=Move selected item down in history
-
-ACTION_HISTORY_MOVEFORWARD_LABEL=Move Forward
-ACTION_HISTORY_MOVEFORWARD_TOOLTIP=Move to the next item in history
-
-ACTION_HISTORY_MOVEBACKWARD_LABEL=Move Backward
-ACTION_HISTORY_MOVEBACKWARD_TOOLTIP=Move to the previous item in history
-
-ACTION_COPY_LABEL=Copy
-ACTION_COPY_TOOLTIP=Copy selected resources to same or different parent
-
-ACTION_CUT_LABEL=Cut
-ACTION_CUT_TOOLTIP=Copy selection to clipboard and delete
-
-ACTION_UNDO_LABEL=Undo
-ACTION_UNDO_TOOLTIP=Undo previous edit action
-
-ACTION_PASTE_LABEL=Paste
-ACTION_PASTE_TOOLTIP=Copy clipboard contents
-
-ACTION_COPY_CONNECTION_LABEL=Copy...
-ACTION_COPY_CONNECTION_TOOLTIP=Copy selected connection to same or different profile
-
-ACTION_COPY_FILTERPOOL_LABEL=Copy...
-ACTION_COPY_FILTERPOOL_TOOLTIP=Copy selected filter pool to same or different profile
-
-ACTION_COPY_FILTER_LABEL=Copy...
-ACTION_COPY_FILTER_TOOLTIP=Copy selected filter to same or different filter pool
-
-ACTION_COPY_FILTERSTRING_LABEL=Copy
-ACTION_COPY_FILTERSTRING_TOOLTIP=Copy selected filter string to same or different filter
-
-ACTION_MOVE_LABEL=Move...
-ACTION_MOVE_TOOLTIP=Move selected resources to a different parent
-
-ACTION_MOVE_CONNECTION_LABEL=Move...
-ACTION_MOVE_CONNECTION_TOOLTIP=Move selected connection to a different profile
-
-ACTION_MOVE_FILTERPOOL_LABEL=Move...
-ACTION_MOVE_FILTERPOOL_TOOLTIP=Move selected filter pool to a different profile
-
-ACTION_MOVE_FILTER_LABEL=Move...
-ACTION_MOVE_FILTER_TOOLTIP=Move selected filter to a different filter pool
-
-ACTION_MOVE_FILTERSTRING_LABEL=Move...
-ACTION_MOVE_FILTERSTRING_TOOLTIP=Move selected filter string to a different filter
-
-ACTION_TABLE_LABEL=Show in Table
-ACTION_TABLE_TOOLTIP=Display the contents of this resource in a table
-
-ACTION_MONITOR_LABEL=Monitor
-ACTION_MONITOR_TOOLTIP=Display the contents of this resource in a monitoring table
-
-ACTION_SEARCH_LABEL=Search...
-ACTION_SEARCH_TOOLTIP=Opens a dialog to search for text and files
-
-ACTION_CANCEL_SEARCH_LABEL=Cancel Search
-ACTION_CANCEL_SEARCH_TOOLTIP=Terminate search operation
-
-ACTION_LOCK_LABEL=Lock
-ACTION_LOCK_TOOLTIP=Disable the change of view input from another view.
-
-ACTION_UNLOCK_LABEL=Unlock
-ACTION_UNLOCK_TOOLTIP=Enable the change of view input from another view.
-
-ACTION_POSITIONTO_LABEL=Position To...
-ACTION_POSITIONTO_TOOLTIP=Specify objects for the view to scroll to and select
-
-ACTION_SUBSET_LABEL=Subset...
-ACTION_SUBSET_TOOLTIP=Specify objects for the view to show
-
-ACTION_PRINTLIST_LABEL=Print...
-ACTION_PRINTLIST_TOOLTIP=Print the current table
-
-ACTION_SELECTCOLUMNS_LABEL=Customize Table...
-ACTION_SELECTCOLUMNS_TOOLTIP=Select columns to display in the table
-
-ACTION_OPENEXPLORER_DIFFPERSP2_LABEL=Open in New Window
-ACTION_OPENEXPLORER_DIFFPERSP2_TOOLTIP=Open a new workbench window, with the Remote Systems view rooted at this resource
-
-ACTION_EXPAND_SELECTED_LABEL=Expand
-ACTION_EXPAND_SELECTED_TOOLTIP=Expand selected elements. '+'
-
-ACTION_COLLAPSE_SELECTED_LABEL=Collapse
-ACTION_COLLAPSE_SELECTED_TOOLTIP=Collapse selected elements. '-'
-
-ACTION_COLLAPSE_ALL_LABEL=Collapse All
-ACTION_COLLAPSE_ALL_TOOLTIP=Collapse whole tree. Ctrl+-
-
-ACTION_EXPAND_ALL_LABEL=All
-ACTION_EXPAND_ALL_TOOLTIP=Show all contents
-
-ACTION_SELECT_ALL_LABEL=Select All
-ACTION_SELECT_ALL_TOOLTIP=Select all child elements. '+'
-
-ACTION_SELECT_INPUT_LABEL=Select Input...
-ACTION_SELECT_INPUT_DLG=Select Input
-ACTION_SELECT_INPUT_TOOLTIP=Select the input for the view
-
-
-
-#==============================================================
-# Signon Information Preferences Page
-#==============================================================
-RESID_PREF_SIGNON_HOSTNAME_TITLE= Host Name
-RESID_PREF_SIGNON_HOSTNAME_LABEL= Host name:
-RESID_PREF_SIGNON_HOSTNAME_TOOLTIP= Hostname or IP address of target system
-
-RESID_PREF_SIGNON_SYSTYPE_TITLE= System Type
-RESID_PREF_SIGNON_SYSTYPE_LABEL= System type:
-RESID_PREF_SIGNON_SYSTYPE_TOOLTIP= System type for the remote system
-
-RESID_PREF_SIGNON_USERID_TITLE= User ID
-RESID_PREF_SIGNON_USERID_LABEL= User ID:
-RESID_PREF_SIGNON_USERID_TOOLTIP= User ID used to signon to the remote system
-
-RESID_PREF_SIGNON_ADD_LABEL= Add...
-RESID_PREF_SIGNON_ADD_TOOLTIP= Add a new user ID and password
-
-RESID_PREF_SIGNON_REMOVE_LABEL= Remove
-RESID_PREF_SIGNON_REMOVE_TOOLTIP= Remove the selected user ID and password
-
-RESID_PREF_SIGNON_CHANGE_LABEL= Change...
-RESID_PREF_SIGNON_CHANGE_TOOLTIP= Change the password for the selected user ID
-
-RESID_PREF_SIGNON_PASSWORD_LABEL= Password:
-RESID_PREF_SIGNON_PASSWORD_TOOLTIP= Enter the password for the remote system
-
-RESID_PREF_SIGNON_PASSWORD_VERIFY_LABEL= Verify password:
-RESID_PREF_SIGNON_PASSWORD_VERIFY_TOOLTIP= Re-enter the password for the remote system
-
-RESID_PREF_SIGNON_ADD_DIALOG_TITLE= New Saved Password
-RESID_PREF_SIGNON_CHANGE_DIALOG_TITLE= Change Saved Password
-
-###################################################################################
-########################       Remote Search View      ############################
-###################################################################################
-RESID_SEARCH_REMOVE_SELECTED_MATCHES_LABEL= Remove Selected Matches
-RESID_SEARCH_REMOVE_SELECTED_MATCHES_TOOLTIP= Remove selected matches
-RESID_SEARCH_REMOVE_ALL_MATCHES_LABEL= Remove All Matches
-RESID_SEARCH_REMOVE_ALL_MATCHES_TOOLTIP= Remove all matches
-RESID_SEARCH_CLEAR_HISTORY_LABEL= Clear History
-RESID_SEARCH_CLEAR_HISTORY_TOOLTIP= Clear all search results
-
-
-###################################################################################
-############################    Monitor View  ############################
-###################################################################################
-RESID_MONITOR_POLL_INTERVAL_LABEL=Wait Interval
-RESID_MONITOR_POLL_INTERVAL_TOOLTIP=Specify how long to wait before refreshing the view
-RESID_MONITOR_POLL_LABEL=Poll
-RESID_MONITOR_POLL_TOOLTIP=Periodically refresh the contents
-RESID_MONITOR_POLL_CONFIGURE_POLLING_LABEL=Poll Configuration
-RESID_MONITOR_POLL_CONFIGURE_POLLING_EXPAND_TOOLTIP=Expand to configure polling 
-RESID_MONITOR_POLL_CONFIGURE_POLLING_COLLAPSE_TOOLTIP=Collapse to hide polling controls
-	
-###################################################################################
-############################    Work With Compile Commands    #####################
-###################################################################################
-
-
-##################################################################################
-############################    Browse menu item    ##############################
-##################################################################################
-ACTION_CASCADING_BROWSEWITH_LABEL= Browse With
-ACTION_CASCADING_BROWSEWITH_TOOLTIP= Browse resource
-
-##################################################################################
-############################    Compare menu item    #############################
-##################################################################################
-ACTION_CASCADING_COMPAREWITH_LABEL= Compare With
-ACTION_CASCADING_COMPAREWITH_TOOLTIP= Compare remote resources
-##################################################################################
-############################    Replace menu item    #############################
-##################################################################################
-ACTION_CASCADING_REPLACEWITH_LABEL= Replace With
-ACTION_CASCADING_REPLACEWITH_TOOLTIP= Remote remote resources with local editions
-
-#=============================================================
-# SELECT REMOTE FILES RE-USABLE WIDGET...
-#=============================================================
-RESID_SELECTFILES_SELECTTYPES_BUTTON_ROOT_LABEL=Select Types
-RESID_SELECTFILES_SELECTTYPES_BUTTON_ROOT_TOOLTIP=Select file types to filter by
-RESID_SELECTFILES_SELECTALL_BUTTON_ROOT_LABEL=Select All
-RESID_SELECTFILES_SELECTALL_BUTTON_ROOT_TOOLTIP=Select all files
-RESID_SELECTFILES_DESELECTALL_BUTTON_ROOT_LABEL=Deselect All
-RESID_SELECTFILES_DESELECTALL_BUTTON_ROOT_TOOLTIP=Deselect all files
-
-
-
-
-# Additions May 15, 2003
-
-##################################################################################
-############################    Offline Support          #########################
-##################################################################################
-RESID_OFFLINE_LABEL= Offline
-RESID_OFFLINE_WORKOFFLINE_LABEL= Work Offline
-RESID_OFFLINE_WORKOFFLINE_TOOLTIP= Switch the connection between offline and online modes
-
-#=============================================================
-# ENTER OR SELECT FILE DIALOG...
-#=============================================================
-
-
-##===============================
-# Quick Open
-#================================
-
-#=============================================================
-# RE-USABLE COMPOSITE FILE SYSTEM WIDGETS
-#=============================================================
-
-#==========================
-# Generic Editor Actions
-#==========================
-
-	
-###################################################################################
-############################    Table View Dlgs ############################
-###################################################################################
-
-
-RESID_TABLE_POSITIONTO_LABEL=Position To
-RESID_TABLE_POSITIONTO_ENTRY_TOOLTIP=Enter the name filter for the objects that the view is to locate
-RESID_TABLE_SUBSET_LABEL=Subset
-RESID_TABLE_SUBSET_ENTRY_TOOLTIP=Enter a filter pattern for the specified property.
-RESID_TABLE_PRINTLIST_TITLE=Remote Systems Details
-
-
-
-RESID_TABLE_SELECT_COLUMNS_LABEL=Customize Table
-RESID_TABLE_SELECT_COLUMNS_TOOLTIP=Select columns to display in the table
-
-RESID_TABLE_SELECT_COLUMNS_ADD_LABEL=Add>
-RESID_TABLE_SELECT_COLUMNS_ADD_TOOLTIP=Add the selected properties to be displayed as a column in the table
-	
-RESID_TABLE_SELECT_COLUMNS_REMOVE_LABEL= <Remove
-RESID_TABLE_SELECT_COLUMNS_REMOVE_TOOLTIP=Remove the selected column from the table display
-	
-RESID_TABLE_SELECT_COLUMNS_UP_LABEL=Move Up
-RESID_TABLE_SELECT_COLUMNS_UP_TOOLTIP=Move the selected column to the left in the table 
-	
-RESID_TABLE_SELECT_COLUMNS_DOWN_LABEL=Move Down
-RESID_TABLE_SELECT_COLUMNS_DOWN_TOOLTIP=Move the selected column to the right in the table 
-	
-RESID_TABLE_SELECT_COLUMNS_AVAILABLE_LABEL=Available contents:
-
-RESID_TABLE_SELECT_COLUMNS_DISPLAYED_LABEL=Displayed contents:
-RESID_TABLE_SELECT_COLUMNS_DESCRIPTION_LABEL=Choose contents to display in the table view.
-
-
-#### connectors and  services $$$$
-RESID_PROPERTIES_SERVICES_NAME=Services
-RESID_PROPERTIES_SERVICES_LABEL=Available Services
-RESID_PROPERTIES_SERVICES_TOOLTIP=
-RESID_PROPERTIES_DESCRIPTION_LABEL=Description
-RESID_PROPERTIES_FACTORIES_LABEL=Configuration
-RESID_PROPERTIES_FACTORIES_TOOLTIP=
-RESID_PROPERTIES_PROPERTIES_LABEL=Properties
-RESID_PROPERTIES_PROPERTIES_TOOLTIP=
-
-
-RESID_SERVICESFORM_CONFIGURATION_TOOLTIP=Select the configuration you wish to use to enable this subsystem. A configuration comprises a connector service and a subsystem service.
-RESID_SERVICESFORM_SERVICES_TOOLTIP=Select the elements of your chosen configuration and you can view and edit their properties in the Properties section.
-RESID_SERVICESFORM_CONNECTORSERVICES_TOOLTIP=Select the connector services available to you for this connection and you can view and edit their properties in the Properties section.
-RESID_SERVICESFORM_PROPERTIES_TOOLTIP=Edit the properties of the item selected in the Available Services section by clicking on the property's value.
-
-## Do not show this message again
-RESID_DO_NOT_SHOW_MESSAGE_AGAIN_LABEL = Do not show this message again
-RESID_DO_NOT_SHOW_MESSAGE_AGAIN_TOOLTIP = Select this option if you do not want to see this message again
-RESID_EXPORT_CONNECTION_ACTIONS_TOOLTIP=Export connection definition
-RESID_EXPORT_CONNECTIONS_ACTION_LABEL=Export...
-
-# Strings for Encodings
-RESID_HOST_ENCODING_GROUP_LABEL=Default encoding
-RESID_HOST_ENCODING_SETTING_NOTE=Note:
-RESID_HOST_ENCODING_SETTING_MSG=This setting can only be changed when no subsystem is connected
-RESID_HOST_ENCODING_REMOTE_LABEL=Default from remote system
-RESID_HOST_ENCODING_REMOTE_ENCODING_LABEL=Default from remote system (%1)
-RESID_HOST_ENCODING_REMOTE_TOOLTIP=The default encoding of the platform obtained from the remote system
-RESID_HOST_ENCODING_OTHER_LABEL=Other:
-RESID_HOST_ENCODING_OTHER_TOOLTIP=Specify a different encoding
-RESID_HOST_ENCODING_ENTER_TOOLTIP=Select or enter an encoding
-RESID_IMPORT_CONNECTION_ACTION_LABEL=Import...
-RESID_IMPORT_CONNECTION_ACTION_TOOLTIP=Import connection definition
-RESID_IMPORT_CONNECTION_LABEL_LONG=Import Connection...
-SystemExportConnectionAction_CoreExceptionFound=Core exception found during export.
-SystemExportConnectionAction_Error=Error
-SystemExportConnectionAction_ExportJobName=RSE Connection Export Job
-SystemExportConnectionAction_OverwriteFileCondition=The file {0} already exists. Click OK to overwrite it.
-SystemExportConnectionAction_UnexpectedException=unexpected exception
-SystemExportConnectionAction_Warning=Warning
-SystemExportConnectionAction_WriteProtectedFileCondition=The file {0} is write protected.
-SystemImportConnectionAction_CoreExceptionFound=Core exception found during import.
-SystemImportConnectionAction_Error=Error
-SystemImportConnectionAction_FileNotFoundCondition=File {0} does not exist.
-SystemImportConnectionAction_FileNotReadableCondition=You do not have permission to read file {0}.
-SystemImportConnectionAction_ImportJobName=RSE Connection Import Job
-SystemImportConnectionAction_UnexpectedException=unexpected exception
-SystemTableViewPart_title={0} {1}
-SystemTypeFieldEditor_false=false
-SystemTypeFieldEditor_true=true
-
-# collision dialog when copying from RSE to eclipse workspace
-RESID_COLLISION_DUPLICATE_RESOURCE_TITLE=Resource Exists
-RESID_COLLISION_OVERWRITE_RESOURCE_MESSAGE=The resource {0} already exists. Do you want to overwrite it?
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/SystemSortableSelection.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/SystemSortableSelection.java
deleted file mode 100644
index 748778784..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/SystemSortableSelection.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2007 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui;
-import java.util.Arrays;
-import java.util.Iterator;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-
-/**
- * The TreeViewer widget does not seem to guarantee that multiple-selections are
- *  returned sorted in order of appearance in the tree. Some action require they be,
- *  such as MoveUp and MoveDown. This class captures the information for each selected item
- *  and permits sorting via position, using the Arrays helper class in java.util.
- */
-public class SystemSortableSelection implements Comparable 
-{
-	
-    private Object selectedObject;
-    private int    position;
-
-	/**
-	 * Constructor for SystemSortableSelection
-	 */
-	public SystemSortableSelection(Object selectedObject) 
-	{
-		super();
-		this.selectedObject = selectedObject;
-	}
-
-    /**
-     * Get the selected object
-     */
-    public Object getSelectedObject()
-    {
-    	return selectedObject;
-    }
-    
-    /**
-     * Set the position of the selected object within its parent list
-     */
-    public void setPosition(int position)
-    {
-    	this.position = position;
-    }
-    
-    /**
-     * Get the poisition of the selected object within its parent list
-     */
-    public int getPosition()
-    {
-        return position;
-    }
-    
-	/**
-	 * @see Comparable#compareTo(Object)
-	 */
-	public int compareTo(Object other) 
-	{
-		SystemSortableSelection otherSelectableObject = (SystemSortableSelection)other;
-		int otherPosition = otherSelectableObject.getPosition();
-		if (position < otherPosition)
-		  return -1;
-		else if (position == otherPosition)
-		  return 0;
-		else
-		  return 1;
-	}
-
-    public boolean equals(Object other)
-    {
-    	if (!(other instanceof SystemSortableSelection))
-    	  return super.equals(other);
-		SystemSortableSelection otherSelectableObject = (SystemSortableSelection)other;
-		int otherPosition = otherSelectableObject.getPosition();
-        return (position == otherPosition);    	
-    }
-    
-    /**
-     * Convert structured selection into an array of these objects.
-     * YOU MUST CALL SET POSITION AFTER FOR EACH ITEM, BEFORE YOU CAN SORT THIS ARRAY!
-     */
-    public static SystemSortableSelection[] makeSortableArray(IStructuredSelection selection)
-    {
-    	SystemSortableSelection[] array = new SystemSortableSelection[selection.size()];
-    	Iterator i = selection.iterator();
-    	int idx=0;
-    	while (i.hasNext())
-    	  array[idx++] = new SystemSortableSelection(i.next());
-    	return array;
-    }
- 
-    /**
-     * IF YOU HAVE CALLED SETPOSITION ON EACH ITEM IN THE GIVEN ARRAY, THIS WILL SORT THAT ARRAY
-     * BY THE POSITION
-     */   
-    public static void sortArray(SystemSortableSelection[] sortableArray)
-    {
-    	Arrays.sort(sortableArray);
-    }
-    
-    /**
-     * IF YOU HAVE CALLED SETPOSITION ON EACH ITEM IN THE GIVEN ARRAY, AND CALLED SORTARRAY,
-     * THIS CONVERTS INTO A SORTED ARRAY THAT JUST HAS THE ORIGINAL OBJECTS IN IT FROM THE SELECTION LIST.
-     */
-    public static Object[] getSortedObjects(SystemSortableSelection[] sortedArray, Object[] outputArray)
-    {
-    	//System.out.println("in SystemSortableSelection#getSortedObjects:");
-    	for (int idx=0;idx<outputArray.length; idx++)
-    	{
-    	   outputArray[idx] = sortedArray[idx].getSelectedObject();
-    	   //System.out.println("...selected Object: " + outputArray[idx]);
-    	   //System.out.println("...position.......: " + sortedArray[idx].getPosition());
-    	}
-    	//System.out.println();
-    	return outputArray;
-    }
-
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/SystemTabFolderLayout.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/SystemTabFolderLayout.java
deleted file mode 100644
index c0693a065..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/SystemTabFolderLayout.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2007 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Layout;
-
-public class SystemTabFolderLayout extends Layout 
-{
-	
-	protected Point computeSize (Composite composite, int wHint, int hHint, boolean flushCache) {
-		if (wHint != SWT.DEFAULT && hHint != SWT.DEFAULT)
-			return new Point(wHint, hHint);
-			
-		Control [] children = composite.getChildren ();
-		int count = children.length;
-		int maxWidth = 0, maxHeight = 0;
-		for (int i=0; i<count; i++) {
-			Control child = children [i];
-			Point pt = child.computeSize (SWT.DEFAULT, SWT.DEFAULT, flushCache);
-			maxWidth = Math.max (maxWidth, pt.x);
-			maxHeight = Math.max (maxHeight, pt.y);
-		}
-		
-		if (wHint != SWT.DEFAULT)
-			maxWidth= wHint;
-		if (hHint != SWT.DEFAULT)
-			maxHeight= hHint;
-		
-		return new Point(maxWidth, maxHeight);	
-		
-	}
-	protected void layout (Composite composite, boolean flushCache) {
-		Rectangle rect= composite.getClientArea();
-	
-		Control[] children = composite.getChildren();
-		for (int i = 0; i < children.length; i++) {
-			children[i].setBounds(rect);
-		}
-		
-		// System.out.println("Setting bounds of each page to " + rect);
-	}
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/ShowInSystemsViewDelegate.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/ShowInSystemsViewDelegate.java
deleted file mode 100644
index bce67adb7..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/ShowInSystemsViewDelegate.java
+++ /dev/null
@@ -1,396 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2009 IBM Corporation. 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight.
- *
- * Contributors:
- * David McKnight     (IBM)  - [160105] [usability] Universal action needed to locate a resource in the Remote Systems View
- * David McKnight     (IBM)  - [218227][usability] Contribute a "Show in RSE" action to Resource Navigator and Project Explorer
- ********************************************************************************/
-package org.eclipse.rse.internal.ui.actions;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.rse.core.RSECorePlugin;
-import org.eclipse.rse.core.filters.ISystemFilter;
-import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManager;
-import org.eclipse.rse.core.filters.ISystemFilterReference;
-import org.eclipse.rse.core.model.ISystemRegistry;
-import org.eclipse.rse.core.subsystems.ISubSystem;
-import org.eclipse.rse.internal.ui.view.SystemView;
-import org.eclipse.rse.internal.ui.view.SystemViewPart;
-import org.eclipse.rse.services.clientserver.messages.CommonMessages;
-import org.eclipse.rse.ui.SystemBasePlugin;
-import org.eclipse.rse.ui.view.ContextObject;
-import org.eclipse.rse.ui.view.ISystemTree;
-import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.ui.IViewActionDelegate;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-
-public class ShowInSystemsViewDelegate implements IViewActionDelegate {
-
-	/**
-	 * Main thread runnable used to create tree items in system view and look for the target remote object
-	 * item in the tree.  If the remote object item is not found, then this indirectly recurses via a new
-	 * LinkFromContainerJob.
-	 */
-	private class ShowChildrenInTree implements Runnable
-	{
-		private Object _parentObject;
-		private Object[] _children;
-		private ISystemTree _systemTree;
-		private IAdaptable _targetRemoteObj;
-		private ISystemFilterReference _filterReference;
-
-		public ShowChildrenInTree(Object parentObject, Object[] children, ISystemFilterReference filterReference, ISystemTree systemTree, IAdaptable targetRemoteObj)
-		{
-			_parentObject = parentObject;
-			_children = children;
-			_systemTree = systemTree;
-			_targetRemoteObj = targetRemoteObj;
-			_filterReference = filterReference;
-		}
-
-		private String getAbsolutePath(IAdaptable adaptable){
-			ISystemViewElementAdapter adapter = (ISystemViewElementAdapter)adaptable.getAdapter(ISystemViewElementAdapter.class);
-			return adapter.getAbsoluteName(adaptable);
-		}
-
-		public void run()
-		{
-			if (_filterReference != null){
-				// make sure the filter is expanded
-				_systemTree.revealAndExpand(_filterReference.getSubSystem(), _filterReference.getReferencedFilter());
-			}
-			else {
-				// make sure the parent is expanded
-				List matches = new ArrayList();
-				_systemTree.findAllRemoteItemReferences(_parentObject, _parentObject, matches);
-				if (matches.size() > 0){
-					TreeItem item = (TreeItem)matches.get(0);
-					item.setExpanded(true);
-				}
-			}
-
-			Vector matches = new Vector();
-
-			_systemTree.findAllRemoteItemReferences(_parentObject, _parentObject, matches);
-			if (matches.size() > 0){
-				TreeItem item = (TreeItem)matches.get(0);
-				_systemTree.createTreeItems(item, _children);
-				item.setExpanded(true);
-
-				IAdaptable container = null;
-
-				String targetPath = getAbsolutePath(_targetRemoteObj);
-
-				// is one of these items our remote object
-				for (int i = 0; i < item.getItemCount(); i++){
-					TreeItem childItem = item.getItem(i);
-					Object data = childItem.getData();
-					if (data instanceof IAdaptable){
-						IAdaptable childObj = (IAdaptable)data;
-						String childPath = getAbsolutePath(childObj);
-
-						if (childPath.equals(targetPath)){
-							// select our remote file
-							_systemTree.getTree().setSelection(childItem);
-							return; // we're done!
-						}
-						else if (targetPath.startsWith(childPath)){
-							container = childObj; // using this to start a deeper search for the target remote file
-						}
-					}
-				}
-
-				// remote file not found so now we have to expand further
-				if (container != null){
-					LinkFromContainerJob job = new LinkFromContainerJob(container, _filterReference, _targetRemoteObj, _systemTree);
-					job.schedule();
-				}
-			}
-		}
-	}
-	/**
-	 * Job for doing a query on a filter and then using Display.asyncExec() to reveal the results in the tree.
-	 */
-	private class LinkFromFilterJob extends Job
-	{
-		private ISubSystem _subSystem;
-		private IAdaptable _targetRemoteObj;
-		private ISystemTree _systemTree;
-
-		public LinkFromFilterJob(IAdaptable targetRemoteObject, ISystemTree systemTree) {
-			super(NLS.bind(CommonMessages.MSG_RESOLVE_PROGRESS, ShowInSystemsViewDelegate.getAdapter(targetRemoteObject).getAbsoluteName(targetRemoteObject)));
-
-			_targetRemoteObj = targetRemoteObject;
-			_subSystem = getSubSystem(_targetRemoteObj);
-			_systemTree = systemTree;
-		}
-
-
-
-		private ISubSystem getSubSystem(IAdaptable adaptable)
-		{
-			ISystemViewElementAdapter adapter = ShowInSystemsViewDelegate.getAdapter(adaptable);
-			return adapter.getSubSystem(adaptable);
-		}
-
-		public IStatus run(IProgressMonitor monitor){
-			try
-			{
-				// find matching filter reference
-				ISystemFilterReference ref = findMatchingFilterReference(_targetRemoteObj, monitor);
-				if (ref == null)
-				{
-					// the object is nowhere to be found!
-					return Status.OK_STATUS;
-				}
-
-				// get the context
-				ContextObject contextObject = new ContextObject(ref, _subSystem, ref);
-
-				// get the children
-				Object[] children = ShowInSystemsViewDelegate.getAdapter((IAdaptable)ref).getChildren(contextObject, monitor);
-
-				if (monitor.isCanceled()){
-					return Status.CANCEL_STATUS;
-				}
-
-				// put these items in the tree and look for remoteFile
-				// if we can't find the remote file under this filter, the ShowChildrenInTree will recurse
-				Display.getDefault().asyncExec(new ShowChildrenInTree(ref, children, ref, _systemTree, _targetRemoteObj));
-			}
-			catch (Exception e){
-				e.printStackTrace();
-			}
-			return Status.OK_STATUS;
-		}
-
-		private ISystemFilterReference findMatchingFilterReference(IAdaptable targetObj, IProgressMonitor monitor)
-		{
-			String remoteObjectName = getAbsolutePath(targetObj);
-	    	ISystemFilterPoolReferenceManager refmgr = _subSystem.getFilterPoolReferenceManager();
-	    	if (refmgr != null){
-			    ISystemFilterReference[] refs = refmgr.getSystemFilterReferences(_subSystem);
-			    for (int i = 0; i < refs.length; i++) {
-			        ISystemFilterReference ref = refs[i];
-
-			        if (doesFilterEncompass(ref.getReferencedFilter(), remoteObjectName)){
-			        	return ref;
-			        }
-			    }
-
-			    // not finding it..use registry to try this
-				ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry();
-				List matches = sr.findFilterReferencesFor(targetObj, _subSystem, false);
-				if (matches != null && matches.size() > 0){
-					return (ISystemFilterReference)matches.get(0);
-				}
-
-				// child may be deep in the tree and not directly under a filter
-				ISystemViewElementAdapter adapter = ShowInSystemsViewDelegate.getAdapter(targetObj);
-				Object parent = adapter.getParent(targetObj);
-				ISystemFilterReference filterRef = findMatchingFilterReference((IAdaptable)parent, monitor);
-			    if (filterRef != null){
-			    	return filterRef;
-			    }
-	    	}
-	    	return null;
-		}
-
-		private String getAbsolutePath(IAdaptable adaptable){
-			ISystemViewElementAdapter adapter = ShowInSystemsViewDelegate.getAdapter(adaptable);
-			return adapter.getAbsoluteName(adaptable);
-		}
-
-		private boolean doesFilterEncompass(ISystemFilter filter, String remoteObjectAbsoluteName)
-		{
-			boolean would = false;
-			String[] strings = filter.getFilterStrings();
-	    	if (strings != null){
-	      	  for (int idx=0; !would && (idx<strings.length); idx++)
-	    	  {
-	    	  	 if (strings[idx].equals("/*")) //$NON-NLS-1$
-	    	  	   would = true;
-	    	  	 else if (strings[idx].equals("./*")) //$NON-NLS-1$
-	    	  	 {
-	    	  		 // my home filter - will encompass iff remoteObjectAbsoluteName is within the home dir
-	    	  		 try
-	    	  		 {
-	    	  			 IAdaptable homeObj = (IAdaptable)_subSystem.getObjectWithAbsoluteName(".", new NullProgressMonitor()); //$NON-NLS-1$
-	    	  			 if (homeObj != null){
-	    	  				 String homePath = getAbsolutePath(homeObj);
-	    	  				 would = remoteObjectAbsoluteName.startsWith(homePath);
-	    	  			 }
-	    	  		 }
-	    	  		 catch (Exception e){
-	    	  		 }
-	    	  	 }
-	    	  	 else
-	    	       would = doesFilterStringEncompass(strings[idx], remoteObjectAbsoluteName);
-	    	  }
-	    	}
-
-	    	return would;
-		}
-
-		private boolean doesFilterStringEncompass(String filterString, String remoteObjectAbsoluteName)
-		{
-			return false;
-		}
-
-	}
-
-	/**
-	 * Job for doing a query on a container and then using Display.asyncExec() to reveal the results in the tree.
-	 */
-	private class LinkFromContainerJob extends Job
-	{
-		private ISubSystem _subSystem;
-		private IAdaptable _remoteContainer;
-		private IAdaptable _targetRemoteObj;
-		private ISystemTree _systemTree;
-		private ISystemFilterReference _filterRef;
-
-		public LinkFromContainerJob(IAdaptable remoteContainer, ISystemFilterReference filterRef, IAdaptable targetRemoteObj, ISystemTree systemTree) {
-
-			super(NLS.bind(CommonMessages.MSG_RESOLVE_PROGRESS, ShowInSystemsViewDelegate.getAdapter(remoteContainer).getAbsoluteName(targetRemoteObj)));
-
-			_remoteContainer = remoteContainer;
-			_subSystem = getSubSystem(remoteContainer);
-			_filterRef = filterRef; // used for context of query
-			_targetRemoteObj = targetRemoteObj;
-			_systemTree = systemTree;
-		}
-
-		private ISubSystem getSubSystem(IAdaptable adaptable)
-		{
-			ISystemViewElementAdapter adapter = (ISystemViewElementAdapter)adaptable.getAdapter(ISystemViewElementAdapter.class);
-			return adapter.getSubSystem(adaptable);
-		}
-
-		public IStatus run(IProgressMonitor monitor){
-			try
-			{
-				// get the adapter
-				ISystemViewElementAdapter adapter = (ISystemViewElementAdapter)_remoteContainer.getAdapter(ISystemViewElementAdapter.class);
-
-				// get the context
-				ContextObject contextObject = new ContextObject(_remoteContainer, _subSystem, _filterRef);
-
-				// get the children
-				Object[] children = adapter.getChildren(contextObject, monitor);
-
-				if (monitor.isCanceled()){
-					return Status.CANCEL_STATUS;
-				}
-
-				// put these items in the tree and look for remoteFile
-				// if we can't find the remote file under this filter, the ShowChildrenInTree will recurse
-				Display.getDefault().asyncExec(new ShowChildrenInTree(_remoteContainer, children, _filterRef, _systemTree, _targetRemoteObj));
-			}
-			catch (Exception e){
-			}
-			return Status.OK_STATUS;
-		}
-
-	}
-	private IAction _action;
-	protected Object _selectedObject;
-	private SystemViewPart _systemViewPart;
-
-	public void init(IViewPart view) {
-
-	}
-
-	public void run(IAction action) {
-		SystemViewPart viewPart = activateSystemView();
-		SystemView systemTree = viewPart.getSystemView();
-
-		// now we've got to show the object in this view part
-		TreeItem item = (TreeItem)systemTree.findFirstRemoteItemReference(_selectedObject, null);
-		if (item != null){
-			systemTree.getTree().setSelection(item);
-		}
-		else if (_selectedObject instanceof IAdaptable)
-		{
-			ISystemViewElementAdapter adapter = getAdapter((IAdaptable)_selectedObject);
-			if (adapter != null){
-				ISubSystem subSystem = adapter.getSubSystem(_selectedObject);
-				if (subSystem.getSubSystemConfiguration().supportsFilters()){
-					// no match, so we will expand from filter
-					// query matching filter in  a job (to avoid main thread)
-					LinkFromFilterJob job = new LinkFromFilterJob((IAdaptable)_selectedObject, systemTree);
-					job.schedule();
-				}
-				else {
-					// no filters so need to directly check children
-					Object[] children = subSystem.getChildren();
-
-					// put these items in the tree and look for remote object
-					// if we can't find the remote object under this, the ShowChildrenInTree will recurse
-					Display.getDefault().asyncExec(new ShowChildrenInTree(subSystem, children, null, systemTree, (IAdaptable)_selectedObject));
-				}
-			}
-		}
-	}
-
-
-	public SystemViewPart activateSystemView(){
-        try
-        {
-        	IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-             _systemViewPart = (SystemViewPart) page.showView(SystemViewPart.ID);
-            page.bringToTop(_systemViewPart);
-        }
-        catch (PartInitException e)
-        {
-        	e.printStackTrace();
-           	SystemBasePlugin.logError("Can not open system view part", e); //$NON-NLS-1$
-        }
-
-        return _systemViewPart;
-    }
-
-	public void selectionChanged(IAction action, ISelection selection) {
-		if (_action == null) {
-			_action= action;
-		}
-		IStructuredSelection sel = (IStructuredSelection)selection;
-		if (sel.size() == 1){
-			_action.setEnabled(true);
-			_selectedObject = sel.getFirstElement();
-		}
-		else {
-			_action.setEnabled(false);
-		}
-	}
-
-	public static ISystemViewElementAdapter getAdapter(IAdaptable adaptable)
-	{
-		return (ISystemViewElementAdapter)adaptable.getAdapter(ISystemViewElementAdapter.class);
-	}
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCascadingBrowseWithAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCascadingBrowseWithAction.java
deleted file mode 100644
index 64bab9041..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCascadingBrowseWithAction.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2007 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.ui.ISystemContextMenuConstants;
-import org.eclipse.rse.ui.actions.SystemBaseSubMenuAction;
-
-
-/**
- * A cascading menu action for "Browse With->"
- */
-public class SystemCascadingBrowseWithAction extends SystemBaseSubMenuAction 
-{
-	
-	/**
-	 * Constructor 
-	 */
-	public SystemCascadingBrowseWithAction()
-	{
-		super(SystemResources.ACTION_CASCADING_BROWSEWITH_LABEL,SystemResources.ACTION_CASCADING_BROWSEWITH_TOOLTIP, null);
-		setMenuID(ISystemContextMenuConstants.MENU_BROWSEWITH);
-        setCreateMenuEachTime(false);
-        setPopulateMenuEachTime(true);
-	}
-
-	/**
-	 * @see SystemBaseSubMenuAction#getSubMenu()
-	 */
-	public IMenuManager populateSubMenu(IMenuManager menu)
-	{
-		// we don't populate it. SystemView populates it by calling each adapter and letting them populate it.
-		return menu;
-	}
-
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCascadingCompareWithAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCascadingCompareWithAction.java
deleted file mode 100644
index 06257afb8..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCascadingCompareWithAction.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2007 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.ui.ISystemContextMenuConstants;
-import org.eclipse.rse.ui.actions.SystemBaseSubMenuAction;
-
-
-/**
- * A cascading menu action for "Compare With->"
- */
-public class SystemCascadingCompareWithAction extends SystemBaseSubMenuAction 
-{
-	
-	/**
-	 * Constructor 
-	 */
-	public SystemCascadingCompareWithAction()
-	{
-		super(SystemResources.ACTION_CASCADING_COMPAREWITH_LABEL, SystemResources.ACTION_CASCADING_COMPAREWITH_TOOLTIP, null);
-		setMenuID(ISystemContextMenuConstants.MENU_COMPAREWITH);
-        setCreateMenuEachTime(false);
-        setPopulateMenuEachTime(true);
-	} 
-
-	/**
-	 * @see SystemBaseSubMenuAction#getSubMenu()
-	 */
-	public IMenuManager populateSubMenu(IMenuManager menu)
-	{
-		// we don't populate it. SystemView populates it by calling each adapter and letting them populate it.
-		return menu;
-	}
-
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCascadingExpandToAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCascadingExpandToAction.java
deleted file mode 100644
index 32289f390..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCascadingExpandToAction.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2007 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.ui.ISystemContextMenuConstants;
-import org.eclipse.rse.ui.actions.SystemBaseSubMenuAction;
-
-
-/**
- * A cascading menu action for "Expand To->"
- */
-public class SystemCascadingExpandToAction extends SystemBaseSubMenuAction 
-{
-	
-	/**
-	 * Constructor 
-	 */
-	public SystemCascadingExpandToAction()
-	{
-		super(SystemResources.ACTION_CASCADING_EXPAND_TO_LABEL, SystemResources.ACTION_CASCADING_EXPAND_TO_TOOLTIP, null);
-		setMenuID(ISystemContextMenuConstants.MENU_EXPANDTO);
-        setCreateMenuEachTime(false);
-        setPopulateMenuEachTime(true);
-	}
-
-	/**
-	 * @see SystemBaseSubMenuAction#getSubMenu()
-	 */
-	public IMenuManager populateSubMenu(IMenuManager menu)
-	{
-		// we don't populate it. SystemView populates it by calling each adapter and letting them populate it.
-		return menu;
-	}
-
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCascadingGoToAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCascadingGoToAction.java
deleted file mode 100644
index 1d1cf45be..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCascadingGoToAction.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2008 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * David Dykstal (IBM) - [232355] Go To menu item missing
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.internal.ui.view.SystemViewPart;
-import org.eclipse.rse.ui.ISystemContextMenuConstants;
-import org.eclipse.rse.ui.actions.SystemBaseSubMenuAction;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.views.framelist.BackAction;
-import org.eclipse.ui.views.framelist.ForwardAction;
-import org.eclipse.ui.views.framelist.FrameList;
-import org.eclipse.ui.views.framelist.UpAction;
-
-
-/**
- * A cascading menu action for "Go To->"
- */
-public class SystemCascadingGoToAction extends SystemBaseSubMenuAction
-{
-	//private IAdaptable pageInput;
-	//private IMenuManager parentMenuManager;
-	private boolean actionsMade = false;
-
-	private SystemViewPart fSystemViewPart;
-	private BackAction backAction;
-	private ForwardAction forwardAction;
-	private UpAction upAction;
-
-
-	/**
-	 * Constructor
-	 */
-	public SystemCascadingGoToAction(Shell shell, SystemViewPart systemViewPart)
-	{
-		super(SystemResources.ACTION_CASCADING_GOTO_LABEL, SystemResources.ACTION_CASCADING_GOTO_TOOLTIP, shell);
-		setMenuID(ISystemContextMenuConstants.MENU_GOTO);
-		this.fSystemViewPart = systemViewPart;
-		// something in ganymede m7 causes the actions of this menu to be lost, therefore must re-create each time
-		// FIXME this looks like a hack
-        setCreateMenuEachTime(true);
-        setPopulateMenuEachTime(true);
-	    allowOnMultipleSelection(false);
-	    setContextMenuGroup(ISystemContextMenuConstants.GROUP_GOTO);
-	}
-
-	/**
-	 * @see SystemBaseSubMenuAction#getSubMenu()
-	 */
-	public IMenuManager populateSubMenu(IMenuManager gotoMenu)
-	{
-		if (!actionsMade)
-		  makeActions();
-		gotoMenu.add(backAction);
-		gotoMenu.add(forwardAction);
-		gotoMenu.add(upAction);
-		return gotoMenu;
-	}
-
-	protected void makeActions()
-	{
-		FrameList frameList = fSystemViewPart.getFrameList();
-		backAction = new BackAction(frameList);
-		forwardAction = new ForwardAction(frameList);
-		upAction = new UpAction(frameList);
-
-		actionsMade = true;
-	}
-
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCascadingNewAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCascadingNewAction.java
deleted file mode 100644
index 64ee8a336..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCascadingNewAction.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2007 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.ui.ISystemContextMenuConstants;
-import org.eclipse.rse.ui.actions.SystemBaseSubMenuAction;
-
-
-/**
- * A cascading menu action for "New->"
- */
-public class SystemCascadingNewAction extends SystemBaseSubMenuAction 
-{
-	
-	/**
-	 * Constructor for SystemCascadingNewAction
-	 */
-	public SystemCascadingNewAction()
-	{
-		super(SystemResources.ACTION_CASCADING_NEW_LABEL, SystemResources.ACTION_CASCADING_NEW_TOOLTIP, null);
-		setMenuID(ISystemContextMenuConstants.MENU_NEW);
-        setCreateMenuEachTime(false);
-        setPopulateMenuEachTime(true);
-	}
-
-	/**
-	 * @see SystemBaseSubMenuAction#getSubMenu()
-	 */
-	public IMenuManager populateSubMenu(IMenuManager menu)
-	{
-		// we don't populate it. SystemView populates it by calling each adapter and letting them populate it.
-		return menu;
-	}
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCascadingOpenWithAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCascadingOpenWithAction.java
deleted file mode 100644
index c448b530b..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCascadingOpenWithAction.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2007 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.ui.ISystemContextMenuConstants;
-import org.eclipse.rse.ui.actions.SystemBaseSubMenuAction;
-
-
-/**
- * A cascading menu action for "Open With->"
- */
-public class SystemCascadingOpenWithAction extends SystemBaseSubMenuAction 
-{
-	
-	/**
-	 * Constructor 
-	 */
-	public SystemCascadingOpenWithAction()
-	{
-		super(SystemResources.ACTION_CASCADING_OPENWITH_LABEL, SystemResources.ACTION_CASCADING_OPENWITH_TOOLTIP, null);
-		setMenuID(ISystemContextMenuConstants.MENU_OPENWITH);
-        setCreateMenuEachTime(false);
-        setPopulateMenuEachTime(true);
-	}
-
-	/**
-	 * @see SystemBaseSubMenuAction#getSubMenu()
-	 */
-	public IMenuManager populateSubMenu(IMenuManager menu)
-	{
-		// we don't populate it. SystemView populates it by calling each adapter and letting them populate it.
-		return menu;
-	}
-
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCascadingPulldownMenuAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCascadingPulldownMenuAction.java
deleted file mode 100644
index cf5ed59b1..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCascadingPulldownMenuAction.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2007 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-import org.eclipse.jface.action.IMenuCreator;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.internal.ui.view.SystemViewPart;
-import org.eclipse.rse.ui.ISystemIconConstants;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.actions.SystemBaseSubMenuAction;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * A cascading menu action for a toolbar, emulating the pulldown menu view parts have.
- */
-public class SystemCascadingPulldownMenuAction 
-       extends SystemBaseSubMenuAction 
-       implements  IMenuListener, IMenuCreator
-{
-	
-	private SystemSubMenuManager dropDownMenuMgr;
-	private ISelectionProvider sp = null;
-		
-	/**
-	 * Constructor 
-	 */
-	public SystemCascadingPulldownMenuAction(Shell shell, ISelectionProvider selectionProviderForToolbarActions)
-	{
-		super(SystemResources.ACTION_CASCADING_PULLDOWN_LABEL, SystemResources.ACTION_CASCADING_PULLDOWN_TOOLTIP, 
-		      RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_PROFILE_ID),shell);
- 	    sp = selectionProviderForToolbarActions;
-        setCreateMenuEachTime(false);
-        setPopulateMenuEachTime(false);
- 	    setMenuCreator(this); // this IAction method tells JFace this is a dropdown menu
-	}
-
-	/**
-	 * @see SystemBaseSubMenuAction#getSubMenu()
-	 */
-	public IMenuManager populateSubMenu(IMenuManager menu)
-	{
-		menu.addMenuListener(this);
-		menu.setRemoveAllWhenShown(false);
-		boolean showConnectionActions = true;
-        SystemViewPart.populateSystemViewPulldownMenu(menu, getShell(), showConnectionActions, null, sp);		
-        return menu;
-	}
-
-	/**
-	 * Called when submenu is about to show
-	 */
-	public void menuAboutToShow(IMenuManager ourSubMenu)
-	{
-	}
-
-    //------------------------
-    // IMenuCreator methods...
-    //------------------------
-    /**
-     * dispose method comment.
-     */
-    public void dispose() 
-    {
-    	if (dropDownMenuMgr != null) 
-    	{
-    		dropDownMenuMgr.dispose();
-    		dropDownMenuMgr = null;
-    	}
-    }
-    /**
-     * getMenu method comment.
-     */
-    public Menu getMenu(Control parent) 
-    {
-    	if (dropDownMenuMgr == null) 
-    	{
-    		//dropDownMenuMgr = new MenuManager();
-    		dropDownMenuMgr = (SystemSubMenuManager)getSubMenu();
-    	}
-    	return dropDownMenuMgr.createContextMenu(parent);
-    }
-    public Menu getMenu(Menu parent) 
-    {
-        //System.out.println("In SystemCascadingPulldownMenuAction#getMenu(Menu)");	
-    	return null;
-    }    
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCascadingRemoteServerBaseAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCascadingRemoteServerBaseAction.java
deleted file mode 100644
index 77d96f92c..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCascadingRemoteServerBaseAction.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2007 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.ui.actions.SystemBaseSubMenuAction;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * This is the base class for actions that populate the "Remote Servers" cascading
- *  menu.  The actions in this menu cascade again, into Start and Stop actions. 
- *  These cascading actions are handling automatically by this base class, but when
- *  they are run, they call back into abstract methods in this base class, to 
- *  actually start and stop the remote server/daemon.
- * 
- */
-public abstract class SystemCascadingRemoteServerBaseAction extends SystemBaseSubMenuAction implements  IMenuListener
-{
-	private SystemRemoteServerStartAction startAction;
-	private SystemRemoteServerStopAction  stopAction;
-
-	/**
-	 * Constructor 
-	 * @deprecated
-	 */
-	public SystemCascadingRemoteServerBaseAction(String label, String tooltip, Shell shell)
-	{
-		super(label, tooltip, shell);
-        setCreateMenuEachTime(false);
-        setPopulateMenuEachTime(false);
-	}
-
-	/**
-	 * Populate the submenu for this action. Here is where we add the start and stop actions.
-	 */
-	public IMenuManager populateSubMenu(IMenuManager menu)
-	{
-		startAction = new SystemRemoteServerStartAction(getShell(), this);
-		stopAction = new SystemRemoteServerStopAction(getShell(), this);
-		startAction.setHelp(getHelpContextId());
-		stopAction.setHelp(getHelpContextId());
-		menu.add(startAction);
-		menu.add(stopAction);		
-		menu.addMenuListener(this); // we want to know when menu is about to be shown.
-		//System.out.println("in populateSubMenu in "+getClass().getName());
-		return menu;
-	}
-
-	/**
-	 * Called when submenu is about to show.
-	 * We use this to decide whether to enable/disable the start and stop actions underneath.
-	 */
-	public void menuAboutToShow(IMenuManager subMenu)
-	{
-		//System.out.println("menuAboutToShow");
-		/*
-		IStructuredSelection selection = getSelection();
-		if( selection == null )
-		{
-			subMenu.add(new SystemBaseAction("Programming error. Selection is null! ", null));
-			return;
-		} // end if(nothing is selected)
-		*/
-		if (!isEnabled())
-		{
-			startAction.setEnabled(false);
-			stopAction.setEnabled(false);
-		}
-		else if (canDetectServerState())
-		{
-			//System.out.println("in action itself. getSystemConnection() = "+getSystemConnection());
-			boolean started = isServerStarted(getSystemConnection());
-			//System.out.println("... started? "+started);
-			startAction.setEnabled(started);
-			stopAction.setEnabled(!started);
-		}		
-	}
-	/**
-	 * This method is an opportunity to decide whether to enable this action or not. 
-	 * Sometimes we can determine if the connection is connected or not, in which case
-	 * we want to disable this action if the connection is not connected.
-	 */
-	protected boolean shouldEnable(IHost connection)
-	{
-		return true;
-	}
-
-	/**
-	 * Overridable method to tell the base code if you are able to determine dynamically if 
-	 * the server is currently running or not. The default is true, and so {@link #isStarted(IHost)} is 
-	 * called to determine enablement state of the cascading start and stop actions. If you
-	 * cannot determine this, override this method and return false, and both start and stop
-	 * will be enabled always. 
-	 * @return true if you have the capability of dynamically determining if this server is running.
-	 */
-	protected boolean canDetectServerState()
-	{
-		return true;
-	}
-	
-	/**
-	 * Overridable method to compute if this remote server/daemon is currently running or not.
-	 * This decides the enablement of the start and stop actions underneath. If there is no way
-	 * to determine this, return false from {@link #canDetectServerState()}, and ignore this method.  
-	 * @return true if the server is currently running or not.
-	 */
-	protected abstract boolean isServerStarted(IHost connection);
-	
-	/**
-	 * Callback from the {@link org.eclipse.rse.internal.ui.actions.SystemRemoteServerStartAction} class
-	 *  that is called when the user selects to start this remote server/daemon.
-	 * @return true if the remote server was successfully started, false if not.
-	 */
-	public abstract boolean startServer();
-
-	/**
-	 * Callback from the {@link org.eclipse.rse.internal.ui.actions.SystemRemoteServerStartAction} class
-	 *  that is called when the user selects to stop this remote server/daemon.
-	 * @return true if the remote server was successfully stopped, false if not.
-	 */
-	public abstract boolean stopServer();
-	
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCascadingRemoteServersAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCascadingRemoteServersAction.java
deleted file mode 100644
index f33fd03bb..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCascadingRemoteServersAction.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2007 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.core.subsystems.ISubSystem;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.ui.ISystemContextMenuConstants;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.actions.SystemBaseAction;
-import org.eclipse.rse.ui.actions.SystemBaseSubMenuAction;
-
-
-/**
- * A cascading menu action for "Remote Servers->". The actions contributed to the
- *  menu must implement the ISystemRemoteServerAction interface.
- * @see org.eclipse.rse.ui.actions.ISystemRemoteServerAction
- */
-public class SystemCascadingRemoteServersAction extends SystemBaseSubMenuAction implements  IMenuListener
-{
-	
-	/**
-	 * Constructor 
-	 */
-	public SystemCascadingRemoteServersAction()
-	{
-		super(SystemResources.ACTION_CASCADING_REMOTESERVERS_LABEL, SystemResources.ACTION_CASCADING_REMOTESERVERS_TOOLTIP, null);
-		setMenuID(ISystemContextMenuConstants.MENU_STARTSERVER);
-        setCreateMenuEachTime(false);
-        setPopulateMenuEachTime(false);
-        setHelp(RSEUIPlugin.HELPPREFIX+"actnsrsv"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @see SystemBaseSubMenuAction#getSubMenu()
-	 */
-	public IMenuManager populateSubMenu(IMenuManager menu)
-	{
-		// we don't populate it. SystemView populates it by calling each adapter and letting them populate it.
-		menu.addMenuListener(this);
-		//System.out.println("in populateSubMenu");
-		return menu;
-	}
-
-	/**
-	 * Called when submenu is about to show
-	 */
-	public void menuAboutToShow(IMenuManager subMenu)
-	{
-		//System.out.println("menuAboutToShow");
-		IStructuredSelection selection = getSelection();
-		if( selection == null )
-		{
-			subMenu.add(new SystemBaseAction("Programming error. Selection is null! ", null)); //$NON-NLS-1$
-			return;
-		} // end if(nothing is selected)
-		Object firstSelection = selection.getFirstElement();
-		IHost conn = null;
-		if (firstSelection instanceof IHost)
-			conn = (IHost)firstSelection;
-		else if (firstSelection instanceof ISubSystem)
-			conn = ((ISubSystem)firstSelection).getHost();
-		
-		// decide whether or not to enable/disable each entry, by letting it decide...
-		IAction[] actions = getActions();
-		//System.out.println("...how many actions? "+actions.length);		
-		//System.out.println("...connection null ? "+(conn==null));
-		for (int idx=0; idx<actions.length; idx++)
-		{
-			if (actions[idx] instanceof SystemCascadingRemoteServerBaseAction)
-			{
-				if (conn != null)
-				{
-				SystemCascadingRemoteServerBaseAction action = (SystemCascadingRemoteServerBaseAction)actions[idx];
-				action.setHost(conn);
-				if (conn.isOffline())
-					action.setEnabled(false);
-				else
-				 	action.setEnabled(action.shouldEnable(conn));
-				}
-			}
-		}
-	}
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCascadingReplaceWithAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCascadingReplaceWithAction.java
deleted file mode 100644
index c86c0ba0e..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCascadingReplaceWithAction.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2007 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.ui.ISystemContextMenuConstants;
-import org.eclipse.rse.ui.actions.SystemBaseSubMenuAction;
-
-
-/**
- * A cascading menu action for "Replace With->"
- */
-public class SystemCascadingReplaceWithAction extends SystemBaseSubMenuAction 
-{
-	
-	/**
-	 * Constructor 
-	 */
-	public SystemCascadingReplaceWithAction()
-	{
-		super(SystemResources.ACTION_CASCADING_REPLACEWITH_LABEL, SystemResources.ACTION_CASCADING_REPLACEWITH_TOOLTIP, null);
-		setMenuID(ISystemContextMenuConstants.MENU_REPLACEWITH);
-        setCreateMenuEachTime(false);
-        setPopulateMenuEachTime(true);
-	} 
-
-	/**
-	 * @see SystemBaseSubMenuAction#getSubMenu()
-	 */
-	public IMenuManager populateSubMenu(IMenuManager menu)
-	{
-		// we don't populate it. SystemView populates it by calling each adapter and letting them populate it.
-		return menu;
-	}
-
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCascadingViewAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCascadingViewAction.java
deleted file mode 100644
index 811808306..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCascadingViewAction.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2007 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.ui.actions.SystemBaseSubMenuAction;
-
-
-
-/**
- * A cascading menu action for "View->"
- */
-public class SystemCascadingViewAction extends SystemBaseSubMenuAction 
-{
-	
-	/**
-	 * Constructor 
-	 */
-	public SystemCascadingViewAction()
-	{
-		super(SystemResources.ACTION_CASCADING_VIEW_LABEL, SystemResources.ACTION_CASCADING_VIEW_TOOLTIP, null);
-        setCreateMenuEachTime(false);
-        setPopulateMenuEachTime(true);
-	}
-
-	/**
-	 * @see SystemBaseSubMenuAction#getSubMenu()
-	 */
-	public IMenuManager populateSubMenu(IMenuManager menu)
-	{
-		// we don't populate it. SystemView populates it by calling each adapter and letting them populate it.
-		return menu;
-	}
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCascadingWorkWithAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCascadingWorkWithAction.java
deleted file mode 100644
index 055be4ccf..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCascadingWorkWithAction.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2007 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.ui.ISystemContextMenuConstants;
-import org.eclipse.rse.ui.actions.SystemBaseSubMenuAction;
-
-
-/**
- * A cascading menu action for "Work With->"
- */
-public class SystemCascadingWorkWithAction extends SystemBaseSubMenuAction 
-{
-	
-	/**
-	 * Constructor 
-	 */
-	public SystemCascadingWorkWithAction()
-	{
-		super(SystemResources.ACTION_CASCADING_WORKWITH_LABEL, SystemResources.ACTION_CASCADING_WORKWITH_TOOLTIP, null);
-		setMenuID(ISystemContextMenuConstants.MENU_WORKWITH);
-        setCreateMenuEachTime(false);
-        setPopulateMenuEachTime(true);
-	}
-
-	/**
-	 * @see SystemBaseSubMenuAction#getSubMenu()
-	 */
-	public IMenuManager populateSubMenu(IMenuManager menu)
-	{
-		// we don't populate it. SystemView populates it by calling each adapter and letting them populate it.
-		return menu;
-	}
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemChangeFilterActionCopyString.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemChangeFilterActionCopyString.java
deleted file mode 100644
index c7f5da339..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemChangeFilterActionCopyString.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2007 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.ui.ISystemContextMenuConstants;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.actions.SystemBaseAction;
-import org.eclipse.rse.ui.filters.SystemChangeFilterPane;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-
-
-
-/**
- * The action is used within the Change Filter dialog, in the context menu of the selected filter string.
- * It is used to copy the selected filter string to the clipboard for subsequent paste.
- */
-public class SystemChangeFilterActionCopyString extends SystemBaseAction 
-                                 
-{
-	private SystemChangeFilterPane parentDialog;
-	
-	/**
-	 * Constructor 
-	 */
-	public SystemChangeFilterActionCopyString(SystemChangeFilterPane parentDialog) 
-	{
-		super(SystemResources.ACTION_COPY_FILTERSTRING_LABEL,SystemResources.ACTION_COPY_FILTERSTRING_TOOLTIP,
-			  PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_TOOL_COPY),
-		      null);
-        allowOnMultipleSelection(false);
-        this.parentDialog = parentDialog;
-		setContextMenuGroup(ISystemContextMenuConstants.GROUP_REORGANIZE);  
-		setHelp(RSEUIPlugin.HELPPREFIX+"dufr2000");       //$NON-NLS-1$
-	}
-
-	/**
-	 * We override from parent to do unique checking.
-	 * We intercept to ensure this is isn't the "new" filter string
-	 */
-	public boolean updateSelection(IStructuredSelection selection)
-	{
-		return parentDialog.canCopy();
-	}
-
-	/**
-	 * This is the method called when the user selects this action.
-	 */
-	public void run() 
-	{
-		parentDialog.doCopy();
-	}		
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemChangeFilterActionDeleteString.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemChangeFilterActionDeleteString.java
deleted file mode 100644
index 0f3388eb5..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemChangeFilterActionDeleteString.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.ui.ISystemContextMenuConstants;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.actions.SystemBaseAction;
-import org.eclipse.rse.ui.filters.SystemChangeFilterPane;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-
-
-/**
- * The action is used within the Change Filter dialog, in the context menu of the selected filter string.
- * It is used to delete the selected filter string
- */
-public class SystemChangeFilterActionDeleteString extends SystemBaseAction 
-                                 
-{
-
-	private SystemChangeFilterPane parentDialog;
-	
-	/**
-	 * Constructor 
-	 */
-	public SystemChangeFilterActionDeleteString(SystemChangeFilterPane parentDialog) 
-	{
-		super(SystemResources.ACTION_DELETE_LABEL,SystemResources.ACTION_DELETE_TOOLTIP,
-			  PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_TOOL_DELETE)
-		      ,null);
-        allowOnMultipleSelection(false);
-        this.parentDialog = parentDialog;
-		setContextMenuGroup(ISystemContextMenuConstants.GROUP_REORGANIZE);  
-		setHelp(RSEUIPlugin.HELPPREFIX+"dufr1000");       //$NON-NLS-1$
-	}
-
-	/**
-	 * We override from parent to do unique checking.
-	 * We intercept to ensure this is isn't the "new" filter string
-	 */
-	public boolean updateSelection(IStructuredSelection selection)
-	{
-		return parentDialog.canDelete();
-	}
-
-	/**
-	 * This is the method called when the user selects this action.
-	 */
-	public void run() 
-	{
-		parentDialog.doDelete();
-	}		
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemChangeFilterActionMoveStringDown.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemChangeFilterActionMoveStringDown.java
deleted file mode 100644
index 2fe9949c7..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemChangeFilterActionMoveStringDown.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.ui.ISystemContextMenuConstants;
-import org.eclipse.rse.ui.ISystemIconConstants;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.actions.SystemBaseAction;
-import org.eclipse.rse.ui.filters.SystemChangeFilterPane;
-
-
-/**
- * The action is used within the Change Filter dialog, in the context menu of the selected filter string.
- * It is used to move the selected filter string up by one in the list
- */
-public class SystemChangeFilterActionMoveStringDown extends SystemBaseAction                                  
-{
-
-	private SystemChangeFilterPane parentDialog;
-	
-	/**
-	 * Constructor
-	 */
-	public SystemChangeFilterActionMoveStringDown(SystemChangeFilterPane parentDialog) 
-	{
-		super(SystemResources.ACTION_MOVEDOWN_LABEL,SystemResources.ACTION_MOVEDOWN_TOOLTIP,
-		      RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_MOVEDOWN_ID),
-		      null);
-        allowOnMultipleSelection(false);
-        this.parentDialog = parentDialog;
-		setContextMenuGroup(ISystemContextMenuConstants.GROUP_REORDER);  
-		setHelp(RSEUIPlugin.HELPPREFIX+"dufr5000");       //$NON-NLS-1$
-	}
-
-	/**
-	 * We override from parent to do unique checking.
-	 * We intercept to ensure this is isn't the last filter string in the list
-	 */
-	public boolean updateSelection(IStructuredSelection selection)
-	{
-		return parentDialog.canMoveDown();
-	}
-
-	/**
-	 * This is the method called when the user selects this action.
-	 */
-	public void run() 
-	{
-		parentDialog.doMoveDown();
-	}		
-		
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemChangeFilterActionMoveStringUp.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemChangeFilterActionMoveStringUp.java
deleted file mode 100644
index 4de0e8ebf..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemChangeFilterActionMoveStringUp.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.ui.ISystemContextMenuConstants;
-import org.eclipse.rse.ui.ISystemIconConstants;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.actions.SystemBaseAction;
-import org.eclipse.rse.ui.filters.SystemChangeFilterPane;
-
-
-/**
- * The action is used within the Change Filter dialog, in the context menu of the selected filter string.
- * It is used to move the selected filter string down by one in the list
- */
-public class SystemChangeFilterActionMoveStringUp extends SystemBaseAction                                  
-{
-
-	private SystemChangeFilterPane parentDialog;
-	
-	/**
-	 * Constructor 
-	 */
-	public SystemChangeFilterActionMoveStringUp(SystemChangeFilterPane parentDialog) 
-	{
-		super(SystemResources.ACTION_MOVEUP_LABEL,SystemResources.ACTION_MOVEUP_TOOLTIP,
-		      RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_MOVEUP_ID),
-		      null);
-        allowOnMultipleSelection(false);
-        this.parentDialog = parentDialog;
-		setContextMenuGroup(ISystemContextMenuConstants.GROUP_REORDER);  
-		setHelp(RSEUIPlugin.HELPPREFIX+"dufr4000");       //$NON-NLS-1$
-	}
-
-	/**
-	 * We override from parent to do unique checking.
-	 * We intercept to ensure this is isn't the fist filter string
-	 */
-	public boolean updateSelection(IStructuredSelection selection)
-	{
-		return parentDialog.canMoveUp();
-	}
-
-	/**
-	 * This is the method called when the user selects this action.
-	 */
-	public void run() 
-	{
-		parentDialog.doMoveUp();
-	}		
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemChangeFilterActionPasteString.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemChangeFilterActionPasteString.java
deleted file mode 100644
index ccf81688f..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemChangeFilterActionPasteString.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.ui.ISystemContextMenuConstants;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.actions.SystemBaseAction;
-import org.eclipse.rse.ui.filters.SystemChangeFilterPane;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-
-
-/**
- * The action is used within the Change Filter dialog, in the context menu of the selected filter string.
- * It is used to paste the copied filter string from the clipboard to the list.
- */
-public class SystemChangeFilterActionPasteString extends SystemBaseAction                                  
-{
-	private SystemChangeFilterPane parentDialog;
-	
-	/**
-	 * Constructor 
-	 */
-	public SystemChangeFilterActionPasteString(SystemChangeFilterPane parentDialog) 
-	{
-		super(SystemResources.ACTION_PASTE_LABEL,SystemResources.ACTION_PASTE_TOOLTIP,
-			  PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_TOOL_PASTE),
-		      null);
-        allowOnMultipleSelection(false);
-        this.parentDialog = parentDialog;
-		setContextMenuGroup(ISystemContextMenuConstants.GROUP_REORGANIZE);  
-		setHelp(RSEUIPlugin.HELPPREFIX+"dufr3000");       //$NON-NLS-1$
-	}
-
-	/**
-	 * We override from parent to do unique checking.
-	 * We intercept to ensure there is something in the clipboard to copy
-	 */
-	public boolean updateSelection(IStructuredSelection selection)
-	{
-		return parentDialog.canPaste();
-	}
-
-	/**
-	 * This is the method called when the user selects this action.
-	 */
-	public void run() 
-	{
-		parentDialog.doPaste();
-	}		
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemClearAllPasswordsAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemClearAllPasswordsAction.java
deleted file mode 100644
index d93d4985a..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemClearAllPasswordsAction.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 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
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core
- * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
- ********************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-
-
-import org.eclipse.rse.core.RSECorePlugin;
-import org.eclipse.rse.core.events.ISystemResourceChangeEvents;
-import org.eclipse.rse.core.events.SystemResourceChangeEvent;
-import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.core.subsystems.IConnectorService;
-import org.eclipse.rse.core.subsystems.ISubSystem;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.ui.ISystemContextMenuConstants;
-import org.eclipse.rse.ui.actions.SystemBaseAction;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * Action to clear cached passwords for all subsystems in a connection.
- */
-public class SystemClearAllPasswordsAction extends SystemBaseAction {
-
-	/**
-	 * Constructor.
-	 * @param shell the parent shell.
-	 */
-	public SystemClearAllPasswordsAction(Shell shell) {
-	    super(SystemResources.ACTION_CLEARPASSWORD_ALL_LABEL, SystemResources.ACTION_CLEARPASSWORD_ALL_TOOLTIP, shell);
-	    allowOnMultipleSelection(false);
-	    setContextMenuGroup(ISystemContextMenuConstants.GROUP_CONNECTION);
-	}
-
-    /**
-     * @see org.eclipse.rse.ui.actions.SystemBaseAction#checkObjectType(java.lang.Object)
-     */
-    public boolean checkObjectType(Object selectedObject) {
-        
-		if (!(selectedObject instanceof IHost)) {
-		    return false;
-		}
-		else {
-		    
-	        IHost conn = (IHost)selectedObject;
-
-	        ISubSystem[] subsystems = conn.getSubSystems();      
-            
-            boolean anyOk = false;
-	        
-	        for (int i = 0; i < subsystems.length; i++) {
-	            
-	            ISubSystem subsystem = subsystems[i];
-	            IConnectorService system = subsystem.getConnectorService();
-	            
-	            anyOk = !system.isConnected() && system.hasPassword(true);
-	            
-	            if (anyOk) 
-	            {
-	                return true;
-	            }
-	        }
-	        
-	        return anyOk;
-		}
-    }
-    
-    /**
-     * @see org.eclipse.jface.action.IAction#run()
-     */
-    public void run() {
-        
-        IHost conn = (IHost)getFirstSelection();
-        
-        ISubSystem[] subsystems = conn.getSubSystems();
-        
-        for (int i = 0; i < subsystems.length; i++) 
-        {
-            ISubSystem ss = subsystems[i];
-        	try 
-        	{
-    			IConnectorService system = ss.getConnectorService();
-    		
-    			if (system.hasPassword(false) || system.hasPassword(true))
-    			{
-	    			// get the user id
-	    			
-	    			// clear userid/password from memory and fire event
-	    			//DKM and disk now
-	    			system.clearPassword(true, true);
-	    			RSECorePlugin.getTheSystemRegistry().fireEvent(new SystemResourceChangeEvent(ss, 
-	    					ISystemResourceChangeEvents.EVENT_PROPERTY_CHANGE, 
-	    					ss.getHost()));
-    			}
-
-    		}
-    		catch (Exception exc) 
-    		{
-    			// msg already shown
-    		}
-        }
-    }
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemClearPasswordAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemClearPasswordAction.java
deleted file mode 100644
index 35a96bcbb..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemClearPasswordAction.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2007 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
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core
- * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
- ********************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-
-import org.eclipse.rse.core.RSECorePlugin;
-import org.eclipse.rse.core.events.ISystemResourceChangeEvents;
-import org.eclipse.rse.core.events.SystemResourceChangeEvent;
-import org.eclipse.rse.core.subsystems.IConnectorService;
-import org.eclipse.rse.core.subsystems.ISubSystem;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.ui.ISystemContextMenuConstants;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.actions.SystemBaseAction;
-import org.eclipse.swt.widgets.Shell;
-
-
-
-/**
- * This is the action for clearing in-memory userId and password cache 
- */
-public class SystemClearPasswordAction extends SystemBaseAction
-{
-	
-	/**
-	 * Constructor.
-	 * @param shell  Shell of parent window, used as the parent for the dialog.
-	 *               Can be null, but be sure to call setParent before the action is used (ie, run).
-	 */
-	public SystemClearPasswordAction(Shell shell) 
-	{
-		super(SystemResources.ACTION_CLEARPASSWORD_LABEL, SystemResources.ACTION_CLEARPASSWORD_TOOLTIP, shell);
-		allowOnMultipleSelection(false);
-		setContextMenuGroup(ISystemContextMenuConstants.GROUP_CONNECTION);
-		setHelp(RSEUIPlugin.HELPPREFIX+"actn0049"); //$NON-NLS-1$
-	}
-	
-	/**
-	 * Override of parent. 
-	 * Called when testing if an action should be enabled based on the current selection.
-	 * The clear password action can be enabled if the selected object is a subsystem
-	 * that is not connected and has a password that is saved.
-	 * @return true if the clear password action can be enabled.
-	 */
-	public boolean checkObjectType(Object obj) {
-		boolean result = false;
-		if (obj instanceof ISubSystem) {
-			ISubSystem subsystem = (ISubSystem) obj;
-			IConnectorService cs = subsystem.getConnectorService();
-			result = !cs.isConnected() && cs.hasPassword(true);
-		}
-		return result;
-	}
-	
-	/**
-	 * Called when this action is selection from the popup menu.
-	 */
-	public void run()
-	{
-		ISubSystem ss = (ISubSystem)getFirstSelection();
-		try {
-			IConnectorService system = ss.getConnectorService();
-			system.clearPassword(true, true);
-			RSECorePlugin.getTheSystemRegistry().fireEvent(new SystemResourceChangeEvent(ss, 
-					ISystemResourceChangeEvents.EVENT_PROPERTY_CHANGE, 
-					ss.getHost()));
-		}
-		catch (Exception exc) {
-			// msg already shown
-		}
-	}
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCollapseAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCollapseAction.java
deleted file mode 100644
index 54471566e..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCollapseAction.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2007 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
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core
- * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
- ********************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.rse.core.RSECorePlugin;
-import org.eclipse.rse.core.events.ISystemResourceChangeEvents;
-import org.eclipse.rse.core.events.ISystemResourceChangeListener;
-import org.eclipse.rse.core.events.SystemResourceChangeEvent;
-import org.eclipse.rse.core.model.ISystemRegistry;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.ui.ISystemContextMenuConstants;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.actions.SystemBaseAction;
-import org.eclipse.rse.ui.view.ISystemTree;
-import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * The action allows users to collapse the selected nodes in the Remote System Explorer tree view
- */
-public class SystemCollapseAction extends SystemBaseAction {
-	/**
-	 * Constructor
-	 * @param parent the parent shell for this action
-	 */
-	public SystemCollapseAction(Shell parent) {
-		super(SystemResources.ACTION_COLLAPSE_SELECTED_LABEL, SystemResources.ACTION_COLLAPSE_SELECTED_TOOLTIP, parent);
-		allowOnMultipleSelection(true);
-		setContextMenuGroup(ISystemContextMenuConstants.GROUP_EXPAND);
-		setAccelerator('-');
-		setHelp(RSEUIPlugin.HELPPREFIX + "actn0024"); //$NON-NLS-1$
-		setAvailableOffline(true);
-	}
-
-	/**
-	 * We intercept to ensure at least one selected item is collapsable
-	 * @see SystemBaseAction#updateSelection(IStructuredSelection)
-	 */
-	public boolean updateSelection(IStructuredSelection selection) {
-		boolean enable = false;
-		if ((viewer != null) && (viewer instanceof ISystemTree)) {
-			return ((ISystemTree) viewer).areAnySelectedItemsExpanded();
-		}
-		Iterator e = selection.iterator();
-		ISystemViewElementAdapter adapter = null;
-		while (!enable && e.hasNext()) {
-			Object selectedObject = e.next();
-			adapter = getViewAdapter(selectedObject);
-			if (adapter != null) {
-				if (adapter.hasChildren((IAdaptable)selectedObject)) enable = true;
-			}
-		}
-		return enable;
-	}
-
-	/**
-	 * This is the method called when the user selects this action.
-	 * @see org.eclipse.jface.action.Action#run()
-	 */
-	public void run() {
-		//System.out.println("Inside run of SystemRefreshAction");
-		ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry();
-		if ((viewer != null) && (viewer instanceof ISystemResourceChangeListener)) {
-			sr.fireEvent((ISystemResourceChangeListener) viewer, new SystemResourceChangeEvent("dummy", ISystemResourceChangeEvents.EVENT_COLLAPSE_SELECTED, null)); //$NON-NLS-1$
-		} else
-			sr.fireEvent(new SystemResourceChangeEvent("dummy", ISystemResourceChangeEvents.EVENT_COLLAPSE_SELECTED, null)); //$NON-NLS-1$
-	}
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCollapseAllAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCollapseAllAction.java
deleted file mode 100644
index 0ec73754b..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCollapseAllAction.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2009 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core
- * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
- ********************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.rse.core.RSECorePlugin;
-import org.eclipse.rse.core.events.ISystemResourceChangeEvents;
-import org.eclipse.rse.core.events.ISystemResourceChangeListener;
-import org.eclipse.rse.core.events.SystemResourceChangeEvent;
-import org.eclipse.rse.core.model.ISystemRegistry;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.ui.ISystemContextMenuConstants;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.actions.SystemBaseAction;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * The action allows users to collapse the entire Remote System Explorer tree view.
- */
-public class SystemCollapseAllAction extends SystemBaseAction {
-	/**
-	 * Constructor
-	 * @param parent the shell that is employing this action
-	 */
-	public SystemCollapseAllAction(Shell parent) {
-		super(SystemResources.ACTION_COLLAPSE_ALL_LABEL, SystemResources.ACTION_COLLAPSE_ALL_TOOLTIP, PlatformUI.getWorkbench().getSharedImages()
-				.getImageDescriptor(ISharedImages.IMG_ELCL_COLLAPSEALL), // D54577
-				parent);
-		//setHoverImageDescriptor(RSEUIPlugin.getDefault().getImageDescriptorFromIDE("elcl16/collapseall.gif")); //$NON-NLS-1$
-		setHoverImageDescriptor(PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_ELCL_COLLAPSEALL));
-		allowOnMultipleSelection(true);
-		setContextMenuGroup(ISystemContextMenuConstants.GROUP_EXPAND); // should never be used
-		setSelectionSensitive(false);
-
-		setHelp(RSEUIPlugin.HELPPREFIX + "actn0023"); //$NON-NLS-1$
-		setAccelerator(SWT.CTRL | '-');
-	}
-
-	/**
-	 * @see SystemBaseAction#updateSelection(IStructuredSelection)
-	 */
-	public boolean updateSelection(IStructuredSelection selection) {
-		return true;
-	}
-
-	/**
-	 * This is the method called when the user selects this action.
-	 * @see org.eclipse.jface.action.Action#run()
-	 */
-	public void run() {
-		ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry();
-		if ((viewer != null) && (viewer instanceof ISystemResourceChangeListener)) {
-			sr.fireEvent((ISystemResourceChangeListener) viewer, new SystemResourceChangeEvent("false", ISystemResourceChangeEvents.EVENT_COLLAPSE_ALL, null)); //$NON-NLS-1$
-		} else
-			sr.fireEvent(new SystemResourceChangeEvent("false", ISystemResourceChangeEvents.EVENT_COLLAPSE_ALL, null)); //$NON-NLS-1$
-	}
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCommonDeleteAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCommonDeleteAction.java
deleted file mode 100644
index 2875e84c0..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCommonDeleteAction.java
+++ /dev/null
@@ -1,411 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2009 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
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
- * Kevin Doyle (IBM) - [188637] Handle the caught exception in DeleteJob.run when file fails to be deleted
- * Kevin Doyle (IBM) - [196582] ClassCastException when doing copy/paste with Remote Search view open
- * Xuan Chen   (IBM) - [160775] [api] rename (at least within a zip) blocks UI thread
- * Xuan Chen (IBM) - [209827] Update DStore command implementation to enable cancelation of archive operations
- * David McKnight   (IBM)        - [226143] [api][breaking] Make RSE rename/delete dialogs internal
- * David McKnight   (IBM)        - [234030] SystemCommonDeleteAction should not fire delete event if deleting is failed
- * David McKnight   (IBM)        - [203361] Deleting multiple target connections misleading
- * David McKnight   (IBM)        - [261367] RSE- Mutiple selection  Delete does not process all items selected
- ********************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.rse.core.RSECorePlugin;
-import org.eclipse.rse.core.events.ISystemRemoteChangeEvents;
-import org.eclipse.rse.core.events.ISystemResourceChangeEvents;
-import org.eclipse.rse.core.model.ISystemRegistry;
-import org.eclipse.rse.core.subsystems.ISubSystem;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.internal.ui.dialogs.SystemDeleteDialog;
-import org.eclipse.rse.services.clientserver.messages.SystemMessage;
-import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
-import org.eclipse.rse.ui.ISystemContextMenuConstants;
-import org.eclipse.rse.ui.ISystemDeleteTarget;
-import org.eclipse.rse.ui.ISystemMessages;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.SystemBasePlugin;
-import org.eclipse.rse.ui.actions.SystemBaseDialogAction;
-import org.eclipse.rse.ui.messages.SystemMessageDialog;
-import org.eclipse.rse.ui.model.SystemRemoteElementResourceSet;
-import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter;
-import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
-import org.eclipse.rse.ui.view.SystemAdapterHelpers;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-
-
-/**
- * The action that displays the Delete confirmation dialog.There are two ways to use this action:
- * <ol>
- *  <li>When invoking from a class that implements ISystemDeleteTarget. In this case, that class 
- *      will be called back to determine if this action is to be enabled or not, and to do the actual delete for 
- *      each selected object, after the dialog is dismissed.
- *  <li>When used without an ISystemDeleteTarget, in which case you need to call wasCancelled() after
- *      running the action, and then do your own delete.
- * </ol>
- * <p>
- * 
- * @see org.eclipse.rse.internal.ui.dialogs.SystemDeleteDialog
- */
-public class SystemCommonDeleteAction
-       extends SystemBaseDialogAction
-{
-	public class DeleteEventRunnable implements Runnable
-	{
-		private List _localDeletedResources;
-		private List _remoteDeletedResources;
-		public DeleteEventRunnable(List localDeletedResources, List remoteDeletedResources)
-		{
-			_localDeletedResources = localDeletedResources;
-			_remoteDeletedResources = remoteDeletedResources;
-		}
-		
-		public void run()
-		{
-			ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry();
-			
-			if (_remoteDeletedResources.size() > 0)
-			{
-				sr.fireRemoteResourceChangeEvent(ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_DELETED, _remoteDeletedResources, null, null, null);
-			}
-			if (_localDeletedResources.size() > 0)
-			{
-				Object[] localDeleted = _localDeletedResources.toArray();
-				sr.fireEvent(new org.eclipse.rse.core.events.SystemResourceChangeEvent(localDeleted, ISystemResourceChangeEvents.EVENT_DELETE_MANY, null/*(getSelectedParent())*/));
-			}
-		}
-	}
-	
-	
-	public class DeleteJob extends Job
-	{
-		private List _localResources;
-		private List _remoteSets;
-		public DeleteJob(List localResources, List remoteSets)
-		{
-			super(SystemResources.ACTION_DELETE_LABEL);
-			_localResources = localResources;
-			_remoteSets = remoteSets;
-			setUser(true);
-		}
-		
-		public IStatus run(IProgressMonitor monitor)
-		{
-			boolean ok = true;
-			List localDeletedObjects = new Vector();
-			List remoteDeletedObjects = new Vector();  
-			HashMap objectsToDelete = new HashMap();
-			
-			// local delete is pretty straight-forward
-			for (int l = 0; l < _localResources.size() && ok; l++)
-			{
-				Object element = _localResources.get(l);
-				ISystemViewElementAdapter adapter = getViewAdapter(element);
-				try
-				{
-					ok = adapter.doDelete(getShell(), element, monitor);
-					if (ok)
-					{
-						localDeletedObjects.add(element);
-					}
-				}
-				catch (Exception e)
-				{	
-					SystemBasePlugin.logError(e.getMessage(), e);
-				}
-			}
-			SystemMessageException exception = null;
-			
-			
-			// remote delete is not as straight-forward
-			for (int r = 0; r < _remoteSets.size() && ok; r++)
-			{
-				SystemRemoteElementResourceSet set = (SystemRemoteElementResourceSet)_remoteSets.get(r);
-				ISystemViewElementAdapter adapter = set.getViewAdapter();
-				try
-				{
-					for (int i = 0; i < set.size(); i++)
-					{
-						Object thisObject = set.get(i);
-						String objectName = adapter.getName(thisObject);
-						objectsToDelete.put(thisObject, objectName);
-						remoteDeletedObjects.add(thisObject);
-					}
-					List resSet = new ArrayList(set.getResourceSet());
-					ok = adapter.doDeleteBatch(getShell(), resSet, monitor);
-				}
-				catch (SystemMessageException e)
-				{
-					exception = e;
-					ok = false;
-				}
-				catch (Exception e)
-				{
-					SystemMessageDialog.displayExceptionMessage(getShell(), e);
-					return Status.CANCEL_STATUS;
-				}				
-				
-				if (!ok){
-					remoteDeletedObjects.clear();
-					if (monitor.isCanceled() && set.size() > 1)
-					{
-						for (int i = 0; i < set.size(); i++)
-						{
-							Object thisObject = set.get(i);
-							if (!(adapter.exists(thisObject)))
-							{
-								//This object has been deleted
-								remoteDeletedObjects.add(thisObject);
-							}	
-						}
-						if (remoteDeletedObjects.size() > 0)
-						{
-							//Get the moved file names
-							Object thisObject = remoteDeletedObjects.get(0);
-							String deletedFileNames = null;
-							//We could not use adapter.getName(thisObject) here since in dstore case, this name has
-							//already been changed to "deleted".  So we need to remember the object and name map, and
-							//find the object name in the map here.
-							deletedFileNames = (String)objectsToDelete.get(thisObject);  
-							for (int i=1; i<(remoteDeletedObjects.size()); i++)
-							{
-								thisObject = remoteDeletedObjects.get(i);
-								deletedFileNames = deletedFileNames + "\n" + (String)objectsToDelete.get(thisObject); //$NON-NLS-1$
-							}
-							SystemMessage thisMessage = RSEUIPlugin.getPluginMessage(ISystemMessages.FILEMSG_DELETE_INTERRUPTED); 
-							thisMessage.makeSubstitution(deletedFileNames);
-							SystemMessageDialog.displayErrorMessage(shell, thisMessage);
-						}
-					}
-					else
-					{
-						SystemMessageDialog.displayMessage(exception);
-					}
-				}
-
-			}
-			
-			// start a runnable to do the action refresh events
-			DeleteEventRunnable fireEvents = new DeleteEventRunnable(localDeletedObjects, remoteDeletedObjects);
-			Display.getDefault().asyncExec(fireEvents);
-			
-			if (ok)
-				return Status.OK_STATUS;
-			else
-				return Status.CANCEL_STATUS;
-		}
-		
-	}
-	
-	private String promptLabel; 
-	private List _setList;
-	
-	/**
-	 * Constructor for SystemDeleteAction when using a delete target
-	 * @param parent The Shell of the parent UI for this dialog
-	 * @param deleteTarget The UI part that has selectable and deletable parts.
-	 */
-	public SystemCommonDeleteAction(Shell parent, ISystemDeleteTarget deleteTarget)
-	{
-		super(SystemResources.ACTION_DELETE_LABEL, SystemResources.ACTION_DELETE_TOOLTIP,
-			  PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_TOOL_DELETE)	      
-		      , parent);
-		setSelectionProvider(deleteTarget);
-		allowOnMultipleSelection(true);
-		setProcessAllSelections(true);
-		setContextMenuGroup(ISystemContextMenuConstants.GROUP_REORGANIZE);		
-  	    setHelp(RSEUIPlugin.HELPPREFIX+"actn0021"); //$NON-NLS-1$
-  	    _setList = new Vector();
-	}
-	
-	/**
-	 * Constructor for SystemDeleteAction when not using a delete target
-	 * @param parent The Shell of the parent UI for this dialog
-	 */
-	public SystemCommonDeleteAction(Shell parent)
-	{
-		this(parent, null);
-	}	
-
-	/**
-	 * Specify the text to show for the label prompt. The default is 
-	 *  "Delete selected resources?"
-	 */
-	public void setPromptLabel(String text)
-	{
-		this.promptLabel = text;
-	}
-
-	private ISystemDeleteTarget getDeleteTarget()
-	{
-		return (ISystemDeleteTarget)getSelectionProvider();
-	}
-
-    /**
-     * Called by SystemBaseAction when selection is set.
-     * Our opportunity to verify we are allowed for this selected type.
-     */
-	public boolean updateSelection(IStructuredSelection selection)
-	{
-		_setList.clear();
-		ISystemDeleteTarget deleteTarget = getDeleteTarget();
-		if (deleteTarget == null)
-		  return true;
-		else
-		  return deleteTarget.showDelete() && getDeleteTarget().canDelete();	
-	}
-	
-	/**
-	 * If you decide to use the supplied run method as is,
-	 *  then you must override this method to create and return
-	 *  the dialog that is displayed by the default run method
-	 *  implementation.
-	 * <p>
-	 * If you override run with your own, then
-	 *  simply implement this to return null as it won't be used.
-	 * @see #run()
-	 */
-	protected Dialog createDialog(Shell shell)
-	{
-		Object firstSelection = getFirstSelection();
-		if (firstSelection != null)
-		{
-			SystemDeleteDialog dlg = new SystemDeleteDialog(shell);
-			if (promptLabel != null)
-				dlg.setPromptLabel(promptLabel);
-		
-			if (getRemoteAdapter(firstSelection) != null)
-			{
-	           String warningMsg = null;
-	           String warningTip = null;
-	
-	             warningMsg = SystemResources.RESID_DELETE_WARNING_LABEL;
-	             warningTip = SystemResources.RESID_DELETE_WARNING_TOOLTIP;
-	           dlg.setWarningMessage(warningMsg,warningTip);
-			}
-			return dlg;
-		}
-		else
-		{
-			return null;
-		}
-	}
-	
-	
-	/**
-	 * New method of doing delete where the physical deletion occurs in a job whereas the refresh is done in a runnable
-	 */
-	protected Object getDialogValue(Dialog dlg)
-	{
-		if (!((SystemDeleteDialog)dlg).wasCancelled() && (getDeleteTarget() != null))
-		{
-			ISystemDeleteTarget target = getDeleteTarget();
-			ISelection selection = target.getSelection();
-			
-			if (selection instanceof IStructuredSelection)
-			{				
-				// keep track of the current set
-				List localSet = new Vector();
-
-				// divide up all objects to delete
-				List selectedResources = ((SystemDeleteDialog)dlg).getSelectedResources();
-								
-				for (int i = 0; i < selectedResources.size(); i++)
-				{
-					Object object = selectedResources.get(i);
-					ISystemViewElementAdapter adapter = SystemAdapterHelpers.getViewAdapter(object);
-					if (getRemoteAdapter(object) != null) 
-					{
-						ISubSystem subSystem = adapter.getSubSystem(object);
-						// a remote object so add to remote set
-						SystemRemoteElementResourceSet set = getSetFor(subSystem, adapter);
-						set.addResource(object);
-					}
-					else
-					{
-						localSet.add(object);
-					}
-				}
-				
-				// do delete for each set
-				DeleteJob job = new DeleteJob(localSet, _setList);
-				job.schedule();
-			}
-			
-		}
-		return null;
-	}
-
-
-	
-	
-	protected SystemRemoteElementResourceSet getSetFor(ISubSystem subSystem, ISystemViewElementAdapter adapter) {
-		for (int i = 0; i < _setList.size(); i++) {
-			SystemRemoteElementResourceSet set = (SystemRemoteElementResourceSet) _setList.get(i);
-			if (set.getViewAdapter() == adapter && set.getSubSystem() == subSystem) {
-				return set;
-			}
-		}
-
-		// no existing set - create one
-		SystemRemoteElementResourceSet newSet = new SystemRemoteElementResourceSet(subSystem, adapter);
-		_setList.add(newSet);
-		return newSet;
-	}
-	
-	
-	
-	protected IRunnableContext getRunnableContext(Shell shell)
-	{
-		IRunnableContext irc = RSEUIPlugin.getTheSystemRegistryUI().getRunnableContext();
-		if (irc != null)
-		{
-			return irc;
-		}
-		else
-		{
-			irc = new ProgressMonitorDialog(shell);
-			RSEUIPlugin.getTheSystemRegistryUI().setRunnableContext(shell, irc);
-			return irc;
-		}
-	}
-	
-    /**
-     * Returns the implementation of ISystemRemoteElement for the given
-     * object.  Returns null if this object does not adaptable to this.
-     */
-    protected ISystemRemoteElementAdapter getRemoteAdapter(Object o)
-    {
-    	return SystemAdapterHelpers.getRemoteAdapter(o);
-    }
-	
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCommonRenameAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCommonRenameAction.java
deleted file mode 100644
index fd927aea3..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCommonRenameAction.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2008 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David McKnight   (IBM)        - [226143] [api][breaking] Make RSE rename/delete dialogs internal
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.internal.ui.dialogs.SystemRenameDialog;
-import org.eclipse.rse.ui.ISystemContextMenuConstants;
-import org.eclipse.rse.ui.ISystemIconConstants;
-import org.eclipse.rse.ui.ISystemRenameTarget;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.actions.SystemBaseDialogAction;
-import org.eclipse.rse.ui.dialogs.SystemRenameSingleDialog;
-import org.eclipse.rse.ui.validators.ISystemValidator;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * The action that displays the Rename dialog. There are two ways to use this action:
- * <ol>
- *  <li>When invoking from a class that implements ISystemRenameTarget. In this case, that class 
- *      will be called back to determine if this action is to be enabled or not, and to do the actual rename for 
- *      each selected object, after the dialog is dismissed.
- *  <li>When used without an ISystemRenameTarget, in which case you need to call getNewNames() after
- *      running the action, and then use the new names to do the rename. This will return null if the dialog
- *      was cancelled. 
- * </ol>
- * <p>
- * If the input objects do not adapt to {@link org.eclipse.rse.ui.view.ISystemRemoteElementAdapter} or 
- * {@link org.eclipse.rse.ui.view.ISystemViewElementAdapter}, then you
- * should call {@link #setNameValidator(org.eclipse.rse.ui.validators.ISystemValidator)} to 
- * specify a validator that is called to verify the typed new name is valid. Further, to show the type value
- * of the input objects, they should implement {@link org.eclipse.rse.ui.dialogs.ISystemTypedObject}.
- * 
- * @see org.eclipse.rse.internal.ui.dialogs.SystemRenameDialog
- * @see org.eclipse.rse.ui.dialogs.SystemRenameSingleDialog
- */
-public class SystemCommonRenameAction extends SystemBaseDialogAction 
-                                 
-{
-	private ISystemRenameTarget renameTarget;
-	private boolean            copyCollisionMode = false;
-	private String              newNames[];
-    private ISystemValidator    nameValidator;
-    private String              singleSelectionHelp, multiSelectionHelp, promptLabel, promptTip, verbiage;	
-    
-	/**
-	 * Constructor when using a rename target
-	 * @param parent The Shell of the parent UI for this dialog
-	 * @param target The UI part that has selectable and renamable parts.
-	 */
-	public SystemCommonRenameAction(Shell parent, ISystemRenameTarget target) 
-	{
-		super(SystemResources.ACTION_RENAME_LABEL, SystemResources.ACTION_RENAME_TOOLTIP, 
-		      RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_RENAME_ID), parent);
-		setSelectionProvider(target);
-		allowOnMultipleSelection(true);
-		setProcessAllSelections(true);
-		renameTarget = target;
-		setContextMenuGroup(ISystemContextMenuConstants.GROUP_REORGANIZE);		
-  	    setHelp(RSEUIPlugin.HELPPREFIX+"actn0018"); //$NON-NLS-1$
-	}
-	
-	/**
-	 * Constructor when not using a rename target
-	 * @param parent The Shell of the parent UI for this dialog
-	 */
-	public SystemCommonRenameAction(Shell parent) 
-	{
-		this(parent, null);
-	}
-	/**
-	 * Set the help to use in the dialog when there is a single selection
-	 */
-	public void setDialogSingleSelectionHelp(String helpID)
-	{
-		this.singleSelectionHelp = helpID;
-	}
-	/**
-	 * Set the help to use in the dialog when there are multiple selections
-	 */
-	public void setDialogMultiSelectionHelp(String helpID)
-	{
-		this.multiSelectionHelp = helpID;
-	}
-	/**
-	 * Set the label and tooltip of the prompt, used when only one thing is selected. The default is "New name:"
-	 */
-	public void setSingleSelectPromptLabel(String label, String tooltip)
-	{
-		this.promptLabel = label;
-		this.promptTip = tooltip;
-	}
-	/**
-	 * Set the verbiage to show at the top of the table, used when multi things are selected. The default is "Enter a new name for each resource"
-	 */
-	public void setMultiSelectVerbiage(String verbiage)
-	{
-		this.verbiage = verbiage;
-	}
-	
-    /**
-     * Set the validator for the new name,as supplied by the adaptor for name checking.
-     * Overrides the default which is to query it from the object's adapter.
-     */
-    public void setNameValidator(ISystemValidator nameValidator)
-    {
-    	this.nameValidator = nameValidator;
-    }
-
-	/**
-	 * Indicate this dialog is the result of a copy/move name collision.
-	 * Affects the title, verbiage at the top of the dialog, and context help.
-	 */
-	public void setCopyCollisionMode(boolean copyCollisionMode)
-	{
-		this.copyCollisionMode = copyCollisionMode;
-	}
-	/**
-	 * Query if this dialog is the result of a copy/move name collision.
-	 * Affects the title, verbiage at the top of the dialog, and context help.
-	 */
-	public boolean getCopyCollisionMode()
-	{
-		return copyCollisionMode;
-	}
-	
-    /**
-     * Called by SystemBaseAction when selection is set.
-     * Our opportunity to verify we are allowed for this selected type.
-     * We overload it to call canRename() in the SystemView class.
-     */
-	public boolean updateSelection(IStructuredSelection selection)
-	{
-		if (renameTarget == null)
-		  return true;
-		else
-		  return renameTarget.canRename();
-	}
-	
-	/**
-	 * If you decide to use the supplied run method as is,
-	 *  then you must override this method to create and return
-	 *  the dialog that is displayed by the default run method
-	 *  implementation.
-	 * <p>
-	 * If you override run with your own, then
-	 *  simply implement this to return null as it won't be used.
-	 * @see #run()
-	 */
-	protected Dialog createDialog(Shell parent)
-	{
-		IStructuredSelection sel = getSelection();
-		// multi-select
-		if (sel != null && sel.size() > 1)
-		{
-		  	SystemRenameDialog dlg = new SystemRenameDialog(parent);
-		  	if (nameValidator != null)
-		    	dlg.setNameValidator(nameValidator);
-			if (multiSelectionHelp != null)
-				dlg.setHelp(multiSelectionHelp);
-		    if (verbiage != null)
-		     	dlg.setVerbiage(verbiage);
-		  	return dlg;
-		}
-		// single-select
-		else if (sel != null && sel.size() == 1)
-		{
-		  	SystemRenameSingleDialog dlg = new SystemRenameSingleDialog(parent);
-		  	if (copyCollisionMode)
-		    	dlg.setCopyCollisionMode(copyCollisionMode);
-		  	if (nameValidator != null)
-		    	dlg.setNameValidator(nameValidator);
-			if (singleSelectionHelp != null)
-				dlg.setHelp(singleSelectionHelp);
-			if ((promptLabel != null) || (promptTip != null))
-				dlg.setPromptLabel(promptLabel, promptTip);
-		  	return dlg;
-		}
-		else
-		{
-			return null;
-		}
-	}
-	
-	/**
-	 * Required by parent. We use it to actually do the rename by calling doRename
-	 *  in the supplied ISystemRenameTarget, if we are in that mode.
-	 * As a result, we return null from here.
-	 * @see #getNewNames()
-	 */
-	protected Object getDialogValue(Dialog dlg)
-	{
-		newNames = null;
-		if (dlg instanceof SystemRenameDialog)
-		{
-		  SystemRenameDialog rnmDlg = (SystemRenameDialog)dlg;
-		  if (!rnmDlg.wasCancelled())
-	 	  {
-		    newNames = rnmDlg.getNewNames();
-		    if (renameTarget != null)
-		      renameTarget.doRename(newNames); // perform the actual renames.
-		  }
-		}
-		else
-		{
-		  SystemRenameSingleDialog rnmDlg = (SystemRenameSingleDialog)dlg;
-		  if (!rnmDlg.wasCancelled())
-	 	  {
-		    String name = rnmDlg.getNewName();
-		    newNames = new String[1];
-		    newNames[0] = name;
-		    if (renameTarget != null)
-		      renameTarget.doRename(newNames); // perform the actual renames.
-		  }
-		}
-		return null;					
-	}
-	
-	/**
-	 * Return the new names entered by the user. You only need to call this when you don't supply a 
-	 *  rename target. In this case, it is your responsibility to do the actual renames.
-	 * @return - array of new names, with the order matching the order of the input selection. Null if dialog cancelled.
-	 */
-	public String[] getNewNames()
-	{
-		return newNames;
-	}
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCommonSelectAllAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCommonSelectAllAction.java
deleted file mode 100644
index 9d482c2c1..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCommonSelectAllAction.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2007 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.rse.ui.ISystemContextMenuConstants;
-import org.eclipse.rse.ui.actions.SystemBaseAction;
-import org.eclipse.rse.ui.view.ISystemSelectAllTarget;
-import org.eclipse.swt.widgets.Shell;
-
-
-
-/**
- * The global action that enables select all.
- * For the RSE tree view, we interpret select all to mean select all the
- *  children of the currently selected parent, if applicable.
- */
-public class SystemCommonSelectAllAction
-       extends SystemBaseAction
-       
-{
-	private ISystemSelectAllTarget target;
-	
-	/**
-	 * Constructor 
-	 * @param parent The Shell of the parent UI for this dialog
-	 * @param selProvider The viewer that provides the selections
-	 * @param target The viewer that is running this action
-	 */
-	public SystemCommonSelectAllAction(Shell parent, ISelectionProvider selProvider, ISystemSelectAllTarget target)
-	{
-		//super(RSEUIPlugin.getResourceBundle(), ISystemConstants.ACTION_SELECTALL, null, parent); TODO: XLATE!
-		super("Select All", (ImageDescriptor)null, parent); //$NON-NLS-1$
-		setSelectionProvider(selProvider);
-		this.target = target;
-		allowOnMultipleSelection(false);
-		setContextMenuGroup(ISystemContextMenuConstants.GROUP_REORGANIZE);		
-  	    //setHelp(RSEUIPlugin.HELPPREFIX+"actn0021"); // TODO: ADD HELP!
-	}
-	
-    /**
-     * Called by SystemBaseAction when selection is set.
-     * Our opportunity to verify we are allowed for this selected type.
-     */
-	public boolean updateSelection(IStructuredSelection selection)
-	{
-		return target.enableSelectAll(selection);
-	}
-	
-	/**
-	 * This is the method called when the user selects this action.
-	 */
-	public void run() 
-	{
-		target.doSelectAll(getSelection());
-	}
-	
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemConnectAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemConnectAction.java
deleted file mode 100644
index 4502bd451..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemConnectAction.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2008 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType
- * Martin Oberhuber (Wind River) - [186640] Add IRSESystemType.testProperty()
- * Martin Oberhuber (Wind River) - [187218] Fix error reporting for connect()
- * Martin Oberhuber (Wind River) - [149285][ssh] multiple prompts and errors in case of incorrect username
- ********************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.rse.core.subsystems.ISubSystem;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
-import org.eclipse.rse.ui.ISystemContextMenuConstants;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.SystemBasePlugin;
-import org.eclipse.rse.ui.actions.SystemBaseAction;
-import org.eclipse.rse.ui.messages.SystemMessageDialog;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * This is the action for connecting to the remote subsystem
- */
-public class SystemConnectAction extends SystemBaseAction
-{
-	public class ConnectJob extends Job
-	{
-		private ISubSystem _subsystem;
-		public ConnectJob(ISubSystem subsystem)
-		{
-			super(SystemResources.ACTION_CONNECT_LABEL);
-			_subsystem = subsystem;
-		}
-
-
-		public IStatus run(IProgressMonitor monitor)
-		{
-			try {
-				if (_subsystem.getHost().getSystemType().isWindows())
-					_subsystem.connect(monitor, false);
-				else
-				  	_subsystem.connect(monitor, true);
-			}
-			catch (OperationCanceledException e) {
-				// user cancelled
-				return Status.CANCEL_STATUS;
-			}
-			catch (SystemMessageException e) {
-				SystemMessageDialog.displayMessage(e);
-			}
-			catch (Exception e) {
-				SystemBasePlugin.logError(
-						e.getLocalizedMessage()!=null ? e.getLocalizedMessage() : e.getClass().getName(),
-						e);
-			}
-			if (monitor.isCanceled())
-			{
-				return Status.CANCEL_STATUS;
-			}
-			return Status.OK_STATUS;
-		}
-	}
-
-	/**
-	 * Constructor.
-	 * @param shell  Shell of parent window, used as the parent for the dialog.
-	 *               Can be null, but be sure to call setParent before the action is used (ie, run).
- 	 */
-	public SystemConnectAction(Shell shell)
-	{
-	  super(SystemResources.ACTION_CONNECT_LABEL,SystemResources.ACTION_CONNECT_TOOLTIP, shell);
-	  allowOnMultipleSelection(false);
-	  setContextMenuGroup(ISystemContextMenuConstants.GROUP_CONNECTION);
-    	setHelp(RSEUIPlugin.HELPPREFIX+"actn0047"); //$NON-NLS-1$
-	}
-	/**
-	 * Override of parent. Called when testing if action should be enabled base on current
-	 *  selection. We check the selected object is one of our subsystems, and we are not
-	 *  already connected.
-	 */
-	public boolean checkObjectType(Object obj)
-	{
-		if ( !(obj instanceof ISubSystem) ||
-		     ((ISubSystem)obj).getConnectorService().isConnected() )
-		  return false;
-		else
-		  return true;
-	}
-
-	/**
-	 * Called when this action is selection from the popup menu.
-	 */
-	public void run()
-	{
-		ISubSystem ss = (ISubSystem)getFirstSelection();
-		ConnectJob job = new ConnectJob(ss);
-		job.schedule();
-
-	}
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemConnectAllSubSystemsAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemConnectAllSubSystemsAction.java
deleted file mode 100644
index 80a60151e..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemConnectAllSubSystemsAction.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2008 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
- * Martin Oberhuber (Wind River) - [187218] Fix error reporting for connect() 
- * Martin Oberhuber (Wind River) - [216266] Consider stateless subsystems (supportsSubSystemConnect==false)
- * David McKnight   (IBM)        - [237970]  Subsystem.connect( ) fails for substituting host name when isOffline( ) is true
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.rse.core.RSECorePlugin;
-import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.core.model.ISystemRegistry;
-import org.eclipse.rse.core.subsystems.IConnectorService;
-import org.eclipse.rse.core.subsystems.ISubSystem;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
-import org.eclipse.rse.ui.ISystemContextMenuConstants;
-import org.eclipse.rse.ui.SystemBasePlugin;
-import org.eclipse.rse.ui.actions.SystemBaseAction;
-import org.eclipse.rse.ui.messages.SystemMessageDialog;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * This is the action for connecting all subsystems for a given connection.
- */
-public class SystemConnectAllSubSystemsAction extends SystemBaseAction
-{
-	public class ConnectAllJob extends Job
-	{
-		private IHost _connection;
-		public ConnectAllJob(IHost connection)
-		{
-			super(SystemResources.ACTION_CONNECT_ALL_LABEL);
-			_connection = connection;
-		}
-		
-		public IStatus run(IProgressMonitor monitor)
-		{
-		    List failedSystems = new ArrayList();
-			try 
-			{
-			    //forced instantiation of all subsystems
-			    ISubSystem[] subsystems = _connection.getSubSystems();
-			    for (int i = 0; i < subsystems.length; i++)
-			    {
-			        ISubSystem subsystem = subsystems[i];
-			        IConnectorService system = subsystem.getConnectorService();
-			        if (!subsystem.isConnected()
-			          && subsystem.getSubSystemConfiguration().supportsSubSystemConnect()
-			          && !failedSystems.contains(system))
-			        {
-			            try
-			            {
-			                subsystem.connect(monitor, false);
-			            }
-						catch (SystemMessageException e) {
-							//TODO should we collect all messages and just show one dialog with a MultiStatus?
-			                failedSystems.add(system);
-							SystemMessageDialog.displayMessage(e);
-						}
-						catch (Exception e) {
-			                failedSystems.add(system);
-			                if ((e instanceof InterruptedException) || (e instanceof OperationCanceledException)) {
-				                // if the user was prompted for password and cancelled
-				                // or if the connect was interrupted for some other reason
-				                // we don't attempt to connect the other subsystems
-								break;
-			                }
-							SystemBasePlugin.logError(
-									e.getLocalizedMessage()!=null ? e.getLocalizedMessage() : e.getClass().getName(),
-									e);
-						}
-			        }
-			    }
-			} 
-			catch (Exception exc) 
-			{
-			} 	// msg already shown	
-			if (failedSystems.size() > 0)
-			{
-				return Status.CANCEL_STATUS;
-			}
-			else
-			{
-				return Status.OK_STATUS;
-			}
-		}
-		
-	}
-	
-	private ISystemRegistry sr = null;
-	/**
-	 * Constructor.
-	 * @param shell  Shell of parent window, used as the parent for the dialog.
-	 *               Can be null, but be sure to call setParent before the action is used (ie, run).
-	 */
-	public SystemConnectAllSubSystemsAction(Shell shell)
-	{
-	    super(SystemResources.ACTION_CONNECT_ALL_LABEL,SystemResources.ACTION_CONNECT_ALL_TOOLTIP, shell);
-	    allowOnMultipleSelection(false);
-	    setContextMenuGroup(ISystemContextMenuConstants.GROUP_CONNECTION);
-	    sr = RSECorePlugin.getTheSystemRegistry();
-  	    //setHelp(RSEUIPlugin.HELPPREFIX+"actn0022");
-	}
-	/**
-	 * Override of parent. Called when testing if action should be enabled base on current
-	 *  selection. We check the selected object is one of our subsystems, and if we are
-	 *  currently connected.
-	 */
-	public boolean checkObjectType(Object obj) 
-	{
-	    if ((obj instanceof IHost) &&
-	    		!((IHost)obj).isOffline() &&
-	            !sr.areAllSubSystemsConnected((IHost)obj))
-	    {
-	        return true;
-	    }
-		else 
-		{
-		  return false;
-		}
-	}
-	
-	/**
-	 * Called when this action is selection from the popup menu.
-	 */
-	public void run()	
-	{		  
-
-		IHost conn = (IHost)getFirstSelection();
-		ConnectAllJob job = new ConnectAllJob(conn);
-		job.schedule();
-	}
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCopyConnectionAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCopyConnectionAction.java
deleted file mode 100644
index 6007a80c7..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCopyConnectionAction.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2008 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API
- * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
- * David McKnight   (IBM)        - [223103] [cleanup] fix broken externalized strings
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.rse.core.RSECorePlugin;
-import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.core.model.ISystemProfile;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.services.clientserver.messages.SystemMessage;
-import org.eclipse.rse.ui.ISystemIconConstants;
-import org.eclipse.rse.ui.ISystemMessages;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.actions.SystemBaseAction;
-import org.eclipse.rse.ui.actions.SystemBaseCopyAction;
-import org.eclipse.rse.ui.dialogs.SystemRenameSingleDialog;
-import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * Copy a connection action.
- */
-public class SystemCopyConnectionAction extends SystemBaseCopyAction
-{
-	private SystemSimpleContentElement initialSelectionElement = null;
-	/**
-	 * Constructor for SystemCopyConnectionAction
-	 */
-	public SystemCopyConnectionAction(Shell parent) 
-	{
-		super(parent, SystemResources.ACTION_COPY_CONNECTION_LABEL, MODE_COPY);
-		setToolTipText(SystemResources.ACTION_COPY_CONNECTION_TOOLTIP);
-		sr = RSECorePlugin.getTheSystemRegistry();
-  	    setHelp(RSEUIPlugin.HELPPREFIX+"actn0019"); //$NON-NLS-1$ 
-  	    setDialogHelp(RSEUIPlugin.HELPPREFIX+"dccn0000");  //$NON-NLS-1$
-	}
- 
-	/**
-	 * We override from parent to do unique checking...
-	 * <p>
-	 * We intercept to ensure only connections from the same profile are selected.
-	 * <p>
-	 * @see SystemBaseAction#updateSelection(IStructuredSelection)
-	 */
-	public boolean updateSelection(IStructuredSelection selection)
-	{
-		boolean enable = true;		
-		ISystemProfile prevProfile = null;
-		Iterator e= selection.iterator();		
-		while (enable && e.hasNext())
-		{
-			Object selectedObject = e.next();
-			if (selectedObject instanceof IHost)
-			{
-			  IHost conn = (IHost)selectedObject;
-			  if (prevProfile == null)
-			    prevProfile = conn.getSystemProfile();
-			  else
-			    enable = (prevProfile == conn.getSystemProfile());
-			  if (enable)
-		        prevProfile = conn.getSystemProfile();
-			}
-			else
-			  enable = false;
-		}
-		return enable;
-	}
- 
-    // --------------------------
-    // PARENT METHOD OVERRIDES...
-    // --------------------------
-    
-	/**
-	 * @see SystemBaseCopyAction#checkForCollision(Shell, IProgressMonitor, Object, Object, String)
-	 */
-	protected String checkForCollision(Shell shell, IProgressMonitor monitor, 
-	                                   Object targetContainer, Object oldObject, String oldName)
-	{
-		ISystemProfile profile = (ISystemProfile)targetContainer;
-		String newName = oldName;
-		IHost match = sr.getHost(profile, oldName);
-		if (match != null)
-		{
-		  //monitor.setVisible(false); wish we could!
-		  //ValidatorConnectionName validator = new ValidatorConnectionName(sr.getConnectionAliasNames(profile));
-		  //SystemCollisionRenameDialog dlg = new SystemCollisionRenameDialog(shell, validator, oldName);
-		  SystemRenameSingleDialog dlg = new SystemRenameSingleDialog(shell, true, match, null); // true => copy-collision-mode
-		  dlg.open();
-		  if (!dlg.wasCancelled())
-		    newName = dlg.getNewName();
-		  else
-		    newName = null;
-		}
-		return newName;
-	}
-	/**
-	 * @see SystemBaseCopyAction#doCopy(Object, Object, String, IProgressMonitor)
-	 */
-	protected boolean doCopy(Object targetContainer, Object oldObject, String newName, IProgressMonitor monitor)
-		throws Exception 
-    {
-    	IHost oldConnection = (IHost)oldObject;
-    	//String oldName = oldConnection.getAliasName();
-    	//RSEUIPlugin.logDebugMessage(this.getClass().getName(),"starting to copy "+oldName+" to "+newName);
-    	ISystemProfile targetProfile = (ISystemProfile)targetContainer;
-        IHost newConn = sr.copyHost(oldConnection, targetProfile, newName, monitor);
-		return (newConn != null);
-	}
-
-	/**
-	 * @see SystemBaseCopyAction#getTreeModel()
-	 */
-	protected SystemSimpleContentElement getTreeModel() 
-	{
-		return getProfileTreeModel(getFirstSelectedConnection().getSystemProfile());
-	}
-	/**
-	 * @see SystemBaseCopyAction#getTreeInitialSelection()
-	 */
-	protected SystemSimpleContentElement getTreeInitialSelection()
-	{
-		return initialSelectionElement;
-	}
-
-	/**
-	 * @see SystemBaseCopyAction#getPromptString()
-	 */
-	protected String getPromptString() 
-	{
-		return SystemResources.RESID_COPY_TARGET_PROFILE_PROMPT;
-	}
-	/**
-	 * @see SystemBaseCopyAction#getCopyingMessage()
-	 */
-	protected SystemMessage getCopyingMessage() 
-	{
-		return RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COPYCONNECTIONS_PROGRESS);
-	}
-	/**
-	 * @see SystemBaseCopyAction#getCopyingMessage( String)
-	 */
-	protected SystemMessage getCopyingMessage(String oldName) 
-	{
-		return RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COPYCONNECTION_PROGRESS).makeSubstitution(oldName);
-	}
-
-	/**
-	 * @see SystemBaseCopyAction#getOldObjects()
-	 */
-	protected Object[] getOldObjects() 
-	{
-		return getSelectedConnections();
-	}
-
-	/**
-	 * @see SystemBaseCopyAction#getOldNames()
-	 */
-	protected String[] getOldNames() 
-	{
-		IHost[] conns = getSelectedConnections();
-		String[] names = new String[conns.length];
-		for (int idx=0; idx<conns.length; idx++)
-		   names[idx] = conns[idx].getAliasName();
-		return names;
-	}
-
-    /**
-     * Get the currently selected connections
-     */
-    protected IHost[] getSelectedConnections()
-    {
-   	    IStructuredSelection selection = getSelection();
-   	    IHost[] conns = new IHost[selection.size()];
-   	    Iterator i = selection.iterator();
-   	    int idx=0;
-   	    while (i.hasNext())
-   	    {
-   	       conns[idx++] = (IHost)i.next();
-   	    }
-   	    return conns;
-    }
-    /**
-     * Get the first selected connection
-     */
-    protected IHost getFirstSelectedConnection()
-    {
-    	return (IHost)getFirstSelection();
-    }
-   
-    // ------------------
-    // PRIVATE METHODS...
-    // ------------------
-    
-	/**
-	 * Create and return data model to populate selection tree with.
-	 * @param profile whose tree model element is to be selected
-	 */
-    protected SystemSimpleContentElement getProfileTreeModel(ISystemProfile profile)
-    {
-    	SystemSimpleContentElement veryRootElement = 
-    	   new SystemSimpleContentElement("Profiles", //$NON-NLS-1$
-    	                                  null, null, (Vector)null);	    	
-    	veryRootElement.setRenamable(false);
-    	veryRootElement.setDeletable(false);
-    	                
-    	ISystemProfile[] profiles = RSECorePlugin.getTheSystemRegistry().getActiveSystemProfiles();
-    	ImageDescriptor image = RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_PROFILE_ID);
-    	                                  
-    	if (profiles == null)
-    	  return veryRootElement;
-    	 
-    	Vector veryRootChildren = new Vector(); 
-    	for (int idx=0; idx<profiles.length; idx++)
-    	{
-           SystemSimpleContentElement profileElement = 
-    	      new SystemSimpleContentElement(profiles[idx].getName(),
-    	                                     profiles[idx], veryRootElement, (Vector)null);	
-    	   profileElement.setRenamable(false);
-    	   profileElement.setDeletable(false);
-    	   profileElement.setImageDescriptor(image);
-           veryRootChildren.addElement(profileElement);
-           if (profiles[idx] == profile)
-             initialSelectionElement = profileElement;          
-    	}    	
-        veryRootElement.setChildren(veryRootChildren);    	
-    	return veryRootElement;
-    }
-     
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemDisconnectAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemDisconnectAction.java
deleted file mode 100644
index ad360f36c..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemDisconnectAction.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2007 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-
-import org.eclipse.rse.core.subsystems.ISubSystem;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.ui.ISystemContextMenuConstants;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.actions.SystemBaseAction;
-import org.eclipse.swt.widgets.Shell;
-
-
-
-/**
- * This is the action for disconnecting from a remote subsystem.
- */
-public class SystemDisconnectAction extends SystemBaseAction
-{
-	
-	/**
-	 * Constructor.
-	 * @param shell  Shell of parent window, used as the parent for the dialog.
-	 *               Can be null, but be sure to call setParent before the action is used (ie, run).
-	 */
-	public SystemDisconnectAction(Shell shell)
-	{
-	    super(SystemResources.ACTION_DISCONNECT_LABEL, SystemResources.ACTION_DISCONNECT_TOOLTIP, shell);
-	    allowOnMultipleSelection(false);
-	    setContextMenuGroup(ISystemContextMenuConstants.GROUP_CONNECTION);
-    	setHelp(RSEUIPlugin.HELPPREFIX+"actn0048"); //$NON-NLS-1$
-	}
-	/**
-	 * Override of parent. Called when testing if action should be enabled based on current
-	 *  selection. We check the selected object is one of our subsystems, and if we are
-	 *  currently connected.
-	 */
-	public boolean checkObjectType(Object obj) 
-	{
-		if ( !(obj instanceof ISubSystem) ||
-		     !((ISubSystem)obj).getConnectorService().isConnected() )
-		  return false;
-		else 
-		  return true;
-	}
-	
-	/**
-	 * Called when this action is selection from the popup menu.
-	 */
-	public void run()	
-	{		  
-		ISubSystem ss = (ISubSystem)getFirstSelection();
-		try {
-		  ss.disconnect();
-		} catch (Exception exc) {} // msg already shown		
-	}
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemDisconnectAllSubSystemsAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemDisconnectAllSubSystemsAction.java
deleted file mode 100644
index aa7b09f6c..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemDisconnectAllSubSystemsAction.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2008 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
- * Kevin Doyle (IBM) - [175277] Cannot disconnect multiple connections at once with multiselect
- * David Dykstal (IBM) - [197036] minor refactoring
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.rse.core.RSECorePlugin;
-import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.core.model.ISystemRegistry;
-import org.eclipse.rse.core.subsystems.ISubSystem;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.ui.ISystemContextMenuConstants;
-import org.eclipse.rse.ui.actions.SystemBaseAction;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * This is the action for disconnecting all subsystems for a given connection.
- */
-public class SystemDisconnectAllSubSystemsAction extends SystemBaseAction
-{
-	
-	private ISystemRegistry sr = null;
-	/**
-	 * Constructor.
-	 * @param shell  Shell of parent window, used as the parent for the dialog.
-	 *               Can be null, but be sure to call setParent before the action is used (ie, run).
-	 */
-	public SystemDisconnectAllSubSystemsAction(Shell shell)
-	{
-	    super(SystemResources.ACTION_DISCONNECTALLSUBSYSTEMS_LABEL, SystemResources.ACTION_DISCONNECTALLSUBSYSTEMS_TOOLTIP, shell);
-	    allowOnMultipleSelection(true);
-	    setContextMenuGroup(ISystemContextMenuConstants.GROUP_CONNECTION);
-	    sr = RSECorePlugin.getTheSystemRegistry();
-	    // TODO help for connect all
-  	    //setHelp(RSEUIPlugin.HELPPREFIX+"actn0022");
-	}
-	
-	private static ISubSystem[] getDisconnectableSubsystems(Object element)
-	{
-		ISubSystem[] result = null;
-		if (element instanceof IHost) {
-			IHost host = (IHost)element;
-			ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry();
-			ISubSystem[] ss = sr.getSubSystems(host);
-			List l = new ArrayList();
-			for (int i=0; i<ss.length; i++) {
-				if (ss[i].isConnected() && ss[i].getSubSystemConfiguration().supportsSubSystemConnect()) {
-					l.add(ss[i]);
-				}
-			}
-			result = (ISubSystem[])l.toArray(new ISubSystem[l.size()]);
-		}
-		return result;
-	}
-	
-	/**
-	 * Override of parent. Called when testing if action should be enabled base on current
-	 *  selection. We check the selected object is one of our subsystems, and if we are
-	 *  currently connected.
-	 */
-	public boolean checkObjectType(Object obj) 
-	{
-		if ( !(obj instanceof IHost) ||
-		     !(sr.isAnySubSystemConnected((IHost)obj) ))
-		  return false;
-		else {
-			ISubSystem[] ss = getDisconnectableSubsystems(obj);
-			return (ss!=null && ss.length>0);
-		}
-	}
-	
-	/**
-	 * Called when this action is selection from the popup menu.
-	 */
-	public void run()	
-	{		  
-		Iterator it = getSelection().iterator();
-		while (it.hasNext()) {
-			Object item = it.next();
-			if (item instanceof IHost) {
-				try {
-					sr.disconnectAllSubSystems((IHost) item);
-				} catch (Exception exc) {} // msg already shown
-			}
-		}
-	}
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemExpandAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemExpandAction.java
deleted file mode 100644
index 98847930c..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemExpandAction.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2007 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
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core
- * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
- ********************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.rse.core.RSECorePlugin;
-import org.eclipse.rse.core.events.ISystemResourceChangeEvents;
-import org.eclipse.rse.core.events.ISystemResourceChangeListener;
-import org.eclipse.rse.core.events.SystemResourceChangeEvent;
-import org.eclipse.rse.core.model.ISystemRegistry;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.ui.ISystemContextMenuConstants;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.actions.SystemBaseAction;
-import org.eclipse.rse.ui.view.ISystemTree;
-import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * The action allows users to expand the selected nodes in the Remote System Explorer tree view
- */
-public class SystemExpandAction extends SystemBaseAction {
-
-	/**
-	 * Constructor
-	 * @param parent the shell that employs this action
-	 */
-	public SystemExpandAction(Shell parent) {
-		super(SystemResources.ACTION_EXPAND_SELECTED_LABEL, SystemResources.ACTION_EXPAND_SELECTED_TOOLTIP, parent);
-		allowOnMultipleSelection(true);
-		setContextMenuGroup(ISystemContextMenuConstants.GROUP_EXPAND);
-		setAccelerator('+');
-		setHelp(RSEUIPlugin.HELPPREFIX + "actn0025"); //$NON-NLS-1$
-		setAvailableOffline(true);
-	}
-
-	/**
-	 * <p>
-	 * We intercept to ensure at least one selected item is expandable
-	 *
-	 * @see SystemBaseAction#updateSelection(IStructuredSelection)
-	 */
-	public boolean updateSelection(IStructuredSelection selection) {
-		boolean enable = false;
-		if ((viewer != null) && (viewer instanceof ISystemTree)) {
-			return ((ISystemTree) viewer).areAnySelectedItemsExpandable();
-		}
-		Iterator e = selection.iterator();
-		ISystemViewElementAdapter adapter = null;
-		while (!enable && e.hasNext()) {
-			Object selectedObject = e.next();
-			adapter = getViewAdapter(selectedObject);
-			if (adapter != null) {
-				if (adapter.hasChildren((IAdaptable)selectedObject)) enable = true;
-			}
-		}
-		return enable;
-	}
-
-	/**
-	 * This is the method called when the user selects this action.
-	 * @see org.eclipse.jface.action.Action#run()
-	 */
-	public void run() {
-		//System.out.println("Inside run of SystemRefreshAction");
-		ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry();
-		if ((viewer != null) && (viewer instanceof ISystemResourceChangeListener)) {
-			sr.fireEvent((ISystemResourceChangeListener) viewer, new SystemResourceChangeEvent("dummy", ISystemResourceChangeEvents.EVENT_EXPAND_SELECTED, null)); //$NON-NLS-1$
-		} else
-			sr.fireEvent(new SystemResourceChangeEvent("dummy", ISystemResourceChangeEvents.EVENT_EXPAND_SELECTED, null)); //$NON-NLS-1$
-	}
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemExportConnectionAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemExportConnectionAction.java
deleted file mode 100644
index d09166d5e..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemExportConnectionAction.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2008 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:
- * David Dykstal (IBM) - [216858] provide ability to import and export connections
- ********************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.rse.core.RSECorePlugin;
-import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.internal.persistence.RSEEnvelope;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.persistence.IRSEPersistenceManager;
-import org.eclipse.rse.persistence.IRSEPersistenceProvider;
-import org.eclipse.rse.ui.ISystemContextMenuConstants;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.SystemBasePlugin;
-import org.eclipse.rse.ui.actions.SystemBaseAction;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.FileDialog;
-
-import com.ibm.icu.text.MessageFormat;
-
-/**
- * This is the action for exporting a connection to a file.
- */
-public class SystemExportConnectionAction extends SystemBaseAction {
-	
-	private class ExportJob extends Job {
-		
-		private File outFile;
-		private IHost host;
-		
-		public ExportJob(IHost host, File outFile) {
-			super(SystemResources.SystemExportConnectionAction_ExportJobName);
-			this.outFile = outFile;
-			this.host = host;
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor)
-		 */
-		protected IStatus run(IProgressMonitor monitor) {
-			IStatus status = Status.OK_STATUS;
-			IRSEPersistenceManager manager = RSECorePlugin.getThePersistenceManager();
-			IRSEPersistenceProvider persistenceProvider = manager.getPersistenceProvider("org.eclipse.rse.persistence.PropertyFileProvider"); //$NON-NLS-1$
-			RSEEnvelope envelope = new RSEEnvelope();
-			envelope.add(host);
-			try {
-				FileOutputStream out = new FileOutputStream(outFile);
-				envelope.put(out, persistenceProvider, monitor);
-				out.close();
-			} catch (FileNotFoundException e) {
-				// should not happen, log as unexpected
-				SystemBasePlugin.logError(SystemResources.SystemExportConnectionAction_UnexpectedException, e);
-			} catch (CoreException e) {
-				// log the exception and return the status code
-				SystemBasePlugin.logError(SystemResources.SystemExportConnectionAction_CoreExceptionFound, e);
-				status = e.getStatus();
-			} catch (IOException e) {
-				// should not happend, log as unexpected
-				SystemBasePlugin.logError(SystemResources.SystemExportConnectionAction_UnexpectedException, e);
-			}
-			return status;
-		}
-		
-	}
-	
-	/**
-	 * Constructor.
-	 */
-	public SystemExportConnectionAction() {
-		super(SystemResources.RESID_EXPORT_CONNECTIONS_ACTION_LABEL, SystemResources.RESID_EXPORT_CONNECTION_ACTIONS_TOOLTIP, null);
-		setContextMenuGroup(ISystemContextMenuConstants.GROUP_REORGANIZE);
-		setHelp(RSEUIPlugin.HELPPREFIX + "ActionExportConnectionDefinitions"); //$NON-NLS-1$
-	}
-
-	/**
-	 * The export connection action is enabled when the selection contains only connections (hosts)
-	 */
-	public boolean checkObjectType(Object obj) {
-		boolean result = obj instanceof IHost;
-		return result;
-	}
-	
-	/**
-	 * Called when this action is selection from the popup menu.
-	 */
-	public void run() {
-		FileDialog saveDialog = new FileDialog(shell, SWT.SAVE);
-		String path = saveDialog.open();
-		if (path != null) {
-			File outFile = new File(path);
-			boolean ok = true;
-			if (outFile.exists()) {
-				if (outFile.canWrite()) {
-					String title = SystemResources.SystemExportConnectionAction_Warning;
-					String message = MessageFormat.format(SystemResources.SystemExportConnectionAction_OverwriteFileCondition, new String[] {path});
-					ok = MessageDialog.openConfirm(shell, title, message);
-				} else {
-					String title = SystemResources.SystemExportConnectionAction_Error;
-					String message = MessageFormat.format(SystemResources.SystemExportConnectionAction_WriteProtectedFileCondition, new String[] {path});
-					MessageDialog.openError(shell, title, message);
-					ok = false;
-				}
-			}
-			if (ok) {
-				IStructuredSelection selection = getSelection();
-				Assert.isTrue(selection.size() == 1, "selection size should be one"); //$NON-NLS-1$
-				IHost host = (IHost) selection.getFirstElement();
-				Job exportJob = new ExportJob(host, outFile);
-				exportJob.schedule();
-			}
-		}
-	}
-	
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterCascadingNewFilterPoolReferenceAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterCascadingNewFilterPoolReferenceAction.java
deleted file mode 100644
index 82c929a7d..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterCascadingNewFilterPoolReferenceAction.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2008 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
-import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManager;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.internal.ui.view.SystemViewMenuListener;
-import org.eclipse.rse.ui.ISystemContextMenuConstants;
-import org.eclipse.rse.ui.ISystemIconConstants;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.actions.ISystemViewMenuListener;
-import org.eclipse.rse.ui.actions.SystemBaseAction;
-import org.eclipse.rse.ui.actions.SystemBaseSubMenuAction;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * A cascading menu action for "New Filter Pool Reference->"
- */
-public class SystemFilterCascadingNewFilterPoolReferenceAction 
-       extends SystemBaseSubMenuAction 
-       implements  IMenuListener
-{
-	private ISystemFilterPoolReferenceManager refMgr;
-
-	/**
-	 * Constructor when reference mgr not available. Must call setSystemFilterPoolReferenceManager.
-	 */
-	public SystemFilterCascadingNewFilterPoolReferenceAction(Shell shell)
-	{
-        this(shell, null);
-	}
-
-	/**
-	 * Constructor when reference mgr is available. No need to call setSystemFilterPoolReferenceManager.
-	 */
-	public SystemFilterCascadingNewFilterPoolReferenceAction(Shell shell, ISystemFilterPoolReferenceManager refMgr)
-	{
-		super(SystemResources.ACTION_CASCADING_FILTERPOOL_NEWREFERENCE_LABEL, SystemResources.ACTION_CASCADING_FILTERPOOL_NEWREFERENCE_TOOLTIP, 
-		      RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_NEWFILTERPOOLREF_ID),shell);
-        setCreateMenuEachTime(false);
-        setPopulateMenuEachTime(false);
-		setContextMenuGroup(ISystemContextMenuConstants.GROUP_NEW);        		        
-        this.refMgr = refMgr;
-	}
-
-    /**
-     * Set the help context Id (infoPop) for this action. This must be fully qualified by
-     *  plugin ID.
-     * <p>
-     * Same as {@link org.eclipse.rse.ui.actions.SystemBaseAction #setHelp(String)}
-     * @see org.eclipse.rse.ui.actions.SystemBaseAction #getHelpContextId()
-     */
-    public void setHelpContextId(String id)
-    {
-    	setHelp(id);
-    }
-
-	/**
-	 * @see SystemBaseSubMenuAction#getSubMenu()
-	 */
-	public IMenuManager populateSubMenu(IMenuManager menu)
-	{
-		menu.addMenuListener(this);
-		menu.setRemoveAllWhenShown(true);
-		//menu.setEnabled(true);
-		menu.add(new SystemBaseAction("dummy",null)); //$NON-NLS-1$
-		return menu;
-	}
-	
-	/**
-	 * Set the master filter pool reference manager from which the filter pools are to be selectable,
-	 * and into which we will add the filter pool reference
-	 */
-	public void setSystemFilterPoolReferenceManager(ISystemFilterPoolReferenceManager refMgr)
-	{
-		this.refMgr = refMgr;
-	}
-	
-	/**
-	 * Called when submenu is about to show
-	 */
-	public void menuAboutToShow(IMenuManager ourSubMenu)
-	{
-		Shell shell = getShell();
-		ISystemFilterPoolManager[] mgrs = refMgr.getSystemFilterPoolManagers();
-		SystemFilterCascadingNewFilterPoolReferenceFPMgrAction action = null;
-		ISystemFilterPoolManager mgr = null;
-	    ISystemFilterPoolManager defaultMgr = refMgr.getDefaultSystemFilterPoolManager();
-	    String helpId = getHelpContextId();
-	    if (defaultMgr != null)
-	    {
-           action = new SystemFilterCascadingNewFilterPoolReferenceFPMgrAction(shell, defaultMgr, refMgr);
-           if (helpId != null)
-             action.setHelp(helpId);
-    	   ourSubMenu.add(action.getSubMenu());		
-	    }
-		for (int idx=0; idx<mgrs.length; idx++)
-		{
-		   mgr = mgrs[idx];
-		   if (mgr != defaultMgr)
-		   {
-		     action = new SystemFilterCascadingNewFilterPoolReferenceFPMgrAction(shell, mgr, refMgr);
-             if (helpId != null)
-               action.setHelp(helpId);
-		     ourSubMenu.add(action.getSubMenu());		
-		   }
-		}
-	}
-	
-    /**
-     * Overridable method from parent that instantiates the menu listener who job is to add mnemonics.
-     * @param setMnemonicsOnlyOnce true if the menu is static and so mnemonics need only be set once. False if it is dynamic
-     */
-    protected ISystemViewMenuListener createMnemonicsListener(boolean setMnemonicsOnlyOnce)
-    {
-    	return new SystemViewMenuListener(false); // our menu is re-built dynamically each time
-    }
-	
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterCascadingNewFilterPoolReferenceFPMgrAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterCascadingNewFilterPoolReferenceFPMgrAction.java
deleted file mode 100644
index 8fa6fcc20..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterCascadingNewFilterPoolReferenceFPMgrAction.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2008 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.rse.core.filters.ISystemFilterPool;
-import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
-import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManager;
-import org.eclipse.rse.internal.ui.view.SystemViewMenuListener;
-import org.eclipse.rse.ui.actions.ISystemViewMenuListener;
-import org.eclipse.rse.ui.actions.SystemBaseAction;
-import org.eclipse.rse.ui.actions.SystemBaseSubMenuAction;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * A cascading submenu action for "New Filter Pool Reference->".
- * This is after the first cascade, where we list filter pool managers.
- */
-public class SystemFilterCascadingNewFilterPoolReferenceFPMgrAction 
-       extends SystemBaseSubMenuAction 
-       implements  IMenuListener
-{
-	private ISystemFilterPoolManager mgr;
-	private ISystemFilterPoolReferenceManager refMgr;
-
-	/**
-	 * Constructor.
-	 */
-	public SystemFilterCascadingNewFilterPoolReferenceFPMgrAction(Shell shell, 
-	                                                                    ISystemFilterPoolManager mgr,
-	                                                                    ISystemFilterPoolReferenceManager refMgr)
-	{
-		super(mgr.getName(),shell);
-        setCreateMenuEachTime(false);
-        setPopulateMenuEachTime(false);
-        this.mgr = mgr;
-        this.refMgr = refMgr;
-	}
-
-    /**
-     * Set the help context Id (infoPop) for this action. This must be fully qualified by
-     *  plugin ID.
-     * <p>
-     * Same as {@link org.eclipse.rse.ui.actions.SystemBaseAction #setHelp(String)}
-     * @see org.eclipse.rse.ui.actions.SystemBaseAction #getHelpContextId()
-     */
-    public void setHelpContextId(String id)
-    {
-    	setHelp(id);
-    }
-
-	/**
-	 * @see SystemBaseSubMenuAction#getSubMenu()
-	 */
-	public IMenuManager populateSubMenu(IMenuManager menu)
-	{
-		menu.addMenuListener(this);
-		menu.setRemoveAllWhenShown(true);
-		//menu.setEnabled(true);
-		menu.add(new SystemBaseAction("dummy",null)); //$NON-NLS-1$
-		return menu;
-	}
-	
-	/**
-	 * Called when submenu is about to show
-	 */
-	public void menuAboutToShow(IMenuManager ourSubMenu)
-	{
-		//System.out.println("inside menu about to show");
-		ISystemFilterPool[] pools = mgr.getSystemFilterPools();
-		SystemFilterPoolReferenceSelectAction action = null;
-		ISystemFilterPool pool = null;
-		Shell shell = getShell();
-		String helpId = getHelpContextId();
-		for (int idx=0; idx<pools.length; idx++)
-		{
-			pool = pools[idx];
-			if (!isPoolAlreadyReferenced(pool) && !isPoolConnectionUnique(pool))
-			{
-		      action = new SystemFilterPoolReferenceSelectAction(shell,pool,refMgr);
-		      if (helpId != null)
-		        action.setHelp(helpId);
-		      ourSubMenu.add(action);		
-			}
-		}
-	}
-	
-	/**
-	 * Determine if the given filter pool is already referenced by this reference manager
-	 */
-	private boolean isPoolAlreadyReferenced(ISystemFilterPool pool)
-	{
-		return refMgr.isSystemFilterPoolReferenced(pool);
-	}
-	/**
-	 * Determine if the given filter pool is the special unique pool for a connection.
-	 * If so, we don't want to let anyone else reference it.
-	 */
-	private boolean isPoolConnectionUnique(ISystemFilterPool pool)
-	{
-		return (pool.getOwningParentName() != null);
-	}
-		
-    /**
-     * Overridable method from parent that instantiates the menu listener who job is to add mnemonics.
-     * @param setMnemonicsOnlyOnce true if the menu is static and so mnemonics need only be set once. False if it is dynamic
-     */
-    protected ISystemViewMenuListener createMnemonicsListener(boolean setMnemonicsOnlyOnce)
-    {
-    	return new SystemViewMenuListener(false); // our menu is re-built dynamically each time
-    }
-	
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterCopyFilterAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterCopyFilterAction.java
deleted file mode 100644
index 0e473997e..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterCopyFilterAction.java
+++ /dev/null
@@ -1,367 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2008 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [186748] Move ISubSystemConfigurationAdapter from UI/rse.core.subsystems.util
- * Martin Oberhuber (Wind River) - [186128][refactoring] Move IProgressMonitor last in public base classes 
- * David McKnight   (IBM)        - [223103] [cleanup] fix broken externalized strings
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.rse.core.filters.ISystemFilter;
-import org.eclipse.rse.core.filters.ISystemFilterPool;
-import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
-import org.eclipse.rse.core.filters.ISystemFilterPoolManagerProvider;
-import org.eclipse.rse.core.filters.ISystemFilterReference;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.services.clientserver.messages.SystemMessage;
-import org.eclipse.rse.ui.ISystemMessages;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.actions.SystemBaseAction;
-import org.eclipse.rse.ui.actions.SystemBaseCopyAction;
-import org.eclipse.rse.ui.dialogs.SystemRenameSingleDialog;
-import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement;
-import org.eclipse.rse.ui.filters.SystemFilterUIHelpers;
-import org.eclipse.rse.ui.subsystems.ISubSystemConfigurationAdapter;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * Copy a filter action.
- */
-public class SystemFilterCopyFilterAction extends SystemBaseCopyAction
-{
-	private String promptString = null;
-	private SystemSimpleContentElement initialSelectionElement = null;
-	private SystemSimpleContentElement root = null;
-	
-	/**
-	 * Constructor 
-	 */
-	public SystemFilterCopyFilterAction(Shell parent) 
-	{
-		super(parent, SystemResources.ACTION_COPY_FILTER_LABEL, MODE_COPY);
-		setToolTipText(SystemResources.ACTION_COPY_FILTER_TOOLTIP);
-		promptString = SystemResources.RESID_COPY_PROMPT;		
-	}
-
-	/**
-	 * Reset. This is a re-run of this action
-	 */
-	protected void reset()
-	{
-		super.reset();
-		initialSelectionElement = null;
-		root = null;
-	}
-
-    /**
-     * Set the help context Id (infoPop) for this action. This must be fully qualified by
-     *  plugin ID.
-     * <p>
-     * Same as {@link org.eclipse.rse.ui.actions.SystemBaseAction #setHelp(String)}
-     * @see org.eclipse.rse.ui.actions.SystemBaseAction #getHelpContextId()
-     */
-    public void setHelpContextId(String id)
-    {
-    	setHelp(id);
-    }
- 
-	/**
-	 * We override from parent to do unique checking...
-	 * <p>
-	 * @see SystemBaseAction#updateSelection(IStructuredSelection)
-	 */
-	public boolean updateSelection(IStructuredSelection selection)
-	{
-		boolean enable = true;
-		/* */
-		Iterator e = selection.iterator();		
-		while (enable && e.hasNext())
-		{
-			Object selectedObject = e.next();
-			if (selectedObject instanceof SystemSimpleContentElement)
-			  selectedObject = ((SystemSimpleContentElement)selectedObject).getData();
-			if (!checkObjectType(selectedObject))
-			  enable = false;
-		}
-		/* */
-		return enable;
-	}
-    /**
-     * Called by SystemBaseAction when selection is set.
-     * Our opportunity to verify we are allowed for this selected type.
-     */
-	public boolean checkObjectType(Object selectedObject)
-	{
-		if (selectedObject instanceof ISystemFilter) 
-		{
-			ISystemFilter fs = (ISystemFilter)selectedObject;
-			return !fs.isNonChangable();
-		}
-		else if (selectedObject instanceof ISystemFilterReference) 
-		{
-			ISystemFilter fs = ((ISystemFilterReference)selectedObject).getReferencedFilter();
-			return !fs.isNonChangable();
-		}
-        else
-          return false;
-	}
- 
-    // --------------------------
-    // PARENT METHOD OVERRIDES...
-    // --------------------------
-	/**
-	 * This method is a callback from the select-target-parent dialog, allowing us to decide whether the current selected
-	 * object is a valid parent object. This affects the enabling of the OK button on that dialog.
-	 */
-	public boolean isValidTargetParent(SystemSimpleContentElement selectedElement)
-	{
-		if (selectedElement == null)
-		  return false;
-		Object data = selectedElement.getData();
-		return (data instanceof ISystemFilterPool);
-	}
-    
-	/**
-	 * @see SystemBaseCopyAction#checkForCollision(Shell, IProgressMonitor, Object, Object, String)
-	 */
-	protected String checkForCollision(Shell shell, IProgressMonitor monitor,
-	                                   Object targetContainer, Object oldObject, String oldName)
-	{
-		ISystemFilterPool newPool = (ISystemFilterPool)targetContainer;
-		//ISystemFilterPoolManager newMgr = newPool.getSystemFilterPoolManager();
-		String newName = oldName;
-		ISystemFilter match = newPool.getSystemFilter(oldName);
-		if (match != null)
-		{
-		  //monitor.setVisible(false); wish we could!
-		  //ValidatorFilterName validator = new ValidatorFilterName(newPool.getSystemFilterNames());
-		  //SystemCollisionRenameDialog dlg = new SystemCollisionRenameDialog(shell, validator, oldName);
-		  SystemRenameSingleDialog dlg = new SystemRenameSingleDialog(shell, true, match, null); // true => copy-collision-mode
-		  dlg.open();
-		  if (!dlg.wasCancelled())
-		    newName = dlg.getNewName();
-		  else
-		    newName = null;
-		}
-		return newName;
-	}
-	/**
-	 * @see SystemBaseCopyAction#doCopy(Object, Object, String, IProgressMonitor)
-	 */
-	protected boolean doCopy(Object targetContainer, Object oldObject, String newName, IProgressMonitor monitor)
-		throws Exception 
-    {
-    	ISystemFilter         oldFilter = (ISystemFilter)oldObject;
-    	ISystemFilterPool oldFilterPool = oldFilter.getParentFilterPool();
-		ISystemFilterPoolManager oldMgr = oldFilterPool.getSystemFilterPoolManager();
-    	ISystemFilterPool       newPool = (ISystemFilterPool)targetContainer;
-    	//ISystemFilterPoolManager newMgr = newPool.getSystemFilterPoolManager();
-    	
-        ISystemFilter         newFilter = oldMgr.copySystemFilter(newPool, oldFilter, newName);
-        
-        if ((root != null) && (newFilter!=null))
-        {
-          Object data = root.getData();
-          if ((data!=null) && (data instanceof TreeViewer))
-            ((TreeViewer)data).refresh();
-        }
-		return (newFilter != null);
-	}
-
-	/**
-	 * @see SystemBaseCopyAction#getTreeModel()
-	 */
-	protected SystemSimpleContentElement getTreeModel() 
-	{
-		ISystemFilter firstFilter = getFirstSelectedFilter(); 
-		ISystemFilterPoolManagerProvider provider = firstFilter.getProvider();
-		return getPoolMgrTreeModel(provider, firstFilter.getSystemFilterPoolManager());
-	}
-	/**
-	 * @see SystemBaseCopyAction#getTreeInitialSelection()
-	 */
-	protected SystemSimpleContentElement getTreeInitialSelection()
-	{
-		return initialSelectionElement;
-	}
-
-    /**
-     * Set the prompt string that shows up at the top of the copy-destination dialog.
-     */
-    public void setPromptString(String promptString)
-    {
-    	this.promptString = promptString;
-    }
-	/**
-	 * @see SystemBaseCopyAction#getPromptString()
-	 */
-	protected String getPromptString() 
-	{
-		return promptString;
-	}
-	/**
-	 * @see SystemBaseCopyAction#getCopyingMessage()
-	 */
-	protected SystemMessage getCopyingMessage() 
-	{
-		return RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COPYFILTERS_PROGRESS);
-	}
-	/**
-	 * @see SystemBaseCopyAction#getCopyingMessage(String)
-	 */
-	protected SystemMessage getCopyingMessage(String oldName) 
-	{
-		return RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COPYFILTER_PROGRESS).makeSubstitution(oldName);
-	}
-
-	/**
-	 * @see SystemBaseCopyAction#getOldObjects()
-	 */
-	protected Object[] getOldObjects() 
-	{
-		return getSelectedFilters();
-	}
-
-	/**
-	 * @see SystemBaseCopyAction#getOldNames()
-	 */
-	protected String[] getOldNames() 
-	{
-		ISystemFilter[] filters = getSelectedFilters();
-		String[] names = new String[filters.length];
-		for (int idx=0; idx<filters.length; idx++)
-		   names[idx] = filters[idx].getName();
-		return names;
-	}
-
-    /**
-     * Get the currently selected filters
-     */
-    protected ISystemFilter[] getSelectedFilters()
-    {
-   	    IStructuredSelection selection = getSelection();
-   	    ISystemFilter[] filters = new ISystemFilter[selection.size()];
-   	    Iterator i = selection.iterator();
-   	    int idx=0;
-   	    while (i.hasNext())
-   	    {
-   	       Object next = i.next();
-   	       if (next instanceof SystemSimpleContentElement)    	
-   	         next = ((SystemSimpleContentElement)next).getData();
-   	       if (next instanceof ISystemFilterReference)
-   	         filters[idx++] = ((ISystemFilterReference)next).getReferencedFilter();
-   	       else
-   	         filters[idx++] = (ISystemFilter)next;
-   	    }
-   	    return filters;
-    }
-    /**
-     * Get the first selected filter
-     */
-    protected ISystemFilter getFirstSelectedFilter()
-    {
-    	Object first = getFirstSelection();
-   	    if (first instanceof SystemSimpleContentElement)    	
-   	    {
-   	      root = ((SystemSimpleContentElement)first).getRoot();
-   	      first = ((SystemSimpleContentElement)first).getData();
-   	    }
-   	    if (first == null)
-   	      return null;
-   	    else if (first instanceof ISystemFilterReference)
-   	      return ((ISystemFilterReference)first).getReferencedFilter();
-   	    else if (first instanceof ISystemFilter)
-   	      return (ISystemFilter)first;
-   	    else
-   	      return null;   	      
-    }
-   
-    // ------------------
-    // PRIVATE METHODS...
-    // ------------------
-    
-	/**
-	 * Create and return data model to populate selection tree with.
-	 * @param poolMgrProvider The provider who will give us the list of filter pool managers to populate the list with
-	 * @param poolMgr The SystemFilterPoolManager whose tree model element is to be pre-selected
-	 */
-    protected SystemSimpleContentElement getPoolMgrTreeModel(ISystemFilterPoolManagerProvider poolMgrProvider, 
-                                                             ISystemFilterPoolManager poolMgr)
-    {
-    	SystemSimpleContentElement veryRootElement = 
-    	   new SystemSimpleContentElement("Root", //$NON-NLS-1$
-    	                                  null, null, (Vector)null);	    	
-    	veryRootElement.setRenamable(false);
-    	veryRootElement.setDeletable(false);
-    	                
-    	ISystemFilterPoolManager[] mgrs = poolMgrProvider.getSystemFilterPoolManagers();
-
-    	ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)poolMgrProvider.getAdapter(ISubSystemConfigurationAdapter.class);
-    	ImageDescriptor image = adapter.getSystemFilterPoolManagerImage();
-    	                                  
-    	if ((mgrs == null) || (mgrs.length == 0))
-    	  return veryRootElement;
-
-    	Vector veryRootChildren = new Vector(); 
-    	for (int idx=0; idx<mgrs.length; idx++)
-    	{
-           SystemSimpleContentElement mgrElement = 
-    	      new SystemSimpleContentElement(mgrs[idx].getName(),
-    	                                     mgrs[idx], veryRootElement, (Vector)null);	
-    	   mgrElement.setRenamable(false);
-    	   mgrElement.setDeletable(false);
-    	   mgrElement.setImageDescriptor(image);
-    	   
-    	   Vector elements = new Vector();    	   
-           populateFilterPoolContentElementVector(poolMgrProvider, mgrs[idx], elements, mgrElement);    	   
-           mgrElement.setChildren(elements);
-    	   
-           veryRootChildren.addElement(mgrElement);
-           if (mgrs[idx] == poolMgr)
-             initialSelectionElement = mgrElement;          
-    	}    	
-        veryRootElement.setChildren(veryRootChildren);    	
-    	return veryRootElement;
-    }
-    
-    /**
-     * Populate filter pool manager subtree with filter pools
-     */
-    protected static void populateFilterPoolContentElementVector(ISystemFilterPoolManagerProvider poolMgrProvider, 
-                                                                 ISystemFilterPoolManager mgr, 
-                                                                 Vector elements, 
-                                                                 SystemSimpleContentElement parentElement)
-    {
-    	//String mgrName = mgr.getName();
-    	ISystemFilterPool[] pools = mgr.getSystemFilterPools();
-        for (int idx=0; idx<pools.length; idx++)
-        {
-           ISystemFilterPool pool = pools[idx];
-           SystemSimpleContentElement cElement = 
-             new SystemSimpleContentElement(pool.getName(), pool, parentElement, (Vector)null);
-           cElement.setImageDescriptor(SystemFilterUIHelpers.getFilterPoolImage(poolMgrProvider, pool));
-           //cElement.setSelected(setFilterPoolSelection(pool));           
-           elements.addElement(cElement);  
-        }        
-    }
-    
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterCopyFilterPoolAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterCopyFilterPoolAction.java
deleted file mode 100644
index 56897e178..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterCopyFilterPoolAction.java
+++ /dev/null
@@ -1,328 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2008 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [186748] Move ISubSystemConfigurationAdapter from UI/rse.core.subsystems.util
- * Martin Oberhuber (Wind River) - [186128][refactoring] Move IProgressMonitor last in public base classes 
- * David Dykstal (IBM) - [194268] fixed updateSelection to disable when selection is empty
- * David McKnight   (IBM)        - [223103] [cleanup] fix broken externalized strings
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.rse.core.filters.ISystemFilterPool;
-import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
-import org.eclipse.rse.core.filters.ISystemFilterPoolManagerProvider;
-import org.eclipse.rse.core.filters.ISystemFilterPoolReference;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.services.clientserver.messages.SystemMessage;
-import org.eclipse.rse.ui.ISystemMessages;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.actions.SystemBaseAction;
-import org.eclipse.rse.ui.actions.SystemBaseCopyAction;
-import org.eclipse.rse.ui.dialogs.SystemRenameSingleDialog;
-import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement;
-import org.eclipse.rse.ui.subsystems.ISubSystemConfigurationAdapter;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * Copy a filter pool action.
- */
-public class SystemFilterCopyFilterPoolAction extends SystemBaseCopyAction
-{
-	private String promptString = null;
-	private SystemSimpleContentElement initialSelectionElement = null;
-	private SystemSimpleContentElement root = null;
-	
-	/**
-	 * Constructor 
-	 */
-	public SystemFilterCopyFilterPoolAction(Shell parent) 
-	{
-		super(parent, SystemResources.ACTION_COPY_FILTERPOOL_LABEL, MODE_COPY);
-		setToolTipText(SystemResources.ACTION_COPY_FILTERPOOL_TOOLTIP);
-		promptString = SystemResources.RESID_COPY_PROMPT;		
-	}
-	/**
-	 * Reset. This is a re-run of this action
-	 */
-	protected void reset()
-	{
-		super.reset();
-		initialSelectionElement = null;
-		root = null;
-	}
-
-    /**
-     * Set the help context Id (infoPop) for this action. This must be fully qualified by
-     *  plugin ID.
-     * <p>
-     * Same as {@link org.eclipse.rse.ui.actions.SystemBaseAction #setHelp(String)}
-     * @see org.eclipse.rse.ui.actions.SystemBaseAction #getHelpContextId()
-     */
-    public void setHelpContextId(String id)
-    {
-    	setHelp(id);
-    }
- 
-	/**
-	 * We override from parent to do unique checking...
-	 * <p>
-	 * @see SystemBaseAction#updateSelection(IStructuredSelection)
-	 */
-	public boolean updateSelection(IStructuredSelection selection) {
-		boolean enable = false;
-		if (!selection.isEmpty()) {
-			enable = true;
-			Iterator e = selection.iterator();
-			while (enable && e.hasNext()) {
-				Object selectedObject = e.next();
-				if (selectedObject instanceof SystemSimpleContentElement) {
-					selectedObject = ((SystemSimpleContentElement) selectedObject).getData();
-				}
-				ISystemFilterPool pool = null;
-				if (selectedObject instanceof ISystemFilterPool) {
-					pool = (ISystemFilterPool) selectedObject;
-				} else if (selectedObject instanceof ISystemFilterPoolReference) {
-					pool = ((ISystemFilterPoolReference) selectedObject).getReferencedFilterPool();
-				}
-				// enable if this is not a connection specific filter pool
-				enable = (pool != null) && (pool.getOwningParentName() == null);
-			}
-		}
-		return enable;
-	}
- 
-    // --------------------------
-    // PARENT METHOD OVERRIDES...
-    // --------------------------
-	/**
-	 * This method is a callback from the select-target-parent dialog, allowing us to decide whether the current selected
-	 * object is a valid parent object. This affects the enabling of the OK button on that dialog.
-	 */
-	public boolean isValidTargetParent(SystemSimpleContentElement selectedElement)
-	{
-		if (selectedElement == null)
-		  return false;
-		Object data = selectedElement.getData();
-		return (data instanceof ISystemFilterPoolManager);
-	}
-    
-	/**
-	 * @see SystemBaseCopyAction#checkForCollision(Shell, IProgressMonitor, Object, Object, String)
-	 */
-	protected String checkForCollision(Shell shell, IProgressMonitor monitor,
-	                                   Object targetContainer, Object oldObject, String oldName)
-	{
-		ISystemFilterPoolManager newMgr = (ISystemFilterPoolManager)targetContainer;
-		String newName = oldName;
-		//SystemFilterPool oldFilterPool = (SystemFilterPool)oldObject;
-		ISystemFilterPool match = newMgr.getSystemFilterPool(oldName);
-		if (match != null)
-		{
-		  //monitor.setVisible(false); wish we could!
-		  //ValidatorFilterPoolName validator = new ValidatorFilterPoolName(newMgr.getSystemFilterPoolNames());
-		  //SystemCollisionRenameDialog dlg = new SystemCollisionRenameDialog(shell, validator, oldName);
-		  SystemRenameSingleDialog dlg = new SystemRenameSingleDialog(shell, true, match, null); // true => copy-collision-mode
-		  dlg.open();
-		  if (!dlg.wasCancelled())
-		    newName = dlg.getNewName();
-		  else
-		    newName = null;
-		}
-		return newName;
-	}
-	/**
-	 * @see SystemBaseCopyAction#doCopy(Object, Object, String, IProgressMonitor)
-	 */
-	protected boolean doCopy(Object targetContainer, Object oldObject, String newName, IProgressMonitor monitor)
-		throws Exception 
-    {
-    	ISystemFilterPool oldFilterPool = (ISystemFilterPool)oldObject;
-		ISystemFilterPoolManager oldMgr = oldFilterPool.getSystemFilterPoolManager();
-    	ISystemFilterPoolManager newMgr = (ISystemFilterPoolManager)targetContainer;
-        ISystemFilterPool newFilterPool = oldMgr.copySystemFilterPool(newMgr, oldFilterPool, newName);
-        if ((root != null) && (newFilterPool!=null))
-        {
-          Object data = root.getData();
-          if ((data!=null) && (data instanceof TreeViewer))
-            ((TreeViewer)data).refresh();
-        }
-		return (newFilterPool != null);
-	}
-	
-	/**
-	 * @see SystemBaseCopyAction#getTreeModel()
-	 */
-	protected SystemSimpleContentElement getTreeModel() 
-	{
-		ISystemFilterPool firstPool = getFirstSelectedFilterPool(); 
-		ISystemFilterPoolManagerProvider provider = firstPool.getProvider();
-		return getPoolMgrTreeModel(provider, firstPool.getSystemFilterPoolManager());
-	}
-	/**
-	 * @see SystemBaseCopyAction#getTreeInitialSelection()
-	 */
-	protected SystemSimpleContentElement getTreeInitialSelection()
-	{
-		return initialSelectionElement;
-	}
-
-    /**
-     * Set the prompt string that shows up at the top of the copy-destination dialog.
-     */
-    public void setPromptString(String promptString)
-    {
-    	this.promptString = promptString;
-    }
-	/**
-	 * @see SystemBaseCopyAction#getPromptString()
-	 */
-	protected String getPromptString() 
-	{
-		//return SystemResources.RESID_COPY_TARGET_PROFILE_PROMPT);
-		return promptString;
-	}
-	/**
-	 * @see SystemBaseCopyAction#getCopyingMessage()
-	 */
-	protected SystemMessage getCopyingMessage() 
-	{
-		return RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COPYFILTERPOOLS_PROGRESS);
-	}
-	/**
-	 * @see SystemBaseCopyAction#getCopyingMessage(String)
-	 */
-	protected SystemMessage getCopyingMessage(String oldName) 
-	{
-		return RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COPYFILTERPOOL_PROGRESS).makeSubstitution(oldName);
-	}
-	/**
-	 * Return complete message
-	 */
-	public SystemMessage getCompletionMessage(Object targetContainer, String[] oldNames, String[] newNames)
-	{
-		return RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COPYFILTERPOOL_COMPLETE).makeSubstitution(((ISystemFilterPoolManager)targetContainer).getName());		
-	}
-	
-	/**
-	 * @see SystemBaseCopyAction#getOldObjects()
-	 */
-	protected Object[] getOldObjects() 
-	{
-		return getSelectedFilterPools();
-	}
-
-	/**
-	 * @see SystemBaseCopyAction#getOldNames()
-	 */
-	protected String[] getOldNames() 
-	{
-		ISystemFilterPool[] filterPools = getSelectedFilterPools();
-		String[] names = new String[filterPools.length];
-		for (int idx=0; idx<filterPools.length; idx++)
-		   names[idx] = filterPools[idx].getName();
-		return names;
-	}
-
-    /**
-     * Get the currently selected filter pools
-     */
-    protected ISystemFilterPool[] getSelectedFilterPools()
-    {
-   	    IStructuredSelection selection = getSelection();
-   	    ISystemFilterPool[] filterPools = new ISystemFilterPool[selection.size()];
-   	    Iterator i = selection.iterator();
-   	    int idx=0;
-   	    while (i.hasNext())
-   	    {
-   	       Object next = i.next();
-   	       if (next instanceof SystemSimpleContentElement)    	
-   	         next = ((SystemSimpleContentElement)next).getData();
-   	       if (next instanceof ISystemFilterPoolReference)
-   	         filterPools[idx++] = ((ISystemFilterPoolReference)next).getReferencedFilterPool();
-   	       else
-   	         filterPools[idx++] = (ISystemFilterPool)next;
-   	    }
-   	    return filterPools;
-    }
-    /**
-     * Get the first selected filter pool
-     */
-    protected ISystemFilterPool getFirstSelectedFilterPool()
-    {
-    	Object first = getFirstSelection();
-   	    if (first instanceof SystemSimpleContentElement)    	
-   	    {
-   	      root = ((SystemSimpleContentElement)first).getRoot();
-   	      first = ((SystemSimpleContentElement)first).getData();
-   	    }
-   	    if (first == null)
-   	      return null;
-   	    else if (first instanceof ISystemFilterPoolReference)
-   	      return ((ISystemFilterPoolReference)first).getReferencedFilterPool();
-   	    else if (first instanceof ISystemFilterPool)
-   	      return (ISystemFilterPool)first;
-   	    else
-   	      return null;   	      
-    }
-   
-    // ------------------
-    // PRIVATE METHODS...
-    // ------------------
-    
-	/**
-	 * Create and return data model to populate selection tree with.
-	 * @param poolMgrProvider The provider who will give us the list of filter pool managers to populate the list with
-	 * @param poolMgr The SystemFilterPoolManager whose tree model element is to be pre-selected
-	 */
-    protected SystemSimpleContentElement getPoolMgrTreeModel(ISystemFilterPoolManagerProvider poolMgrProvider, ISystemFilterPoolManager poolMgr)
-    {
-    	SystemSimpleContentElement veryRootElement = 
-    	   new SystemSimpleContentElement("Root", //$NON-NLS-1$
-    	                                  null, null, (Vector)null);	    	
-    	veryRootElement.setRenamable(false);
-    	veryRootElement.setDeletable(false);
-    	                
-    	ISystemFilterPoolManager[] mgrs = poolMgrProvider.getSystemFilterPoolManagers();
-    	ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)poolMgrProvider.getAdapter(ISubSystemConfigurationAdapter.class);
-    	ImageDescriptor image = adapter.getSystemFilterPoolManagerImage();
-    	                                  
-    	if ((mgrs == null) || (mgrs.length == 0))
-    	  return veryRootElement;
-    	 
-    	Vector veryRootChildren = new Vector(); 
-    	for (int idx=0; idx<mgrs.length; idx++)
-    	{
-           SystemSimpleContentElement mgrElement = 
-    	      new SystemSimpleContentElement(mgrs[idx].getName(),
-    	                                     mgrs[idx], veryRootElement, (Vector)null);	
-    	   mgrElement.setRenamable(false);
-    	   mgrElement.setDeletable(false);
-    	   mgrElement.setImageDescriptor(image);
-           veryRootChildren.addElement(mgrElement);
-           if (mgrs[idx] == poolMgr)
-             initialSelectionElement = mgrElement;          
-    	}    	
-        veryRootElement.setChildren(veryRootChildren);    	
-    	return veryRootElement;
-    }
-     
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterCopyFilterStringAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterCopyFilterStringAction.java
deleted file mode 100644
index 244c77d58..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterCopyFilterStringAction.java
+++ /dev/null
@@ -1,496 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2007 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
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [186748] Move ISubSystemConfigurationAdapter from UI/rse.core.subsystems.util
- * Martin Oberhuber (Wind River) - [186128][refactoring] Move IProgressMonitor last in public base classes 
- ********************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.rse.core.filters.ISystemFilter;
-import org.eclipse.rse.core.filters.ISystemFilterPool;
-import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
-import org.eclipse.rse.core.filters.ISystemFilterPoolManagerProvider;
-import org.eclipse.rse.core.filters.ISystemFilterString;
-import org.eclipse.rse.core.filters.ISystemFilterStringReference;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.services.clientserver.messages.SystemMessage;
-import org.eclipse.rse.ui.ISystemMessages;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.actions.SystemBaseAction;
-import org.eclipse.rse.ui.actions.SystemBaseCopyAction;
-import org.eclipse.rse.ui.dialogs.SystemRenameSingleDialog;
-import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement;
-import org.eclipse.rse.ui.filters.SystemFilterUIHelpers;
-import org.eclipse.rse.ui.messages.SystemMessageDialog;
-import org.eclipse.rse.ui.subsystems.ISubSystemConfigurationAdapter;
-import org.eclipse.rse.ui.validators.ValidatorUniqueString;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * Copy a filter string action.
- */
-public class SystemFilterCopyFilterStringAction extends SystemBaseCopyAction
-{
-	private String promptString = null;
-	private SystemSimpleContentElement initialSelectionElement = null;
-	private SystemSimpleContentElement root = null;
-	private ISystemFilterString[] strings = null;
-	
-	/**
-	 * Constructor 
-	 */
-	public SystemFilterCopyFilterStringAction(Shell parent) 
-	{
-		super(parent, SystemResources.ACTION_COPY_FILTERSTRING_LABEL, MODE_COPY);
-		promptString = SystemResources.RESID_COPY_PROMPT;		
-	}
-	
-	/**
-	 * Reset. This is a re-run of this action
-	 */
-	protected void reset()
-	{
-		super.reset();
-		initialSelectionElement = null;
-		root = null;
-		strings = null;
-	}
-	
-    /**
-     * Set the help context Id (infoPop) for this action. This must be fully qualified by
-     *  plugin ID.
-     * <p>
-     * Same as {@link org.eclipse.rse.ui.actions.SystemBaseAction #setHelp(String)}
-     * @see org.eclipse.rse.ui.actions.SystemBaseAction #getHelpContextId()
-     */
-    public void setHelpContextId(String id)
-    {
-    	setHelp(id);
-    }
- 
-    /**
-     * Overridable method if you support duplicate filter strings in the same filter.
-     * By default, queries the "supportsDuplicateFilterStrings" attribute in the filter.
-     */
-    protected boolean supportsDuplicateFilterStrings(ISystemFilter filter)
-    {
-    	return filter.isSupportsDuplicateFilterStrings();
-    }
-    
-	/**
-	 * We override from parent to do unique checking...
-	 * <p>
-	 * @see SystemBaseAction#updateSelection(IStructuredSelection)
-	 */
-	public boolean updateSelection(IStructuredSelection selection)
-	{
-		boolean enable = true;
-		/* */
-		Iterator e = selection.iterator();		
-		while (enable && e.hasNext())
-		{
-			Object selectedObject = e.next();
-			if (selectedObject instanceof SystemSimpleContentElement)
-			  selectedObject = ((SystemSimpleContentElement)selectedObject).getData();
-            if (!checkObjectType(selectedObject))
-              enable = false;
-		}
-		/* */
-		return enable;
-	}
-    /**
-     * Called by SystemBaseAction when selection is set.
-     * Our opportunity to verify we are allowed for this selected type.
-     */
-	public boolean checkObjectType(Object selectedObject)
-	{
-		if (selectedObject instanceof ISystemFilterString) 
-		{
-			ISystemFilterString fs = (ISystemFilterString)selectedObject;
-			return fs.isChangable();
-		}
-		else if (selectedObject instanceof ISystemFilterStringReference) 
-		{
-			ISystemFilterStringReference frs = (ISystemFilterStringReference)selectedObject;
-			return frs.getReferencedFilterString().isChangable();
-		}
-        else
-          return false;
-	}
- 
-    // --------------------------
-    // PARENT METHOD OVERRIDES...
-    // --------------------------
-	/**
-	 * This method is a callback from the select-target-parent dialog, allowing us to decide whether the current selected
-	 * object is a valid parent object. This affects the enabling of the OK button on that dialog.
-	 * <p>
-	 * The default is to return true if the selected element has no children. This is sufficient for most cases. However, 
-	 * in some cases it is not, such as for filter strings where we want to only enable OK if a filter is selected. It is 
-	 * possible that filter pools have no filters, so the default algorithm is not sufficient. In these cases the child class
-	 * can override this method.
-	 */
-	public boolean isValidTargetParent(SystemSimpleContentElement selectedElement)
-	{
-		Object data = selectedElement.getData();
-		if (data instanceof ISystemFilter)
-		  return !((ISystemFilter)data).isPromptable();
-		else
-		  return false;
-	}
-
-	/**
-	 * Overridable entry point when you want to prevent any copies/moves if any of the
-	 * selected objects have a name collision.
-	 * <p>
-	 * If you decide to override this, it is your responsibility to issue the error 
-	 * message to the user and return false here.
-	 * <p>
-	 * @return true if there is no problem, false if there is a fatal collision
-	 */
-	protected boolean preCheckForCollision(Shell shell, Object targetContainer, 
-	                                       Object oldObject, String oldName)
-	{
-		ISystemFilter newFilter = (ISystemFilter)targetContainer;
-		if (supportsDuplicateFilterStrings(newFilter))
-		  return true;
-		ISystemFilterString match = newFilter.getSystemFilterString(oldName);
-		if (match != null)
-		{
-		  SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_FILTERSTRING_ALREADYEXISTS);
-		  msg.makeSubstitution(oldName, newFilter.getName());
-  		  SystemMessageDialog.displayErrorMessage(shell, msg);
-		}
-		return (match == null); // all is well iff such a filter string doesn't already exist.
-	}	
-    
-	/**
-	 * SHOULD NEVER BE CALLED IF preCheckForCollision WORKS PROPERLY
-	 * @see SystemBaseCopyAction#checkForCollision(Shell, IProgressMonitor, Object, Object, String)
-	 */
-	protected String checkForCollision(Shell shell, IProgressMonitor monitor,
-	                                   Object targetContainer, Object oldObject, String oldName)
-	{
-		ISystemFilter     newFilter = (ISystemFilter)targetContainer;
-		if (supportsDuplicateFilterStrings(newFilter))
-		  return oldName;
-		//ISystemFilterPool newPool   = newFilter.getParentFilterPool();
-		//ISystemFilterPoolManager newMgr = newPool.getSystemFilterPoolManager();
-		String newName = oldName;
-		ISystemFilterString match = newFilter.getSystemFilterString(oldName);
-		if (match != null)
-		{
-		  //monitor.setVisible(false); wish we could!
-		  boolean caseSensitive = false;
-		  ValidatorUniqueString validator = new ValidatorUniqueString(newFilter.getFilterStrings(),caseSensitive);
-		  //SystemCollisionRenameDialog dlg = new SystemCollisionRenameDialog(shell, validator, oldName);
-		  SystemRenameSingleDialog dlg = new SystemRenameSingleDialog(shell, true, match, validator); // true => copy-collision-mode
-		  dlg.open();
-		  if (!dlg.wasCancelled())
-		    newName = dlg.getNewName();
-		  else
-		    newName = null;
-		}
-		return newName;
-	}
-	/**
-	 * @see SystemBaseCopyAction#doCopy(Object, Object, String, IProgressMonitor)
-	 */
-	protected boolean doCopy(Object targetContainer, Object oldObject, String newName, IProgressMonitor monitor)
-		throws Exception 
-    {
-    	ISystemFilterString oldFilterString = (ISystemFilterString)oldObject;
-		ISystemFilterPoolManager     oldMgr = oldFilterString.getSystemFilterPoolManager();
-    	ISystemFilter          targetFilter = (ISystemFilter)targetContainer;
-    	//SystemFilterPoolManager     newMgr = targetFilter.getSystemFilterPoolManager();
-    	
-        ISystemFilterString newFilterString = oldMgr.copySystemFilterString(targetFilter, oldFilterString);
-        
-        if ((root != null) && (newFilterString!=null))
-        {
-          Object data = root.getData();
-          if ((data!=null) && (data instanceof TreeViewer))
-            ((TreeViewer)data).refresh();
-        }
-		return (newFilterString != null);
-	}
-
-	/**
-	 * @see SystemBaseCopyAction#getTreeModel()
-	 */
-	protected SystemSimpleContentElement getTreeModel() 
-	{
-		ISystemFilterString firstFilterString = getFirstSelectedFilterString(); 
-		ISystemFilterPoolManagerProvider provider = firstFilterString.getProvider();
-		return getPoolMgrTreeModel(provider, firstFilterString.getSystemFilterPoolManager(), getSelectedFilters());
-	}
-	/**
-	 * @see SystemBaseCopyAction#getTreeInitialSelection()
-	 */
-	protected SystemSimpleContentElement getTreeInitialSelection()
-	{
-		return initialSelectionElement;
-	}
-
-    /**
-     * Set the prompt string that shows up at the top of the copy-destination dialog.
-     */
-    public void setPromptString(String promptString)
-    {
-    	this.promptString = promptString;
-    }
-	/**
-	 * @see SystemBaseCopyAction#getPromptString()
-	 */
-	protected String getPromptString() 
-	{
-		return promptString;
-	}
-	/**
-	 * @see SystemBaseCopyAction#getCopyingMessage()
-	 */
-	protected SystemMessage getCopyingMessage() 
-	{
-		return RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COPYFILTERSTRINGS_PROGRESS);
-	}
-	/**
-	 * @see SystemBaseCopyAction#getCopyingMessage( String)
-	 */
-	protected SystemMessage getCopyingMessage(String oldName) 
-	{
-		return RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COPYFILTERSTRING_PROGRESS).makeSubstitution(oldName);
-	}
-
-	/**
-	 * @see SystemBaseCopyAction#getOldObjects()
-	 */
-	protected Object[] getOldObjects() 
-	{
-		return getSelectedFilterStrings();
-	}
-
-	/**
-	 * @see SystemBaseCopyAction#getOldNames()
-	 */
-	protected String[] getOldNames() 
-	{
-		strings = null; // clear previous history
-		ISystemFilterString[] strings = getSelectedFilterStrings();
-		String[] names = new String[strings.length];
-		for (int idx=0; idx<strings.length; idx++)
-		   names[idx] = strings[idx].getString();
-		return names;
-	}
-
-    /**
-     * Get the currently selected filter strings
-     */
-    protected ISystemFilterString[] getSelectedFilterStrings()
-    {
-    	if (strings == null)
-    	{
-   	      IStructuredSelection selection = getSelection();
-   	      strings = new ISystemFilterString[selection.size()];
-   	      Iterator i = selection.iterator();
-   	      int idx=0;
-   	      while (i.hasNext())
-   	      {
-   	         Object next = i.next();
-   	         if (next instanceof SystemSimpleContentElement)    	
-   	           next = ((SystemSimpleContentElement)next).getData();
-   	         if (next instanceof ISystemFilterStringReference)
-   	           strings[idx++] = ((ISystemFilterStringReference)next).getReferencedFilterString();
-   	         else
-   	           strings[idx++] = (ISystemFilterString)next;
-   	      }
-   	    }
-   	    return strings;
-    }
-    /**
-     * Get the intersection list of filters of currently selected filter strings
-     */
-    protected ISystemFilter[] getSelectedFilters()
-    {
-        Vector v = new Vector();
-        ISystemFilterString[] strings = getSelectedFilterStrings();
-        for (int idx=0; idx<strings.length; idx++)
-        {
-           ISystemFilter filter = strings[idx].getParentSystemFilter();
-           if (!supportsDuplicateFilterStrings(filter))
-           {
-             if (!containsFilter(v,filter))
-               v.addElement(filter);      	
-           }
-        }
-        ISystemFilter[] filters = new ISystemFilter[v.size()];
-        for (int idx=0; idx<v.size(); idx++)
-           filters[idx] = (ISystemFilter)v.elementAt(idx);
-        return filters;
-    }    
-    /**
-     * Get the first selected filter string
-     */
-    protected ISystemFilterString getFirstSelectedFilterString()
-    {
-    	Object first = getFirstSelection();
-   	    if (first instanceof SystemSimpleContentElement)    	
-   	    {
-   	      root = ((SystemSimpleContentElement)first).getRoot();
-   	      first = ((SystemSimpleContentElement)first).getData();
-   	    }
-   	    if (first == null)
-   	      return null;
-   	    else if (first instanceof ISystemFilterStringReference)
-   	      return ((ISystemFilterStringReference)first).getReferencedFilterString();
-   	    else if (first instanceof ISystemFilterString)
-   	      return (ISystemFilterString)first;
-   	    else
-   	      return null;   	      
-    }
-   
-    // ------------------
-    // PRIVATE METHODS...
-    // ------------------
-    
-	/**
-	 * Create and return data model to populate selection tree with.
-	 * @param poolMgrProvider The provider who will give us the list of filter pool managers to populate the list with
-	 * @param poolMgr The SystemFilterPoolManager whose tree model element is to be pre-selected
-	 * @param filtersToExclude All the currently selected filters, which are excluded from the target list
-	 */
-    protected SystemSimpleContentElement getPoolMgrTreeModel(ISystemFilterPoolManagerProvider poolMgrProvider, 
-                                                             ISystemFilterPoolManager poolMgr,
-                                                             ISystemFilter[] filtersToExclude)
-    {
-    	SystemSimpleContentElement veryRootElement = 
-    	   new SystemSimpleContentElement("Root", //$NON-NLS-1$
-    	                                  null, null, (Vector)null);	    	
-    	veryRootElement.setRenamable(false);
-    	veryRootElement.setDeletable(false);
-    	                
-    	ISystemFilterPoolManager[] mgrs = poolMgrProvider.getSystemFilterPoolManagers();
-
-    	ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)poolMgrProvider.getAdapter(ISubSystemConfigurationAdapter.class);
-    	ImageDescriptor image = adapter.getSystemFilterPoolManagerImage();
-    	    	                                  
-    	if ((mgrs == null) || (mgrs.length == 0))
-    	  return veryRootElement;
-
-        ISystemFilter parentFilter = getFirstSelectedFilterString().getParentSystemFilter();
-        ISystemFilterPool parentFilterPool = parentFilter.getParentFilterPool();
-         
-    	Vector veryRootChildren = new Vector(); 
-    	for (int idx=0; idx<mgrs.length; idx++)
-    	{
-           SystemSimpleContentElement mgrElement = 
-    	      new SystemSimpleContentElement(mgrs[idx].getName(),
-    	                                     mgrs[idx], veryRootElement, (Vector)null);	
-    	   mgrElement.setRenamable(false);
-    	   mgrElement.setDeletable(false);
-    	   mgrElement.setImageDescriptor(image);
-    	   
-    	   Vector elements = new Vector();    	   
-           populateFilterPoolContentElementVector(poolMgrProvider, mgrs[idx], elements, 
-                                                  mgrElement, filtersToExclude, parentFilterPool, parentFilter);    	   
-           mgrElement.setChildren(elements);
-    	   
-           veryRootChildren.addElement(mgrElement);
-           //if (mgrs[idx] == poolMgr)
-           //  initialSelectionElement = mgrElement;          
-    	}    	
-        veryRootElement.setChildren(veryRootChildren);    	
-    	return veryRootElement;
-    }
-    
-    /**
-     * Populate filter pool manager subtree with filter pools
-     */
-    protected void populateFilterPoolContentElementVector(ISystemFilterPoolManagerProvider poolMgrProvider,
-                                                          ISystemFilterPoolManager mgr, 
-                                                          Vector elements, 
-                                                          SystemSimpleContentElement parentElement,
-                                                          ISystemFilter[] filtersToExclude,
-                                                          ISystemFilterPool filterPoolToSelect,
-                                                          ISystemFilter filterToSelect)
-    {
-    	ISystemFilterPool[] pools = mgr.getSystemFilterPools();
-        for (int idx=0; idx<pools.length; idx++)
-        {
-           ISystemFilterPool pool = pools[idx];
-           SystemSimpleContentElement cElement = 
-             new SystemSimpleContentElement(pool.getName(), pool, parentElement, (Vector)null);
-           cElement.setImageDescriptor(SystemFilterUIHelpers.getFilterPoolImage(poolMgrProvider,pool));             
-           
-           Vector childElements = new Vector();
-           populateFilterContentElementVector(poolMgrProvider, pool, childElements, cElement, filtersToExclude, filterToSelect);    	   
-           cElement.setChildren(childElements);           
-           
-           elements.addElement(cElement);             
-           if ((pool == filterPoolToSelect) && (initialSelectionElement==null))
-             initialSelectionElement = cElement;
-        }        
-    }
-    
-    /**
-     * Populate filter pool subtree with filters
-     */
-    protected void populateFilterContentElementVector(ISystemFilterPoolManagerProvider poolMgrProvider,
-                                                      ISystemFilterPool pool, 
-                                                      Vector elements, 
-                                                      SystemSimpleContentElement parentElement,
-                                                      ISystemFilter[] filtersToExclude,
-                                                      ISystemFilter filterToSelect)
-    {
-    	ISystemFilter[] filters = pool.getSystemFilters();
-        for (int idx=0; idx<filters.length; idx++)
-        {
-           ISystemFilter filter = filters[idx];
-           if (!filter.isNonChangable() && !filter.isPromptable() && // defect 43242
-               !containsFilter(filtersToExclude,filter))
-           {
-             SystemSimpleContentElement cElement = 
-               new SystemSimpleContentElement(filter.getName(), filter, parentElement, (Vector)null);
-             cElement.setImageDescriptor(SystemFilterUIHelpers.getFilterImage(poolMgrProvider, filter));             
-             elements.addElement(cElement);  
-             if (filterToSelect == filter)
-               initialSelectionElement = cElement;   
-           }
-        }        
-    }
-    
-    private static boolean containsFilter(ISystemFilter[] filters, ISystemFilter filter)
-    {
-    	ISystemFilter match = null;
-    	for (int idx=0; (match==null) && (idx<filters.length); idx++)
-    	   if (filters[idx] == filter)
-    	     match = filters[idx];
-        return (match != null);
-    }
-    public static boolean containsFilter(Vector filters, ISystemFilter filter)
-    {
-    	ISystemFilter match = null;
-    	for (int idx=0; (match==null) && (idx<filters.size()); idx++)
-    	   if (filters.elementAt(idx) == filter)
-    	     match = (ISystemFilter)filters.elementAt(idx);
-        return (match != null);
-    }
-
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterMoveDownFilterAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterMoveDownFilterAction.java
deleted file mode 100644
index 64b1441a7..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterMoveDownFilterAction.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2007 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-import java.util.Iterator;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.rse.core.filters.ISystemFilter;
-import org.eclipse.rse.core.filters.ISystemFilterContainer;
-import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
-import org.eclipse.rse.core.filters.ISystemFilterReference;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.internal.ui.SystemSortableSelection;
-import org.eclipse.rse.ui.ISystemContextMenuConstants;
-import org.eclipse.rse.ui.ISystemIconConstants;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.actions.SystemBaseAction;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * The action allows users to move the current filter down in the list
- */
-public class SystemFilterMoveDownFilterAction extends SystemBaseAction 
-                                 
-{
-
-
-	/**
-	 * Constructor
-	 */
-	public SystemFilterMoveDownFilterAction(Shell parent) 
-	{
-		super(SystemResources.ACTION_MOVEDOWN_LABEL,SystemResources.ACTION_MOVEDOWN_TOOLTIP,
-		      RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_MOVEDOWN_ID),
-		      parent);
-        allowOnMultipleSelection(true);
-		setContextMenuGroup(ISystemContextMenuConstants.GROUP_REORDER);    
-	}
-
-    /**
-     * Set the help context Id (infoPop) for this action. This must be fully qualified by
-     *  plugin ID.
-     * <p>
-     * Same as {@link org.eclipse.rse.ui.actions.SystemBaseAction #setHelp(String)}
-     * @see org.eclipse.rse.ui.actions.SystemBaseAction #getHelpContextId()
-     */
-    public void setHelpContextId(String id)
-    {
-    	setHelp(id);
-    }
-
-	/**
-	 * Intercept of parent method. We need to test that the filters
-	 *  come from the same parent
-	 */
-	public boolean updateSelection(IStructuredSelection selection)
-	{
-		ISystemFilterContainer prevContainer = null;
-		boolean enable = true;
-		Iterator e = selection.iterator();
-		while (enable && e.hasNext())
-		{
-			Object selectedObject = e.next();
-			ISystemFilter filter = getSystemFilter(selectedObject);
-			if (prevContainer != null)
-			{
-				if (prevContainer != filter.getParentFilterContainer())
-					enable = false;
-				else
-					prevContainer = filter.getParentFilterContainer();			 
-			}
-			else
-				prevContainer = filter.getParentFilterContainer();
-			if (enable)
-				enable = checkObjectType(filter);		  
-		}
-		return enable;
-	}
-	    
-    /**
-     * Called by SystemBaseAction when selection is set.
-     * Our opportunity to verify we are allowed for this selected type.
-     */
-	public boolean checkObjectType(Object selectedObject)
-	{
-		if (!((selectedObject instanceof ISystemFilter) ||
-		      (selectedObject instanceof ISystemFilterReference)))
-		  return false;
-
-		ISystemFilter filter = getSystemFilter(selectedObject);
-		//SystemFilterPoolManager fpMgr = filter.getSystemFilterPoolManager();
-		ISystemFilterContainer fpContainer = filter.getParentFilterContainer();
-		int pos = fpContainer.getSystemFilterPosition(filter);
-		return (pos < (fpContainer.getSystemFilterCount()-1));
-	}
-	
-	private ISystemFilter getSystemFilter(Object selectedObject)
-	{
-		if (selectedObject instanceof ISystemFilter)
-		  return (ISystemFilter)selectedObject;
-		else
-		  return ((ISystemFilterReference)selectedObject).getReferencedFilter();
-	}
-	
-	/**
-	 * This is the method called when the user selects this action.
-	 * @see org.eclipse.jface.action.Action#run()
-	 */
-	public void run() 
-	{
-		IStructuredSelection selections = getSelection();
-
-		SystemSortableSelection[] sortableArray = new SystemSortableSelection[selections.size()];
-		Iterator i = selections.iterator();
-		int idx = 0;
-		ISystemFilter filter = null;
-		ISystemFilterContainer fpContainer = null;
-		while (i.hasNext())	
-		{
-		  	sortableArray[idx] = new SystemSortableSelection(getSystemFilter(i.next()));
-		 	filter = (ISystemFilter)sortableArray[idx].getSelectedObject();
-		  	fpContainer = filter.getParentFilterContainer();
-		  	sortableArray[idx].setPosition(fpContainer.getSystemFilterPosition(filter));
-		  	idx++;
-		}
-		SystemSortableSelection.sortArray(sortableArray);
-		ISystemFilter[] filters = (ISystemFilter[])SystemSortableSelection.getSortedObjects(sortableArray, new ISystemFilter[sortableArray.length]);
-		
-		if (idx>0)
-		{
-		  	ISystemFilterPoolManager fpMgr = filters[0].getSystemFilterPoolManager();
-		  	try {
-		    	fpMgr.moveSystemFilters(filters,1);
-		  	} catch (Exception exc)
-		  	{
-		  	}
-		}
-	}	
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterMoveDownFilterPoolReferenceAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterMoveDownFilterPoolReferenceAction.java
deleted file mode 100644
index 6ab1096f9..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterMoveDownFilterPoolReferenceAction.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2007 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-import java.util.Iterator;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.rse.core.filters.ISystemFilterPoolReference;
-import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManager;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.internal.ui.SystemSortableSelection;
-import org.eclipse.rse.ui.ISystemContextMenuConstants;
-import org.eclipse.rse.ui.ISystemIconConstants;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.actions.SystemBaseAction;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * The action allows users to move the current filter down in the list
- */
-public class SystemFilterMoveDownFilterPoolReferenceAction extends SystemBaseAction 
-                                 
-{
-
-
-	/**
-	 * Constructor
-	 */
-	public SystemFilterMoveDownFilterPoolReferenceAction(Shell parent) 
-	{
-		super(SystemResources.ACTION_MOVEDOWN_LABEL,SystemResources.ACTION_MOVEDOWN_TOOLTIP,
-		      RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_MOVEDOWN_ID),
-		      parent);
-        allowOnMultipleSelection(true);
-		setContextMenuGroup(ISystemContextMenuConstants.GROUP_REORDER);        
-	}
-
-    /**
-     * Set the help context Id (infoPop) for this action. This must be fully qualified by
-     *  plugin ID.
-     * <p>
-     * Same as {@link org.eclipse.rse.ui.actions.SystemBaseAction #setHelp(String)}
-     * @see org.eclipse.rse.ui.actions.SystemBaseAction #getHelpContextId()
-     */
-    public void setHelpContextId(String id)
-    {
-    	setHelp(id);
-    }
-
-	/**
-	 * Intercept of parent method. We need to test that the filter pools
-	 *  come from the same parent
-	 */
-	public boolean updateSelection(IStructuredSelection selection)
-	{
-		ISystemFilterPoolReferenceManager prevMgr = null;
-		boolean enable = true;
-		Iterator e = selection.iterator();
-		while (enable && e.hasNext())
-		{
-			Object selectedObject = e.next();
-			ISystemFilterPoolReference filterPoolRef = (ISystemFilterPoolReference)selectedObject;
-			if (prevMgr != null)
-			{
-				if (prevMgr != filterPoolRef.getFilterPoolReferenceManager())
-					enable = false;
-				else
-				prevMgr = filterPoolRef.getFilterPoolReferenceManager();			 
-			}
-			else
-				prevMgr = filterPoolRef.getFilterPoolReferenceManager();			
-			if (enable)
-				enable = checkObjectType(filterPoolRef);		  
-		}
-		return enable;
-	}
-	
-    /**
-     * Called by SystemBaseAction when selection is set.
-     * Our opportunity to verify we are allowed for this selected type.
-     */
-	public boolean checkObjectType(Object selectedObject)
-	{
-		if (!(selectedObject instanceof ISystemFilterPoolReference))
-		  return false;
-		ISystemFilterPoolReference filterPoolRef = (ISystemFilterPoolReference)selectedObject;
-		ISystemFilterPoolReferenceManager fprMgr = filterPoolRef.getFilterPoolReferenceManager();
-		int pos = fprMgr.getSystemFilterPoolReferencePosition(filterPoolRef);
-		return (pos < (fprMgr.getSystemFilterPoolReferenceCount()-1));
-	}
-	
-	/**
-	 * This is the method called when the user selects this action.
-	 * @see org.eclipse.jface.action.Action#run()
-	 */
-	public void run() 
-	{		
-		IStructuredSelection selections = getSelection();
-		//SystemFilterPoolReference filterPoolRefs[] = new SystemFilterPoolReference[selections.size()];
-		//Iterator i = selections.iterator();
-		//int idx = 0;
-		//while (i.hasNext())		
-		  //filterPoolRefs[idx++] = (SystemFilterPoolReference)i.next();
-
-		SystemSortableSelection[] sortableArray = new SystemSortableSelection[selections.size()];
-		Iterator i = selections.iterator();
-		int idx = 0;
-		ISystemFilterPoolReference filterPoolRef = null;
-		ISystemFilterPoolReferenceManager fprMgr = null;
-		while (i.hasNext())	
-		{
-		  	sortableArray[idx] = new SystemSortableSelection(i.next());
-		  	filterPoolRef = (ISystemFilterPoolReference)sortableArray[idx].getSelectedObject();
-		  	fprMgr = filterPoolRef.getFilterPoolReferenceManager();
-		  	sortableArray[idx].setPosition(fprMgr.getSystemFilterPoolReferencePosition(filterPoolRef));
-		  	idx++;
-		}
-		SystemSortableSelection.sortArray(sortableArray);
-		ISystemFilterPoolReference[] filterPoolRefs = (ISystemFilterPoolReference[])SystemSortableSelection.getSortedObjects(sortableArray, new ISystemFilterPoolReference[sortableArray.length]);
-		
-		if (idx>0)
-		{
-		  	fprMgr = filterPoolRefs[0].getFilterPoolReferenceManager();
-		  	fprMgr.moveSystemFilterPoolReferences(filterPoolRefs,1);
-		}
-	}	
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterMoveFilterAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterMoveFilterAction.java
deleted file mode 100644
index 8586af980..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterMoveFilterAction.java
+++ /dev/null
@@ -1,375 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2008 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [186748] Move ISubSystemConfigurationAdapter from UI/rse.core.subsystems.util
- * Martin Oberhuber (Wind River) - [186128][refactoring] Move IProgressMonitor last in public base classes 
- * David McKnight   (IBM)        - [223103] [cleanup] fix broken externalized strings
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.rse.core.filters.ISystemFilter;
-import org.eclipse.rse.core.filters.ISystemFilterPool;
-import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
-import org.eclipse.rse.core.filters.ISystemFilterPoolManagerProvider;
-import org.eclipse.rse.core.filters.ISystemFilterReference;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.services.clientserver.messages.SystemMessage;
-import org.eclipse.rse.ui.ISystemMessages;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.actions.SystemBaseAction;
-import org.eclipse.rse.ui.actions.SystemBaseCopyAction;
-import org.eclipse.rse.ui.dialogs.SystemRenameSingleDialog;
-import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement;
-import org.eclipse.rse.ui.filters.SystemFilterUIHelpers;
-import org.eclipse.rse.ui.subsystems.ISubSystemConfigurationAdapter;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * Copy a filter action.
- */
-public class SystemFilterMoveFilterAction extends SystemBaseCopyAction
-{
-	private String promptString = null;
-	private SystemSimpleContentElement initialSelectionElement = null;
-	private SystemSimpleContentElement root = null;
-	
-	/**
-	 * Constructor 
-	 */
-	public SystemFilterMoveFilterAction(Shell parent) 
-	{
-		super(parent, SystemResources.ACTION_MOVE_FILTER_LABEL, MODE_MOVE);
-		setToolTipText(SystemResources.ACTION_MOVE_FILTER_TOOLTIP);
-		promptString = SystemResources.RESID_MOVE_PROMPT;		
-	}
-
-	/**
-	 * Reset. This is a re-run of this action
-	 */
-	protected void reset()
-	{
-		super.reset();
-		initialSelectionElement = null;
-		root = null;
-	}
-
-    /**
-     * Set the help context Id (infoPop) for this action. This must be fully qualified by
-     *  plugin ID.
-     * <p>
-     * Same as {@link org.eclipse.rse.ui.actions.SystemBaseAction #setHelp(String)}
-     * @see org.eclipse.rse.ui.actions.SystemBaseAction #getHelpContextId()
-     */
-    public void setHelpContextId(String id)
-    {
-    	setHelp(id);
-    }
- 
-	/**
-	 * We override from parent to do unique checking...
-	 * <p>
-	 * @see SystemBaseAction#updateSelection(IStructuredSelection)
-	 */
-	public boolean updateSelection(IStructuredSelection selection)
-	{
-		boolean enable = true;
-		/* */
-		Iterator e= selection.iterator();		
-		while (enable && e.hasNext())
-		{
-			Object selectedObject = e.next();
-			if (selectedObject instanceof SystemSimpleContentElement)
-			  selectedObject = ((SystemSimpleContentElement)selectedObject).getData();
-			if (!checkObjectType(selectedObject))
-			  enable = false;
-		}
-		/* */
-		return enable;
-	}
-    /**
-     * Called by SystemBaseAction when selection is set.
-     * Our opportunity to verify we are allowed for this selected type.
-     */
-	public boolean checkObjectType(Object selectedObject)
-	{
-		if (selectedObject instanceof ISystemFilter) 
-		{
-			ISystemFilter fs = (ISystemFilter)selectedObject;
-			return !fs.isNonChangable();
-		}
-		else if (selectedObject instanceof ISystemFilterReference) 
-		{
-			ISystemFilter fs = ((ISystemFilterReference)selectedObject).getReferencedFilter();
-			return !fs.isNonChangable();
-		}
-        else
-          return false;
-	}
-
- 
-    // --------------------------
-    // PARENT METHOD OVERRIDES...
-    // --------------------------
-	/**
-	 * This method is a callback from the select-target-parent dialog, allowing us to decide whether the current selected
-	 * object is a valid parent object. This affects the enabling of the OK button on that dialog.
-	 */
-	public boolean isValidTargetParent(SystemSimpleContentElement selectedElement)
-	{
-		if (selectedElement == null)
-		  return false;
-		Object data = selectedElement.getData();
-		return (data instanceof ISystemFilterPool);
-	}
-    
-	/**
-	 * @see SystemBaseCopyAction#checkForCollision(Shell, IProgressMonitor, Object, Object, String)
-	 */
-	protected String checkForCollision(Shell shell, IProgressMonitor monitor,
-	                                   Object targetContainer, Object oldObject, String oldName)
-	{
-		ISystemFilterPool newPool = (ISystemFilterPool)targetContainer;
-		//ISystemFilterPoolManager newMgr = newPool.getSystemFilterPoolManager();
-		String newName = oldName;
-		ISystemFilter match = newPool.getSystemFilter(oldName);
-		if (match != null)
-		{
-		  //monitor.setVisible(false); wish we could!
-		  //ValidatorFilterName validator = new ValidatorFilterName(newPool.getSystemFilterNames());
-		  //SystemCollisionRenameDialog dlg = new SystemCollisionRenameDialog(shell, validator, oldName);
-		  SystemRenameSingleDialog dlg = new SystemRenameSingleDialog(shell, true, match, null); // true => copy-collision-mode
-		  dlg.open();
-		  if (!dlg.wasCancelled())
-		    newName = dlg.getNewName();
-		  else
-		    newName = null;
-		}
-		return newName;
-	}
-	/**
-	 * @see SystemBaseCopyAction#doCopy(Object, Object, String, IProgressMonitor)
-	 */
-	protected boolean doCopy(Object targetContainer, Object oldObject, String newName, IProgressMonitor monitor)
-		throws Exception 
-    {
-    	ISystemFilter         oldFilter = (ISystemFilter)oldObject;
-    	ISystemFilterPool oldFilterPool = oldFilter.getParentFilterPool();
-		ISystemFilterPoolManager oldMgr = oldFilterPool.getSystemFilterPoolManager();
-    	ISystemFilterPool       newPool = (ISystemFilterPool)targetContainer;
-    	//ISystemFilterPoolManager newMgr = newPool.getSystemFilterPoolManager();
-    	
-        ISystemFilter         newFilter = oldMgr.moveSystemFilter(newPool, oldFilter, newName);
-        
-        if ((root != null) && (newFilter!=null))
-        {
-          	Object data = root.getData();
-          	if ((data!=null) && (data instanceof TreeViewer))
-            	((TreeViewer)data).refresh();
-        }
-		return (newFilter != null);
-	}
-
-	/**
-	 * @see SystemBaseCopyAction#getTreeModel()
-	 */
-	protected SystemSimpleContentElement getTreeModel() 
-	{
-		ISystemFilter firstFilter = getFirstSelectedFilter(); 
-		ISystemFilterPoolManagerProvider provider = firstFilter.getProvider();
-		return getPoolMgrTreeModel(provider, firstFilter.getSystemFilterPoolManager(), firstFilter.getParentFilterPool());
-	}
-	/**
-	 * @see SystemBaseCopyAction#getTreeInitialSelection()
-	 */
-	protected SystemSimpleContentElement getTreeInitialSelection()
-	{
-		return initialSelectionElement;
-	}
-
-    /**
-     * Set the prompt string that shows up at the top of the copy-destination dialog.
-     */
-    public void setPromptString(String promptString)
-    {
-    	this.promptString = promptString;
-    }
-	/**
-	 * @see SystemBaseCopyAction#getPromptString()
-	 */
-	protected String getPromptString() 
-	{
-		return promptString;
-	}
-	/**
-	 * @see SystemBaseCopyAction#getCopyingMessage()
-	 */
-	protected SystemMessage getCopyingMessage() 
-	{
-		return RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_MOVEFILTERS_PROGRESS);
-	}
-	/**
-	 * @see SystemBaseCopyAction#getCopyingMessage( String)
-	 */
-	protected SystemMessage getCopyingMessage(String oldName) 
-	{
-		return RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_MOVEFILTER_PROGRESS).makeSubstitution(oldName);
-	}
-
-	/**
-	 * @see SystemBaseCopyAction#getOldObjects()
-	 */
-	protected Object[] getOldObjects() 
-	{
-		return getSelectedFilters();
-	}
-
-	/**
-	 * @see SystemBaseCopyAction#getOldNames()
-	 */
-	protected String[] getOldNames() 
-	{
-		ISystemFilter[] filters = getSelectedFilters();
-		String[] names = new String[filters.length];
-		for (int idx=0; idx<filters.length; idx++)
-		   names[idx] = filters[idx].getName();
-		return names;
-	}
-
-    /**
-     * Get the currently selected filters
-     */
-    protected ISystemFilter[] getSelectedFilters()
-    {
-   	    IStructuredSelection selection = getSelection();
-   	    ISystemFilter[] filters = new ISystemFilter[selection.size()];
-   	    Iterator i = selection.iterator();
-   	    int idx=0;
-   	    while (i.hasNext())
-   	    {
-   	       Object next = i.next();
-   	       if (next instanceof SystemSimpleContentElement)    	
-   	         next = ((SystemSimpleContentElement)next).getData();
-   	       if (next instanceof ISystemFilterReference)
-   	         filters[idx++] = ((ISystemFilterReference)next).getReferencedFilter();
-   	       else
-   	         filters[idx++] = (ISystemFilter)next;
-   	    }
-   	    return filters;
-    }
-    /**
-     * Get the first selected filter
-     */
-    protected ISystemFilter getFirstSelectedFilter()
-    {
-    	Object first = getFirstSelection();
-   	    if (first instanceof SystemSimpleContentElement)    	
-   	    {
-   	      root = ((SystemSimpleContentElement)first).getRoot();
-   	      first = ((SystemSimpleContentElement)first).getData();
-   	    }
-   	    if (first == null)
-   	      return null;
-   	    else if (first instanceof ISystemFilterReference)
-   	      return ((ISystemFilterReference)first).getReferencedFilter();
-   	    else if (first instanceof ISystemFilter)
-   	      return (ISystemFilter)first;
-   	    else
-   	      return null;   	      
-    }
-   
-    // ------------------
-    // PRIVATE METHODS...
-    // ------------------
-    
-	/**
-	 * Create and return data model to populate selection tree with.
-	 * @param poolMgrProvider The provider who will give us the list of filter pool managers to populate the list with
-	 * @param poolMgr The SystemFilterPoolManager whose tree model element is to be pre-selected
-	 * @param pool The SystemFilterPool whose tree model element is to be excluded
-	 */
-    protected SystemSimpleContentElement getPoolMgrTreeModel(ISystemFilterPoolManagerProvider poolMgrProvider, 
-                                                             ISystemFilterPoolManager poolMgr,
-                                                             ISystemFilterPool pool)
-    {
-    	SystemSimpleContentElement veryRootElement = 
-    	   new SystemSimpleContentElement("Root", //$NON-NLS-1$
-    	                                  null, null, (Vector)null);	    	
-    	veryRootElement.setRenamable(false);
-    	veryRootElement.setDeletable(false);
-    	                
-    	ISystemFilterPoolManager[] mgrs = poolMgrProvider.getSystemFilterPoolManagers();
-
-    	ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)poolMgrProvider.getAdapter(ISubSystemConfigurationAdapter.class);
-    	ImageDescriptor image = adapter.getSystemFilterPoolManagerImage();
-    	                                  
-    	if ((mgrs == null) || (mgrs.length == 0))
-    	  return veryRootElement;
-
-    	Vector veryRootChildren = new Vector(); 
-    	for (int idx=0; idx<mgrs.length; idx++)
-    	{
-           SystemSimpleContentElement mgrElement = 
-    	      new SystemSimpleContentElement(mgrs[idx].getName(),
-    	                                     mgrs[idx], veryRootElement, (Vector)null);	
-    	   mgrElement.setRenamable(false);
-    	   mgrElement.setDeletable(false);
-    	   mgrElement.setImageDescriptor(image);
-    	   
-    	   Vector elements = new Vector();    	   
-           populateFilterPoolContentElementVector(poolMgrProvider, mgrs[idx], elements, mgrElement, pool);    	   
-           mgrElement.setChildren(elements);
-
-           if (mgrs[idx] == poolMgr)
-             initialSelectionElement = mgrElement;          
-    	   
-           veryRootChildren.addElement(mgrElement);
-    	}    	
-        veryRootElement.setChildren(veryRootChildren);    	
-    	return veryRootElement;
-    }
-    
-    /**
-     * Populate filter pool manager subtree with filter pools
-     */
-    protected static void populateFilterPoolContentElementVector(ISystemFilterPoolManagerProvider poolMgrProvider,
-                                                                 ISystemFilterPoolManager mgr, 
-                                                                 Vector elements, 
-                                                                 SystemSimpleContentElement parentElement,
-                                                                 ISystemFilterPool poolToExclude)
-    {
-    	ISystemFilterPool[] pools = mgr.getSystemFilterPools();
-        for (int idx=0; idx<pools.length; idx++)
-        {          
-           ISystemFilterPool pool = pools[idx];
-           if (pool != poolToExclude)
-           {
-             SystemSimpleContentElement cElement = 
-               new SystemSimpleContentElement(pool.getName(), pool, parentElement, (Vector)null);
-             cElement.setImageDescriptor(SystemFilterUIHelpers.getFilterPoolImage(poolMgrProvider, pool));
-             //cElement.setSelected(setFilterPoolSelection(pool));           
-             elements.addElement(cElement);  
-           }
-        }        
-    }
-    
-     
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterMoveFilterPoolAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterMoveFilterPoolAction.java
deleted file mode 100644
index 235435686..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterMoveFilterPoolAction.java
+++ /dev/null
@@ -1,367 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2008 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [186748] Move ISubSystemConfigurationAdapter from UI/rse.core.subsystems.util
- * Martin Oberhuber (Wind River) - [186128][refactoring] Move IProgressMonitor last in public base classes 
- * David Dykstal (IBM) - [194268] fixed updateSelection() to disable when selection is empty
- * David McKnight   (IBM)        - [223103] [cleanup] fix broken externalized strings
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.rse.core.filters.ISystemFilterPool;
-import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
-import org.eclipse.rse.core.filters.ISystemFilterPoolManagerProvider;
-import org.eclipse.rse.core.filters.ISystemFilterPoolReference;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.services.clientserver.messages.SystemMessage;
-import org.eclipse.rse.ui.ISystemMessages;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.actions.SystemBaseAction;
-import org.eclipse.rse.ui.actions.SystemBaseCopyAction;
-import org.eclipse.rse.ui.dialogs.SystemRenameSingleDialog;
-import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement;
-import org.eclipse.rse.ui.subsystems.ISubSystemConfigurationAdapter;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * Move a filter pool action.
- */
-public class SystemFilterMoveFilterPoolAction extends SystemBaseCopyAction
-{
-	private String promptString = null;
-	private SystemSimpleContentElement initialSelectionElement = null;
-	private SystemSimpleContentElement root = null;
-	
-	/**
-	 * Constructor 
-	 */
-	public SystemFilterMoveFilterPoolAction(Shell parent) 
-	{
-		super(parent, SystemResources.ACTION_MOVE_FILTERPOOL_LABEL, MODE_MOVE);
-		setToolTipText(SystemResources.ACTION_MOVE_FILTERPOOL_TOOLTIP);
-		promptString = SystemResources.RESID_MOVE_PROMPT;		
-	}
-
-	/**
-	 * Reset. This is a re-run of this action
-	 */
-	protected void reset()
-	{
-		super.reset();
-		initialSelectionElement = null;
-		root = null;
-	}
-
-    /**
-     * Set the help context Id (infoPop) for this action. This must be fully qualified by
-     *  plugin ID.
-     * <p>
-     * Same as {@link org.eclipse.rse.ui.actions.SystemBaseAction #setHelp(String)}
-     * @see org.eclipse.rse.ui.actions.SystemBaseAction #getHelpContextId()
-     */
-    public void setHelpContextId(String id)
-    {
-    	setHelp(id);
-    }
- 
-	/**
-	 * We override from parent to do unique checking...
-	 * <p>
-	 * We intercept to ensure only filterpools from the same filterpool manager are selected.
-	 * <p>
-	 * @see SystemBaseAction#updateSelection(IStructuredSelection)
-	 */
-	public boolean updateSelection(IStructuredSelection selection) {
-		boolean enable = false;
-		if (!selection.isEmpty()) {
-			enable = true;
-			Iterator e = selection.iterator();
-			Set managers = new HashSet();
-			while (enable && e.hasNext()) {
-				Object selectedObject = e.next();
-				if (selectedObject instanceof SystemSimpleContentElement) {
-					selectedObject = ((SystemSimpleContentElement) selectedObject).getData();
-				}
-				ISystemFilterPool pool = null;
-				if (selectedObject instanceof ISystemFilterPool){
-					pool = (ISystemFilterPool) selectedObject;
-				}
-				else if (selectedObject instanceof ISystemFilterPoolReference) {
-					pool = ((ISystemFilterPoolReference) selectedObject).getReferencedFilterPool();
-				}
-				if (pool != null) {
-					String ownerName = pool.getOwningParentName();
-					ISystemFilterPoolManager manager = pool.getSystemFilterPoolManager();
-					managers.add(manager);
-					// enable if the number of managers is one and the owner name is null (i.e. the pool does not belong to a connection)
-					enable = (managers.size() == 1) && (ownerName == null);
-				} else {
-					enable = false;
-				}
-			}
-		}
-		return enable;
-	}
- 
-    // --------------------------
-    // PARENT METHOD OVERRIDES...
-    // --------------------------
-	/**
-	 * This method is a callback from the select-target-parent dialog, allowing us to decide whether the current selected
-	 * object is a valid parent object. This affects the enabling of the OK button on that dialog.
-	 */
-	public boolean isValidTargetParent(SystemSimpleContentElement selectedElement)
-	{
-		if (selectedElement == null)
-		  return false;
-		Object data = selectedElement.getData();
-		return (data instanceof ISystemFilterPoolManager);
-	}
-    
-	/**
-	 * @see SystemBaseCopyAction#checkForCollision(Shell, IProgressMonitor, Object, Object, String)
-	 */
-	protected String checkForCollision(Shell shell, IProgressMonitor monitor,
-	                                   Object targetContainer, Object oldObject, String oldName)
-	{
-		ISystemFilterPoolManager newMgr = (ISystemFilterPoolManager)targetContainer;
-		String newName = oldName;
-		ISystemFilterPool match = newMgr.getSystemFilterPool(oldName);
-		if (match != null)
-		{
-		  //monitor.setVisible(false); wish we could!
-		  //ValidatorFilterPoolName validator = new ValidatorFilterPoolName(newMgr.getSystemFilterPoolNames());
-		  //SystemCollisionRenameDialog dlg = new SystemCollisionRenameDialog(shell, validator, oldName);
-		  SystemRenameSingleDialog dlg = new SystemRenameSingleDialog(shell, true, match, null); // true => copy-collision-mode
-		  dlg.open();
-		  if (!dlg.wasCancelled())
-		    newName = dlg.getNewName();
-		  else
-		    newName = null;
-		}
-		return newName;
-	}
-	/**
-	 * @see SystemBaseCopyAction#doCopy(Object, Object, String, IProgressMonitor)
-	 */
-	protected boolean doCopy(Object targetContainer, Object oldObject, String newName, IProgressMonitor monitor)
-		throws Exception 
-    {
-    	ISystemFilterPool oldFilterPool = (ISystemFilterPool)oldObject;
-		ISystemFilterPoolManager oldMgr = oldFilterPool.getSystemFilterPoolManager();
-    	ISystemFilterPoolManager newMgr = (ISystemFilterPoolManager)targetContainer;
-        ISystemFilterPool newFilterPool = oldMgr.moveSystemFilterPool(newMgr, oldFilterPool, newName);
-        if ((root != null) && (newFilterPool!=null))
-        {
-          Object data = root.getData();
-          if ((data!=null) && (data instanceof TreeViewer))
-            ((TreeViewer)data).refresh();
-        }
-		return (newFilterPool != null);
-	}
-
-	/**
-	 * @see SystemBaseCopyAction#getTreeModel()
-	 */
-	protected SystemSimpleContentElement getTreeModel() 
-	{
-		ISystemFilterPool firstPool = getFirstSelectedFilterPool(); 
-		ISystemFilterPoolManagerProvider provider = firstPool.getProvider();
-		
-		return getPoolMgrTreeModel(provider, firstPool.getSystemFilterPoolManager());
-	}
-	/**
-	 * @see SystemBaseCopyAction#getTreeInitialSelection()
-	 */
-	protected SystemSimpleContentElement getTreeInitialSelection()
-	{
-		return initialSelectionElement;
-	}
-
-    /**
-     * Set the prompt string that shows up at the top of the copy-destination dialog.
-     */
-    public void setPromptString(String promptString)
-    {
-    	this.promptString = promptString;
-    }
-	/**
-	 * @see SystemBaseCopyAction#getPromptString()
-	 */
-	protected String getPromptString() 
-	{
-		return promptString;
-	}
-	/**
-	 * @see SystemBaseCopyAction#getCopyingMessage()
-	 */
-	protected SystemMessage getCopyingMessage() 
-	{
-		return RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_MOVEFILTERPOOLS_PROGRESS);
-	}
-	/**
-	 * @see SystemBaseCopyAction#getCopyingMessage( String)
-	 */
-	protected SystemMessage getCopyingMessage(String oldName) 
-	{
-		return RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_MOVEFILTERPOOL_PROGRESS).makeSubstitution(oldName);
-	}
-	/**
-	 * Return complete message
-	 */
-	public SystemMessage getCompletionMessage(Object targetContainer, String[] oldNames, String[] newNames)
-	{
-		return RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_MOVEFILTERPOOL_COMPLETE).makeSubstitution(((ISystemFilterPoolManager)targetContainer).getName());		
-	}
-
-	/**
-	 * @see SystemBaseCopyAction#getOldObjects()
-	 */
-	protected Object[] getOldObjects() 
-	{
-		return getSelectedFilterPools();
-	}
-
-	/**
-	 * @see SystemBaseCopyAction#getOldNames()
-	 */
-	protected String[] getOldNames() 
-	{
-		ISystemFilterPool[] filterPools = getSelectedFilterPools();
-		String[] names = new String[filterPools.length];
-		for (int idx=0; idx<filterPools.length; idx++)
-		   names[idx] = filterPools[idx].getName();
-		return names;
-	}
-
-    /**
-     * Get the currently selected filter pools
-     */
-    protected ISystemFilterPool[] getSelectedFilterPools()
-    {
-   	    IStructuredSelection selection = getSelection();
-   	    ISystemFilterPool[] filterPools = new ISystemFilterPool[selection.size()];
-   	    Iterator i = selection.iterator();
-   	    int idx=0;
-   	    while (i.hasNext())
-   	    {
-   	       Object next = i.next();
-   	       if (next instanceof SystemSimpleContentElement)    	
-   	         next = ((SystemSimpleContentElement)next).getData();
-   	       if (next instanceof ISystemFilterPoolReference)
-   	         filterPools[idx++] = ((ISystemFilterPoolReference)next).getReferencedFilterPool();
-   	       else
-   	         filterPools[idx++] = (ISystemFilterPool)next;
-   	    }
-   	    return filterPools;
-    }
-    /**
-     * Get the managers of the currently selected filter pools
-     */
-    protected ISystemFilterPoolManager[] getSelectedFilterPoolManagers()
-    {
-    	ISystemFilterPoolManager[] mgrs = null;
-    	Vector v = new Vector();
-    	ISystemFilterPool[] pools = getSelectedFilterPools();    	
-    	for (int idx=0; idx<pools.length; idx++)
-    	{
-    	   ISystemFilterPoolManager mgr = pools[idx].getSystemFilterPoolManager();
-    	   if (!v.contains(mgr))
-    	     v.addElement(mgr);  
-    	}
-    	
-    	mgrs = new ISystemFilterPoolManager[v.size()];
-    	for (int idx=0; idx<mgrs.length; idx++)
-    	   mgrs[idx] = (ISystemFilterPoolManager)v.elementAt(idx);
-    	
-    	return mgrs;
-    }
-
-    /**
-     * Get the first selected filter pool
-     */
-    protected ISystemFilterPool getFirstSelectedFilterPool()
-    {
-    	Object first = getFirstSelection();
-   	    if (first instanceof SystemSimpleContentElement)    	
-   	    {
-   	      root = ((SystemSimpleContentElement)first).getRoot();
-   	      first = ((SystemSimpleContentElement)first).getData();
-   	    }
-   	    if (first == null)
-   	      return null;
-   	    else if (first instanceof ISystemFilterPoolReference)
-   	      return ((ISystemFilterPoolReference)first).getReferencedFilterPool();
-   	    else if (first instanceof ISystemFilterPool)
-   	      return (ISystemFilterPool)first;
-   	    else
-   	      return null;   	      
-    }
-   
-    // ------------------
-    // PRIVATE METHODS...
-    // ------------------
-    
-	/**
-	 * Create and return data model to populate selection tree with.
-	 * @param poolMgrProvider The provider who will give us the list of filter pool managers to populate the list with
-	 * @param poolMgr The current SystemFilterPoolManager which is to be excluded from the list.
-	 */
-    protected SystemSimpleContentElement getPoolMgrTreeModel(ISystemFilterPoolManagerProvider poolMgrProvider, ISystemFilterPoolManager poolMgr)
-    {
-    	SystemSimpleContentElement veryRootElement = 
-    	   new SystemSimpleContentElement("Root", //$NON-NLS-1$
-    	                                  null, null, (Vector)null);	    	
-    	veryRootElement.setRenamable(false);
-    	veryRootElement.setDeletable(false);
-    	                
-    	ISystemFilterPoolManager[] mgrs = poolMgrProvider.getSystemFilterPoolManagers();
-    	
-    	ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)poolMgrProvider.getAdapter(ISubSystemConfigurationAdapter.class);
-    	ImageDescriptor image = adapter.getSystemFilterPoolManagerImage();
-    	                                  
-    	if ((mgrs == null) || (mgrs.length == 0))
-    	  return veryRootElement;
-    	 
-    	Vector veryRootChildren = new Vector(); 
-    	for (int idx=0; idx<mgrs.length; idx++)
-    	{
-    	   if (mgrs[idx] != poolMgr)
-    	   {
-             SystemSimpleContentElement mgrElement = 
-    	        new SystemSimpleContentElement(mgrs[idx].getName(),
-    	                                       mgrs[idx], veryRootElement, (Vector)null);	
-    	     mgrElement.setRenamable(false);
-    	     mgrElement.setDeletable(false);
-    	     mgrElement.setImageDescriptor(image);
-             veryRootChildren.addElement(mgrElement);
-             if (initialSelectionElement == null)
-               initialSelectionElement = mgrElement;          
-    	   }
-    	}    	
-        veryRootElement.setChildren(veryRootChildren);    	
-    	return veryRootElement;
-    }
-
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterMoveFilterStringAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterMoveFilterStringAction.java
deleted file mode 100644
index f587cd6ed..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterMoveFilterStringAction.java
+++ /dev/null
@@ -1,490 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2008 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [186748] Move ISubSystemConfigurationAdapter from UI/rse.core.subsystems.util
- * Martin Oberhuber (Wind River) - [186128][refactoring] Move IProgressMonitor last in public base classes 
- * David McKnight   (IBM)        - [223103] [cleanup] fix broken externalized strings
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.rse.core.filters.ISystemFilter;
-import org.eclipse.rse.core.filters.ISystemFilterPool;
-import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
-import org.eclipse.rse.core.filters.ISystemFilterPoolManagerProvider;
-import org.eclipse.rse.core.filters.ISystemFilterString;
-import org.eclipse.rse.core.filters.ISystemFilterStringReference;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.services.clientserver.messages.SystemMessage;
-import org.eclipse.rse.ui.ISystemMessages;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.actions.SystemBaseAction;
-import org.eclipse.rse.ui.actions.SystemBaseCopyAction;
-import org.eclipse.rse.ui.dialogs.SystemRenameSingleDialog;
-import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement;
-import org.eclipse.rse.ui.filters.SystemFilterUIHelpers;
-import org.eclipse.rse.ui.messages.SystemMessageDialog;
-import org.eclipse.rse.ui.subsystems.ISubSystemConfigurationAdapter;
-import org.eclipse.rse.ui.validators.ValidatorUniqueString;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * Move a filter string action.
- */
-public class SystemFilterMoveFilterStringAction extends SystemBaseCopyAction
-{
-	private String promptString = null;
-	private SystemSimpleContentElement initialSelectionElement = null;
-	private SystemSimpleContentElement root = null;
-	private ISystemFilterString[] strings = null;
-	
-	/**
-	 * Constructor 
-	 */
-	public SystemFilterMoveFilterStringAction(Shell parent) 
-	{
-		super(parent, SystemResources.ACTION_MOVE_FILTERSTRING_LABEL, MODE_MOVE);
-		setToolTipText(SystemResources.ACTION_MOVE_FILTERSTRING_TOOLTIP);
-		promptString = SystemResources.RESID_MOVE_PROMPT;		
-	}
-
-	/**
-	 * Reset. This is a re-run of this action
-	 */
-	protected void reset()
-	{
-		super.reset();
-		initialSelectionElement = null;
-		root = null;
-		strings = null;
-	}
-
-    /**
-     * Set the help context Id (infoPop) for this action. This must be fully qualified by
-     *  plugin ID.
-     * <p>
-     * Same as {@link org.eclipse.rse.ui.actions.SystemBaseAction #setHelp(String)}
-     * @see org.eclipse.rse.ui.actions.SystemBaseAction #getHelpContextId()
-     */
-    public void setHelpContextId(String id)
-    {
-    	setHelp(id);
-    }
-
-    /**
-     * Overridable method if you support duplicate filter strings in the same filter.
-     * By default, queries the "supportsDuplicateFilterStrings" attribute in the filter.
-     */
-    protected boolean supportsDuplicateFilterStrings(ISystemFilter filter)
-    {
-    	return filter.isSupportsDuplicateFilterStrings();
-    }
-     
-	/**
-	 * We override from parent to do unique checking...
-	 * <p>
-	 * @see SystemBaseAction#updateSelection(IStructuredSelection)
-	 */
-	public boolean updateSelection(IStructuredSelection selection)
-	{
-		boolean enable = true;
-		/* */
-		Iterator e= selection.iterator();		
-		while (enable && e.hasNext())
-		{
-			Object selectedObject = e.next();
-			if (selectedObject instanceof SystemSimpleContentElement)
-			  selectedObject = ((SystemSimpleContentElement)selectedObject).getData();
-            if (!checkObjectType(selectedObject))
-              enable = false;
-		}
-		/* */
-		return enable;
-	}
-    /**
-     * Called by SystemBaseAction when selection is set.
-     * Our opportunity to verify we are allowed for this selected type.
-     */
-	public boolean checkObjectType(Object selectedObject)
-	{
-		if (selectedObject instanceof ISystemFilterString) 
-		{
-			ISystemFilterString fs = (ISystemFilterString)selectedObject;
-			return fs.isChangable();
-		}
-		else if (selectedObject instanceof ISystemFilterStringReference) 
-		{
-			ISystemFilterStringReference frs = (ISystemFilterStringReference)selectedObject;
-			return frs.getReferencedFilterString().isChangable();
-		}
-        else
-          return false;
-	}
- 
-    // --------------------------
-    // PARENT METHOD OVERRIDES...
-    // --------------------------
-	/**
-	 * This method is a callback from the select-target-parent dialog, allowing us to decide whether the current selected
-	 * object is a valid parent object. This affects the enabling of the OK button on that dialog.
-	 * <p>
-	 * The default is to return true if the selected element has no children. This is sufficient for most cases. However, 
-	 * in some cases it is not, such as for filter strings where we want to only enable OK if a filter is selected. It is 
-	 * possible that filter pools have no filters, so the default algorithm is not sufficient. In these cases the child class
-	 * can override this method.
-	 */
-	public boolean isValidTargetParent(SystemSimpleContentElement selectedElement)
-	{
-		Object data = selectedElement.getData();
-		if (data instanceof ISystemFilter)
-		  return !((ISystemFilter)data).isPromptable();
-		else
-		  return false;
-	}
-
-	/**
-	 * Overridable entry point when you want to prevent any copies/moves if any of the
-	 * selected objects have a name collision.
-	 * <p>
-	 * If you decide to override this, it is your responsibility to issue the error 
-	 * message to the user and return false here.
-	 * <p>
-	 * @return true if there is no problem, false if there is a fatal collision
-	 */
-	protected boolean preCheckForCollision(Shell shell, Object targetContainer, 
-	                                       Object oldObject, String oldName)
-	{
-		ISystemFilter newFilter = (ISystemFilter)targetContainer;
-		if (supportsDuplicateFilterStrings(newFilter))
-		  return true;
-		ISystemFilterString match = newFilter.getSystemFilterString(oldName);
-		if (match != null)
-		{
-		  SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_FILTERSTRING_ALREADYEXISTS);
-		  msg.makeSubstitution(oldName, newFilter.getName());
-  		  SystemMessageDialog.displayErrorMessage(shell, msg);
-  		  
-		}
-		return (match == null); // all is well iff such a filter string doesn't already exist.
-	}	
-    
-	/**
-	 * SHOULD NEVER BE CALLED IF preCheckForCollision WORKS PROPERLY
-	 * @see SystemBaseCopyAction#checkForCollision(Shell, IProgressMonitor, Object, Object, String)
-	 */
-	protected String checkForCollision(Shell shell, IProgressMonitor monitor,
-	                                   Object targetContainer, Object oldObject, String oldName)
-	{
-		ISystemFilter     newFilter = (ISystemFilter)targetContainer;
-		if (supportsDuplicateFilterStrings(newFilter))
-		  return oldName;
-		//ISystemFilterPool newPool   = newFilter.getParentFilterPool();
-		//ISystemFilterPoolManager newMgr = newPool.getSystemFilterPoolManager();
-		String newName = oldName;
-		ISystemFilterString match = newFilter.getSystemFilterString(oldName);
-		if (match != null)
-		{
-		  //monitor.setVisible(false); wish we could!
-		  boolean caseSensitive = false;
-		  ValidatorUniqueString validator = new ValidatorUniqueString(newFilter.getFilterStrings(),caseSensitive);
-		  //SystemCollisionRenameDialog dlg = new SystemCollisionRenameDialog(shell, validator, oldName);
-		  SystemRenameSingleDialog dlg = new SystemRenameSingleDialog(shell, true, match, validator); // true => copy-collision-mode
-		  dlg.open();
-		  if (!dlg.wasCancelled())
-		    newName = dlg.getNewName();
-		  else
-		    newName = null;
-		}
-		return newName;
-	}
-	/**
-	 * @see SystemBaseCopyAction#doCopy(Object, Object, String, IProgressMonitor)
-	 */
-	protected boolean doCopy(Object targetContainer, Object oldObject, String newName, IProgressMonitor monitor)
-		throws Exception 
-    {
-    	ISystemFilterString oldFilterString = (ISystemFilterString)oldObject;
-		ISystemFilterPoolManager     oldMgr = oldFilterString.getSystemFilterPoolManager();
-    	ISystemFilter          targetFilter = (ISystemFilter)targetContainer;
-    	//SystemFilterPoolManager     newMgr = targetFilter.getSystemFilterPoolManager();
-    	
-        ISystemFilterString newFilterString = oldMgr.moveSystemFilterString(targetFilter, oldFilterString);
-        
-        if ((root != null) && (newFilterString!=null))
-        {
-          Object data = root.getData();
-          if ((data!=null) && (data instanceof TreeViewer))
-            ((TreeViewer)data).refresh();
-        }
-		return (newFilterString != null);
-	}
-
-	/**
-	 * @see SystemBaseCopyAction#getTreeModel()
-	 */
-	protected SystemSimpleContentElement getTreeModel() 
-	{
-		ISystemFilterString firstFilterString = getFirstSelectedFilterString(); 
-		ISystemFilterPoolManagerProvider provider = firstFilterString.getProvider();
-		return getPoolMgrTreeModel(provider, firstFilterString.getSystemFilterPoolManager(), getSelectedFilters());
-	}
-	/**
-	 * @see SystemBaseCopyAction#getTreeInitialSelection()
-	 */
-	protected SystemSimpleContentElement getTreeInitialSelection()
-	{
-		return initialSelectionElement;
-	}
-
-    /**
-     * Set the prompt string that shows up at the top of the copy-destination dialog.
-     */
-    public void setPromptString(String promptString)
-    {
-    	this.promptString = promptString;
-    }
-	/**
-	 * @see SystemBaseCopyAction#getPromptString()
-	 */
-	protected String getPromptString() 
-	{
-		return promptString;
-	}
-	/**
-	 * @see SystemBaseCopyAction#getCopyingMessage()
-	 */
-	protected SystemMessage getCopyingMessage() 
-	{
-		return RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_MOVEFILTERSTRINGS_PROGRESS);
-	}
-	/**
-	 * @see SystemBaseCopyAction#getCopyingMessage( String)
-	 */
-	protected SystemMessage getCopyingMessage(String oldName) 
-	{
-		return RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_MOVEFILTERSTRING_PROGRESS).makeSubstitution(oldName);
-	}
-
-	/**
-	 * @see SystemBaseCopyAction#getOldObjects()
-	 */
-	protected Object[] getOldObjects() 
-	{
-		return getSelectedFilterStrings();
-	}
-
-	/**
-	 * @see SystemBaseCopyAction#getOldNames()
-	 */
-	protected String[] getOldNames() 
-	{
-		ISystemFilterString[] strings = getSelectedFilterStrings();
-		String[] names = new String[strings.length];
-		for (int idx=0; idx<strings.length; idx++)
-		   names[idx] = strings[idx].getString();
-		return names;
-	}
-
-    /**
-     * Get the currently selected filter strings
-     */
-    protected ISystemFilterString[] getSelectedFilterStrings()
-    {
-    	if (strings == null)
-    	{
-   	      IStructuredSelection selection = getSelection();
-   	      strings = new ISystemFilterString[selection.size()];
-   	      Iterator i = selection.iterator();
-   	      int idx=0;
-   	      while (i.hasNext())
-   	      {
-   	         Object next = i.next();
-   	         if (next instanceof SystemSimpleContentElement)    	
-   	           next = ((SystemSimpleContentElement)next).getData();
-   	         if (next instanceof ISystemFilterStringReference)
-   	           strings[idx++] = ((ISystemFilterStringReference)next).getReferencedFilterString();
-   	         else
-   	           strings[idx++] = (ISystemFilterString)next;
-   	      }
-   	    }
-   	    return strings;
-    }
-    /**
-     * Get the intersection list of filters of currently selected filter strings
-     */
-    protected ISystemFilter[] getSelectedFilters()
-    {
-        Vector v = new Vector();
-        ISystemFilterString[] strings = getSelectedFilterStrings();
-        for (int idx=0; idx<strings.length; idx++)
-        {
-           ISystemFilter filter = strings[idx].getParentSystemFilter();
-		   if (!supportsDuplicateFilterStrings(filter) &&
-               !SystemFilterCopyFilterStringAction.containsFilter(v,filter))
-             v.addElement(filter);      	
-        }
-        ISystemFilter[] filters = new ISystemFilter[v.size()];
-        for (int idx=0; idx<v.size(); idx++)
-           filters[idx] = (ISystemFilter)v.elementAt(idx);
-        return filters;
-    }    
-    /**
-     * Get the first selected filter string
-     */
-    protected ISystemFilterString getFirstSelectedFilterString()
-    {
-    	Object first = getFirstSelection();
-   	    if (first instanceof SystemSimpleContentElement)    	
-   	    {
-   	      root = ((SystemSimpleContentElement)first).getRoot();
-   	      first = ((SystemSimpleContentElement)first).getData();
-   	    }
-   	    if (first == null)
-   	      return null;
-   	    else if (first instanceof ISystemFilterStringReference)
-   	      return ((ISystemFilterStringReference)first).getReferencedFilterString();
-   	    else if (first instanceof ISystemFilterString)
-   	      return (ISystemFilterString)first;
-   	    else
-   	      return null;   	      
-    }
-   
-    // ------------------
-    // PRIVATE METHODS...
-    // ------------------
-    
-	/**
-	 * Create and return data model to populate selection tree with.
-	 * @param poolMgrProvider The provider who will give us the list of filter pool managers to populate the list with
-	 * @param poolMgr The SystemFilterPoolManager whose tree model element is to be pre-selected
-	 * @param filtersToExclude All the currently selected filters, which are excluded from the target list
-	 */
-    protected SystemSimpleContentElement getPoolMgrTreeModel(ISystemFilterPoolManagerProvider poolMgrProvider, 
-                                                             ISystemFilterPoolManager poolMgr,
-                                                             ISystemFilter[] filtersToExclude)
-    {
-    	SystemSimpleContentElement veryRootElement = 
-    	   new SystemSimpleContentElement("Root", //$NON-NLS-1$
-    	                                  null, null, (Vector)null);	    	
-    	veryRootElement.setRenamable(false);
-    	veryRootElement.setDeletable(false);
-    	                
-    	ISystemFilterPoolManager[] mgrs = poolMgrProvider.getSystemFilterPoolManagers();
-
-    	ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)poolMgrProvider.getAdapter(ISubSystemConfigurationAdapter.class);
-    	ImageDescriptor image = adapter.getSystemFilterPoolManagerImage();
-    	    	                                  
-    	if ((mgrs == null) || (mgrs.length == 0))
-    	  return veryRootElement;
-
-        ISystemFilter parentFilter = getFirstSelectedFilterString().getParentSystemFilter();
-        ISystemFilterPool parentFilterPool = parentFilter.getParentFilterPool();
-         
-    	Vector veryRootChildren = new Vector(); 
-    	for (int idx=0; idx<mgrs.length; idx++)
-    	{
-           SystemSimpleContentElement mgrElement = 
-    	      new SystemSimpleContentElement(mgrs[idx].getName(),
-    	                                     mgrs[idx], veryRootElement, (Vector)null);	
-    	   mgrElement.setRenamable(false);
-    	   mgrElement.setDeletable(false);
-    	   mgrElement.setImageDescriptor(image);
-    	   
-    	   Vector elements = new Vector();    	   
-           populateFilterPoolContentElementVector(poolMgrProvider, mgrs[idx], elements, 
-                                                  mgrElement, filtersToExclude, 
-                                                  parentFilterPool, parentFilter);   
-           mgrElement.setChildren(elements);
-    	   
-           veryRootChildren.addElement(mgrElement);
-           //if (mgrs[idx] == poolMgr)
-             //initialSelectionElement = mgrElement;          
-    	}    	
-        veryRootElement.setChildren(veryRootChildren);    	
-    	return veryRootElement;
-    }
-    
-    /**
-     * Populate filter pool manager subtree with filter pools
-     */
-    protected void populateFilterPoolContentElementVector(ISystemFilterPoolManagerProvider poolMgrProvider, 
-                                                          ISystemFilterPoolManager mgr, 
-                                                          Vector elements, 
-                                                          SystemSimpleContentElement parentElement,
-                                                          ISystemFilter[] filtersToExclude,
-                                                          ISystemFilterPool filterPoolToSelect,
-                                                          ISystemFilter filterToSelect)
-    {
-    	ISystemFilterPool[] pools = mgr.getSystemFilterPools();
-        for (int idx=0; idx<pools.length; idx++)
-        {
-           ISystemFilterPool pool = pools[idx];
-           SystemSimpleContentElement cElement = 
-             new SystemSimpleContentElement(pool.getName(), pool, parentElement, (Vector)null);
-           cElement.setImageDescriptor(SystemFilterUIHelpers.getFilterPoolImage(poolMgrProvider,pool));
-
-           Vector childElements = new Vector();
-           populateFilterContentElementVector(poolMgrProvider, pool, childElements, cElement, filtersToExclude, filterToSelect);    	   
-           cElement.setChildren(childElements);           
-           
-           elements.addElement(cElement);             
-           if ((pool == filterPoolToSelect) && (initialSelectionElement==null))
-             initialSelectionElement = cElement;
-        }        
-    }
-    
-    /**
-     * Populate filter pool subtree with filters
-     */
-    protected void populateFilterContentElementVector(ISystemFilterPoolManagerProvider poolMgrProvider, 
-                                                      ISystemFilterPool pool, 
-                                                      Vector elements, 
-                                                      SystemSimpleContentElement parentElement,
-                                                      ISystemFilter[] filtersToExclude,
-                                                      ISystemFilter filterToSelect)
-    {
-    	ISystemFilter[] filters = pool.getSystemFilters();
-        for (int idx=0; idx<filters.length; idx++)
-        {
-           ISystemFilter filter = filters[idx];
-           if (!filter.isNonChangable() && !filter.isPromptable() && // defect 43242
-               !containsFilter(filtersToExclude,filter))
-           {
-             SystemSimpleContentElement cElement = 
-               new SystemSimpleContentElement(filter.getName(), filter, parentElement, (Vector)null);
-             cElement.setImageDescriptor(SystemFilterUIHelpers.getFilterImage(poolMgrProvider,filter));
-             elements.addElement(cElement);  
-             if (filter == filterToSelect)
-               initialSelectionElement = cElement;
-           }
-        }        
-    }
-    
-    private boolean containsFilter(ISystemFilter[] filters, ISystemFilter filter)
-    {
-    	ISystemFilter match = null;
-    	for (int idx=0; (match==null) && (idx<filters.length); idx++)
-    	   if (filters[idx] == filter)
-    	     match = filters[idx];
-        return (match != null);
-    }
-     
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterMoveUpFilterAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterMoveUpFilterAction.java
deleted file mode 100644
index 6285cd814..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterMoveUpFilterAction.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2007 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-import java.util.Iterator;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.rse.core.filters.ISystemFilter;
-import org.eclipse.rse.core.filters.ISystemFilterContainer;
-import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
-import org.eclipse.rse.core.filters.ISystemFilterReference;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.internal.ui.SystemSortableSelection;
-import org.eclipse.rse.ui.ISystemContextMenuConstants;
-import org.eclipse.rse.ui.ISystemIconConstants;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.actions.SystemBaseAction;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * The action allows users to move the current filter up in the list
- */
-public class SystemFilterMoveUpFilterAction extends SystemBaseAction 
-                                 
-{
-
-	/**
-	 * Constructor
-	 */
-	public SystemFilterMoveUpFilterAction(Shell parent) 
-	{
-		super(SystemResources.ACTION_MOVEUP_LABEL,SystemResources.ACTION_MOVEUP_TOOLTIP,
-		      RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_MOVEUP_ID),
-		      parent);
-        allowOnMultipleSelection(true);
-		setContextMenuGroup(ISystemContextMenuConstants.GROUP_REORDER);        
-	}
-
-    /**
-     * Set the help context Id (infoPop) for this action. This must be fully qualified by
-     *  plugin ID.
-     * <p>
-     * Same as {@link org.eclipse.rse.ui.actions.SystemBaseAction #setHelp(String)}
-     * @see org.eclipse.rse.ui.actions.SystemBaseAction #getHelpContextId()
-     */
-    public void setHelpContextId(String id)
-    {
-    	setHelp(id);
-    }
-    
-    /**
-     * Intercept of parent method. We need to test that the filters
-     *  come from the same parent
-     */
-	public boolean updateSelection(IStructuredSelection selection)
-	{
-		ISystemFilterContainer prevContainer = null;
-		boolean enable = true;
-		Iterator e = selection.iterator();
-		while (enable && e.hasNext())
-		{
-			Object selectedObject = e.next();
-			ISystemFilter filter = getSystemFilter(selectedObject);
-			if (prevContainer != null)
-			{
-				if (prevContainer != filter.getParentFilterContainer())
-					enable = false;
-				else
-					prevContainer = filter.getParentFilterContainer();			 
-			}
-			else
-				prevContainer = filter.getParentFilterContainer();
-			if (enable)
-				enable = checkObjectType(filter);		  
-		}
-		return enable;
-	}
-	
-    /**
-     * Called by SystemBaseAction when selection is set.
-     * Our opportunity to verify we are allowed for this selected type.
-     */
-	public boolean checkObjectType(Object selectedObject)
-	{
-		if (!((selectedObject instanceof ISystemFilter) ||
-		      (selectedObject instanceof ISystemFilterReference)))
-		  return false;
-		ISystemFilter filter = getSystemFilter(selectedObject);
-		ISystemFilterContainer fpContainer = filter.getParentFilterContainer();
-		int pos = fpContainer.getSystemFilterPosition(filter);
-		return (pos>0);		
-	}
-	
-	private ISystemFilter getSystemFilter(Object selectedObject)
-	{
-		if (selectedObject instanceof ISystemFilter)
-		  return (ISystemFilter)selectedObject;
-		else
-		  return ((ISystemFilterReference)selectedObject).getReferencedFilter();
-	}	
-
-	/**
-	 * This is the method called when the user selects this action.
-	 * @see org.eclipse.jface.action.Action#run()
-	 */
-	public void run() 
-	{
-		IStructuredSelection selections = getSelection();
-		//SystemFilter filters[] = new SystemFilter[selections.size()];
-		//Iterator i = selections.iterator();
-		//int idx = 0;
-		//while (i.hasNext())		
-		  //filters[idx++] = getSystemFilter(i.next());
-
-		SystemSortableSelection[] sortableArray = new SystemSortableSelection[selections.size()];
-		Iterator i = selections.iterator();
-		int idx = 0;
-		ISystemFilter filter = null;
-		ISystemFilterContainer fpContainer = null;
-		while (i.hasNext())	
-		{
-		  	sortableArray[idx] = new SystemSortableSelection(getSystemFilter(i.next()));
-		  	filter = (ISystemFilter)sortableArray[idx].getSelectedObject();
-		  	fpContainer = filter.getParentFilterContainer();
-		  	sortableArray[idx].setPosition(fpContainer.getSystemFilterPosition(filter));
-		  	idx++;
-		}
-		SystemSortableSelection.sortArray(sortableArray);
-		ISystemFilter[] filters = (ISystemFilter[])SystemSortableSelection.getSortedObjects(sortableArray, new ISystemFilter[sortableArray.length]);
-		
-		if (idx>0)
-		{
-		  	ISystemFilterPoolManager fpMgr = filters[0].getSystemFilterPoolManager();
-		  	try {
-		  		//System.out.println("In SystemFilterMoveUpFilterAction#run(). Calling mgr.moveSystemFilters");
-		    	fpMgr.moveSystemFilters(filters,-1);
-		  	} catch (Exception exc)
-		  	{
-		  	}
-		}
-	}		
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterMoveUpFilterPoolReferenceAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterMoveUpFilterPoolReferenceAction.java
deleted file mode 100644
index 455ce1306..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterMoveUpFilterPoolReferenceAction.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2007 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-import java.util.Iterator;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.rse.core.filters.ISystemFilterPoolReference;
-import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManager;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.internal.ui.SystemSortableSelection;
-import org.eclipse.rse.ui.ISystemContextMenuConstants;
-import org.eclipse.rse.ui.ISystemIconConstants;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.actions.SystemBaseAction;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * The action allows users to move the current filter pool reference up in the list
- */
-public class SystemFilterMoveUpFilterPoolReferenceAction extends SystemBaseAction 
-                                 
-{
-
-
-	/**
-	 * Constructor
-	 */
-	public SystemFilterMoveUpFilterPoolReferenceAction(Shell parent) 
-	{
-		super(SystemResources.ACTION_MOVEUP_LABEL,SystemResources.ACTION_MOVEUP_TOOLTIP,
-		      RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_MOVEUP_ID),
-		      parent);
-        allowOnMultipleSelection(true);
-		setContextMenuGroup(ISystemContextMenuConstants.GROUP_REORDER);        
-	}
-
-    /**
-     * Set the help context Id (infoPop) for this action. This must be fully qualified by
-     *  plugin ID.
-     * <p>
-     * Same as {@link org.eclipse.rse.ui.actions.SystemBaseAction#setHelp(String)}
-     * @see org.eclipse.rse.ui.actions.SystemBaseAction#getHelpContextId()
-     */
-    public void setHelpContextId(String id)
-    {
-    	setHelp(id);
-    }
-
-	/**
-	 * Intercept of parent method. We need to test that the filter pools
-	 *  come from the same parent
-	 */
-	public boolean updateSelection(IStructuredSelection selection)
-	{
-		ISystemFilterPoolReferenceManager prevMgr = null;
-		boolean enable = true;
-		Iterator e = selection.iterator();
-		while (enable && e.hasNext())
-		{
-			Object selectedObject = e.next();
-			ISystemFilterPoolReference filterPoolRef = (ISystemFilterPoolReference)selectedObject;
-			if (prevMgr != null)
-			{
-				if (prevMgr != filterPoolRef.getFilterPoolReferenceManager())
-					enable = false;
-				else
-					prevMgr = filterPoolRef.getFilterPoolReferenceManager();			 
-			}
-			else
-				prevMgr = filterPoolRef.getFilterPoolReferenceManager();			
-			if (enable)
-				enable = checkObjectType(filterPoolRef);		  
-		}
-		return enable;
-	}
-	
-    /**
-     * Called by SystemBaseAction when selection is set.
-     * Our opportunity to verify we are allowed for this selected type.
-     */
-	public boolean checkObjectType(Object selectedObject)
-	{
-		if (!(selectedObject instanceof ISystemFilterPoolReference))
-		  return false;
-		ISystemFilterPoolReference filterPoolRef = (ISystemFilterPoolReference)selectedObject;
-		ISystemFilterPoolReferenceManager fprMgr = filterPoolRef.getFilterPoolReferenceManager();
-		int pos = fprMgr.getSystemFilterPoolReferencePosition(filterPoolRef);		
-		return (pos>0);
-	}
-	
-	/**
-	 * This is the method called when the user selects this action.
-	 * @see org.eclipse.jface.action.Action#run()
-	 */
-	public void run() 
-	{
-		IStructuredSelection selections = getSelection();
-		//SystemFilterPoolReference filterPoolRefs[] = new SystemFilterPoolReference[selections.size()];
-		//Iterator i = selections.iterator();
-		//int idx = 0;
-		//while (i.hasNext())		
-		  //filterPoolRefs[idx++] = (SystemFilterPoolReference)i.next();
-
-		SystemSortableSelection[] sortableArray = new SystemSortableSelection[selections.size()];
-		Iterator i = selections.iterator();
-		int idx = 0;
-		ISystemFilterPoolReference filterPoolRef = null;
-		ISystemFilterPoolReferenceManager fprMgr = null;
-		while (i.hasNext())	
-		{
-		  	sortableArray[idx] = new SystemSortableSelection(i.next());
-		  	filterPoolRef = (ISystemFilterPoolReference)sortableArray[idx].getSelectedObject();
-		  	fprMgr = filterPoolRef.getFilterPoolReferenceManager();
-		  	sortableArray[idx].setPosition(fprMgr.getSystemFilterPoolReferencePosition(filterPoolRef));
-		  	idx++;
-		}
-		SystemSortableSelection.sortArray(sortableArray);
-		ISystemFilterPoolReference[] filterPoolRefs = (ISystemFilterPoolReference[])SystemSortableSelection.getSortedObjects(sortableArray, new ISystemFilterPoolReference[sortableArray.length]);
-		
-		if (idx > 0)
-        {
-		  	fprMgr = filterPoolRefs[0].getFilterPoolReferenceManager();
-		  	fprMgr.moveSystemFilterPoolReferences(filterPoolRefs,-1);
-        }
-	}		
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterNewFilterPoolAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterNewFilterPoolAction.java
deleted file mode 100644
index 551e3c20a..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterNewFilterPoolAction.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2008 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.rse.core.filters.ISystemFilterPool;
-import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
-import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManager;
-import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManagerProvider;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.internal.ui.filters.dialogs.SystemFilterNewFilterPoolWizard;
-import org.eclipse.rse.internal.ui.filters.dialogs.SystemFilterPoolWizardDialog;
-import org.eclipse.rse.internal.ui.filters.dialogs.SystemFilterWorkWithFilterPoolsDialog;
-import org.eclipse.rse.ui.ISystemContextMenuConstants;
-import org.eclipse.rse.ui.ISystemIconConstants;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.actions.ISystemWizardAction;
-import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement;
-import org.eclipse.rse.ui.filters.SystemFilterPoolDialogOutputs;
-import org.eclipse.rse.ui.filters.actions.SystemFilterAbstractFilterPoolWizardAction;
-import org.eclipse.rse.ui.filters.dialogs.SystemFilterPoolWizardInterface;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * The action that displays the New Filter Pool wizard
- * @see #setHelpContextId(String)
- */
-public class SystemFilterNewFilterPoolAction 
-       extends SystemFilterAbstractFilterPoolWizardAction 
-       implements  ISystemWizardAction
-{
-	
-    private SystemFilterWorkWithFilterPoolsDialog wwdialog = null;
-    //private SystemFilterNewFilterPoolWizard wizard = null;
-    	
-	/**
-	 * Constructor for SystemNewFilterPoolAction when not called from work-with dialog.
-	 */
-	public SystemFilterNewFilterPoolAction(Shell parent) 
-	{
-	    this(parent, null);
-	}	
-
-	/**
-	 * Constructor for SystemNewFilterPoolAction when called from work-with dialog.
-	 */
-	public SystemFilterNewFilterPoolAction(Shell parent,
-	                                       SystemFilterWorkWithFilterPoolsDialog wwdialog) 
-	{
-		super(parent, 
-		      RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_NEWFILTERPOOL_ID),
-		      SystemResources.ACTION_NEWFILTERPOOL_LABEL, SystemResources.ACTION_NEWFILTERPOOL_TOOLTIP);
-		this.wwdialog = wwdialog;
-		allowOnMultipleSelection(false);		
-		setContextMenuGroup(ISystemContextMenuConstants.GROUP_NEW);        		
-	}
-    
-    /**
-     * Override of init in parent
-     */
-    protected void init()
-    {
-    	super.init();
-        dlgInputs.prompt = SystemResources.RESID_NEWFILTERPOOL_PAGE1_DESCRIPTION;
-        dlgInputs.title = SystemResources.RESID_NEWFILTERPOOL_PAGE1_TITLE;
-		dlgInputs.poolNamePrompt = SystemResources.RESID_FILTERPOOLNAME_LABEL;
-		dlgInputs.poolNameTip = SystemResources.RESID_FILTERPOOLNAME_TIP;        
-		dlgInputs.poolMgrNamePrompt = SystemResources.RESID_FILTERPOOLMANAGERNAME_LABEL;
-		dlgInputs.poolMgrNameTip = SystemResources.RESID_FILTERPOOLMANAGERNAME_TIP;        
-    }
-
-    /**
-     * Called by SystemBaseAction when selection is set.
-     * Our opportunity to verify we are allowed for this selected type.
-     */
-	public boolean checkObjectType(Object selectedObject)
-	{
-		if (selectedObject instanceof SystemSimpleContentElement)
-		  selectedObject = ((SystemSimpleContentElement)selectedObject).getData();
-		boolean enable = 
-		  (selectedObject instanceof ISystemFilterPoolReferenceManagerProvider) ||
-		  (selectedObject instanceof ISystemFilterPoolManager) ||
-		  (selectedObject instanceof ISystemFilterPool);
-		return enable;
-	}
-
-	
-	/**
-	 * Return the wizard so we can customize it prior to showing it.
-	 * Returns new SystemFilterNewFilterPoolWizard(). Override to replace with your own.
-	 */
-	public SystemFilterPoolWizardInterface getFilterPoolWizard()
-	{
-		//if (wizard == null)
-		//  wizard = new SystemFilterNewFilterPoolWizard();
-		//return wizard;
-		return new SystemFilterNewFilterPoolWizard();
-	}
-
-	/**
-     * Overrides parent. Called after dialog dismissed.
-	 */
-	protected Object getDialogValue(Dialog dlg)
-	{
-		SystemFilterPoolWizardDialog wizardDlg = (SystemFilterPoolWizardDialog)dlg;
-        SystemFilterPoolDialogOutputs dlgOutput = wizardDlg.getFilterPoolDialogOutputs();
-        return dlgOutput;
-	}
-
-	/**
-     * Overrides parent. Called after dialog dismissed and getDialogValue called.
-     * The output of getDialogValue passed as input here.
-	 */
-	public void doOKprocessing(Object dlgValue)
-	{
-	  //System.out.println("In SystemFilterNewFIlterPoolAction.doOKProcessing");
-        SystemFilterPoolDialogOutputs dlgOutput = (SystemFilterPoolDialogOutputs)dlgValue;
-        // called from WorkWith dialog... we do not offer to create a reference...
-        if ((dlgOutput.newPool != null) && (wwdialog != null))
-          wwdialog.addNewFilterPool(getShell(), dlgOutput.newPool);
-        else if (dlgOutput.newPool != null)
-        {
-          ISystemFilterPoolReferenceManagerProvider sfprmp = getReferenceManagerProviderSelection();
-          // Action selected by user when a reference manager provider was selected.
-          // Seems obvious then that the user wishes to see the newly created pool, so
-          //  we take the liberty of creating a reference object...
-          if (sfprmp != null)
-          {
-          	ISystemFilterPoolReferenceManager sfprm = sfprmp.getSystemFilterPoolReferenceManager();
-	  //System.out.println("...calling addREferenceToSystemFilterPool...");
-          	sfprm.addReferenceToSystemFilterPool(dlgOutput.newPool);
-	  //System.out.println("...back from addREferenceToSystemFilterPool");
-          }
-        }
-	}
-
-	/**
-	 * Returns array of managers to show in combo box.
-	 * Overrides parent to call back to wwdialog if not null.
-	 */
-    public ISystemFilterPoolManager[] getFilterPoolManagers()
-	{
-	   if (wwdialog != null)
-	     return wwdialog.getFilterPoolManagers();
-       else 
-         return super.getFilterPoolManagers();
-	}
-	
-	/**
-	 * Returns the zero-based index of the manager name to preselect.
-	 * Overrides parent to call back to wwdialog if not null.
-	 */
-	public int getFilterPoolManagerNameSelectionIndex()
-	{
-	   if (wwdialog != null)
-	     return wwdialog.getFilterPoolManagerSelection();
-	   else
-         return super.getFilterPoolManagerNameSelectionIndex();
-	}
-
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterPoolReferenceSelectAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterPoolReferenceSelectAction.java
deleted file mode 100644
index 038ec5438..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterPoolReferenceSelectAction.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2007 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
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [168870] refactor org.eclipse.rse.core package of the UI plugin
- ********************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.rse.core.filters.ISystemFilterPool;
-import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManager;
-import org.eclipse.rse.ui.ISystemIconConstants;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.SystemBasePlugin;
-import org.eclipse.rse.ui.actions.SystemBaseAction;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * A selectable filter pool name action.
- * This is typically used to allow users to select a filter pool for referencing
- */
-public class SystemFilterPoolReferenceSelectAction extends SystemBaseAction 
-                                 
-{	
-	private ISystemFilterPool pool;
-	private ISystemFilterPoolReferenceManager refMgr;
-	
-	/**
-	 * Constructor
-	 */
-	public SystemFilterPoolReferenceSelectAction(Shell parent, ISystemFilterPool pool, ISystemFilterPoolReferenceManager refMgr) 
-	{
-		super(pool.getName(), RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_NEWFILTERPOOLREF_ID), parent);
-		this.pool = pool;
-		this.refMgr = refMgr;
-		//setChecked(false);
-	}
-
-    /**
-     * Set the help context Id (infoPop) for this action. This must be fully qualified by
-     *  plugin ID.
-     * <p>
-     * Same as {@link org.eclipse.rse.ui.actions.SystemBaseAction #setHelp(String)}
-     * @see org.eclipse.rse.ui.actions.SystemBaseAction #getHelpContextId()
-     */
-    public void setHelpContextId(String id)
-    {
-    	setHelp(id);
-    }
-
-	/**
-	 * @see SystemBaseAction#updateSelection(IStructuredSelection)
-	 */
-	public boolean updateSelection(IStructuredSelection selection)
-	{
-		boolean enable = true;
-		return enable;
-	}
-
-	/**
-	 * This is the method called when the user selects this action.
-	 * @see org.eclipse.jface.action.Action#run()
-	 */
-	public void run() 
-	{
-        //System.out.println("Pretend to select");
-        try 
-        {
-            refMgr.addReferenceToSystemFilterPool(pool);
-        } catch (Exception exc)
-        {
-        	SystemBasePlugin.logError("Unexpected error adding filter pool reference",exc); //$NON-NLS-1$
-        }
-	}		
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterRemoveFilterPoolReferenceAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterRemoveFilterPoolReferenceAction.java
deleted file mode 100644
index 6d2c6dd96..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterRemoveFilterPoolReferenceAction.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2007 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-import java.util.Iterator;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.rse.core.filters.ISystemFilterPoolReference;
-import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManager;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.ui.ISystemContextMenuConstants;
-import org.eclipse.rse.ui.ISystemIconConstants;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.actions.SystemBaseAction;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * The action allows users to remove a filter pool reference
- */
-public class SystemFilterRemoveFilterPoolReferenceAction 
-       extends SystemBaseAction 
-       
-{
-
-
-	/**
-	 * Constructor
-	 */
-	public SystemFilterRemoveFilterPoolReferenceAction(Shell parent) 
-	{
-		super(SystemResources.ACTION_RMVFILTERPOOLREF_LABEL,SystemResources.ACTION_RMVFILTERPOOLREF_TOOLTIP,
-		      RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_DELETEREF_ID),
-		      parent);
-        allowOnMultipleSelection(true);
-		setContextMenuGroup(ISystemContextMenuConstants.GROUP_REORGANIZE); 
-	}
-
-    /**
-     * Set the help context Id (infoPop) for this action. This must be fully qualified by
-     *  plugin ID.
-     * <p>
-     * Same as {@link org.eclipse.rse.ui.actions.SystemBaseAction #setHelp(String)}
-     * @see org.eclipse.rse.ui.actions.SystemBaseAction #getHelpContextId()
-     */
-    public void setHelpContextId(String id)
-    {
-    	setHelp(id);
-    }
-
-    /**
-     * Called by SystemBaseAction when selection is set.
-     * Our opportunity to verify we are allowed for this selected type.
-     */
-	public boolean checkObjectType(Object selectedObject)
-	{
-		if (!(selectedObject instanceof ISystemFilterPoolReference))
-		  	return false;
-		// disable if this is a connection-unique filter pool
-		else 
-			return ((ISystemFilterPoolReference)selectedObject).getReferencedFilterPool().getOwningParentName() == null;
-	}
-	
-	/**
-	 * This is the method called when the user selects this action.
-	 * @see org.eclipse.jface.action.Action#run()
-	 */
-	public void run() 
-	{
-		IStructuredSelection selections = getSelection();
-		Iterator i = selections.iterator();
-		ISystemFilterPoolReferenceManager fprMgr = null;
-		while (i.hasNext())		
-		{
-		  ISystemFilterPoolReference poolReference = (ISystemFilterPoolReference)i.next();
-		  fprMgr = poolReference.getFilterPoolReferenceManager();
-		  fprMgr.removeSystemFilterPoolReference(poolReference,true); // true means do dereference
-		}
-	}		
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterSelectFilterPoolsAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterSelectFilterPoolsAction.java
deleted file mode 100644
index 2669a5af4..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterSelectFilterPoolsAction.java
+++ /dev/null
@@ -1,270 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2008 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-import java.util.Vector;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.rse.core.filters.ISystemFilterPool;
-import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
-import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManager;
-import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManagerProvider;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.ui.ISystemContextMenuConstants;
-import org.eclipse.rse.ui.ISystemIconConstants;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement;
-import org.eclipse.rse.ui.dialogs.SystemSimpleSelectDialog;
-import org.eclipse.rse.ui.filters.SystemFilterPoolDialogInterface;
-import org.eclipse.rse.ui.filters.SystemFilterUIHelpers;
-import org.eclipse.rse.ui.filters.actions.SystemFilterAbstractFilterPoolAction;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * The action that displays the Select Filter Pools dialog, and which returns
- * an array of selected filter pools.
- * <p>
- * Dialog will display a root node for each manager, and then the filter pools
- * within each manager as children. User can select any pool from any of the 
- * given managers.
- * <p>
- * Uses getName() on manager for display name of root nodes.
- * <p>
- * Typically, such a dialog is used to allow the user to select a subset of pools
- * that they will access in some context. There is framework support for such
- * selections, via SystemFilterPoolReferences. Each of these are a reference to a 
- * filter pool, and the SystemFilterPoolReferenceManager class offers full support
- * for manager a list of such references, optionally even saving and restoring such
- * a list.
- * 
- * <p>
- * You call the setFilterPoolManagers method to set the array of filter pool managers
- * this dialog allows the user to select from.
- * <p>
- * If you also call the optional method setFilterPoolReferenceManager, you need not 
- * subclass this action. It will handle everything for you!!
- * <ul
- *   <li>Preselects the filter pools currently referenced by one or more reference objects
- *          in the filter pool reference manager.
- *   <li>What OK is pressed, removes the previous references from the reference manager,
- *          and adds references for the pools selected by the user.
- * </ul>
- * 
- * You can either supply the label, dialog title, dialog prompt, filter pool image,
- * input filter pool managers and filter pool reference manager by calling the 
- * appropriate setXXX methods, or by overriding the related getXXX methods.
- */
-public class SystemFilterSelectFilterPoolsAction 
-       extends SystemFilterAbstractFilterPoolAction
-       
-{
-
-
-	/**
-	 * Constructor when default label desired.
-	 */
-	public SystemFilterSelectFilterPoolsAction(Shell parent) 
-	{
-		super(parent,
-		      RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_SELECTFILTERPOOLS_ID),
-		      SystemResources.ACTION_SELECTFILTERPOOLS_LABEL, SystemResources.ACTION_SELECTFILTERPOOLS_TOOLTIP);
-		setContextMenuGroup(ISystemContextMenuConstants.GROUP_CHANGE);        		
-		// set default help for action and dialog
-		setHelp(RSEUIPlugin.HELPPREFIX + "actn0043"); //$NON-NLS-1$
-		setDialogHelp(RSEUIPlugin.HELPPREFIX + "dsfp0000"); //$NON-NLS-1$
-	}	
-	/**
-	 * Constructor when given the translated action label
-	 */
-	public SystemFilterSelectFilterPoolsAction(Shell parent, String title) 
-	{
-		super(parent, title);
-		setContextMenuGroup(ISystemContextMenuConstants.GROUP_CHANGE);        		
-		// set default help for action and dialog
-		setHelp(RSEUIPlugin.HELPPREFIX + "actn0043"); //$NON-NLS-1$
-		setDialogHelp(RSEUIPlugin.HELPPREFIX + "dsfp0000"); //$NON-NLS-1$
-	}
-	
-	
-	/**
-	 * Constructor when given the translated action label
-	 */
-	public SystemFilterSelectFilterPoolsAction(Shell parent, String title, String tooltip) 
-	{
-		super(parent, title, tooltip);
-		setContextMenuGroup(ISystemContextMenuConstants.GROUP_CHANGE);        		
-		// set default help for action and dialog
-		setHelp(RSEUIPlugin.HELPPREFIX + "actn0043"); //$NON-NLS-1$
-		setDialogHelp(RSEUIPlugin.HELPPREFIX + "dsfp0000"); //$NON-NLS-1$
-	}
-	
-
-    /**
-     * Override of init in parent
-     */
-    protected void init()
-    {
-    	super.init();
-        dlgInputs.prompt = SystemResources.RESID_SELECTFILTERPOOLS_PROMPT;
-        dlgInputs.title = SystemResources.RESID_SELECTFILTERPOOLS_TITLE;
-    }
-
-	/**
-     * Creates our select-filter-pools dialog, and populates it with the list of
-     * filter pools to select from.
-     * <p>
-     * <i>Assumes setFilterPoolManagers has been called.</i>
-     * <p>
-     * Dialog will display a root node for each manager, and then the filter pools
-     * within each manager as children. User can select any pool from any of the 
-     * given managers.
-     * <p>
-     * Uses getName() on manager for display name of root nodes.
-     *
- 	 * @see org.eclipse.rse.ui.actions.SystemBaseDialogAction#run()
-	 */
-	protected Dialog createDialog(Shell parent)
-	{
-		SystemSimpleSelectDialog dialog = 
-		   new SystemSimpleSelectDialog(parent, getDialogTitle(), getDialogPrompt());
-		   
-    	ISystemFilterPoolManager[] mgrs = getFilterPoolManagers();
-		ISystemFilterPoolReferenceManagerProvider sprmp = getReferenceManagerProviderSelection();
-		ISystemFilterPoolManager[] additionalMgrs = null;
-		if (sprmp != null)
-          additionalMgrs = sprmp.getSystemFilterPoolReferenceManager().getAdditionalSystemFilterPoolManagers();
-        if (additionalMgrs != null)
-        {
-          ISystemFilterPoolManager[] allmgrs = new ISystemFilterPoolManager[mgrs.length+additionalMgrs.length];
-          int allidx = 0;
-          for (int idx=0; idx<mgrs.length; idx++)
-             allmgrs[allidx++] = mgrs[idx];
-          for (int idx=0; idx<additionalMgrs.length; idx++)
-             allmgrs[allidx++] = additionalMgrs[idx];
-          mgrs = allmgrs;
-        }
-
-		SystemSimpleContentElement input = 
-		      SystemFilterUIHelpers.getFilterPoolModel(getFilterPoolManagerProvider(), mgrs);
-		preSelect(input);
-		setValue(input);
-
-		if (sprmp != null)
-		{
-			ISystemFilterPoolManager initialSelection = sprmp.getSystemFilterPoolReferenceManager().getDefaultSystemFilterPoolManager();
-			if (initialSelection != null)
-			{
-			  SystemSimpleContentElement initialElementSelection = SystemFilterUIHelpers.getDataElement(input, initialSelection);
-			  if (initialElementSelection != null)
-			    dialog.setRootToPreselect(initialElementSelection);
-			}
-		}
-		return dialog;
-	}
-	/**
-	 * We override createDialog from parent, so this is a no-op.
-	 */
-	public SystemFilterPoolDialogInterface createFilterPoolDialog(Shell parent)
-	{
-		return null;
-	}
-	    
-    /**
-     * Walk elements deciding pre-selection
-     */
-    protected void preSelect(SystemSimpleContentElement inputElement)
-    {
-    	super.preSelect(inputElement);
-    }
-	/**
-	 * Decide per pool if it should be selected or not.
-	 * Default behaviour is to select it if it is currently referenced.
-	 */
-	protected boolean getFilterPoolPreSelection(ISystemFilterPool pool)
-	{
-        ISystemFilterPoolReferenceManagerProvider refMgrProvider = getReferenceManagerProviderSelection();
-        if (refMgrProvider != null)
-        {
-          ISystemFilterPoolReferenceManager refMgr = refMgrProvider.getSystemFilterPoolReferenceManager();
-          if (refMgr != null)
-          {
-          	return refMgr.isSystemFilterPoolReferenced(pool);
-          }
-          else
-            return false;
-        }
-        else
-		  return false;
-	}
-	
-	/**
-     * Called by parent class after dialog returns. We set the internal value attribute
-     * to be the array of user selected filter pools.
-     * <p>
-	 * After this action executes, simply call getValue() to get an 
-	 * array of SystemFilterPool objects representing what pools the user selected.
-	 * A result of null means the dialog was cancelled.
-	 */
-	protected Object getDialogValue(Dialog dlg)
-	{
-		SystemSimpleSelectDialog dialog = (SystemSimpleSelectDialog)dlg;
-		if (!dialog.wasCancelled())
-		{
-          Vector selectedFilterPools = new Vector();			
-		  SystemSimpleContentElement inputElement = dialog.getUpdatedContent();		  
-		  SystemSimpleContentElement[] mgrElements = inputElement.getChildren();
-		  for (int idx=0; idx<mgrElements.length; idx++)
-		  {
-		     SystemSimpleContentElement[] poolElements = mgrElements[idx].getChildren();
-		     for (int jdx=0; jdx<poolElements.length; jdx++)
-		     {
-          	    if (poolElements[jdx].isSelected())
-		     	  selectedFilterPools.addElement(poolElements[jdx].getData());
-		     }
-		  }
-		  
-          ISystemFilterPool[] selectedPoolArray = new ISystemFilterPool[selectedFilterPools.size()];
-          for (int idx=0; idx<selectedFilterPools.size(); idx++)
-             selectedPoolArray[idx] = (ISystemFilterPool)selectedFilterPools.elementAt(idx);          
-		  return selectedPoolArray;
-		}
-		else
-		  return null;
-	}
-
-
-	/**
-	 * Method called when ok pressed on dialog and after getDialogValue has set the
-	 * value attribute to an array of SystemFilterPool objects for the selected pools.
-	 * <p>
-	 * By default, if the current selected object implements SystemFilterPoolReferenceManagerProvider,
-	 * then this will call setFilterPoolReferences on that selected object.
-	 * <p>
-	 * @param dlgOutput The array of SystemFilterPools selected by the user, as set in getDialogValue()
-	 */
-	public void doOKprocessing(Object dlgOutput)
-	{
-		ISystemFilterPool[] selectedPools = (ISystemFilterPool[])dlgOutput;
-		ISystemFilterPoolReferenceManagerProvider sfprmp = getReferenceManagerProviderSelection();
-		if (sfprmp != null)
-		{
-		  sfprmp.getSystemFilterPoolReferenceManager().setSystemFilterPoolReferences(selectedPools,true);
-		}
-	}
-	
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterWorkWithFilterPoolsAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterWorkWithFilterPoolsAction.java
deleted file mode 100644
index 68186b9e1..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterWorkWithFilterPoolsAction.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2008 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David Dykstal (IBM) - [194268] action now assumes the first filter pool manager is selected if there was no selection
- *                       provided by the caller.
- * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types                    
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
-import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManagerProvider;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.internal.ui.filters.SystemFilterPoolManagerUIProvider;
-import org.eclipse.rse.internal.ui.filters.dialogs.SystemFilterWorkWithFilterPoolsDialog;
-import org.eclipse.rse.ui.ISystemContextMenuConstants;
-import org.eclipse.rse.ui.ISystemIconConstants;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement;
-import org.eclipse.rse.ui.filters.SystemFilterPoolDialogInterface;
-import org.eclipse.rse.ui.filters.SystemFilterUIHelpers;
-import org.eclipse.rse.ui.filters.actions.SystemFilterAbstractFilterPoolAction;
-import org.eclipse.rse.ui.validators.ValidatorFilterPoolName;
-import org.eclipse.swt.widgets.Shell;
-
-
-
-/**
- * The action that displays the Work With Filter Pools dialog
- */
-public class SystemFilterWorkWithFilterPoolsAction 
-       extends SystemFilterAbstractFilterPoolAction 
-       implements  SystemFilterPoolManagerUIProvider
-{
-
-	private ValidatorFilterPoolName poolNameValidator = null;
-
-	/**
-	 * Constructor when default label desired.
-	 */
-	public SystemFilterWorkWithFilterPoolsAction(Shell parent) 
-	{
-		super(parent,
-		      RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_WORKWITHFILTERPOOLS_ID),		
-		      SystemResources.ACTION_WORKWITH_FILTERPOOLS_LABEL, SystemResources.ACTION_WORKWITH_FILTERPOOLS_TOOLTIP);
-		setContextMenuGroup(ISystemContextMenuConstants.GROUP_WORKWITH);
-		allowOnMultipleSelection(false);
-		// set default action and dialog help 
-		setHelp(RSEUIPlugin.HELPPREFIX + "actn0044"); //$NON-NLS-1$
-		setDialogHelp(RSEUIPlugin.HELPPREFIX + "dwfp0000");		 //$NON-NLS-1$
-	}	
-	/**
-	 * Constructor when default label desired, and you want to choose between
-	 *  Work With -> Filter Pools and Work With Filter Pools. 
-	 */
-	public SystemFilterWorkWithFilterPoolsAction(Shell parent, boolean cascadingAction) 
-	{
-		super(parent,
-			  RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_WORKWITHFILTERPOOLS_ID),		
-			  cascadingAction ? SystemResources.ACTION_WORKWITH_FILTERPOOLS_LABEL : SystemResources.ACTION_WORKWITH_WWFILTERPOOLS_LABEL,
-			  cascadingAction ? SystemResources.ACTION_WORKWITH_FILTERPOOLS_TOOLTIP : SystemResources.ACTION_WORKWITH_WWFILTERPOOLS_TOOLTIP 
-		);
-		if (cascadingAction)
-			setContextMenuGroup(ISystemContextMenuConstants.GROUP_WORKWITH);
-		else
-			setContextMenuGroup(ISystemContextMenuConstants.GROUP_REORGANIZE);
-		allowOnMultipleSelection(false);
-		// set default action and dialog help 
-		setHelp(RSEUIPlugin.HELPPREFIX + "actn0044"); //$NON-NLS-1$
-		setDialogHelp(RSEUIPlugin.HELPPREFIX + "dwfp0000");		 //$NON-NLS-1$
-	}		
-	/**
-	 * Constructor when given the translated action label
-	 */
-	public SystemFilterWorkWithFilterPoolsAction(Shell parent, String title) 
-	{
-		super(parent, title);
-		setContextMenuGroup(ISystemContextMenuConstants.GROUP_REORGANIZE); 
-		allowOnMultipleSelection(false);
-		// set default action and dialog help 
-		setHelp(RSEUIPlugin.HELPPREFIX + "actn0044"); //$NON-NLS-1$
-		setDialogHelp(RSEUIPlugin.HELPPREFIX + "dwfp0000");		 //$NON-NLS-1$
-	}
-
-
-    /**
-     * Override of init in parent
-     */
-    protected void init()
-    {
-    	super.init();
-        dlgInputs.prompt = SystemResources.RESID_WORKWITHFILTERPOOLS_PROMPT;
-        dlgInputs.title = SystemResources.RESID_WORKWITHFILTERPOOLS_TITLE;
-    }
-
-	/**
-	 * Reset between runs
-	 */
-	public void reset()
-	{
-	}
-	
-	/**
-	 * Set the pool name validator for the rename action.
-	 * The work-with dialog automatically calls setExistingNamesList on it for each selection.
-	 */
-	public void setFilterPoolNameValidator(ValidatorFilterPoolName pnv)
-	{
-		this.poolNameValidator = pnv;
-	}
-	
-    /**
-     * Called by SystemBaseAction when selection is set.
-     * Our opportunity to verify we are allowed for this selected type.
-     */
-	public boolean checkObjectType(Object selectedObject)
-	{
-		//return (selectedObject instanceof SystemFilterPoolReferenceManagerProvider); // override as appropriate
-		return true; // override as appropriate
-	}
-	
-	
-	/**
-	 * Override of parent to create and return our specific filter pool dialog.
-	 */
-	public SystemFilterPoolDialogInterface createFilterPoolDialog(Shell parent)
-	{
-    	//SystemFilterPoolManager[] mgrs = getFilterPoolManagers();
-		//SystemSimpleContentElement input = getTreeModel();
-		      //SystemFilterUIHelpers.getFilterPoolModel(getFilterPoolImageDescriptor(),mgrs);		
-		      
-		SystemFilterWorkWithFilterPoolsDialog dialog = 
-		   	new SystemFilterWorkWithFilterPoolsDialog(parent, getDialogTitle(), getDialogPrompt(), this);
-
-        if (poolNameValidator != null)
-          	dialog.setFilterPoolNameValidator(poolNameValidator);
-          
-	    //SystemSimpleContentElement initialElementSelection = getTreeModelPreSelection(input);
-	    //if (initialElementSelection != null)
-	      //dialog.setRootToPreselect(initialElementSelection);
-	      
-		return dialog;		
-	}
-	
-	/**
-	 * Callback for dialog to refresh its contents
-	 */
-	public SystemSimpleContentElement getTreeModel()
-	{
-    	ISystemFilterPoolManager[] mgrs = getFilterPoolManagers();
-		SystemSimpleContentElement input = 
-		      SystemFilterUIHelpers.getFilterPoolModel(getFilterPoolManagerProvider(), mgrs);		
-        return input;		
-	}
-
-	/**
-	 * Callback for dialog to refresh its contents
-	 */
-	public SystemSimpleContentElement getTreeModelPreSelection(SystemSimpleContentElement input) {
-		SystemSimpleContentElement initialElementSelection = null;
-		ISystemFilterPoolReferenceManagerProvider sprmp = getReferenceManagerProviderSelection();
-		if (sprmp != null) {
-			ISystemFilterPoolManager initialSelection = sprmp.getSystemFilterPoolReferenceManager().getDefaultSystemFilterPoolManager();
-			if (initialSelection != null) {
-				initialElementSelection = SystemFilterUIHelpers.getDataElement(input, initialSelection);
-			}
-		} else {
-			SystemSimpleContentElement[] children = input.getChildren();
-			if (children.length > 0) {
-				initialElementSelection = children[0];
-			}
-		}
-		return initialElementSelection;
-	}
-	
-	/**
-	 * We are a special case of dialog, where we do not need to do anything
-	 * upon return from the dialog, as the dialog itself does it all.
-	 */
-	protected Object getDialogValue(Dialog dlg)
-	{
-		return null;
-	}
-	
-	/**
-	 * Because we return null from getDialogValue(Dialog dlg), this
-	 * method will never be called.
-	 */
-	public void doOKprocessing(Object dlgValue)
-	{
-		
-	}
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterWorkWithFilterPoolsRefreshAllAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterWorkWithFilterPoolsRefreshAllAction.java
deleted file mode 100644
index 16f6784d3..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterWorkWithFilterPoolsRefreshAllAction.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2007 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Michael Berger (IBM) - 146339 Added refresh action graphic.
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.ui.ISystemContextMenuConstants;
-import org.eclipse.rse.ui.ISystemIconConstants;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.actions.SystemBaseAction;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * The action allows users to refresh the entire Remote System Explorer tree view
- */
-public class SystemFilterWorkWithFilterPoolsRefreshAllAction extends SystemBaseAction 
-                                 
-{
-
-
-	private TreeViewer viewer = null;
-	
-	/**
-	 * Constructor 
-	 */
-	public SystemFilterWorkWithFilterPoolsRefreshAllAction(TreeViewer viewer, Shell parent) 
-	{
-		super(SystemResources.ACTION_REFRESH_ALL_LABEL,SystemResources.ACTION_REFRESH_ALL_TOOLTIP,
-		      RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_REFRESH_ID),
-		      parent);
-		this.viewer = viewer;
-        allowOnMultipleSelection(true);
-		setContextMenuGroup(ISystemContextMenuConstants.GROUP_BUILD);        
-	}
-
-    /**
-     * Set the help context Id (infoPop) for this action. This must be fully qualified by
-     *  plugin ID.
-     * <p>
-     * Same as {@link org.eclipse.rse.ui.actions.SystemBaseAction #setHelp(String)}
-     * @see org.eclipse.rse.ui.actions.SystemBaseAction #getHelpContextId()
-     */
-    public void setHelpContextId(String id)
-    {
-    	setHelp(id);
-    }
-
-	/**
-	 * @see SystemBaseAction#updateSelection(IStructuredSelection)
-	 */
-	public boolean updateSelection(IStructuredSelection selection)
-	{
-		boolean enable = true;
-		return enable;
-	}
-
-	/**
-	 * This is the method called when the user selects this action.
-	 * @see org.eclipse.jface.action.Action#run()
-	 */
-	public void run() 
-	{
-		viewer.refresh();
-	}		
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemImportConnectionAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemImportConnectionAction.java
deleted file mode 100644
index bfae6ba5d..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemImportConnectionAction.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2008 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:
- * David Dykstal (IBM) - [216858] provide ability to import and export connections
- * David Dykstal (IBM) - [233876] filters lost after restart
- ********************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.rse.core.RSECorePlugin;
-import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.core.model.ISystemProfile;
-import org.eclipse.rse.core.model.ISystemProfileManager;
-import org.eclipse.rse.core.model.ISystemRegistry;
-import org.eclipse.rse.internal.core.model.ISystemProfileOperation;
-import org.eclipse.rse.internal.core.model.SystemProfileManager;
-import org.eclipse.rse.internal.persistence.RSEEnvelope;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.ui.ISystemContextMenuConstants;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.SystemBasePlugin;
-import org.eclipse.rse.ui.actions.SystemBaseAction;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.FileDialog;
-
-import com.ibm.icu.text.MessageFormat;
-
-/**
- * This action is used to import a connection from a file into the selected profile.
- */
-public class SystemImportConnectionAction extends SystemBaseAction {
-	
-	private class ImportJob extends Job {
-		
-		private ISystemProfile profile = null;
-		private File inFile = null;
-		
-		public ImportJob(File inFile, ISystemProfile profile) {
-			super(SystemResources.SystemImportConnectionAction_ImportJobName);
-			this.inFile = inFile;
-			this.profile = profile;
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor)
-		 */
-		protected IStatus run(final IProgressMonitor monitor) {
-			IStatus status = Status.OK_STATUS;
-			try {
-				final FileInputStream in = new FileInputStream(inFile);
-				// run inside an ISystemProfileOperation to ensure that the changes are committed
-				status = SystemProfileManager.run(new ISystemProfileOperation() {
-					public IStatus run() {
-						IStatus operationStatus = Status.OK_STATUS;
-						try {
-							final RSEEnvelope envelope = new RSEEnvelope();
-							envelope.get(in, monitor);
-							envelope.mergeWith(profile);
-						} catch (CoreException e) {
-							// log the exception and return the status code
-							operationStatus = e.getStatus();
-							String message = operationStatus.getMessage();
-							if (message == null) {
-								message = SystemResources.SystemImportConnectionAction_CoreExceptionFound;
-							}
-							SystemBasePlugin.logError(message, e);
-						}
-						return operationStatus;
-					}
-				});
-			} catch (FileNotFoundException e) {
-				// should not happen, log as unexpected
-				SystemBasePlugin.logError(SystemResources.SystemImportConnectionAction_UnexpectedException, e);
-			}
-			return status;
-		}
-		
-	}
-	
-	/**
-	 * Creates a new action to import a connection into a profile.
-	 */
-	public SystemImportConnectionAction() {
-		super(SystemResources.RESID_IMPORT_CONNECTION_ACTION_LABEL, SystemResources.RESID_IMPORT_CONNECTION_ACTION_TOOLTIP, null);
-		setContextMenuGroup(ISystemContextMenuConstants.GROUP_REORGANIZE);
-		setHelp(RSEUIPlugin.HELPPREFIX + "ActionImportConnectionDefinitions"); //$NON-NLS-1$
-	}
-
-	/**
-	 * The import action can be run if the selection contains profiles or hosts.
-	 * @return true if the selection contains a profile or a host.
-	 */
-	public boolean checkObjectType(Object obj) {
-		return (obj instanceof ISystemProfile || obj instanceof IHost);
-	}
-
-	/**
-	 * Called when this action is selection from the popup menu.
-	 */
-	public void run() {
-		FileDialog openDialog = new FileDialog(shell, SWT.OPEN);
-		String path = openDialog.open();
-		if (path != null) {
-			File inFile = new File(path);
-			if (inFile.exists()) {
-				if (inFile.canRead()) {
-					ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
-					ISystemProfileManager profileManager = registry.getSystemProfileManager();
-					ISystemProfile profile = profileManager.getDefaultPrivateSystemProfile();
-					IStructuredSelection selection = getSelection();
-					if (selection != null && selection.size() > 0) {
-						Object selected = getFirstSelection();
-						if (selected instanceof IHost) {
-							profile = ((IHost)selected).getSystemProfile();
-						} else if (selected instanceof ISystemProfile) {
-							profile = (ISystemProfile) selected;
-						}
-					}
-					ImportJob importJob = new ImportJob(inFile, profile);
-					importJob.schedule();
-				} else {
-					String title = SystemResources.SystemImportConnectionAction_Error;
-					String message = MessageFormat.format(SystemResources.SystemImportConnectionAction_FileNotReadableCondition, new String[] {path});
-					MessageDialog.openError(shell, title, message);
-				}
-			} else {
-				String title = SystemResources.SystemImportConnectionAction_Error;
-				String message = MessageFormat.format(SystemResources.SystemImportConnectionAction_FileNotFoundCondition, new String[] {path});
-				MessageDialog.openError(shell, title, message);
-			}
-		}
-	}
-	
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemMoveConnectionAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemMoveConnectionAction.java
deleted file mode 100644
index f9c2b4795..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemMoveConnectionAction.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2008 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API
- * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
- * David McKnight   (IBM)        - [223103] [cleanup] fix broken externalized strings
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.rse.core.RSECorePlugin;
-import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.core.model.ISystemProfile;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.services.clientserver.messages.SystemMessage;
-import org.eclipse.rse.ui.ISystemIconConstants;
-import org.eclipse.rse.ui.ISystemMessages;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.actions.SystemBaseAction;
-import org.eclipse.rse.ui.actions.SystemBaseCopyAction;
-import org.eclipse.rse.ui.dialogs.SystemRenameSingleDialog;
-import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * Move a connection action.
- */
-public class SystemMoveConnectionAction extends SystemBaseCopyAction
-{
-
-	private SystemSimpleContentElement initialSelectionElement = null;
-
-	/**
-	 * Constructor
-	 */
-	public SystemMoveConnectionAction(Shell parent) 
-	{
-		super(parent, SystemResources.ACTION_MOVE_CONNECTION_LABEL, MODE_MOVE);
-		//allowOnMultipleSelection(false); // too hard to handle, for now!
-		setToolTipText(SystemResources.ACTION_MOVE_CONNECTION_TOOLTIP);
-		sr = RSECorePlugin.getTheSystemRegistry();
-  	    setHelp(RSEUIPlugin.HELPPREFIX+"actn0020"); //$NON-NLS-1$
-  	    setDialogHelp(RSEUIPlugin.HELPPREFIX+"dmcn0000");  //$NON-NLS-1$
-	}
- 
-	/**
-	 * We override from parent to do unique checking...
-	 * <p>
-	 * We intercept to ensure only connections from the same profile are selected.
-	 * <p>
-	 * @see SystemBaseAction#updateSelection(IStructuredSelection)
-	 */
-	public boolean updateSelection(IStructuredSelection selection)
-	{
-		if (sr.getActiveSystemProfiles().length <= 1)
-		  return false;
-		boolean enable = true;
-		ISystemProfile prevProfile = null;
-		Iterator e= selection.iterator();		
-		while (enable && e.hasNext())
-		{
-			Object selectedObject = e.next();
-			if (selectedObject instanceof IHost)
-			{
-			  IHost conn = (IHost)selectedObject;
-			  if (prevProfile == null)
-			    prevProfile = conn.getSystemProfile();
-			  else
-			    enable = (prevProfile == conn.getSystemProfile());
-			  if (enable)
-		        prevProfile = conn.getSystemProfile();
-			}
-			else
-			  enable = false;
-		}
-		return enable;
-	}
- 
-    // --------------------------
-    // PARENT METHOD OVERRIDES...
-    // --------------------------
-    
-	/**
-	 * @see SystemBaseCopyAction#checkForCollision(Shell, IProgressMonitor, Object, Object, String)
-	 */
-	protected String checkForCollision(Shell shell, IProgressMonitor monitor,
-	                                   Object targetContainer, Object oldObject, String oldName)
-	{
-		ISystemProfile profile = (ISystemProfile)targetContainer;
-		String newName = oldName;
-		IHost match = sr.getHost(profile, oldName);
-		if (match != null)
-		{
-		  //monitor.setVisible(false); wish we could!
-		  //ValidatorConnectionName validator = new ValidatorConnectionName(sr.getConnectionAliasNames(profile));
-		  //SystemCollisionRenameDialog dlg = new SystemCollisionRenameDialog(shell, validator, oldName);
-		  SystemRenameSingleDialog dlg = new SystemRenameSingleDialog(shell, true, match, null); // true => copy-collision-mode
-		  dlg.open();
-		  if (!dlg.wasCancelled())
-		    newName = dlg.getNewName();
-		  else
-		    newName = null;
-		}
-		return newName;
-	}
-	/**
-	 * @see SystemBaseCopyAction#doCopy(Object, Object, String, IProgressMonitor)
-	 */
-	protected boolean doCopy(Object targetContainer, Object oldObject, String newName, IProgressMonitor monitor)
-		throws Exception 
-    {
-    	IHost oldConnection = (IHost)oldObject;
-    	//String oldName = oldConnection.getAliasName();
-    	//RSEUIPlugin.logDebugMessage(this.getClass().getName(),"starting to copy "+oldName+" to "+newName);
-    	ISystemProfile targetProfile = (ISystemProfile)targetContainer;
-        IHost newConn = sr.moveHost(oldConnection, targetProfile, newName, monitor);
-		return (newConn != null);
-	}
-
-	/**
-	 * @see SystemBaseCopyAction#getTreeModel()
-	 */
-	protected SystemSimpleContentElement getTreeModel() 
-	{
-		return getProfileTreeModel(getFirstSelectedConnection().getSystemProfile());
-	}
-	/**
-	 * @see SystemBaseCopyAction#getTreeInitialSelection()
-	 */
-	protected SystemSimpleContentElement getTreeInitialSelection()
-	{
-		return initialSelectionElement;
-	}
-
-	/**
-	 * @see SystemBaseCopyAction#getPromptString()
-	 */
-	protected String getPromptString() 
-	{
-		return SystemResources.RESID_MOVE_TARGET_PROFILE_PROMPT;
-	}
-	/**
-	 * @see SystemBaseCopyAction#getCopyingMessage()
-	 */
-	protected SystemMessage getCopyingMessage() 
-	{
-		return RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_MOVECONNECTIONS_PROGRESS);
-	}
-	/**
-	 * @see SystemBaseCopyAction#getCopyingMessage( String)
-	 */
-	protected SystemMessage getCopyingMessage(String oldName) 
-	{
-		return RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_MOVECONNECTION_PROGRESS).makeSubstitution(oldName);
-	}
-
-	/**
-	 * @see SystemBaseCopyAction#getOldObjects()
-	 */
-	protected Object[] getOldObjects() 
-	{
-		return getSelectedConnections();
-	}
-
-	/**
-	 * @see SystemBaseCopyAction#getOldNames()
-	 */
-	protected String[] getOldNames() 
-	{
-		IHost[] conns = getSelectedConnections();
-		String[] names = new String[conns.length];
-		for (int idx=0; idx<conns.length; idx++)
-		   names[idx] = conns[idx].getAliasName();
-		return names;
-	}
-
-    /**
-     * Get the currently selected connections
-     */
-    protected IHost[] getSelectedConnections()
-    {
-   	    IStructuredSelection selection = getSelection();
-   	    IHost[] conns = new IHost[selection.size()];
-   	    Iterator i = selection.iterator();
-   	    int idx=0;
-   	    while (i.hasNext())
-   	    {
-   	       conns[idx++] = (IHost)i.next();
-   	    }
-   	    return conns;
-    }
-    /**
-     * Get the first selected connection
-     */
-    protected IHost getFirstSelectedConnection()
-    {
-    	return (IHost)getFirstSelection();
-    }
-   
-    // ------------------
-    // PRIVATE METHODS...
-    // ------------------
-    
-	/**
-	 * Create and return data model to populate selection tree with.
-	 * @param profile whose tree model element is not to be include
-	 */
-    protected SystemSimpleContentElement getProfileTreeModel(ISystemProfile profile)
-    {
-    	SystemSimpleContentElement veryRootElement = 
-    	   new SystemSimpleContentElement("Profiles", //$NON-NLS-1$
-    	                                  null, null, (Vector)null);	    	
-    	veryRootElement.setRenamable(false);
-    	veryRootElement.setDeletable(false);
-    	                
-    	ISystemProfile[] profiles = RSECorePlugin.getTheSystemRegistry().getActiveSystemProfiles();
-    	ImageDescriptor image = RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_PROFILE_ID);
-    	                                  
-    	if (profiles == null)
-    	  return veryRootElement;
-    	 
-    	Vector veryRootChildren = new Vector();     	
-    	
-    	for (int idx=0; idx<profiles.length; idx++)
-    	{
-    	   if (!(profiles[idx]==profile))
-    	   {
-             SystemSimpleContentElement profileElement = 
-    	      new SystemSimpleContentElement(profiles[idx].getName(),
-    	                                     profiles[idx], veryRootElement, (Vector)null);	
-    	     profileElement.setRenamable(false);
-    	     profileElement.setDeletable(false);
-    	     profileElement.setImageDescriptor(image);
-             veryRootChildren.addElement(profileElement);
-    	     if (initialSelectionElement == null)
-               initialSelectionElement = profileElement;          
-    	   }             
-    	}    	
-        veryRootElement.setChildren(veryRootChildren);    	
-    	return veryRootElement;
-    }
-     
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemMoveDownConnectionAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemMoveDownConnectionAction.java
deleted file mode 100644
index 1c708ef23..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemMoveDownConnectionAction.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2007 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
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
- ********************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-import java.util.Iterator;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.rse.core.RSECorePlugin;
-import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.core.model.ISystemProfile;
-import org.eclipse.rse.core.model.ISystemRegistry;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.internal.ui.SystemSortableSelection;
-import org.eclipse.rse.ui.ISystemContextMenuConstants;
-import org.eclipse.rse.ui.ISystemIconConstants;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.actions.SystemBaseAction;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * The action allows users to move the current connection down in the list
- */
-public class SystemMoveDownConnectionAction extends SystemBaseAction 
-                                 
-{
-	
-	private ISystemProfile prevProfile = null;
-	
-	/**
-	 * Constructor for SystemMoveDownAction
-	 */
-	public SystemMoveDownConnectionAction(Shell parent) 
-	{
-		super(SystemResources.ACTION_MOVEDOWN_LABEL, SystemResources.ACTION_MOVEDOWN_TOOLTIP,
-		      RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_MOVEDOWN_ID),
-		      parent);
-        allowOnMultipleSelection(true);
-		setContextMenuGroup(ISystemContextMenuConstants.GROUP_REORDER);        
-		setHelp(RSEUIPlugin.HELPPREFIX+"actn0002"); //$NON-NLS-1$
-	}
-
-	/**
-	 * We override from parent to do unique checking...
-	 * <p>
-	 * We intercept to ensure only connections from the same profile are selected.
-	 * <p>
-	 * @see SystemBaseAction#updateSelection(IStructuredSelection)
-	 */
-	public boolean updateSelection(IStructuredSelection selection)
-	{
-		boolean enable = true;
-		ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry();		
-		prevProfile = null;
-		Iterator e = selection.iterator();		
-		while (enable && e.hasNext())
-		{
-			Object selectedObject = e.next();
-			if (selectedObject instanceof IHost)
-			{
-			  IHost conn = (IHost)selectedObject;
-		      int connCount = sr.getHostCountWithinProfile(conn)-1;
-			  if (prevProfile == null)
-			    prevProfile = conn.getSystemProfile();
-			  else
-			    enable = (prevProfile == conn.getSystemProfile());
-			  if (enable)
-			  {
-		        enable = (sr.getHostPosition(conn) < connCount);
-		        prevProfile = conn.getSystemProfile();
-			  }
-			}
-			else
-			  enable = false;
-		}
-		return enable;
-	}
-
-	/**
-	 * This is the method called when the user selects this action.
-	 * @see org.eclipse.jface.action.Action#run()
-	 */
-	public void run() 
-	{
-		ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry();	
-		SystemSortableSelection[] sortableArray = SystemSortableSelection.makeSortableArray(getSelection());
-		IHost conn = null;
-		for (int idx=0; idx<sortableArray.length; idx++)
-		{
-		   conn = (IHost)sortableArray[idx].getSelectedObject();
-           sortableArray[idx].setPosition(sr.getHostPosition(conn));
-		}
-		SystemSortableSelection.sortArray(sortableArray);
-		IHost[] conns = (IHost[])SystemSortableSelection.getSortedObjects(sortableArray, new IHost[sortableArray.length]);
-		sr.moveHosts(prevProfile.getName(),conns,1);
-	}	
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemMoveUpConnectionAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemMoveUpConnectionAction.java
deleted file mode 100644
index 9ffb6a043..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemMoveUpConnectionAction.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2007 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
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
- ********************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-import java.util.Iterator;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.rse.core.RSECorePlugin;
-import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.core.model.ISystemProfile;
-import org.eclipse.rse.core.model.ISystemRegistry;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.internal.ui.SystemSortableSelection;
-import org.eclipse.rse.ui.ISystemContextMenuConstants;
-import org.eclipse.rse.ui.ISystemIconConstants;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.actions.SystemBaseAction;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * The action allows users to move the current connection up in the list
- */
-public class SystemMoveUpConnectionAction extends SystemBaseAction 
-                                 
-{
-	
-	private ISystemProfile prevProfile = null;
-	
-	/**
-	 * Constructor for SystemMoveUpAction
-	 */
-	public SystemMoveUpConnectionAction(Shell parent) 
-	{
-		super(SystemResources.ACTION_MOVEUP_LABEL, SystemResources.ACTION_MOVEUP_TOOLTIP,
-		      RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_MOVEUP_ID),
-		      parent);
-        allowOnMultipleSelection(true);
-		setContextMenuGroup(ISystemContextMenuConstants.GROUP_REORDER);  
-		setHelp(RSEUIPlugin.HELPPREFIX+"actn0001"); //$NON-NLS-1$      
-	}
-
-	/**
-	 * We override from parent to do unique checking...
-	 * <p>
-	 * We intercept to ensure only connections from the same profile are selected.
-	 * <p>
-	 * @see SystemBaseAction#updateSelection(IStructuredSelection)
-	 */
-	public boolean updateSelection(IStructuredSelection selection)
-	{
-		boolean enable = true;
-		ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry();		
-		prevProfile = null;
-		Iterator e = selection.iterator();		
-		while (enable && e.hasNext())
-		{
-			Object selectedObject = e.next();
-			if (selectedObject instanceof IHost)
-			{
-			  IHost conn = (IHost)selectedObject;
-			  if (prevProfile == null)
-			    prevProfile = conn.getSystemProfile();
-			  else
-			    enable = (prevProfile == conn.getSystemProfile());
-			  if (enable)
-			  {
-		        enable = (sr.getHostPosition(conn) > 0);
-		        prevProfile = conn.getSystemProfile();
-			  }
-			}
-			else
-			  enable = false;
-		}
-		return enable;
-	}
-
-	/**
-	 * This is the method called when the user selects this action.
-	 * @see org.eclipse.jface.action.Action#run()
-	 */
-	public void run() 
-	{
-		ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry();		
-
-		SystemSortableSelection[] sortableArray = SystemSortableSelection.makeSortableArray(getSelection());
-		IHost conn = null;
-		for (int idx=0; idx<sortableArray.length; idx++)
-		{
-		   conn = (IHost)sortableArray[idx].getSelectedObject();
-           sortableArray[idx].setPosition(sr.getHostPosition(conn));
-		}
-		SystemSortableSelection.sortArray(sortableArray);
-		IHost[] conns = (IHost[])SystemSortableSelection.getSortedObjects(sortableArray, new IHost[sortableArray.length]);
-
-		sr.moveHosts(prevProfile.getName(),conns,-1);
-	}		
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemNewProfileAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemNewProfileAction.java
deleted file mode 100644
index 746fb89d4..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemNewProfileAction.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2008 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [cleanup] Avoid using SystemStartHere in production code
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.internal.ui.view.team.SystemTeamView;
-import org.eclipse.rse.ui.ISystemContextMenuConstants;
-import org.eclipse.rse.ui.ISystemIconConstants;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.actions.SystemBaseWizardAction;
-import org.eclipse.rse.ui.wizards.SystemNewProfileWizard;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * The action that displays the New Profile wizard
- */
-public class SystemNewProfileAction extends SystemBaseWizardAction {
-
-	/**
-	 * Constructor for SystemNewProfileAction for "New -> Profile..."
-	 * @param parent the parent shell in which this action executes
-	 */
-	public SystemNewProfileAction(Shell parent) {
-		super(SystemResources.ACTION_NEWPROFILE_LABEL, SystemResources.ACTION_NEWPROFILE_TOOLTIP, RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_NEWPROFILE_ID), parent);
-		setSelectionSensitive(false);
-		setContextMenuGroup(ISystemContextMenuConstants.GROUP_NEW);
-		setHelp(RSEUIPlugin.HELPPREFIX + "actn0003"); //$NON-NLS-1$		    
-	}
-
-	/**
-	 * Constructor for SystemNewProfileAction where you can choose between "New profile..." and "New -> Profile"
-	 * @param parent the parent shell in which this action executes
-	 * @param cascading if true then use the "New -> Profile" style, else use the "New profile..." style.
-	 */
-	public SystemNewProfileAction(Shell parent, boolean cascading) {
-		super(cascading ? SystemResources.ACTION_NEWPROFILE_LABEL : SystemResources.ACTION_NEW_PROFILE_LABEL, cascading ? SystemResources.ACTION_NEWPROFILE_TOOLTIP
-				: SystemResources.ACTION_NEW_PROFILE_TOOLTIP, RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_NEWPROFILE_ID), parent);
-		setSelectionSensitive(false);
-		if (cascading)
-			setContextMenuGroup(ISystemContextMenuConstants.GROUP_NEW);
-		else
-			setContextMenuGroup(ISystemContextMenuConstants.GROUP_NEW_NONCASCADING);
-		setHelp(RSEUIPlugin.HELPPREFIX + "actn0003"); //$NON-NLS-1$		    
-	}
-
-	/**
-	 * Refresh the enabled state
-	 */
-	public void refreshEnablement() {
-		setEnabled(isEnabled());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.ui.actions.SystemBaseAction#isEnabled()
-	 */
-	public boolean isEnabled() {
-		return true;
-		/*
-		 * From the old javadoc:
-		 * We disable this action if it is a new workspace and the user has yet to create
-		 * their first connection, and hence rename their default profile.
-		 * @return true if the action is enabled
-		 * 
-		 * defect 43428 was an early RSE defect whose fix prevented the creation of profiles until the first 
-		 * connection was created. However, new default profiles are created when RSE is initially activated
-		 * so there is no need to inhibit profile creation. 
-		 */
-//		ISystemProfile defaultProfile = RSECorePlugin.getTheSystemProfileManager().getDefaultPrivateSystemProfile();
-//		if (defaultProfile != null)
-//			return false;
-//		else
-//			return true;
-	}
-
-	/**
-	 * @return a new Wizard object for creating a profile.
-	 */
-	protected IWizard createWizard() {
-		return new SystemNewProfileWizard();
-	}
-
-	/**
-	 * Typically, the wizard's performFinish method does the work required by
-	 * a successful finish of the wizard. However, often we also want to be
-	 * able to extract user-entered data from the wizard, by calling getters
-	 * in this action. To enable this, override this method to populate your
-	 * output instance variables from the completed wizard, which is passed
-	 * as a parameter. This is only called after successful completion of the
-	 * wizard.
-	 * @param wizard the wizard that was just completed
-	 */
-	protected void postProcessWizard(IWizard wizard) {
-		if (getViewer() instanceof SystemTeamView) {
-			getViewer().refresh();
-		}
-		
-	}
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemOpenExplorerPerspectiveAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemOpenExplorerPerspectiveAction.java
deleted file mode 100644
index e5f7f86ab..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemOpenExplorerPerspectiveAction.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2007 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
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core
- * David McKnight   (IBM)        - [187342] Open in New Window expand failed error when not connected
- ********************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.rse.core.filters.ISystemFilterReference;
-import org.eclipse.rse.core.model.IRSECallback;
-import org.eclipse.rse.core.subsystems.ISubSystem;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.ui.ISystemContextMenuConstants;
-import org.eclipse.rse.ui.ISystemIconConstants;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.SystemBasePlugin;
-import org.eclipse.rse.ui.actions.SystemBaseAction;
-import org.eclipse.rse.ui.model.ISystemPromptableObject;
-import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.actions.OpenInNewWindowAction;
-
-
-/**
- * The action allows users to open a new Remote System Explorer perspective, anchored
- *  by the currently selected resource.
- */
-public class SystemOpenExplorerPerspectiveAction 
-       extends SystemBaseAction 
-       
-{
-	//private boolean replaceEnabled = true;
-	private IWorkbenchWindow window;
-	
-	/**
-	 * Constructor 
-	 */
-	public SystemOpenExplorerPerspectiveAction(Shell parent, IWorkbenchWindow currentWorkbenchWindow) 
-	{
-		super(SystemResources.ACTION_OPENEXPLORER_DIFFPERSP2_LABEL, SystemResources.ACTION_OPENEXPLORER_DIFFPERSP2_TOOLTIP, 
-				RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_PERSPECTIVE_ID),
-				parent);
-		this.window = currentWorkbenchWindow;
-		
-        allowOnMultipleSelection(false);
-		setContextMenuGroup(ISystemContextMenuConstants.GROUP_OPEN);  
-  	    setHelp(RSEUIPlugin.HELPPREFIX+"actn0016");  //$NON-NLS-1$
-	}
-
-	/**
-	 * We override from parent to do unique checking...
-	 * <p>
-	 * We intercept to ensure only connections from the same profile are selected.
-	 * <p>
-	 * @see SystemBaseAction#updateSelection(IStructuredSelection)
-	 */
-	public boolean updateSelection(IStructuredSelection selection)
-	{
-		boolean enable = true;
-		Object selected = selection.getFirstElement();
-		if (selected instanceof ISystemFilterReference)
-		{
-		  if ( ((ISystemFilterReference)selected).getReferencedFilter().isPromptable() )
-		    enable = false;
-		}
-		else if (selected instanceof ISystemPromptableObject)
-		  enable = false;
-		return enable;
-	}
-
-	/**
-	 * This is the method called when the user selects this action.
-	 * @see Action#run()
-	 */
-	public void run() 
-	{
-		final IAdaptable input = getPageInput();
-		final ISubSystem ss = getSubSystem(input);
-		if (ss!=null && !ss.isConnected()) {			
-			// Connect if the object's children will require a live connection.  If the connect is made, then
-			// the open window occurs as a result of the callback to connect.
-			try
-			{
-				ss.connect(false, 
-					new IRSECallback() // call back for opening the window after the connect
-					{
-						public void done(IStatus status, Object object)
-						{
-							if (ss.isConnected()) // only open the window if we're connected
-							{
-								Display.getDefault().asyncExec(new Runnable()
-								{
-									public void run()
-									{
-										openWindow(input);
-									}
-								});
-							}
-							
-						}
-					});		
-			}
-			catch (Exception e) {
-				// ignore since connect failed (and don't show in the window)
-				SystemBasePlugin.logError(e.getMessage(), e);
-			}
-		}
-		else {
-			openWindow(input);
-		}
-	}		
-		
-	/**
-	 * Returns the associated subsystem if the object is remote, a filter or a subsystem
-	 * @param input the input object
-	 * @return
-	 */	
-	private ISubSystem getSubSystem(IAdaptable input)
-	{
-		ISystemViewElementAdapter adapter = (ISystemViewElementAdapter)input.getAdapter(ISystemViewElementAdapter.class);
-		if (adapter != null) {
-			if ((input instanceof ISystemFilterReference)
-				|| input instanceof ISubSystem	
-				|| adapter.isRemote(input)) // not sure if we'd ever have 
-										// a remote object when not connected
-			{
-				return adapter.getSubSystem(input);
-			}
-		}
-		return null;
-	}
-
-	
-	/**
-	 * Open the input object in a new window
-	 * @param input the input to the new window
-	 */
-	protected void openWindow(IAdaptable input)
-	{
-		OpenInNewWindowAction workbenchOpenAction = // NEW FOR RELEASE 2
-			   new OpenInNewWindowAction(window,input);
-		workbenchOpenAction.run();
-	}
-	
-	/**
-	 * Sets the page input.  
-	 *
-	 * @param input the page input
-	 */
-	public void setPageInput(IAdaptable input) 
-	{
-	}
-	/**
-	 * Get the page input.
-	 * Will use explicitly set input if given, else deduces from selection
-	 */
-	public IAdaptable getPageInput()
-	{
-		//if (pageInput != null) safer to always recalculate!
-		//  return pageInput;
-		//else
-		{
-			Object firstSel = getFirstSelection();
-			if ((firstSel != null) && (firstSel instanceof IAdaptable))
-			  return (IAdaptable)firstSel;
-			else
-			  return null;
-		}
-	}
-	
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemOpenRSEPerspectiveAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemOpenRSEPerspectiveAction.java
deleted file mode 100644
index f40be6180..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemOpenRSEPerspectiveAction.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2007 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.rse.internal.ui.view.SystemPerspectiveHelpers;
-
-
-/**
- * Open the RSE perspective (used in welcome.xml)
- */
-public class SystemOpenRSEPerspectiveAction extends Action {
-	
-
-       public SystemOpenRSEPerspectiveAction() 
-       {
-              super();
-       }
-
-       /**
-        * @see Action#run()
-        */
-       public void run() 
-       {
-       		  SystemPerspectiveHelpers.openRSEPerspective();
-       }
-
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemPreferenceQualifyConnectionNamesAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemPreferenceQualifyConnectionNamesAction.java
deleted file mode 100644
index 1e63e4327..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemPreferenceQualifyConnectionNamesAction.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2008 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
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core
- * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
- * Martin Oberhuber (Wind River) - [215820] Move SystemRegistry implementation to Core
- ********************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-import org.eclipse.rse.core.RSECorePlugin;
-import org.eclipse.rse.core.events.ISystemPreferenceChangeEvents;
-import org.eclipse.rse.internal.core.model.SystemPreferenceChangeEvent;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.actions.SystemBaseAction;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * The action is a shortcut to the preferences setting for showing connection names
- *   qualified by profile name.
- */
-public class SystemPreferenceQualifyConnectionNamesAction extends SystemBaseAction 
-                                 
-{
-	/**
-	 * Constructor
-	 */
-	public SystemPreferenceQualifyConnectionNamesAction(Shell parent) 
-	{
-		super(SystemResources.ACTION_QUALIFY_CONNECTION_NAMES_LABEL,SystemResources.ACTION_QUALIFY_CONNECTION_NAMES_TOOLTIP,
-		      parent);
-        setSelectionSensitive(false);
-        allowOnMultipleSelection(true);
-        setChecked(RSEUIPlugin.getTheSystemRegistryUI().getQualifiedHostNames());
-
-		setHelp(RSEUIPlugin.HELPPREFIX+"actn0008"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This is the method called when the user selects this action.
-	 * @see org.eclipse.jface.action.Action#run()
-	 */
-	public void run() 
-	{
-		boolean newState = isChecked();
-		RSEUIPlugin.getTheSystemRegistryUI().setQualifiedHostNames(newState);        
-    	firePreferenceChangeEvent(ISystemPreferenceChangeEvents.EVENT_QUALIFYCONNECTIONNAMES,
-    	                          !newState,newState);  // defect 41794             
-	}		
-	
-    /**
-     * Fire a preference change event
-     */
-    private void firePreferenceChangeEvent(int type, boolean oldValue, boolean newValue)
-    {
-    	RSECorePlugin.getTheSystemRegistry().fireEvent(
-    	  new SystemPreferenceChangeEvent(type,
-    	                                  oldValue ? Boolean.TRUE : Boolean.FALSE,
-    	                                  newValue ? Boolean.TRUE : Boolean.FALSE));
-    }
-	
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemPreferenceRestoreStateAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemPreferenceRestoreStateAction.java
deleted file mode 100644
index 1614d0b3f..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemPreferenceRestoreStateAction.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2007 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
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David Dykstal (IBM) - moved SystemPreferencesManager to a new package
- * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core
- * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
- ********************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-import org.eclipse.rse.core.RSECorePlugin;
-import org.eclipse.rse.core.events.ISystemPreferenceChangeEvents;
-import org.eclipse.rse.internal.core.model.SystemPreferenceChangeEvent;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.SystemPreferencesManager;
-import org.eclipse.rse.ui.actions.SystemBaseAction;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * The action is a shortcut to the preferences setting for restoring the RSE to its 
- *   previous state.
- */
-public class SystemPreferenceRestoreStateAction extends SystemBaseAction 
-{
-    //private ISystemRegistry sr = null;
-
-	/**
-	 * Constructor
-	 */
-	public SystemPreferenceRestoreStateAction(Shell parent) 
-	{
-		super(SystemResources.ACTION_RESTORE_STATE_PREFERENCE_LABEL,SystemResources.ACTION_RESTORE_STATE_PREFERENCE_TOOLTIP, parent);
-        setSelectionSensitive(false);
-        allowOnMultipleSelection(true);
-        //sr = RSECorePlugin.getTheSystemRegistry();	        
-        setChecked(SystemPreferencesManager.getRememberState());
-
-		setHelp(RSEUIPlugin.HELPPREFIX+"aprefres"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This is the method called when the user selects this action.
-	 * @see org.eclipse.jface.action.Action#run()
-	 */
-	public void run() 
-	{
-		boolean newState = isChecked();
-		SystemPreferencesManager.setRememberState(newState);        
-    	firePreferenceChangeEvent(ISystemPreferenceChangeEvents.EVENT_RESTORESTATE,
-    	                          !newState,newState);               
-	}		
-	
-    /**
-     * Fire a preference change event
-     */
-    private void firePreferenceChangeEvent(int type, boolean oldValue, boolean newValue)
-    {
-    	RSECorePlugin.getTheSystemRegistry().fireEvent(
-    	  new SystemPreferenceChangeEvent(type,
-    	                                  oldValue ? Boolean.TRUE : Boolean.FALSE,
-    	                                  newValue ? Boolean.TRUE : Boolean.FALSE));
-    }	
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemPreferenceShowFilterPoolsAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemPreferenceShowFilterPoolsAction.java
deleted file mode 100644
index 357a29e2b..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemPreferenceShowFilterPoolsAction.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2007 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
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David Dykstal (IBM) - moved SystemPreferencesManager to a new package
- * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core
- * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
- ********************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-import org.eclipse.rse.core.RSECorePlugin;
-import org.eclipse.rse.core.events.ISystemPreferenceChangeEvents;
-import org.eclipse.rse.internal.core.model.SystemPreferenceChangeEvent;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.SystemPreferencesManager;
-import org.eclipse.rse.ui.actions.SystemBaseAction;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * The action allows users to decide whether or not to show filter pools in the Remote System Explorer.
- * It is a fastpath/convenience method for this option in the preferences page.
- */
-public class SystemPreferenceShowFilterPoolsAction extends SystemBaseAction 
-                                 
-{
-	
-    //private SystemRegistry sr = null;
-	/**
-	 * Constructor
-	 */
-	public SystemPreferenceShowFilterPoolsAction(Shell parent) 
-	{
-		super(SystemResources.ACTION_PREFERENCE_SHOW_FILTERPOOLS_LABEL,SystemResources.ACTION_PREFERENCE_SHOW_FILTERPOOLS_TOOLTIP,
-		      parent);
-        allowOnMultipleSelection(true);        
-        setChecked(SystemPreferencesManager.getShowFilterPools());
-        setSelectionSensitive(false);
-        
-		setHelp(RSEUIPlugin.HELPPREFIX+"actn0011"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This is the method called when the user selects this action.
-	 * @see org.eclipse.jface.action.Action#run()
-	 */
-	public void run() 
-	{
-		boolean newState = isChecked();
-        SystemPreferencesManager.setShowFilterPools(newState);
-    	firePreferenceChangeEvent(ISystemPreferenceChangeEvents.EVENT_SHOWFILTERPOOLS,
-    	                          !newState,newState);  // defect 41794             
-	}		
-
-    /**
-     * Fire a preference change event
-     */
-    private void firePreferenceChangeEvent(int type, boolean oldValue, boolean newValue)
-    {
-    	RSECorePlugin.getTheSystemRegistry().fireEvent(
-    	  new SystemPreferenceChangeEvent(type,
-    	                                  oldValue ? Boolean.TRUE : Boolean.FALSE,
-    	                                  newValue ? Boolean.TRUE : Boolean.FALSE));
-    }
-
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemProfileNameCopyAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemProfileNameCopyAction.java
deleted file mode 100644
index 1a248a11d..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemProfileNameCopyAction.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2008 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core
- * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API
- * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.rse.core.RSECorePlugin;
-import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.core.model.ISystemProfile;
-import org.eclipse.rse.core.model.ISystemRegistry;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.internal.ui.dialogs.SystemCopyProfileDialog;
-import org.eclipse.rse.services.clientserver.messages.SystemMessage;
-import org.eclipse.rse.ui.ISystemMessages;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.SystemBasePlugin;
-import org.eclipse.rse.ui.actions.SystemBaseDialogAction;
-import org.eclipse.rse.ui.messages.SystemMessageDialog;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-
-
-/**
- * A copy profile action. Will copy the profile, and all connections for the profile. 
- * We must first prompt user for a new name for the copied profile.
- */
-public class SystemProfileNameCopyAction extends SystemBaseDialogAction 
-                                 implements  IRunnableWithProgress
-{	
-	private ISystemProfile profile, newProfile;
-	//private ISystemProfileManager mgr;
-	private ISystemRegistry sr;
-	private String oldName,newName;
-	private boolean makeActive;
-    private Exception runException = null;
-    	
-	/**
-	 * Constructor for selection-sensitive popup menu for profiles in Team view. 
-	 */
-	public SystemProfileNameCopyAction(Shell shell) 
-	{
-		super(SystemResources.ACTION_PROFILE_COPY_LABEL, SystemResources.ACTION_PROFILE_COPY_TOOLTIP,
-			  PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_TOOL_COPY), 
-			  shell);
-		//mgr = SystemProfileManager.getSystemProfileManager();
-		sr = RSECorePlugin.getTheSystemRegistry();
-		setSelectionSensitive(true);
-        allowOnMultipleSelection(false);
-		setHelp(RSEUIPlugin.HELPPREFIX+"actndupr"); //$NON-NLS-1$
-	}
-	
-	/**
-	 * Set the profile
-	 */
-	public void setProfile(ISystemProfile profile)
-	{
-		this.profile = profile;
-	}
-	
-	/**
-	 * Override of parent
-	 * @see #run()
-	 */
-	protected Dialog createDialog(Shell parent)
-	{
-		return new SystemCopyProfileDialog(parent, profile); 
-	}
-	
-	/**
-	 * Required by parent. We use it to return the new name
-	 */
-	protected Object getDialogValue(Dialog dlg)
-	{
-		newName = null;
-		SystemCopyProfileDialog rnmDlg = (SystemCopyProfileDialog)dlg;
-		if (!rnmDlg.wasCancelled())
-	    {
-           oldName = profile.getName();
-		   newName = rnmDlg.getNewName();
-		   makeActive = rnmDlg.getMakeActive();
-    	   IRunnableContext runnableContext = getRunnableContext();
-    	   try
-    	   {
-    	     runnableContext.run(false,false,this); // inthread, cancellable, IRunnableWithProgress
-             if (makeActive && (newProfile!=null))
-               sr.setSystemProfileActive(newProfile, true);
-    	   }
-    	   catch (java.lang.reflect.InvocationTargetException exc) // unexpected error
-    	   {
-    	  	 showOperationMessage(exc, getShell());
-    	     //throw (Exception) exc.getTargetException();    	    	
-    	   }
-    	   catch (Exception exc)
-    	   {
-    	  	 showOperationMessage(exc, getShell());
-             //throw exc;
-    	   }    	
-		}
-		return newName;					
-	}
-	/**
-	 * Get an IRunnable context to show progress in. If there is currently a dialog or wizard up with
-	 * a progress monitor in it, we will use this, else we will create a progress monitor dialog.
-	 */
-	protected IRunnableContext getRunnableContext()
-	{
-		IRunnableContext irc = RSEUIPlugin.getTheSystemRegistryUI().getRunnableContext();
-		if (irc == null)
-		  irc = new ProgressMonitorDialog(getShell());
-		return irc;
-	}
-	
-	
-    // ----------------------------------
-    // INTERNAL METHODS...
-    // ----------------------------------
-	/**
-	 * Method required by IRunnableWithProgress interface.
-	 * Allows execution of a long-running operation modally by via a thread.
-	 * In our case, it runs the copy operation with a visible progress monitor
-	 */
-    public void run(IProgressMonitor monitor)
-         throws java.lang.reflect.InvocationTargetException,
-                java.lang.InterruptedException
-	{		
-		String msg = getCopyingMessage(oldName,newName);
-		runException = null;
-		
-        try
-        {
-           int steps = 0;
-           IHost[] conns = sr.getHostsByProfile(profile);
-           if ((conns != null) && (conns.length > 0))
-             steps = conns.length;
-           steps += 2; // for filterpools and subsystems
-	       monitor.beginTask(msg, steps);
-		   newProfile = sr.copySystemProfile(profile, newName,makeActive,monitor);
-           monitor.done();
-        }
-        catch(java.lang.InterruptedException exc)
-        {
-           monitor.done();
-           runException = exc;
-           throw (java.lang.InterruptedException)runException;
-        }						
-        catch(Exception exc)
-        {
-           monitor.done();
-           runException = new java.lang.reflect.InvocationTargetException(exc);
-           throw (java.lang.reflect.InvocationTargetException)runException;
-        }
-
-	}
-	
-
-    /**
-     * Helper method to return the message "Copying &1 to &2..."
-     */
-    public static String getCopyingMessage(String oldName, String newName)
-    {
-    	SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COPY_PROGRESS);
-    	msg.makeSubstitution(oldName,newName);
-    	return msg.getLevelOneText();
-    }
-
-    /**
-     * Helper method to show an error message resulting from the attempted operation.
-     */
-	protected void showOperationMessage(Exception exc, Shell shell)
-	{
-		if (exc instanceof java.lang.InterruptedException)
-		  showOperationCancelledMessage(shell);
-		else if (exc instanceof java.lang.reflect.InvocationTargetException)
-		  showOperationErrorMessage(shell, ((java.lang.reflect.InvocationTargetException)exc).getTargetException());
-		else
-		  showOperationErrorMessage(shell, exc);
-	}
-
-    /**
-     * Show an error message when the operation fails.
-     * Shows a common message by default.
-     * Overridable.
-     */
-    protected void showOperationErrorMessage(Shell shell, Throwable exc)
-    {
-    	SystemMessageDialog msgDlg = new SystemMessageDialog(shell, RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_OPERATION_FAILED).makeSubstitution(exc.getMessage()));
-    	msgDlg.open();
-        SystemBasePlugin.logError("Copy profile operation failed",exc); //$NON-NLS-1$
-    }	
-    /**
-     * Show an error message when the user cancels the operation.
-     * Shows a common message by default.
-     * Overridable.
-     */
-    protected void showOperationCancelledMessage(Shell shell)
-    {
-    	SystemMessageDialog msgDlg = new SystemMessageDialog(shell, RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_OPERATION_CANCELLED));
-    	msgDlg.open();
-    }	
-
-
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemProfileNameSelectAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemProfileNameSelectAction.java
deleted file mode 100644
index 9703421c1..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemProfileNameSelectAction.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2007 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
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
- ********************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-import org.eclipse.rse.core.RSECorePlugin;
-import org.eclipse.rse.core.model.ISystemProfile;
-import org.eclipse.rse.core.model.ISystemProfileManager;
-import org.eclipse.rse.core.model.ISystemRegistry;
-import org.eclipse.rse.internal.core.model.SystemProfileManager;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.actions.SystemBaseAction;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * A selectable profile name action.
- */
-public class SystemProfileNameSelectAction extends SystemBaseAction 
-{	
-	private ISystemProfile profile;
-	
-	/**
-	 * Constructor
-	 */
-	public SystemProfileNameSelectAction(Shell parent, ISystemProfile profile) 
-	{
-		super(profile.getName(),parent);
-		this.profile = profile;
-		ISystemProfileManager mgr = SystemProfileManager.getDefault();
-		setChecked(mgr.isSystemProfileActive(profile.getName()));
-        setSelectionSensitive(false);
-        
-		setHelp(RSEUIPlugin.HELPPREFIX+"actn0004"); //$NON-NLS-1$
-	}
-
-
-	/**
-	 * This is the method called when the user selects this action.
-	 * @see org.eclipse.jface.action.Action#run()
-	 */
-	public void run() 
-	{
-		ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry();
-		sr.setSystemProfileActive(profile, isChecked());
-	}		
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemRemoteServerStartAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemRemoteServerStartAction.java
deleted file mode 100644
index 8110e6e4c..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemRemoteServerStartAction.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2007 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.actions.SystemBaseAction;
-import org.eclipse.swt.widgets.Shell;
-
-
-
-/**
- * This is the "Start" action that shows up under a remote server action
- *  within the Remote Servers cascading menu.
- */
-public class SystemRemoteServerStartAction extends SystemBaseAction
-{
-	private SystemCascadingRemoteServerBaseAction parentAction;
-	
-	/**
-	 * Constructor.
-	 * @param shell  Shell of parent window, used as the parent for the dialog.
-	 *               Can be null, but be sure to call setParent before the action is used (ie, run).
-	 * @param parentAction The action that cascades into this action.
- 	 */
-	public SystemRemoteServerStartAction(Shell shell, SystemCascadingRemoteServerBaseAction parentAction) 
-	{
-	  	super(SystemResources.ACTION_REMOTESERVER_START_LABEL,SystemResources.ACTION_REMOTESERVER_START_TOOLTIP,  shell);
-	  	this.parentAction = parentAction;
-	  	allowOnMultipleSelection(false);
-	  	//setContextMenuGroup(ISystemContextMenuConstants.GROUP_CONNECTION);
-    	setHelp(RSEUIPlugin.HELPPREFIX+"actnstsv"); //$NON-NLS-1$
-	}
-	
-	/**
-	 * Called when this action is selection from the popup menu.
-	 * Calls {@link SystemCascadingRemoteServerBaseAction#startServer()} in the parent action.
-	 */
-	public void run()
-	{
-		boolean ok = parentAction.startServer();
-		setEnabled(!ok);	
-	}
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemRemoteServerStopAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemRemoteServerStopAction.java
deleted file mode 100644
index 04b6a33be..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemRemoteServerStopAction.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2007 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.actions.SystemBaseAction;
-import org.eclipse.swt.widgets.Shell;
-
-
-
-/**
- * This is the "Stop" action that shows up under a remote server action
- *  within the Remote Servers cascading menu.
- */
-public class SystemRemoteServerStopAction extends SystemBaseAction
-{
-	private SystemCascadingRemoteServerBaseAction parentAction;
-	
-	/**
-	 * Constructor.
-	 * @param shell  Shell of parent window, used as the parent for the dialog.
-	 *               Can be null, but be sure to call setParent before the action is used (ie, run).
-	 * @param parentAction The action that cascades into this action.
- 	 */
-	public SystemRemoteServerStopAction(Shell shell, SystemCascadingRemoteServerBaseAction parentAction) 
-	{
-	  	super(SystemResources.ACTION_REMOTESERVER_STOP_LABEL,SystemResources.ACTION_REMOTESERVER_STOP_TOOLTIP,  shell);
-	  	this.parentAction = parentAction;
-	  	allowOnMultipleSelection(false);
-	  	//setContextMenuGroup(ISystemContextMenuConstants.GROUP_CONNECTION);
-    	setHelp(RSEUIPlugin.HELPPREFIX+"actnspsv"); //$NON-NLS-1$
-	}
-	
-	/**
-	 * Called when this action is selection from the popup menu.
-	 * Calls {@link SystemCascadingRemoteServerBaseAction#stopServer()} in the parent action.
-	 */
-	public void run()
-	{
-		boolean ok = parentAction.stopServer();
-		setEnabled(!ok);	
-	}
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemResolveFilterStringAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemResolveFilterStringAction.java
deleted file mode 100644
index 7bae8eabe..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemResolveFilterStringAction.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2008 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.rse.core.subsystems.ISubSystem;
-import org.eclipse.rse.internal.ui.dialogs.SystemResolveFilterStringDialog;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * The action for testing a given filter string by resolving it and showing the resolve results
- */
-public class SystemResolveFilterStringAction extends SystemTestFilterStringAction
-{
-	
-	
-	/**
-	 * Constructor when input subsystem and filter string are known already
-	 */
-	public SystemResolveFilterStringAction(Shell shell, ISubSystem subsystem, String filterString) 
-	{
-		super(shell, subsystem, filterString);
-	}
-	
-	/**
-	 * Constructor when input subsystem and filter string are not known already.
-	 * @see #setSubSystem(ISubSystem)
-	 * @see #setFilterString(String)
-	 */
-	public SystemResolveFilterStringAction(Shell shell) 
-	{
-		super(shell);
-	}
-	
-	
-	/**
-	 * If you decide to use the supplied run method as is,
-	 *  then you must override this method to create and return
-	 *  the dialog that is displayed by the default run method
-	 *  implementation.
-	 * <p>
-	 * If you override run with your own, then
-	 *  simply implement this to return null as it won't be used.
-	 * @see #run()
-	 */
-	protected Dialog createDialog(Shell shell)
-	{
-	  return new SystemResolveFilterStringDialog(shell, subsystem, filterString);
-	} // end createDialog()
-	
-	/**
-	 * Return selected object. If multiple objects are selected,
-	 * returns the first selected object.
-	 */
-	public Object getSelectedObject()
-	{
-	  return getValue();
-	}	
-	
-} // end class SystemResolveFilterStringAction
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemRunAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemRunAction.java
deleted file mode 100644
index fbc786162..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemRunAction.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2007 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.ui.ISystemContextMenuConstants;
-import org.eclipse.rse.ui.ISystemIconConstants;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.actions.SystemBaseAction;
-import org.eclipse.rse.ui.view.ISystemViewRunnableObject;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * The action is for any object that wants a "Run" action in their popup menu.
- * The object must support the ISystemViewRunnableObject interface.
- */
-public class SystemRunAction extends SystemBaseAction 
-                                 
-{
-	
-	/**
-	 * Constructor.
-	 */
-	public SystemRunAction(Shell shell) 
-	{
-		this(SystemResources.ACTION_RUN_LABEL, SystemResources.ACTION_RUN_TOOLTIP,
-		      RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_RUN_ID),
-		      shell);
-	}
-	
-	
-	/**
-	 * Constructor.
-	 * @param label
-	 * @param tooltip
-	 * @param image the image.
-	 * @param shell the parent shell.
-	 */
-	public SystemRunAction(String label, String tooltip, ImageDescriptor image, Shell shell) 
-	{
-		super(label, tooltip, image, shell);
-		init();
-	}
-	
-	/**
-	 * Initialize.
-	 */
-	protected void init() {
-        allowOnMultipleSelection(false);
-		setContextMenuGroup(ISystemContextMenuConstants.GROUP_OPEN);
-		setHelp(RSEUIPlugin.HELPPREFIX+"actn0100");		 //$NON-NLS-1$
-	}
-
-
-	/**
-	 * @see SystemBaseAction#updateSelection(IStructuredSelection)
-	 */
-	public boolean updateSelection(IStructuredSelection selection)
-	{
-		boolean enable = true;
-		Object selectedObject = getFirstSelection();
-		if ((selectedObject == null) || !(selectedObject instanceof ISystemViewRunnableObject))
-		  enable = false;
-		return enable;
-	}
-
-	/**
-	 * This is the method called when the user selects this action.
-	 * @see org.eclipse.jface.action.Action#run()
-	 */
-	public void run() 
-	{
-		Object selectedObject = getFirstSelection();
-		if ((selectedObject == null) || !(selectedObject instanceof ISystemViewRunnableObject))
-		  return;
-		ISystemViewRunnableObject runnable = (ISystemViewRunnableObject)selectedObject;
-		runnable.run(getShell());
-	}		
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemSeparatorAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemSeparatorAction.java
deleted file mode 100644
index a07fe470d..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemSeparatorAction.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2007 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.rse.ui.actions.SystemBaseAction;
-import org.eclipse.swt.widgets.Shell;
-/**
- * Dummy action representing a separator in menus.
- */
-public class SystemSeparatorAction extends SystemBaseAction 
-{
-	private boolean realAction;
-	
-	/**
-	 * Constructor for SystemSeparatorAction when you intend to subclass
-	 */
-	public SystemSeparatorAction(Shell parent) 
-	{
-		super("_separator_",(ImageDescriptor)null,parent); //$NON-NLS-1$
-		realAction = true;
-	}
-	/**
-	 * Constructor for SystemSeparatorAction when you just want the separator
-	 */
-	public SystemSeparatorAction() 
-	{
-		super("_separator_",(ImageDescriptor)null,null); //$NON-NLS-1$
-		realAction = false;
-	}
-
-    public Separator getSeparator()
-    {
-    	return new Separator();
-    }
-    
-    /**
-     * Return true if this is both a separator and a real action, false if this is only
-     *  a separator
-     */
-    public boolean isRealAction()
-    {
-    	return realAction;
-    }
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemShowInMonitorAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemShowInMonitorAction.java
deleted file mode 100644
index 844047dd2..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemShowInMonitorAction.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2007 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.internal.ui.view.monitor.SystemMonitorUI;
-import org.eclipse.rse.internal.ui.view.monitor.SystemMonitorViewPart;
-import org.eclipse.rse.ui.ISystemIconConstants;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.actions.SystemBaseAction;
-import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-
-
-/**
- * This is the default action for showing a remote object in a table
- */
-public class SystemShowInMonitorAction extends SystemBaseAction
-{
-	private Object _selected;
-
-	/**
-	 * Constructor.
-	 * @param shell  Shell of parent window, used as the parent for the dialog.
-	 *               Can be null, but be sure to call setParent before the action is used (ie, run).
-	 */
-	public SystemShowInMonitorAction(Shell parent)
-	{
-		super(SystemResources.ACTION_MONITOR_LABEL,			
-			SystemResources.ACTION_MONITOR_TOOLTIP,
-			RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_SHOW_MONITOR_ID),
-			parent);
-		setAvailableOffline(true);
-	}
-
-	/**
-	 * Called when this action is selected from the popup menu.
-	 */
-	public void run()
-	{
-		SystemMonitorViewPart viewPart = null;
-		IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-		try
-		{
-			viewPart = (SystemMonitorViewPart) page.showView(SystemMonitorUI.MONITOR_VIEW_ID, null, IWorkbenchPage.VIEW_CREATE);
-		}
-		catch (PartInitException e)
-		{
-			return;
-		}
-		catch (Exception e)
-		{
-			return;
-		}
-
-		viewPart.addItemToMonitor((IAdaptable) _selected);
-		page.activate(viewPart);
-
-	}
-
-	/**
-	 * Called when the selection changes.  The selection is checked to
-	 * make sure this action can be performed on the selected object.
-	 */
-	public boolean updateSelection(IStructuredSelection selection)
-	{
-		boolean enable = false;
-		Iterator e = selection.iterator();
-		Object selected = e.next();
-
-		if (selected != null && selected instanceof IAdaptable)
-		{
-			ISystemViewElementAdapter va = (ISystemViewElementAdapter) ((IAdaptable) selected).getAdapter(ISystemViewElementAdapter.class);
-			if (va.hasChildren((IAdaptable)selected))
-			{
-				_selected = selected;
-				enable = true;
-			}
-		}
-
-		return enable;
-	}
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemShowInTableAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemShowInTableAction.java
deleted file mode 100644
index b62ccd8e6..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemShowInTableAction.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2007 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.internal.ui.view.SystemTableViewPart;
-import org.eclipse.rse.ui.ISystemIconConstants;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.actions.SystemBaseAction;
-import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-
-
-/**
- * This is the default action for showing a remote object in a table
- */
-public class SystemShowInTableAction extends SystemBaseAction
-{
-	private Object _selected;
-
-	/**
-	 * Constructor.
-	 * @param shell  Shell of parent window, used as the parent for the dialog.
-	 *               Can be null, but be sure to call setParent before the action is used (ie, run).
-	 */
-	public SystemShowInTableAction(Shell parent)
-	{
-		super(SystemResources.ACTION_TABLE_LABEL,			
-			SystemResources.ACTION_TABLE_TOOLTIP,
-			RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_SHOW_TABLE_ID),
-			parent);
-		setAvailableOffline(true);
-	}
-
-	/**
-	 * Called when this action is selected from the popup menu.
-	 */
-	public void run()
-	{
-		SystemTableViewPart viewPart = null;
-		IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-		try
-		{
-			viewPart = (SystemTableViewPart) page.showView("org.eclipse.rse.ui.view.systemTableView", null, IWorkbenchPage.VIEW_CREATE); //$NON-NLS-1$
-		}
-		catch (PartInitException e)
-		{
-			return;
-		}
-		catch (Exception e)
-		{
-			return;
-		}
-
-		viewPart.setInput((IAdaptable) _selected);
-		page.activate(viewPart);
-
-	}
-
-	/**
-	 * Called when the selection changes.  The selection is checked to
-	 * make sure this action can be performed on the selected object.
-	 */
-	public boolean updateSelection(IStructuredSelection selection)
-	{
-		boolean enable = false;
-		Iterator e = selection.iterator();
-		Object selected = e.next();
-
-		if (selected != null && selected instanceof IAdaptable)
-		{
-			ISystemViewElementAdapter va = (ISystemViewElementAdapter) ((IAdaptable) selected).getAdapter(ISystemViewElementAdapter.class);
-			if (va.hasChildren((IAdaptable)selected))
-			{
-				_selected = selected;
-				enable = true;
-			}
-		}
-
-		return enable;
-	}
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemShowPreferencesPageAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemShowPreferencesPageAction.java
deleted file mode 100644
index 395adf4a3..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemShowPreferencesPageAction.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2008 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * Martin Oberhuber (Wind River) - [185552] Remove remoteSystemsViewPreferencesActions extension point
- * Kevin Doyle 	 (IBM) - [186769] Enable Contributions to Drop Down menu of Remote Systems view -> Preferences
- ********************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.preference.IPreferenceNode;
-import org.eclipse.jface.preference.PreferenceDialog;
-import org.eclipse.jface.preference.PreferenceManager;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.actions.SystemBaseAction;
-import org.eclipse.ui.IViewActionDelegate;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.internal.dialogs.WorkbenchPreferenceDialog;
-
-/**
- * This action will launch the Preferences dialog, but only rooted at a given
- * preference page (it will include its children underneath), including the
- * child pages registered under that page ("category").
- * <p>
- * @deprecated this will be moved to use the command/handler extension point.
- */
-public class SystemShowPreferencesPageAction extends SystemBaseAction implements IViewActionDelegate
-{
-
-	private PreferenceManager preferenceManager;
-	private String[] preferencePageIDs;
-	private String preferencePageCategory;
-
-	/**
-	 * Constructor.
-	 * We are instantiated inside {@link RSEUIPlugin#getShowPreferencePageActions()}
-	 * for each menu shortcut to show a particular preference page.
-	 */
-	public SystemShowPreferencesPageAction()
-	{
-		super("temp label", null); //$NON-NLS-1$
-	}
-
-	/**
-	 * Set ID of the preference root page to show.
-	 * @param preferencePageID The ID of the preference page root to show. All child nodes will also be shown.
-	 */
-	public void setPreferencePageID(String preferencePageID)
-	{
-		setPreferencePageID(new String[] {preferencePageID});
-	}
-	/**
-	 * Set IDs of the preference root pages to show.
-	 * @param preferencePageIDs The IDs of the preference page roots to show. All child nodes will also be shown.
-	 */
-	public void setPreferencePageID(String[] preferencePageIDs)
-	{
-		allowOnMultipleSelection(false);
-		setSelectionSensitive(false);
-		this.preferencePageIDs = preferencePageIDs;
-	}
-	/**
-	 * Set the category of the pages to be shown. This only needs to be called
-	 *  for non-root pages. Note that the ID to give here is not of the immediate
-	 *  parent, but that of the root parent. It tells us which root subtree to
-	 *  search for the given page(s).
-	 */
-	public void setPreferencePageCategory(String preferencePageCategory)
-	{
-		this.preferencePageCategory = preferencePageCategory;
-	}
-
-	/**
-	 * @see IViewActionDelegate#init(IViewPart)
-	 */
-	public void init(IViewPart view)
-	{
-		setShell(view.getSite().getShell());
-	}
-
-
-
-	/**
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	public void run(IAction action)
-	{
-		run();
-	}
-
-	/**
-	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection selection)
-	{
-	}
-
-	/**
-	 * This is the method called when the user selects this action.
-	 * @see org.eclipse.jface.action.Action#run()
-	 */
-	public void run()
-	{
-		// Bring up the preferences page
-		/*
-		PreferenceManager prefMgr = new PreferenceManager();
-		prefMgr.addToRoot(new PreferenceNode("tempid", new RemoteSystemsPreferencePage()));
-		PreferenceDialog dialog = new PreferenceDialog(shell, prefMgr);
-		dialog.open();
-		*/
-		PreferenceManager pm = getPreferenceManager();
-
-		if (pm != null)
-		{
-			shell = RSEUIPlugin.getTheSystemRegistryUI().getShell();
-			PreferenceDialog d = new WorkbenchPreferenceDialog(shell, pm);
-			d.create();
-			// TODO - hack to make this work in  3.1
-			String id = PlatformUI.PLUGIN_ID + ".preference_dialog_context"; //$NON-NLS-1$
-
-			PlatformUI.getWorkbench().getHelpSystem().setHelp(d.getShell(), id);
-			d.open();
-		}
-	}
-	/*
-	 * Get the preference manager.
-	 */
-	public PreferenceManager getPreferenceManager()
-	{
-		if (preferenceManager == null)
-		{
-			preferenceManager = new PreferenceManager('/');
-
-			//Get the pages from the registry
-			//PreferencePageRegistryReader registryReader = new PreferencePageRegistryReader(PlatformUI.getWorkbench());
-
-			//List pageContributions = registryReader.getPreferenceContributions(Platform.getExtensionRegistry());
-
-			PreferenceManager workbenchMgr = PlatformUI.getWorkbench().getPreferenceManager();
-
-			List pageContributions = workbenchMgr.getElements(PreferenceManager.POST_ORDER);
-
-
-
-			//Add the contributions to the manager
-			Iterator iter = pageContributions.iterator();
-			while (iter.hasNext())
-			{
-				IPreferenceNode prefNode = (IPreferenceNode) iter.next();
-				//System.out.println("prefNode.getId() == "+prefNode.getId());
-	 			//System.out.println("         getLabelText() == "+prefNode.getLabelText());
-	 			boolean match = false;
-	 			String prefNodeID = prefNode.getId();
-	 			if (preferencePageCategory == null)
-	 			{
-	 				match = testForMatch(prefNodeID);
-				}
-				else if (prefNodeID.equals(preferencePageCategory))
-				{
-					//System.out.println("Made it here");
-					prefNode = searchForSubPage(prefNode, prefNodeID);
-					if (prefNode != null)
-						match = true;
-				}
-				if (match)
-					preferenceManager.addToRoot(prefNode);
-			}
-
-		}
-		return preferenceManager;
-	}
-
-	private IPreferenceNode searchForSubPage(IPreferenceNode parent, String prefNodeID)
-	{
-		IPreferenceNode match = null;
-
-		IPreferenceNode[] subNodes = parent.getSubNodes();
-		if (subNodes!=null)
-			for (int idx=0; (match==null) && (idx<subNodes.length); idx++)
-			{
-				if (testForMatch(subNodes[idx].getId()))
-					match = subNodes[idx];
-				else
-					match = searchForSubPage(subNodes[idx], prefNodeID);
-			}
-
-		return match;
-	}
-
-	private boolean testForMatch(String prefNodeID)
-	{
-		boolean match = false;
-		for (int idx=0; !match && (idx<preferencePageIDs.length); idx++)
-		{
-			if (prefNodeID.equals(preferencePageIDs[idx]))
-				match = true;
-		}
-		return match;
-	}
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemStringPromptAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemStringPromptAction.java
deleted file mode 100644
index deaabc8de..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemStringPromptAction.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2007 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.InputDialog;
-import org.eclipse.rse.ui.ISystemContextMenuConstants;
-import org.eclipse.rse.ui.actions.SystemBaseDialogAction;
-import org.eclipse.rse.ui.validators.ISystemValidator;
-import org.eclipse.swt.widgets.Shell;
-
-
-
-/**
- * This is a default action for prompting for a string. 
- * It puts up a simple dialog with an entry field. You specify the button/menuitem
- *  strings, and the title and prompt on the resulting dialog.
- * You can also optionally specify an input validator that is called to verify the
- *  contents of the entry field.
- */
-public class SystemStringPromptAction extends SystemBaseDialogAction
-{
-
-	private String          title, prompt;
-	private ISystemValidator inputValidator;
-
-	/**
-	 * @param rb Resource bundle where to find following keys
-	 * @param key Key used as prefix in resource bundle to get:
-	 * <sl>
-	 *   <li>button/menuitem label -> appends ".label" to key     
-	 *   <li>button/menuitem tooltip -> appends ".tooltip" to key
-	 *   <li>button/menuitem description on status line -> appends ".description" to key
-	 *   <li>title of generic prompt dialog box displayed -> appends ".title"
-	 *   <li>prompt text in generic prompt dialog box displayed -> appends ".prompt"
-	 * </sl>
-	 * @param parent Shell of parent window
-	 * 
-	 * @deprecated use fields from resource class directly now
-	 */
-	public SystemStringPromptAction(String label, String tooltip, String title, String prompt, Shell parent)
-	{
-	    super(label, tooltip, null, parent); // null => no image
-	    this.title  = title;
-	    this.prompt = prompt;
-		setContextMenuGroup(ISystemContextMenuConstants.GROUP_OPEN);  
-	}
-
-   
-	/** 
-	 * Set validator to use to check validity of input
-	 * @param text validator     
-	 */ 
-	public void setValidator(ISystemValidator inputValidator)
-	{
-		this.inputValidator = inputValidator;
-	}
-	
-	/**
-	 * We use the default inherited actionPerformed method,
-	 *  which calls this method to create our dialog.
-	 */
-	public Dialog createDialog(Shell parent) 
-	{
-		InputDialog dlg= new InputDialog(parent, title, prompt,null,inputValidator);		
-		//dlg.getShell().setSize(300, 200); // ? right thing to do ?
-		dlg.setBlockOnOpen(true); // modal
-		return dlg;
-	}	        
-
-	/**
-	 * We use the default inherited actionPerformed method,
-	 *  which calls this method after the dialog is closed in
-	 *  order to retrieve the dialog's data. This is then
-	 *  placed in this object's value property and can be
-	 *  retrieved publicly via getValue().
-	 */
-	protected Object getDialogValue(Dialog dlg)
-	{
-		String value = ((InputDialog)dlg).getValue();
-		if (value != null)
-		  value = value.trim();
-		return value;	    	
-	}
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemSubMenuManager.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemSubMenuManager.java
deleted file mode 100644
index cfe34b63c..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemSubMenuManager.java
+++ /dev/null
@@ -1,404 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2008 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
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [168870] refactor org.eclipse.rse.core package of the UI plugin
- * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
- ********************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-import org.eclipse.jface.action.ActionContributionItem;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.rse.ui.SystemBasePlugin;
-import org.eclipse.rse.ui.actions.ISystemAction;
-import org.eclipse.rse.ui.actions.SystemBaseSubMenuAction;
-import org.eclipse.swt.widgets.Shell;
-
-
-
-/**
- * For cascading menus, we need our own menu subclass so we can intercept
- *  the state-setting methods of our frameworks, and foreword those onto the
- *  sub-menu actions.
- * <p>
- * The state-setting methods including setShell, setSelection and setValue.
- */
-public class SystemSubMenuManager  
-       extends MenuManager 
-{
-	protected String          toolTipText;	
-    protected ImageDescriptor image = null;
-    protected Shell           shell = null;
-    protected Viewer          viewer = null;
-    protected boolean         deferPopulation;
-	protected boolean         traceSelections = false;	
-	protected String          traceTarget;
-    protected ISelection      selection;
-    protected String          label;
-    protected SystemBaseSubMenuAction parentCascadingAction;
-    
-	/**
-	 * Constructor for SystemSubMenuManager
-	 */
-	public SystemSubMenuManager(SystemBaseSubMenuAction parentAction)
-	{
-		super();
-		this.parentCascadingAction = parentAction;
-	}
-	/**
-	 * Constructor for SystemSubMenuManager
-	 */
-	public SystemSubMenuManager(SystemBaseSubMenuAction parentAction, String text)
-	{
-		super(text);
-		this.label = text;
-		this.parentCascadingAction = parentAction;
-	}
-	/**
-	 * Constructor for SystemSubMenuManager
-	 */
-	public SystemSubMenuManager(SystemBaseSubMenuAction parentAction, String text, String id)
-	{
-		super(text, id);
-		this.label = text;
-		this.parentCascadingAction = parentAction;
-	}
-	/**
-	 * Constructor for SystemSubMenuManager
-	 */
-	public SystemSubMenuManager(SystemBaseSubMenuAction parentAction, String text, String id, ImageDescriptor image)
-	{
-		super(text, id);
-		this.label = text;
-		this.image = image;
-		this.parentCascadingAction = parentAction;
-	}
-	
-	/**
-	 * Return the parent cascading menu action that created this.
-	 */
-	public SystemBaseSubMenuAction getParentCascadingAction()
-	{
-		return parentCascadingAction;
-	}
-
-	/**
-	 * Set the tooltip text when this is used for in a cascading menu.
-	 * @see org.eclipse.rse.ui.actions.SystemBaseSubMenuAction
-	 */
-	public void setToolTipText(String tip)
-	{
-		this.toolTipText = tip;
-	}
-	/**
-	 * Get the tooltip text when this is used for in a cascading menu
-	 */
-	public String getToolTipText()
-	{
-		return toolTipText;
-	}
-	
-	/**
-	 * Return the label for this submenu
-	 */
-	public String getLabel()
-	{
-		return label;
-	}
-	
-	// ------------------------
-    // ISYSTEMACTION METHODS...
-    // ------------------------	
-    /**
-     * An optimization for performance reasons that allows all inputs to be set in one call.
-     * This is called by SystemView's fillContextMenu method.
-     */
-    public void setInputs(Shell shell, Viewer v, ISelection selection)
-    {
-		if (traceSelections)
-		  issueTraceMessage(" INSIDE SETINPUTS FOR SUBMENUMGR FOR '"+label+"'"); //$NON-NLS-1$ //$NON-NLS-2$
-    	this.shell = shell;
-    	this.viewer = v;
-        this.selection = selection;  
-        if (parentCascadingAction != null)
-          parentCascadingAction.setInputsFromSubMenuManager(shell, v, selection);
-        cascadeAllInputs();
-    }
-
-
-	/** 
-	 * Sets the parent shell for this action. Usually context dependent.
-	 * We cascade this down to all of the actions added to this submenu.
-	 */
-	public void setShell(Shell shell)
-	{
-		this.shell = shell;
-	    IContributionItem[] items = getItems();
-	    for (int idx=0; idx < items.length; idx++)
-	    {
-	    	if ((items[idx] instanceof ActionContributionItem) &&
-	      	    (((ActionContributionItem)items[idx]).getAction() instanceof ISystemAction))
-	      	{	      	   
-	      	   ISystemAction item = (ISystemAction) ( ((ActionContributionItem)items[idx]).getAction() );
-	      	   item.setShell(shell);
-	      	}
-	      	else if (items[idx] instanceof SystemSubMenuManager)
-	      	{
-	      	   SystemSubMenuManager item = (SystemSubMenuManager)items[idx];
-	      	   item.setShell(shell);
-	      	}
-	    }
-    	if (traceSelections)
-    	{
-    	  issueTraceMessage("*** INSIDE SETSHELL FOR SUBMENUMGR "+label+". #ITEMS = "+items.length); //$NON-NLS-1$ //$NON-NLS-2$
-    	}
-
-	}
-
-	/**
-	 * This is called by the framework to set the selection input, just prior to showing the popup menu.
-	 * We cascade this down to all of the actions added to this submenu.
-	 */
-	public void setSelection(ISelection selection) 
-	{	
-        this.selection = selection;     
-	    IContributionItem[] items = getItems();
-	    for (int idx=0; idx < items.length; idx++)
-	    {
-	    	if ((items[idx] instanceof ActionContributionItem) &&
-	      	    (((ActionContributionItem)items[idx]).getAction() instanceof ISystemAction))
-	      	{	      	   
-	      	   ISystemAction item = (ISystemAction) ( ((ActionContributionItem)items[idx]).getAction() );
-	      	   item.setSelection(selection);
-	      	}
-	      	else if (items[idx] instanceof SystemSubMenuManager)
-	      	{
-	      	   SystemSubMenuManager item = (SystemSubMenuManager)items[idx];
-	      	   item.setSelection(selection);
-	      	}
-	    }
-    	if (traceSelections)
-    	{
-    	  issueTraceMessage("*** INSIDE SETSELECTION FOR SUBMENUMGR"+label+". #ITEMS = "+items.length); //$NON-NLS-1$ //$NON-NLS-2$
-    	}
-
-	}	
-	/**
-	 * Set the Viewer that called this action. It is good practice for viewers to call this
-	 *  so actions can directly access them if needed.
-	 */
-	public void setViewer(Viewer v)
-	{
-		this.viewer = v;
-	    IContributionItem[] items = getItems();
-	    for (int idx=0; idx < items.length; idx++)
-	    {
-	    	if ((items[idx] instanceof ActionContributionItem) &&
-	      	    (((ActionContributionItem)items[idx]).getAction() instanceof ISystemAction))
-	      	{	      	   
-	      	   ISystemAction item = (ISystemAction) ( ((ActionContributionItem)items[idx]).getAction() );
-	      	   item.setViewer(viewer);
-	      	}
-	      	else if (items[idx] instanceof SystemSubMenuManager)
-	      	{
-	      	   SystemSubMenuManager item = (SystemSubMenuManager)items[idx];
-	      	   item.setViewer(viewer);
-	      	}
-	    }
-	}
-	
-	/**
-	 * Get the Viewer that called this action. Not guaranteed to be set,
-	 *  depends if that viewer called setViewer or not. SystemView does.
-	 */
-	public Viewer getViewer()
-	{
-		return viewer;
-	}	
-	/**
-	 * Get the Shell that hosts this action. Not guaranteed to be set,
-	 */
-	public Shell getShell()
-	{
-		return shell;
-	}	
-	/**
-	 * Get the Selection
-	 */
-	public IStructuredSelection getSelection()
-	{
-		return (IStructuredSelection)selection;
-	}	
-		
-	/**
-	 * @see ContributionManager#add(IAction)
-	 */
-
-    // add(): solve problem that cascaded menu items were not receiving their
-    // setSelection() call, due to them only being constructed on the 
-    // cascade's MenuAboutToShow(), after the setSelections have run.
-    
-    // THE QUESTION IS, IF WE DO THIS HERE WHEN ITEMS ARE ADDED TO THIS SUBMENU,
-    // IS IT REDUNDANT TO ALSO DO IT WHEN SETINPUTS IS CALLED?
-
-    /**
-     * Intercept so we can cascade the selection, viewer and shell down
-     */
-    public void appendToGroup(String groupName, IAction action)     
-	{
-    	super.appendToGroup(groupName, action);
-    	if (action instanceof ISystemAction)
-          cascadeAllInputs((ISystemAction)action);    
-	}
-    /**
-     * Intercept so we can cascade the selection, viewer and shell down
-     */
-	public void appendToGroup(String groupName, IContributionItem item) 
-	{
-		super.appendToGroup(groupName, item);
-	    if (item instanceof SystemSubMenuManager)
-	      cascadeAllInputs((SystemSubMenuManager)item);
-	}
-    /**
-     * Intercept so we can cascade the selection, viewer and shell down
-     * THIS WAS ONLY CATCHING ACTIONS, NOT NESTED SUBMENUS. THE SUPER OF THIS
-     * METHOD CALLS ADD(new ActionContributionItem(action)) SO WE NOW INTERCEPT
-     * THERE INSTEAD, AS THAT IS WHAT IS CALLED FOR MULTI-CASCADING MENUS
-    public void add(IAction action) 
-	{
-    	super.add(action);
-    	if (action instanceof ISystemAction)
-          cascadeAllInputs((ISystemAction)action);    
-	}*/
-    /**
-     * Intercept so we can cascade the selection, viewer and shell down
-     */
-	public void add(IContributionItem item) 
-	{
-		super.add(item);
-		if (item instanceof ActionContributionItem) 
-		{
-			IAction action = ((ActionContributionItem)item).getAction();
-			if (action instanceof ISystemAction)
-		       cascadeAllInputs((ISystemAction)action);
-		}
-		else if (item instanceof SystemSubMenuManager)
-		  cascadeAllInputs((SystemSubMenuManager)item);
-	}
-
-	/**
-	 * Cascade in one shot all input state inputs to all actions
-	 */
-	protected void cascadeAllInputs()
-    {
-    	//super.menuAboutToShow(ourSubMenu);
-	    IContributionItem[] items = getItems();
-    	if (traceSelections)
-    	{
-    		issueTraceMessage("INSIDE CASCADEALLINPUTS FOR SUBMENUMGR FOR "+label+". NBR ITEMS = "+items.length); //$NON-NLS-1$ //$NON-NLS-2$
-    	}
-
-	    for (int idx=0; idx < items.length; idx++)
-	    {
-	    	if ((items[idx] instanceof ActionContributionItem) &&
-	      	    (((ActionContributionItem)items[idx]).getAction() instanceof ISystemAction))
-	      	{	      	   
-	      	   ISystemAction item = (ISystemAction) ( ((ActionContributionItem)items[idx]).getAction() );
-	      	   if (!item.isDummy())
-	      	     cascadeAllInputs(item);
-	      	}
-	      	else if (items[idx] instanceof SystemSubMenuManager)
-	      	{
-	      	   SystemSubMenuManager item = (SystemSubMenuManager)items[idx];
-	      	   cascadeAllInputs(item);
-	      	}
-	    }
-
-    }
-	/**
-	 * Cascade in one shot all input state inputs to one action
-	 */
-	protected void cascadeAllInputs(ISystemAction action)
-    {
-    	if (action.isDummy())
-    	  return; // waste of time
-		if (shell != null)
-		  action.setShell(shell);
-		if (viewer != null)
-		  action.setViewer(viewer);
-		if (selection != null)
-		  action.setSelection(selection);
-    }
-	/**
-	 * Cascade in one shot all input state inputs to one submenu
-	 */
-	protected void cascadeAllInputs(SystemSubMenuManager submenu)
-    {
-		if (shell != null)
-		  submenu.setShell(shell);
-		if (viewer != null)
-		  submenu.setViewer(viewer);
-		if (selection != null)
-		  submenu.setSelection(selection);
-    }
-    // ------------------------
-    // HELPER METHODS...
-    // ------------------------
-    /**
-     * Turn on tracing for selections, shell and viewer to watch as it is set
-     */
-    public void setTracing(boolean tracing)
-    {
-    	traceSelections = tracing;
-    }
-    /**
-     * Turn on tracing for selections, shell and viewer to watch as it is set,
-     *  scoped to a particular class name (will use indexOf('xxx') to match).
-     */
-    public void setTracing(String tracingClassTarget)
-    {
-    	traceSelections = (tracingClassTarget != null);
-    	traceTarget = tracingClassTarget;
-    }
-    /**
-     * Turn on tracing for selections, shell and viewer to watch as it is set,
-     *  scoped to a particular class name (will use indexOf('xxx') to match).
-     */
-    public void setTracing(boolean tracing, String tracingClassTarget)
-    {
-    	traceSelections = tracing;
-    	traceTarget = tracingClassTarget;
-    }
-
-    /**
-     * Issue trace message
-     */
-    protected void issueTraceMessage(String msg)
-    {
-    	if (traceSelections)
-    	{
-    		String className = this.getClass().getName();
-    		if ((traceTarget==null) || (className.indexOf(traceTarget)>=0))
-    		{
-    		  className = className.substring(className.lastIndexOf('.'));
-              SystemBasePlugin.logInfo(className+": "+msg); //$NON-NLS-1$
-    		}
-    	}
-    }
-
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemSubMenuManagerForTesting.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemSubMenuManagerForTesting.java
deleted file mode 100644
index 335b8f13a..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemSubMenuManagerForTesting.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2007 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-import org.eclipse.jface.action.ActionContributionItem;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.rse.ui.actions.ISystemAction;
-import org.eclipse.rse.ui.actions.SystemBaseSubMenuAction;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * For cascading menus, we need our own menu subclass so we can intercept
- *  the state-setting methods our frameworks, and foreword those onto the
- *  sub-menu actions.
- * <p>
- * The state-setting methods including setShell, setSelection and setValue.
- * <p>
- * We often have trouble tracking down when the shell, selection and viewer is
- *  not properly set for cascading actions. For these cases, we can use this
- *  override of the SystemSubMenuManager to trace what happens.
- */
-public class SystemSubMenuManagerForTesting  
-       extends SystemSubMenuManager
-       //implements ISelectionChangedListener
-       //implements ISystemAction
-{
-	private String prefix = ""; //$NON-NLS-1$
-    
-	/**
-	 * Constructor
-	 */
-	public SystemSubMenuManagerForTesting(SystemBaseSubMenuAction parentAction)
-	{
-		super(parentAction);
-	}
-	/**
-	 * Constructor
-	 */
-	public SystemSubMenuManagerForTesting(SystemBaseSubMenuAction parentAction, String text)
-	{
-		super(parentAction, text);
-		System.out.println("SUBMENUMGR CTOR " + text); //$NON-NLS-1$
-	}
-	/**
-	 * Constructor 
-	 */
-	public SystemSubMenuManagerForTesting(SystemBaseSubMenuAction parentAction, String text, String id)
-	{
-		super(parentAction, text, id);
-		System.out.println("SUBMENUMGR CTOR " + text); //$NON-NLS-1$
-	}
-	/**
-	 * Constructor
-	 */
-	public SystemSubMenuManagerForTesting(SystemBaseSubMenuAction parentAction, String text, String id, ImageDescriptor image)
-	{
-		super(parentAction, text, id, image);
-	}
-
-	
-    /**
-     * Override of parent so we can trace it....
-     */
-    public void setInputs(Shell shell, Viewer v, ISelection selection)
-    {
-		System.out.println(" INSIDE SETINPUTS FOR SUBMENUMGR '"+label+"': selection = "+selection); //$NON-NLS-1$ //$NON-NLS-2$
-		super.setInputs(shell, v, selection);
-    }
-       
-
-
-	
-    // add(): solve problem that cascaded menu items were not receiving their
-    // setSelection() call, due to them only being constructed on the 
-    // cascade's MenuAboutToShow(), after the setSelections have run.
-    
-    // THE QUESTION IS, IF WE DO THIS HERE WHEN ITEMS ARE ADDED TO THIS SUBMENU,
-    // IS IT REDUNDANT TO ALSO DO IT WHEN SETINPUTS IS CALLED?
-
-    /**
-     * Intercept so we can cascade the selection, viewer and shell down
-     */
-    public void appendToGroup(String groupName, IAction action)     
-	{
-	 	  System.out.println("INSIDE APPENDTOGROUP OF ISYSTEMACTION FOR SUBMENUMGR FOR '"+label+"'"); //$NON-NLS-1$ //$NON-NLS-2$
-		  prefix = "  "; //$NON-NLS-1$
-    	  super.appendToGroup(groupName, action);
-		  prefix = ""; //$NON-NLS-1$
-	}
-    /**
-     * Intercept so we can cascade the selection, viewer and shell down
-     */
-	public void appendToGroup(String groupName, IContributionItem item) 
-	{
-		  System.out.println("INSIDE APPENDTOGROUP OF SYSTEMSUBMENUMGR FOR SUBMENUMGR FOR '"+label+"'"); //$NON-NLS-1$ //$NON-NLS-2$
-		  prefix = "  "; //$NON-NLS-1$
-		  super.appendToGroup(groupName, item);
-	      prefix = "";	       //$NON-NLS-1$
-	}
-    /**
-     * Intercept so we can cascade the selection, viewer and shell down
-     * THIS WAS ONLY CATCHING ACTIONS, NOT NESTED SUBMENUS. THE SUPER OF THIS
-     * METHOD CALLS ADD(new ActionContributionItem(action)) SO WE NOW INTERCEPT
-     * THERE INSTEAD, AS THAT IS WHAT IS CALLED FOR MULTI-CASCADING MENUS
-    public void add(IAction action) 
-	{
-    	super.add(action);
-    	if (action instanceof ISystemAction)
-          cascadeAllInputs((ISystemAction)action);    
-	}*/
-    /**
-     * Intercept so we can cascade the selection, viewer and shell down
-     */
-	public void add(IContributionItem item) 
-	{
-		prefix = "  "; //$NON-NLS-1$
-		if (item instanceof ActionContributionItem) 
-		{
-			IAction action = ((ActionContributionItem)item).getAction();
-			if (action instanceof ISystemAction)
-               System.out.println("INSIDE ADD OF ISYSTEMACTION(action="+action.getText()+") FOR THIS MNUMGR: "+label); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-		else if (item instanceof SystemSubMenuManager)
-		{
-			SystemSubMenuManager submenu = (SystemSubMenuManager)item;
-            System.out.println("INSIDE ADD OF SUBMENUMGR(submenu="+submenu.getLabel()+") FOR THIS MNUMGR: "+label); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-		super.add(item);
-	    prefix = "";	       //$NON-NLS-1$
-	}
-
-	/**
-	 * Cascade in one shot all input state inputs to all actions
-	 */
-	protected void cascadeAllInputs()
-    {
-    	//super.menuAboutToShow(ourSubMenu);
-	    IContributionItem[] items = getItems();
-        System.out.println(prefix+"INSIDE CASCADEALLINPUTS TO ALL ITEMS FOR SUBMENUMGR FOR "+label+". NBR ITEMS = "+items.length); //$NON-NLS-1$ //$NON-NLS-2$
-        System.out.println(prefix+"...shell = "+shell+", viewer = "+viewer+", selection = "+selection); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-        String oldPrefix = prefix;
-        prefix += "  "; //$NON-NLS-1$
-        super.cascadeAllInputs();
-	    prefix = oldPrefix;
-    }
-	/**
-	 * Cascade in one shot all input state inputs to one action
-	 */
-	protected void cascadeAllInputs(ISystemAction action)
-    {
-        System.out.println(prefix+"INSIDE CASCADEALLINPUTS TO ISYSTEMACTION(action="+action.getText()+") FOR THIS MNUMGR: "+label); //$NON-NLS-1$ //$NON-NLS-2$
-        System.out.println(prefix+"...shell = "+shell+", viewer = "+viewer+", selection = "+selection); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-        super.cascadeAllInputs(action);
-    }
-	/**
-	 * Cascade in one shot all input state inputs to one submenu
-	 */
-	protected void cascadeAllInputs(SystemSubMenuManager submenu)
-    {
-        System.out.println("INSIDE CASCADEALLINPUTS TO SUBMENUMGR(submenu="+submenu.getLabel()+") FOR THIS MNUMGR: "+label); //$NON-NLS-1$ //$NON-NLS-2$
-        System.out.println("...shell = "+shell+", viewer = "+viewer+", selection = "+selection); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-        super.cascadeAllInputs(submenu);        
-    }
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemTeamReloadAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemTeamReloadAction.java
deleted file mode 100644
index 970cb1f81..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemTeamReloadAction.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2007 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
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
- ********************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.rse.internal.ui.SystemResourceListener;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.services.clientserver.messages.SystemMessage;
-import org.eclipse.rse.ui.ISystemContextMenuConstants;
-import org.eclipse.rse.ui.ISystemMessages;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.actions.SystemBaseAction;
-import org.eclipse.rse.ui.messages.SystemMessageDialog;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * The action allows users to refresh the entire Remote System Explorer tree view,
- * by reloading it from disk. This is to be done after the user does a synchronization
- * with the repository.
- */
-public class SystemTeamReloadAction extends SystemBaseAction 
-                                 
-{
-	
-	//private SystemProfile prevProfile = null;
-	
-	/**
-	 * Constructor 
-	 */
-	public SystemTeamReloadAction(Shell parent) 
-	{
-		super(SystemResources.ACTION_TEAM_RELOAD_LABEL,SystemResources.ACTION_TEAM_RELOAD_TOOLTIP,
-		      parent);
-        allowOnMultipleSelection(false);
-		setContextMenuGroup(ISystemContextMenuConstants.GROUP_BUILD);        
-        //setSelectionSensitive(false);        
-		setHelp(RSEUIPlugin.HELPPREFIX+"actn0009"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Selection has been changed. Decide to enable or not.
-	 */
-	public boolean updateSelection(IStructuredSelection selection)
-	{
-		boolean enable = SystemResourceListener.changesPending();
-		return enable;
-	}
-
-	/**
-	 * This is the method called when the user selects this action to run.
-	 */
-	public void run() 
-	{
-		//SystemRegistry sr = RSECorePlugin.getTheSystemRegistry();
-		SystemMessage confirmMsg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_CONFIRM_RELOADRSE);
-		SystemMessageDialog msgDlg = new SystemMessageDialog(getShell(), confirmMsg);
-		boolean ok = msgDlg.openQuestionNoException();
-		if (ok)
-		{
-			SystemResourceListener.reloadRSE();
-		}
-	}		
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemTestFilterStringAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemTestFilterStringAction.java
deleted file mode 100644
index e3f37647e..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemTestFilterStringAction.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2008 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.rse.core.subsystems.ISubSystem;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.internal.ui.dialogs.SystemTestFilterStringDialog;
-import org.eclipse.rse.ui.actions.SystemBaseDialogAction;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * The action for testing a given filter string by resolving it and showing the resolve results
- */
-public class SystemTestFilterStringAction extends SystemBaseDialogAction 
-                                 
-{
-	
-	protected ISubSystem subsystem;
-	protected String filterString;
-	
-	/**
-	 * Constructor when input subsystem and filter string are known already
-	 */
-	public SystemTestFilterStringAction(Shell shell, ISubSystem subsystem, String filterString) 
-	{
-		super(SystemResources.ACTION_TESTFILTERSTRING_LABEL, SystemResources.ACTION_TESTFILTERSTRING_TOOLTIP, null,
-		      shell);
-		allowOnMultipleSelection(false);
-		setSubSystem(subsystem);
-		setFilterString(filterString);
-	}
-	/**
-	 * Constructor when input subsystem and filter string are not known already.
-	 * @see #setSubSystem(ISubSystem)
-	 * @see #setFilterString(String)
-	 */
-	public SystemTestFilterStringAction(Shell shell) 
-	{
-		this(shell, null, null);
-	}
-	
-	/**
-	 * Set the subsystem within the context of which this filter string is to be tested.
-	 */
-	public void setSubSystem(ISubSystem subsystem)
-	{
-		this.subsystem = subsystem;
-	}
-	
-	/**
-	 * Set the filter string to test
-	 */
-	public void setFilterString(String filterString)
-	{
-		this.filterString = filterString;
-	}
-	
-	/**
-	 * If you decide to use the supplied run method as is,
-	 *  then you must override this method to create and return
-	 *  the dialog that is displayed by the default run method
-	 *  implementation.
-	 * <p>
-	 * If you override run with your own, then
-	 *  simply implement this to return null as it won't be used.
-	 * @see #run()
-	 */
-	protected Dialog createDialog(Shell shell)
-	{
-		return new SystemTestFilterStringDialog(shell, subsystem, filterString);
-	}
-	
-	/**
-	 * Required by parent. We just return null.
-	 */
-	protected Object getDialogValue(Dialog dlg)
-	{
-		return null;
-	}
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemViewExpandToAllAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemViewExpandToAllAction.java
deleted file mode 100644
index bc7187090..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemViewExpandToAllAction.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * When we support Expand-To menu items to expand a remote item via subsetting criteria, 
- *  we should also support an Expand-To->All action. This is it.
- */
-public class SystemViewExpandToAllAction extends SystemViewExpandToBaseAction 
-{
-
-
-
-	/**
-	 * Constructor for SystemViewExpandToAllAction.
-	 * @param rb
-	 * @param prefix
-	 * @param image
-	 * @param parent
-	 */
-	public SystemViewExpandToAllAction(Shell parent) 
-	{
-		super(SystemResources.ACTION_EXPAND_ALL_LABEL, SystemResources.ACTION_EXPAND_ALL_TOOLTIP,null, parent);
-	}
-
-	/**
-	 * @see org.eclipse.rse.internal.ui.actions.SystemViewExpandToBaseAction#getFilterString(Object)
-	 */
-	protected String getFilterString(Object selectedObject) 
-	{
-		return null;
-	}
-
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemViewExpandToBaseAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemViewExpandToBaseAction.java
deleted file mode 100644
index d714ff286..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemViewExpandToBaseAction.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2007 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.rse.internal.ui.view.SystemView;
-import org.eclipse.rse.ui.actions.SystemBaseAction;
-import org.eclipse.rse.ui.view.ISystemTree;
-import org.eclipse.swt.widgets.Shell;
-
-
-
-/**
- * Base class for Expand To actions on a container
- */
-public abstract class SystemViewExpandToBaseAction extends SystemBaseAction 
-{
-	
-
-	
-	/**
-	 * Constructor.
-	 */
-	public SystemViewExpandToBaseAction(String label, String tooltip, ImageDescriptor image, Shell parent) 
-	{
-		super(label, tooltip, image, parent);
-		allowOnMultipleSelection(false);
-		setContextMenuGroup(org.eclipse.rse.ui.ISystemContextMenuConstants.GROUP_EXPANDTO);
-		setChecked(false); // will reset once we know the selection.
-	}
-	
-	/**
-	 * Second and easiest opportunity to decide if the action should be enabled or not based
-	 * on the current selection. Called by default implementation of updateSelection, once for
-	 * each item in the selection. If any call to this returns false, the action is disabled.
-	 * The default implementation returns true.
-	 */
-	public boolean checkObjectType(Object selectedObject)
-	{
-		SystemView sv = getSystemView();
-		if (sv == null)
-		  return false;
-		String currentFilter = sv.getExpandToFilter(selectedObject);
-		String thisFilter = getFilterString(selectedObject);
-		if (currentFilter != null) 
-		{
-		  if ((thisFilter!=null) && currentFilter.equals(thisFilter))
-		     setChecked(true);
-		}
-		else if (thisFilter == null) // I assume this is only the case for Expand To->All.
-		  setChecked(true); 
-		return true;
-	}
-	
-	/**
-	 * Actually do the work
-	 */	
-	public void run() 
-	{	
-		Object element = getFirstSelection();		
-		if (element != null) 
-		{
-			SystemView view = (SystemView)getCurrentTreeView();
-			view.expandTo(getFilterString(element));
-		}
-	}	
-	
-	/**
-	 * Overridable extension point to get the fully resolved filter string at the time
-	 *  action is run.
-	 */
-	protected abstract String getFilterString(Object selectedObject);
-	
-	/**
-	 * Return the current SystemView or null if the current viewer is not a system view
-	 */
-	protected SystemView getSystemView()
-	{
-		ISystemTree tree = getCurrentTreeView();
-		if ((tree instanceof SystemView) && (((SystemView)tree).getSystemViewPart() != null))
-		  return (SystemView)tree;
-		else
-		  return null;
-	}
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemWorkOfflineAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemWorkOfflineAction.java
deleted file mode 100644
index f624d1b8f..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemWorkOfflineAction.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2008 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType 
- * Martin Oberhuber (Wind River) - [186640] Add IRSESystemType.testProperty() 
- * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
- * David McKnight (IBM) 		 - [225747] [dstore] Trying to connect to an "Offline" system throws an NPE
- * David McKnight (IBM)          - [251026] Work Offline requires being selected twice to turn on Offline Mode
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.rse.core.RSECorePlugin;
-import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.core.model.ISystemRegistry;
-import org.eclipse.rse.core.subsystems.IConnectorService;
-import org.eclipse.rse.core.subsystems.ISubSystem;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.services.clientserver.messages.CommonMessages;
-import org.eclipse.rse.ui.ISystemContextMenuConstants;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.SystemBasePlugin;
-import org.eclipse.rse.ui.actions.SystemBaseAction;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * Action for switching RSE Connections offline
- * 
- * @author yantzi
- */
-public class SystemWorkOfflineAction extends SystemBaseAction 
-{
-	/**
-	 * Constructor
-	 * 
-	 * @param shell
-	 */
-	public SystemWorkOfflineAction(Shell shell) {
-		super(SystemResources.RESID_OFFLINE_WORKOFFLINE_LABEL, SystemResources.RESID_OFFLINE_WORKOFFLINE_TOOLTIP, shell);
-		allowOnMultipleSelection(false);
-		setContextMenuGroup(ISystemContextMenuConstants.GROUP_CONNECTION);
-		setHelp(RSEUIPlugin.HELPPREFIX+"wofa0000"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Override of parent. Called when testing if action should be enabled base on current
-	 *  selection. We check the selected object is one of our subsystems, and if we are
-	 *  currently connected.
-	 */
-	public boolean checkObjectType(Object obj) 
-	{
-		if (obj instanceof IHost)
-		  return true;
-		else 
-		  return false;
-	}
-	
-	/**
-	 * Called when this action is selection from the popup menu.
-	 */
-	public void run()	
-	{		  
-		final IHost conn = (IHost)getFirstSelection();
-		final ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry(); 
-	
-		if (conn.isOffline())
-		{
-			// offline going online
-			setChecked(false);
-			sr.setHostOffline(conn, false);
-		}
-		else
-		{
-			// these need to be set before calling disconnect so the iSeires subsystems know not
-			// to collapse 
-			sr.setHostOffline(conn, true);
-			setChecked(true);
-			
-			// online going offline, disconnect all subsystems
-			final Display display = Display.getCurrent();
-			String jobName =  NLS.bind(CommonMessages.MSG_DISCONNECT_PROGRESS, conn.getName());
-			Job disconnectJob = new Job(jobName) 
-			{										
-				public IStatus run(IProgressMonitor monitor){
-					ISubSystem[] subsystems = sr.getSubSystems(conn);
-					if (subsystems != null && subsystems.length > 0){
-						boolean cancelled = false;
-						// disconnect each connector service associated with the host
-						for (int i = 0; i < subsystems.length && !cancelled; i++){
-																					
-							final ISubSystem subSystem = subsystems[i];
-							
-							if(subSystem.getSubSystemConfiguration().supportsSubSystemConnect()){
-								if (subSystem.isConnected()){
-									// should always have a connector service
-									IConnectorService cs = subSystem.getConnectorService();
-									if (cs.isConnected()){
-										try {
-											cs.disconnect(monitor);
-										}
-										catch (Exception e){					
-											SystemBasePlugin.logError(e.getMessage());
-										}
-										
-										// failed to disconnect?
-										if (cs.isConnected()){
-											cancelled = true;
-										}								
-										else {
-											cs.reset();
-											display.asyncExec(new Runnable(){
-												public void run(){
-													// this will take care of updating all subsystems
-													sr.connectedStatusChange(subSystem, false, true, false);
-												}
-											});
-										}
-									}
-								}
-							}
-							if (monitor.isCanceled()){
-								cancelled = true;
-							}
-						}					
-						
-						if (cancelled){ // either monitor got cancelled or disconnect failed
-							setChecked(false);
-							sr.setHostOffline(conn, false);
-							return Status.CANCEL_STATUS;
-						}
-					}
-					return Status.OK_STATUS;
-				}
-				
-				};
-									
-			disconnectJob.schedule();
-		}
-	}
-
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.ui.actions.SystemBaseAction#updateSelection(org.eclipse.jface.viewers.IStructuredSelection)
-	 */
-	public boolean updateSelection(IStructuredSelection selection) {
-		if (super.updateSelection(selection))
-		{
-			setChecked(((IHost) selection.getFirstElement()).isOffline());
-			return true;
-		}
-		
-		return false;
-	}
-
-
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemWorkWithProfilesAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemWorkWithProfilesAction.java
deleted file mode 100644
index c8cc645bb..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemWorkWithProfilesAction.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2007 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
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
- ********************************************************************************/
-
-package org.eclipse.rse.internal.ui.actions;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.internal.ui.view.SystemPerspectiveHelpers;
-import org.eclipse.rse.internal.ui.view.team.SystemTeamViewPart;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.actions.SystemBaseAction;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * The action shows in the local toolbar of the Remote Systems View, and 
- *  users can select it to give the Team view focus. 
- */
-public class SystemWorkWithProfilesAction extends SystemBaseAction 
-                                 
-{
-    //private ISystemRegistry sr = null;
-
-	/**
-	 * Constructor
-	 */
-	public SystemWorkWithProfilesAction(Shell parent) 
-	{
-		super(SystemResources.ACTION_WORKWITH_PROFILES_LABEL, SystemResources.ACTION_WORKWITH_PROFILES_TOOLTIP, parent);
-        setSelectionSensitive(false);
-        allowOnMultipleSelection(true);
-        //sr = RSECorePlugin.getTheSystemRegistry();	        
-		setHelp(RSEUIPlugin.HELPPREFIX+"actnwwpr"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This is the method called when the user selects this action.
-	 * @see org.eclipse.jface.action.Action#run()
-	 */
-	public void run() 
-	{
-		SystemPerspectiveHelpers.showView(SystemTeamViewPart.ID);
-	}		
-	
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/CopyRunnable.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/CopyRunnable.java
deleted file mode 100644
index bac7df7da..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/CopyRunnable.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2008 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:
- * Rupen Mardirossian (IBM) - [210693] Created class to run SystemCopyDialog for enhancement defect.  
- ********************************************************************************/
-
-package org.eclipse.rse.internal.ui.dialogs;
-
-import java.util.List;
-
-public class CopyRunnable implements Runnable
-{	
-	private boolean _ok;
-	private List _existingNames;
-	private SystemCopyDialog dlg;
-	
-	public CopyRunnable(List existing)
-	{
-		_existingNames = existing;
-	}
-	
-	public void run() {
-		dlg = new SystemCopyDialog(null, _existingNames);
-		dlg.open();
-		if (!dlg.wasCancelled())
-			_ok = true;
-		else
-			_ok = false;
-	}
-	public boolean getOk()
-	{
-		return _ok;
-	}
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemControlEnableState.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemControlEnableState.java
deleted file mode 100644
index 5bf4f2206..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemControlEnableState.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2008 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.dialogs;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.rse.internal.ui.view.SystemPropertySheetForm;
-import org.eclipse.rse.internal.ui.view.SystemViewForm;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-
-
-/**
- * Helper class to save the enable/disable state of a control
- * including all its descendent controls.
- */
-public class SystemControlEnableState 
-{
-
-
-
-	/**
-	 * List of exception controls (element type: <code>Control</code>); 
-	 * <code>null</code> if none.
-	 */
-	private List exceptions = null;
-
-	/**
-	 * List of saved states (element type: <code>ItemState</code>).
-	 */
-	private List states;
-
-	/**
-	 * Internal class for recording the enable/disable state of a
-	 * single control.
-	 */
-	private class ItemState 
-	{
-		protected Control item;
-		protected boolean state;
-		public ItemState(Control item, boolean state) 
-		{
-			this.item = item;
-			this.state = state;
-		}
-		public void restore() 
-		{			
-			if (item != null)
-				item.setEnabled(state);
-		}
-	}
-
-	/**
-	 * Creates a new object and saves in it the current enable/disable
-	 * state of the given control and its descendents; the controls 
-	 * that are saved are also disabled.
-	 *
-	 * @param w the control
-	 */
-	protected SystemControlEnableState(Control w) 
-	{
-		this(w, null);
-	}
-	/**
-	 * Creates a new object and saves in it the current enable/disable
-	 * state of the given control and its descendents except for the 
-	 * given list of exception cases; the controls that are saved
-	 * are also disabled.
-	 *
-	 * @param w the control
-	 * @param exceptions the list of controls to not disable
-	 *  (element type: <code>Control</code>), or <code>null</code> if none
-	 */
-	protected SystemControlEnableState(Control w, List exceptions) 
-	{
-		super();
-		states = new ArrayList();
-		this.exceptions = exceptions;
-		readStateForAndDisable(w);
-	}
-	/**
-	 * Saves the current enable/disable state of the given control
-	 * and its descendents in the returned object; the controls
-	 * are all disabled.
-	 *
-	 * @param w the control
-	 * @return an object capturing the enable/disable state
-	 */
-	public static SystemControlEnableState disable(Control w) 
-	{
-		return new SystemControlEnableState(w);
-	}
-	/**
-	 * Saves the current enable/disable state of the given control
-	 * and its descendents in the returned object except for the 
-	 * given list of exception cases; the controls that are saved
-	 * are also disabled.
-	 *
-	 * @param w the control
-	 * @param exceptions the list of controls to not disable
-	 *  (element type: <code>Control</code>)
-	 * @return an object capturing the enable/disable state
-	 */
-	public static SystemControlEnableState disable(Control w, List exceptions) 
-	{
-		return new SystemControlEnableState(w, exceptions);
-	}
-	/**
-	 * Recursively reads the enable/disable state for the given window
-	 * and disables all controls.
-	 */
-	private void readStateForAndDisable(Control w) 
-	{
-		if ((exceptions != null && exceptions.contains(w)))
-			return;
-
-		if ((w instanceof Composite) && !(w instanceof SystemViewForm) && !(w instanceof SystemPropertySheetForm))
-		{
-			Composite c = (Composite) w;
-			Control[] children = c.getChildren();
-			for (int i = 0; i < children.length; i++) 
-			{
-				readStateForAndDisable(children[i]);
-			}
-		}
-		// XXX: Workaround for 1G2Q8SS: ITPUI:Linux - Combo box is not enabled in "File->New->Solution"
-		states.add(new ItemState(w, w.getEnabled()));
-		w.setEnabled(false);
-	}
-	/**
-	 * Restores the window enable state saved in this object.
-	 */
-	public void restore() 
-	{
-		int size = states.size();
-		for (int i = 0; i < size; i++) 
-		{
-			((ItemState) states.get(i)).restore();
-		}
-	}
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemCopyDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemCopyDialog.java
deleted file mode 100644
index 7dc13c0bf..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemCopyDialog.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2008 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:
- * Rupen Mardirossian (IBM) - [210693] Created Dialog for enhancement defect  
- ********************************************************************************/
-
-
-package org.eclipse.rse.internal.ui.dialogs;
-
-import java.util.List;
-
-import org.eclipse.jface.viewers.ColumnLayoutData;
-import org.eclipse.jface.viewers.ColumnPixelData;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.internal.ui.dialogs.SystemCopyTableProvider;
-import org.eclipse.rse.ui.SystemWidgetHelpers;
-import org.eclipse.rse.ui.dialogs.SystemPromptDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-
-/**
- * Dialog for confirming overwriting of resources when copy collision occurs. 
- * 
- * This dialog is a mirror copy of the SystemDeleteDialog with a few changes 
- * 
- */
-
-public class SystemCopyDialog extends SystemPromptDialog
-{
-	private String verbiage;
-	private SystemCopyTableProvider sctp;
-    private Table table;
-    private TableViewer tableViewer;    
-    private GridData tableData;
-    private List collisions;
-	
-	// column layout
-	private ColumnLayoutData columnLayouts[] = 
-	{
-		new ColumnPixelData(19, false),		
-		new ColumnWeightData(150,150,true)
-    };
-	
-    // column headers
-	private String columnHeaders[] = {
-		"", //$NON-NLS-1$
-		SystemResources.RESID_COLLISION_COPY_COLHDG_OLDNAME
-	};
-	/**
-	 * Constructor when you have your list of files and would like to use default title.
-	 */
-	public SystemCopyDialog(Shell shell, List files) 
-	{
-		this(shell, SystemResources.RESID_COPY_TITLE, files);				
-	}
-	/**
-	 * Constructor when you have your own title and list of files.
-	 */
-	public SystemCopyDialog(Shell shell, String title, List files) 
-	{
-		super(shell, title);				 
-		setOkButtonLabel(SystemResources.BUTTON_OVERWRITE_ALL);
-		setOkButtonToolTipText(SystemResources.BUTTON_OVERWRITE_ALL_TOOLTIP);
-		setCancelButtonLabel(SystemResources.BUTTON_CANCEL_ALL);
-		setCancelButtonToolTipText(SystemResources.BUTTON_CANCEL_ALL_TOOLTIP);
-		collisions=files;
-	}
-	/**
-	 * @see SystemPromptDialog#createInner(Composite)
-	 */
-	protected Control createInner(Composite parent) 
-	{
-		// Inner composite
-		int nbrColumns = 1;
-		Composite composite = SystemWidgetHelpers.createComposite(parent, nbrColumns);	
-		
-		if (verbiage != null)
-			SystemWidgetHelpers.createVerbiage(composite, verbiage, nbrColumns, false, 200);
-		else
-			SystemWidgetHelpers.createVerbiage(composite, SystemResources.RESID_COLLISION_COPY_VERBIAGE, nbrColumns, false, 200);
-		
-		// TABLE
-        tableViewer = createTableViewer(composite, nbrColumns);        
-        createColumns();    
-                
-        sctp = new SystemCopyTableProvider();
-        
-		int width = tableData.widthHint;
-		int nbrRows = Math.min(collisions.size(),8);
-		int rowHeight = table.getItemHeight() + table.getGridLineWidth();
-		int sbHeight = table.getHorizontalBar().getSize().y;	    
-		int height = (nbrRows * rowHeight) + sbHeight;
-	    
-		tableData.heightHint = height;
-		table.setLayoutData(tableData);  	  	    
-		table.setSize(width, height);         
- 
-        tableViewer.setLabelProvider(sctp);
-        tableViewer.setContentProvider(sctp);
-
-        tableViewer.setInput(collisions);  
-        
-		return composite;
-	}
-	/**
-	 * Creates and returns TableViewer
-	 */
-	private TableViewer createTableViewer(Composite parent, int nbrColumns) 
-    {
-	   table = new Table(parent, SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER | SWT.HIDE_SELECTION);
-  	   table.setLinesVisible(true);
-  	   tableViewer = new TableViewer(table);
-	   tableData = new GridData();
-	   tableData.horizontalAlignment = GridData.FILL;
-	   tableData.grabExcessHorizontalSpace = true;
-	   tableData.widthHint = 350;    
-	   tableData.heightHint = 30;    
-	   tableData.verticalAlignment = GridData.CENTER;
-	   tableData.grabExcessVerticalSpace = true;
-	   tableData.horizontalSpan = nbrColumns;
-	   table.setLayoutData(tableData);  	  	   
-	   return tableViewer;
-    }	
-	
-	protected Control getInitialFocusControl() 
-	{
-		return null;
-	}
-
-	
-	private void createColumns() 
-	{
-		TableLayout layout = new TableLayout();
-		table.setLayout(layout);
-		table.setHeaderVisible(true);
-		for (int i = 0; i < columnHeaders.length; i++) 
-		{
-			layout.addColumnData(columnLayouts[i]);
-			TableColumn tc = new TableColumn(table, SWT.NONE,i);
-			tc.setResizable(columnLayouts[i].resizable);
-			tc.setText(columnHeaders[i]);
-		}    	
-	}
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemCopyProfileDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemCopyProfileDialog.java
deleted file mode 100644
index 245d0f062..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemCopyProfileDialog.java
+++ /dev/null
@@ -1,281 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2007 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.dialogs;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.rse.core.model.ISystemProfile;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.services.clientserver.messages.SystemMessage;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.SystemWidgetHelpers;
-import org.eclipse.rse.ui.dialogs.SystemPromptDialog;
-import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement;
-import org.eclipse.rse.ui.messages.ISystemMessageLine;
-import org.eclipse.rse.ui.validators.ISystemValidator;
-import org.eclipse.rse.ui.validators.ValidatorFactory;
-import org.eclipse.rse.ui.validators.ValidatorProfileName;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * Dialog for copying a system profile.
- */
-public class SystemCopyProfileDialog extends SystemPromptDialog
-{
-    private Text newName;
-    private Button makeActiveCB;
-    private String newNameString, inputName;
-    private boolean makeActive = false;
-    private SystemMessage errorMessage;    
-    private ISystemValidator nameValidator;
-    private boolean initialized = false;
-    private ISystemProfile profile;
-
-	/**
-	 * Constructor when profile not already known
-	 * @param shell The parent window hosting this dialog
-	 */
-	public SystemCopyProfileDialog(Shell shell) 
-	{
-		this(shell, null);
-	}
-	/**
-	 * Constructor when profile known
-	 * @param shell The parent window hosting this dialog
-	 * @param profile The profile to be copied
-	 */
-	public SystemCopyProfileDialog(Shell shell, ISystemProfile profile) 
-	{
-		super(shell, SystemResources.RESID_COPY_PROFILE_TITLE);				
-		this.profile = profile;
-		if (profile != null)
-		{		
-		   setInputObject(profile);
-		}
-		nameValidator = ValidatorFactory.getProfileNameValidator((String)null);		
-		//pack();
-		setHelp(RSEUIPlugin.HELPPREFIX+"drnp0000"); //$NON-NLS-1$
-	}
-	/**
-	 * Create message line. Intercept so we can set msg line of form.
-	 */
-	protected ISystemMessageLine createMessageLine(Composite c)
-	{
-		super.createMessageLine(c);
-		//form.setMessageLine(msgLine);
-		return fMessageLine;
-	}
-
-
-	/**
-	 * Return widget to set focus to initially
-	 */
-	protected Control getInitialFocusControl() 
-	{
-		return newName;
-	}
-	
-	/**
-	 * Set the name validator
-	 */
-	public void setNameValidator(ISystemValidator nv)
-	{
-		nameValidator = nv;
-	}
-
-	/**
-	 * Create widgets, and populate given composite with them
-	 */
-	protected Control createInner(Composite parent) 
-	{
-		// Inner composite
-		int nbrColumns = 2;
-		Composite composite_prompts = SystemWidgetHelpers.createComposite(parent, nbrColumns);	
-
-        // ENTRY FIELD		
-		newName = SystemWidgetHelpers.createLabeledTextField(composite_prompts,null,
-				SystemResources.RESID_COPY_PROFILE_PROMPT_LABEL, SystemResources.RESID_COPY_PROFILE_PROMPT_TOOLTIP);
-        newName.setTextLimit(ValidatorProfileName.MAX_PROFILENAME_LENGTH); // defect 41816
-		// Make active
-		makeActiveCB = SystemWidgetHelpers.createCheckBox(
-			composite_prompts, nbrColumns, null, SystemResources.RESID_NEWPROFILE_MAKEACTIVE_LABEL, SystemResources.RESID_NEWPROFILE_MAKEACTIVE_TOOLTIP);
-
-		// SET HELP CONTEXT IDS...                                                    
-		//SystemWidgetHelpers.setHelp(newName, RSEUIPlugin.HELPPREFIX+"drnp0002", RSEUIPlugin.HELPPREFIX+"drnp0000");
-		SystemWidgetHelpers.setHelp(newName, RSEUIPlugin.HELPPREFIX+"drnp0002"); //$NON-NLS-1$
-		//SystemWidgetHelpers.setHelp(makeActiveCB, RSEUIPlugin.HELPPREFIX+"drnp0003", RSEUIPlugin.HELPPREFIX+"drnp0000");
-		SystemWidgetHelpers.setHelp(makeActiveCB, RSEUIPlugin.HELPPREFIX+"drnp0003"); //$NON-NLS-1$
-		                  
-	    initialize();
-			
-		// add keystroke listeners...
-		newName.addModifyListener(
-			new ModifyListener() {
-				public void modifyText(ModifyEvent e) {
-					validateNameInput();
-				}
-			}
-		);			   
-			
-		return composite_prompts;
-	}
-	
-
-	/**
-	 * Override of parent. Must pass selected object onto the form for initializing fields.
-	 * Called by SystemDialogAction's default run() method after dialog instantiated.
-	 */
-	public void setInputObject(Object inputObject)
-	{
-		//System.out.println("INSIDE SETINPUTOBJECT: " + inputObject + ", "+inputObject.getClass().getName());
-		super.setInputObject(inputObject);
-		if (inputObject instanceof SystemSimpleContentElement)
-		{
-		  SystemSimpleContentElement element = (SystemSimpleContentElement)inputObject;
-		  inputName = element.getName();
-		}
-		else if (inputObject instanceof ISelection)
-		{
-		   SystemSimpleContentElement element = (SystemSimpleContentElement)(((IStructuredSelection)inputObject).getFirstElement());
-		   inputName = element.getName();
-		}
-		else if (inputObject instanceof ISystemProfile)
-		  inputName = profile.getName();
-		initialize();
-	}
-	
-	/**
-	 * Initialize input fields from input
-	 */	
-	protected void initialize()
-	{
-		if (!initialized && (newName!=null) && (inputName!=null))
-		{
-		  initialized = true;
-		  newName.setText(inputName);
-		  newName.selectAll();
-		  if (makeActiveCB != null)
-		    makeActiveCB.setSelection(true);
-		  setPageComplete(false);
-		}
-	}
-	/**
-	 * Called when user presses OK button. 
-	 * Return true to close dialog.
-	 * Return false to not close dialog.
-	 */
-	protected boolean processOK() 
-	{
-		newNameString = newName.getText().trim();		
-		boolean closeDialog = verify();
-		if (closeDialog)
-		{
-			if (makeActiveCB != null)
-			  makeActive = makeActiveCB.getSelection();
-			setOutputObject(newNameString);
-		}
-		return closeDialog;
-	}	
-	/**
-	 * Verifies all input.
-	 * @return true if there are no errors in the user input
-	 */
-	public boolean verify() 
-	{
-		clearErrorMessage();				
-		errorMessage = validateNameInput();
-		if (errorMessage != null)
-		  newName.setFocus();
-		return (errorMessage == null);
-	}
-	
-  	/**
-	 * This hook method is called whenever the text changes in the input field.
-	 * The default implementation delegates the request to an <code>ISystemValidator</code> object.
-	 * If the <code>ISystemValidator</code> reports an error the error message is displayed
-	 * in the Dialog's message line.
-	 * @see #setNameValidator(ISystemValidator)
-	 */
-	protected SystemMessage validateNameInput() 
-	{			
-	    errorMessage = nameValidator.validate(newName.getText());
-	    if (errorMessage != null)
-		   setErrorMessage(errorMessage);
-	    else
-	       clearErrorMessage();
-		setPageComplete();		
-		return errorMessage;		
-	}
-
- 
-	/**
-	 * This method can be called by the dialog or wizard page host, to decide whether to enable
-	 * or disable the next, final or ok buttons. It returns true if the minimal information is
-	 * available and is correct.
-	 */
-	public boolean isPageComplete()
-	{
-		boolean pageComplete = false;
-		if (errorMessage == null)
-		{
-		  String theNewName = newName.getText().trim();
-		  pageComplete = (theNewName.length() > 0) && !(theNewName.equalsIgnoreCase(inputName));
-		}
-		return pageComplete;
-	}
-	
-	/**
-	 * Inform caller of page-complete status of this form
-	 */
-	public void setPageComplete()
-	{
-		setPageComplete(isPageComplete());
-	}
-
-	/**
-	 * Returns the user-entered new name
-	 */
-	public String getNewName()
-	{
-		return newNameString;
-	}    	
-	/**
-	 * Returns the make-active checkbox state
-	 */
-	public boolean getMakeActive()
-	{
-		return makeActive;
-	}    	
-
-	
-	/**
-	 * Returns the user-entered new name as an array for convenience to ISystemRenameTarget hosts.
-	 */
-	public String[] getNewNameArray()
-	{
-		String[] newNames = new String[1];
-		newNames[0] = newNameString;
-		return newNames;
-	}    		
-	
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemCopyTableProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemCopyTableProvider.java
deleted file mode 100644
index 0fb79f0f0..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemCopyTableProvider.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2008 IBM Corporation. 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:
- * Rupen Mardirossian (IBM) - [210682] Created for SystemCopyDialog
- ********************************************************************************/
-
-package org.eclipse.rse.internal.ui.dialogs;
-import java.util.Collection;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IBaseLabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.graphics.Image;
-/**
- * This class is the table provider class for the SystemCopyDialog
- */
-public class SystemCopyTableProvider implements ITableLabelProvider, IStructuredContentProvider
-{
-	
-    static final int COLUMN_IMAGE = 0;
-    static final int COLUMN_NAME = 1;      
-    protected Map imageTable = new Hashtable(20);	 
-    protected Object[] children = null;    
-    
-	/**
-	 * Constructor for SystemCopyTableProvider
-	 */
-	public SystemCopyTableProvider() 
-	{
-		super();
-	}
-	
-	private SystemCopyTableRow getTableRow(Object element)
-	{
-		return (SystemCopyTableRow)element;
-	}
- 
-    private Image getImageFromDescriptor(ImageDescriptor descriptor)
-    {
-    	if (descriptor == null)
-    	  	return null;
-	    //obtain the cached image corresponding to the descriptor
-	    Image image = (Image) imageTable.get(descriptor);
-	    if (image == null) 
-	    {
-		  	image = descriptor.createImage();
-		  	imageTable.put(descriptor, image);
-	    }
-    	//System.out.println("...image = " + image);	    
-	    return image;      	  
-    }
-     
-	/**
-	 * @see ITableLabelProvider#getColumnImage(java.lang.Object, int)
-	 */
-	public Image getColumnImage(Object element, int column) 
-	{
-		if (column == COLUMN_IMAGE)
-		  	return getImageFromDescriptor(getTableRow(element).getImageDescriptor());
-		else
-		  	return null;
-	}
-
-	/**
-	 * @see ITableLabelProvider#getColumnText(java.lang.Object, int)
-	 */
-	public String getColumnText(Object element, int column) 
-	{
-		String text = ""; //$NON-NLS-1$
-		if (column == COLUMN_NAME)
-		  	text = getTableRow(element).getName();
-		return text;  
-	}
-
-	/**
-	 * @see IBaseLabelProvider#addListener(ILabelProviderListener)
-	 */
-	public void addListener(ILabelProviderListener listener) 
-	{
-	}
-
-	/**
-	 * @see IBaseLabelProvider#dispose()
-	 */
-	public void dispose() 
-	{
-		// The following we got from WorkbenchLabelProvider
-        if (imageTable != null)
-        {
-	      	Collection imageValues = imageTable.values();
-	      	if (imageValues!=null)
-	      	{
-	        	Iterator images = imageValues.iterator();	    	
-	        	if (images!=null)
-	          		while (images.hasNext())
-    	        		((Image)images.next()).dispose();
-    	    	imageTable = null;	    
-	      	}
-        }
-	}
-
-	/**
-	 * @see IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)
-	 */
-	public boolean isLabelProperty(Object element, String property) 
-	{
-		return true;
-	}
-
-	/**
-	 * @see IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
-	 */
-	public void removeListener(ILabelProviderListener listener) 
-	{
-	}
-	
-	/**
-	 * Return rows. Input must be an IStructuredSelection.
-	 */
-	public Object[] getElements(Object inputElement)
-	{
-        if (children == null)
-        {
-		  	List list = (List)inputElement;
-		  	children = new SystemCopyTableRow[list.size()];
-		  	for(int i=0;i<list.size();i++)
-		  	{
-		  		children[i] = new SystemCopyTableRow(list.get(i), i);
-		  	}
-        }
-		return children;
-	}
-	
-	/**
-	 * Return the 0-based row number of the given element.
-	 */
-	public int getRowNumber(SystemCopyTableRow row)
-	{
-		return row.getRowNumber();
-	}
-		
-	/**
-	 * 
-	 */
-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
-	{
-	}
-
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemCopyTableRow.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemCopyTableRow.java
deleted file mode 100644
index 88156a5f8..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemCopyTableRow.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2008 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:
- * Rupen Mardirossian (IBM) - [210682] created for SystemCopyDialog
- ********************************************************************************/
-
-package org.eclipse.rse.internal.ui.dialogs;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.rse.core.filters.ISystemFilterPoolReference;
-import org.eclipse.rse.internal.ui.view.SystemViewResources;
-import org.eclipse.rse.ui.ISystemIconConstants;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.dialogs.ISystemTypedObject;
-import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement;
-import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter;
-import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
-import org.eclipse.rse.ui.view.SystemAdapterHelpers;
-
-/**
- * Represents one row in the table in the SystemCopyDialog dialog.
- */
-public class SystemCopyTableRow 
-{
-	
-	private Object element;
-	private String name;
-	private String type;	
-	private ImageDescriptor imageDescriptor;
-	private ISystemViewElementAdapter adapter;
-	private ISystemRemoteElementAdapter remoteAdapter;
-	private int rowNbr = 0;
-	
-    public SystemCopyTableRow(Object element, int rowNbr)
-    {
-    	if (element instanceof SystemSimpleContentElement)
-    	  element = ((SystemSimpleContentElement)element).getData();
-    	this.element = element;    	
-        this.adapter = getViewAdapter(element);    	
-        this.remoteAdapter = getRemoteAdapter(element);
-        this.rowNbr = rowNbr;
-    	//this.oldName = getAdapter(element).getText(element);
-    	if (adapter != null)
-    	  this.name = adapter.getName(element);
-    	else
-    	{
-    		if (element instanceof ISystemTypedObject)
-    		  this.name = ((ISystemTypedObject)element).getName();
-    		else if (element instanceof IResource)
-    		  this.name = ((IResource)element).getName();
-    	}
-    	ISystemViewElementAdapter typeAdapter = adapter;
-    	Object typeElement = element;
-    	if (typeElement instanceof ISystemFilterPoolReference)
-    	{
-    	  typeElement = ((ISystemFilterPoolReference)typeElement).getReferencedFilterPool();
-    	  typeAdapter = getViewAdapter(typeElement);
-    	}
-    	if (typeAdapter != null)
-    	  this.type = typeAdapter.getType(typeElement);
-    	else
-    	{
-    		if (element instanceof ISystemTypedObject)
-    		  this.type = ((ISystemTypedObject)element).getType();
-    		else if (element instanceof IResource)
-    		{
-    			if ((element instanceof IFolder) || (element instanceof IProject))
-    			  this.type = SystemViewResources.RESID_PROPERTY_FILE_TYPE_FOLDER_VALUE;
-    			else
-    			  this.type = SystemViewResources.RESID_PROPERTY_FILE_TYPE_FILE_VALUE;
-    		}
-    		else
-    	      this.type = element.getClass().getName();
-    	}
-    	if (adapter != null)
-    	  this.imageDescriptor = adapter.getImageDescriptor(element);
-    	else if (element instanceof ISystemTypedObject)
-    	  this.imageDescriptor = ((ISystemTypedObject)element).getImageDescriptor();
-    	else if (element instanceof IFolder)
-		  this.imageDescriptor = //PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_OBJ_FOLDER); 
-		  	RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_FOLDER_ID);
-    	else if (element instanceof IFile)
-    	  this.imageDescriptor = RSEUIPlugin.getDefault().getWorkbench().getEditorRegistry().getImageDescriptor(name);
-    }
-    
-    /**
-     * Return the name of the item to be copy
-     * @return display name of the item.
-     */
-    public String getName()
-    {
-    	return name;
-    }
-    /**
-     * Return the resource type of the item to be copy
-     * @return resource type of the item
-     */
-    public String getType()
-    {
-    	return type;
-    }
-    /**
-     * Return the 0-based row number of this item
-     * @return 0-based row number
-     */
-    public int getRowNumber()
-    {
-    	return rowNbr;
-    }
-
-	/**
-	 * Returns an image descriptor for the image. More efficient than getting the image.
-	 */
-	public ImageDescriptor getImageDescriptor()
-	{
-    	return imageDescriptor;
-    }
-    
-    /**
-     * Get the input object this row represents
-     */
-    public Object getElement()
-    {
-    	return element;
-    }
-    /**
-     * Get the input object adapter for the input object this row represents
-     */
-    public ISystemViewElementAdapter getViewAdapter()
-    {
-    	return adapter;
-    }
-    /**
-     * Get the input object remote adapter for the input object this row represents
-     */
-    public ISystemRemoteElementAdapter getRemoteAdapter()
-    {
-    	return remoteAdapter;
-    }
-    /**
-     * Return true if this is a remote object
-     */
-    public boolean isRemote()
-    {
-    	return (remoteAdapter != null);
-    }
-        
-    /**
-     * Returns the implementation of ISystemViewElement for the given
-     * object.  Returns null if the adapter is not defined or the
-     * object is not adaptable.
-     */
-    protected ISystemViewElementAdapter getViewAdapter(Object o) 
-    {
-    	return SystemAdapterHelpers.getViewAdapter(o);
-    }
-    
-    /**
-     * Returns the implementation of ISystemRemoteElement for the given
-     * object.  Returns null if this object does not adaptable to this.
-     */
-    protected ISystemRemoteElementAdapter getRemoteAdapter(Object o) 
-    {
-    	return SystemAdapterHelpers.getRemoteAdapter(o);
-    }
-    
-    public String toString()
-    {
-    	return name;
-    }    
-}
-
- 
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemDeleteDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemDeleteDialog.java
deleted file mode 100644
index 69dec1e92..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemDeleteDialog.java
+++ /dev/null
@@ -1,323 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2009 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * Martin Oberhuber (Wind River) - [186640] Add IRSESystemType.testProperty()
- * David McKnight   (IBM)        - [226143] [api][breaking] Make RSE rename/delete dialogs internal
- * David McKnight   (IBM)        - [203361] Deleting multiple target connections misleading
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.dialogs;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.viewers.ColumnLayoutData;
-import org.eclipse.jface.viewers.ColumnPixelData;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.IBasicPropertyConstants;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.SystemWidgetHelpers;
-import org.eclipse.rse.ui.dialogs.SystemPromptDialog;
-import org.eclipse.rse.ui.messages.ISystemMessageLine;
-import org.eclipse.rse.ui.view.ISystemPropertyConstants;
-import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
-import org.eclipse.rse.ui.view.SystemAdapterHelpers;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-
-/**
- * Dialog for confirming resource deletion.
- * <p>
- * This is a re-usable dialog that you can use  directly, or via the {@link org.eclipse.rse.internal.ui.actions.SystemCommonDeleteAction}
- *  action. It asks the user to confirm the deletion of the input selection.
- * <p>If the input objects do not adapt to {@link org.eclipse.rse.ui.view.ISystemViewElementAdapter} or
- *  {@link org.eclipse.rse.ui.view.ISystemRemoteElementAdapter}, then they should implement the
- *  interface {@link org.eclipse.rse.ui.dialogs.ISystemTypedObject} so that their type can be
- *  displayed in this delete confirmation dialog.
- *
- * @see org.eclipse.rse.internal.ui.actions.SystemCommonDeleteAction
- */
-public class SystemDeleteDialog extends SystemPromptDialog
-                                implements ISelectionChangedListener
-{
-    private String warningMessage, warningTip;
-    private String promptLabel;
-    private SystemDeleteTableProvider sdtp;
-    //private Label prompt;
-    private Table table;
-    private TableViewer tableViewer;
-    private GridData tableData;
-    private List _selectedResources;
-
-    // column headers
-	private String columnHeaders[] = {
-		"", //$NON-NLS-1$
-		SystemResources.RESID_DELETE_COLHDG_OLDNAME,
-		SystemResources.RESID_DELETE_COLHDG_TYPE
-	};
-
-	// column layout
-	private ColumnLayoutData columnLayouts[] =
-	{
-		new ColumnPixelData(19, false),
-		new ColumnWeightData(150,150,true),
-		new ColumnWeightData(120,120,true)
-    };
-
-    // give each column a property value to identify it
-	private static String[] tableColumnProperties =
-	{
-		ISystemPropertyConstants.P_OK,
-		IBasicPropertyConstants.P_TEXT,
-		ISystemPropertyConstants.P_TYPE,
-    };
-
-	/**
-	 * Constructor for SystemUpdateConnectionDialog
-	 */
-	public SystemDeleteDialog(Shell shell)
-	{
-		super(shell, SystemResources.RESID_DELETE_TITLE);
-		super.setOkButtonLabel(SystemResources.RESID_DELETE_BUTTON);
-		setHelp(RSEUIPlugin.HELPPREFIX+"ddlt0000"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Create message line. Intercept so we can set msg line of form.
-	 */
-	protected ISystemMessageLine createMessageLine(Composite c)
-	{
-		/*ISystemMessageLine msgLine =*/ super.createMessageLine(c);
-		return fMessageLine;
-	}
-
-	/**
-	 * Specify a warning message to show at the top of the dialog
-	 */
-	public void setWarningMessage(String msg, String tip)
-	{
-		this.warningMessage = msg;
-		this.warningTip = tip;
-	}
-
-	/**
-	 * Specify the text to show for the label prompt. The default is
-	 *  "Delete selected resources?"
-	 */
-	public void setPromptLabel(String text)
-	{
-		this.promptLabel = text;
-	}
-
-	/**
-	 * @see SystemPromptDialog#getInitialFocusControl()
-	 */
-	protected Control getInitialFocusControl()
-	{
-		return tableViewer.getControl();
-	}
-
-	/**
-	 * @see SystemPromptDialog#createInner(Composite)
-	 */
-	protected Control createInner(Composite parent)
-	{
-		// Inner composite
-		int nbrColumns = 2;
-		Composite composite = SystemWidgetHelpers.createComposite(parent, nbrColumns);
-
-        // PROMPT
-        if (promptLabel == null) {
-        	Object input = getInputObject();
-
-        	if (input instanceof IStructuredSelection) {
-        		int size = ((IStructuredSelection)input).size();
-
-        		if (size > 1) {
-        			/*prompt =*/ SystemWidgetHelpers.createLabel(composite, SystemResources.RESID_DELETE_PROMPT, nbrColumns);
-        		}
-        		else {
-        			/*prompt =*/ SystemWidgetHelpers.createLabel(composite, SystemResources.RESID_DELETE_PROMPT_SINGLE, nbrColumns);
-        		}
-        	}
-        	// should never get here
-        	else {
-        		/*prompt =*/ SystemWidgetHelpers.createLabel(composite, SystemResources.RESID_DELETE_PROMPT, nbrColumns);
-        	}
-        }
-		else {
-			/*prompt =*/ SystemWidgetHelpers.createVerbiage(composite, promptLabel, nbrColumns, false, 200);
-		}
-
-        // WARNING
-        if (warningMessage != null)
-        {
-          // filler line
-          SystemWidgetHelpers.createLabel(composite, "", nbrColumns); //$NON-NLS-1$
-		  // create image
-		  Image image = getShell().getDisplay().getSystemImage(SWT.ICON_WARNING);
-		  Label imageLabel = null;
-		  if (image != null)
-		  {
-			 imageLabel = new Label(composite, 0);
-			 image.setBackground(imageLabel.getBackground());
-			 imageLabel.setImage(image);
-			 imageLabel.setLayoutData(new GridData(
-				GridData.HORIZONTAL_ALIGN_CENTER |
-				GridData.VERTICAL_ALIGN_BEGINNING));
-		  }
-          Label warningLabel = SystemWidgetHelpers.createLabel(composite, warningMessage);
-          if (warningTip != null)
-          {
-          	warningLabel.setToolTipText(warningTip);
-          	if (imageLabel!=null) {
-              	imageLabel.setToolTipText(warningTip);
-          	}
-          }
-          // filler line
-          SystemWidgetHelpers.createLabel(composite, "", nbrColumns); //$NON-NLS-1$
-        }
-
-        // TABLE
-        tableViewer = createTableViewer(composite, nbrColumns);
-        createColumns();
-	    tableViewer.setColumnProperties(tableColumnProperties);
-
-        sdtp = new SystemDeleteTableProvider();
-
-		int width = tableData.widthHint;
-		int nbrRows = Math.min(getRows().length,8);
-		int rowHeight = table.getItemHeight() + table.getGridLineWidth();
-		int sbHeight = table.getHorizontalBar().getSize().y;
-		int height = (nbrRows * rowHeight) + sbHeight;
-
-		tableData.heightHint = height;
-		table.setLayoutData(tableData);
-		table.setSize(width, height);
-
-        tableViewer.setLabelProvider(sdtp);
-        tableViewer.setContentProvider(sdtp);
-
-        Object input = getInputObject();
-        tableViewer.setInput(input);
-
-        // check all off
-        TableItem[] items = tableViewer.getTable().getItems();
-        for (int i = 0; i < items.length; i++){
-        	items[i].setChecked(true);
-        }
-        
-		return composite;
-	}
-
-    private TableViewer createTableViewer(Composite parent, int nbrColumns)
-    {
-	   table = new Table(parent, SWT.CHECK  | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER | SWT.HIDE_SELECTION);
-  	   table.setLinesVisible(true);
-  	   tableViewer = new TableViewer(table);
-	   tableData = new GridData();
-	   tableData.horizontalAlignment = GridData.FILL;
-	   tableData.grabExcessHorizontalSpace = true;
-	   tableData.widthHint = 350;
-	   tableData.heightHint = 30;
-	   tableData.verticalAlignment = GridData.CENTER;
-	   tableData.grabExcessVerticalSpace = true;
-	   tableData.horizontalSpan = nbrColumns;
-	   table.setLayoutData(tableData);
-	   return tableViewer;
-    }
-
-    private void createColumns()
-    {
-        TableLayout layout = new TableLayout();
-        table.setLayout(layout);
-        table.setHeaderVisible(true);
-	    for (int i = 0; i < columnHeaders.length; i++)
-	    {
-		   layout.addColumnData(columnLayouts[i]);
-		   TableColumn tc = new TableColumn(table, SWT.NONE,i);
-		   tc.setResizable(columnLayouts[i].resizable);
-		   tc.setText(columnHeaders[i]);
-	    }
-    }
-
-    public void selectionChanged(SelectionChangedEvent event)
-    {
-    }
-
-	/**
-	 * Override of parent. Must pass selected object onto the form for initializing fields.
-	 * Called by SystemDialogAction's default run() method after dialog instantiated.
-	 */
-	public void setInputObject(Object inputObject)
-	{
-		super.setInputObject(inputObject);
-	}
-
-	/**
-	 * Called when user presses OK button.
-	 * Return true to close dialog.
-	 * Return false to not close dialog.
-	 */
-	protected boolean processOK()
-	{
-		_selectedResources = new ArrayList();
-		TableItem[] items = table.getItems();
-		for (int i = 0; i < items.length; i++){
-			if (items[i].getChecked()){
-				SystemDeleteTableRow row = (SystemDeleteTableRow)items[i].getData();
-				_selectedResources.add(row.getElement());
-			}
-		}
-		
-		return true;
-	}
-	
-	public List getSelectedResources()
-	{
-		return _selectedResources;
-	}
-	
-
-	/**
-	 * Returns the rows of deletable items.
-	 */
-	public SystemDeleteTableRow[] getRows()
-	{
-		return (SystemDeleteTableRow[])sdtp.getElements(getInputObject());
-	}
-
-    /**
-     * Returns the implementation of ISystemViewElement for the given
-     * object.  Returns null if the adapter is not defined or the
-     * object is not adaptable.
-     */
-    protected ISystemViewElementAdapter getViewAdapter(Object o)
-    {
-    	return SystemAdapterHelpers.getViewAdapter(o);
-    }
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemDeleteTableProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemDeleteTableProvider.java
deleted file mode 100644
index 90822e9ca..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemDeleteTableProvider.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation. 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * David McKnight   (IBM)        - [226143] [api][breaking] Make RSE rename/delete dialogs internal
- ********************************************************************************/
-
-package org.eclipse.rse.internal.ui.dialogs;
-import java.util.Collection;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IBaseLabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.graphics.Image;
-/**
- * This class is the table provider class for the delete dialog
- */
-public class SystemDeleteTableProvider implements ITableLabelProvider, IStructuredContentProvider
-{
-
-    static final int COLUMN_IMAGE = 0;
-    static final int COLUMN_NAME = 1;
-    static final int COLUMN_TYPE = 2;
-    protected Map imageTable = new Hashtable(20);
-    protected Object[] children = null;
-
-	/**
-	 * Constructor for SystemDeleteTableProvider
-	 */
-	public SystemDeleteTableProvider()
-	{
-		super();
-	}
-
-	private SystemDeleteTableRow getTableRow(Object element)
-	{
-		return (SystemDeleteTableRow)element;
-	}
-
-    private Image getImageFromDescriptor(ImageDescriptor descriptor)
-    {
-    	if (descriptor == null)
-    	  	return null;
-	    //obtain the cached image corresponding to the descriptor
-	    Image image = (Image) imageTable.get(descriptor);
-	    if (image == null)
-	    {
-		  	image = descriptor.createImage();
-		  	imageTable.put(descriptor, image);
-	    }
-    	//System.out.println("...image = " + image);
-	    return image;
-    }
-
-	/**
-	 * @see ITableLabelProvider#getColumnImage(java.lang.Object, int)
-	 */
-	public Image getColumnImage(Object element, int column)
-	{
-		if (column == COLUMN_IMAGE)
-		  	return getImageFromDescriptor(getTableRow(element).getImageDescriptor());
-		else
-		  	return null;
-	}
-
-	/**
-	 * @see ITableLabelProvider#getColumnText(java.lang.Object, int)
-	 */
-	public String getColumnText(Object element, int column)
-	{
-		String text = ""; //$NON-NLS-1$
-		if (column == COLUMN_NAME)
-		  	text = getTableRow(element).getName();
-		else if (column == COLUMN_TYPE)
-		  	text = getTableRow(element).getType();
-		//System.out.println("INSIDE GETCOLUMNTEXT: " + column + ", " + text + ", " + getTableRow(element));
-		return text;
-	}
-
-	/**
-	 * @see IBaseLabelProvider#addListener(ILabelProviderListener)
-	 */
-	public void addListener(ILabelProviderListener listener)
-	{
-	}
-
-	/**
-	 * @see IBaseLabelProvider#dispose()
-	 */
-	public void dispose()
-	{
-		// The following we got from WorkbenchLabelProvider
-        if (imageTable != null)
-        {
-	      	Collection imageValues = imageTable.values();
-	      	if (imageValues!=null)
-	      	{
-	        	Iterator images = imageValues.iterator();
-	        	if (images!=null)
-	          		while (images.hasNext())
-    	        		((Image)images.next()).dispose();
-    	    	imageTable = null;
-	      	}
-        }
-	}
-
-	/**
-	 * @see IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)
-	 */
-	public boolean isLabelProperty(Object element, String property)
-	{
-		return true;
-	}
-
-	/**
-	 * @see IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
-	 */
-	public void removeListener(ILabelProviderListener listener)
-	{
-	}
-
-	/**
-	 * Return rows. Input must be an IStructuredSelection.
-	 */
-	public Object[] getElements(Object inputElement)
-	{
-        if (children == null)
-        {
-		  	IStructuredSelection iss = (IStructuredSelection)inputElement;
-		  	children = new SystemDeleteTableRow[iss.size()];
-		  	Iterator i = iss.iterator();
-		  	int idx = 0;
-		  	while (i.hasNext())
-		  	{
-		    	children[idx] = new SystemDeleteTableRow(i.next(), idx);
-		    	idx++;
-		  	}
-        }
-		return children;
-	}
-
-	/**
-	 * Return the 0-based row number of the given element.
-	 */
-	public int getRowNumber(SystemDeleteTableRow row)
-	{
-		return row.getRowNumber();
-	}
-
-	/**
-	 *
-	 */
-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
-	{
-	}
-
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemDeleteTableRow.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemDeleteTableRow.java
deleted file mode 100644
index b0cde89c1..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemDeleteTableRow.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2008 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
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [168870] refactor org.eclipse.rse.core package of the UI plugin
- * David McKnight   (IBM)        - [226143] [api][breaking] Make RSE rename/delete dialogs internal
- ********************************************************************************/
-
-package org.eclipse.rse.internal.ui.dialogs;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.rse.core.filters.ISystemFilterPoolReference;
-import org.eclipse.rse.internal.ui.view.SystemViewResources;
-import org.eclipse.rse.ui.ISystemIconConstants;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.dialogs.ISystemTypedObject;
-import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement;
-import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter;
-import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
-import org.eclipse.rse.ui.view.SystemAdapterHelpers;
-
-
-/**
- * Represents one row in the table in the SystemDeleteDialog dialog.
- */
-public class SystemDeleteTableRow 
-{
-	
-	private Object element;
-	private String name;
-	private String type;	
-	private ImageDescriptor imageDescriptor;
-	private ISystemViewElementAdapter adapter;
-	private ISystemRemoteElementAdapter remoteAdapter;
-	private int rowNbr = 0;
-	
-    public SystemDeleteTableRow(Object element, int rowNbr)
-    {
-    	if (element instanceof SystemSimpleContentElement)
-    	  element = ((SystemSimpleContentElement)element).getData();
-    	this.element = element;    	
-        this.adapter = getViewAdapter(element);    	
-        this.remoteAdapter = getRemoteAdapter(element);
-        this.rowNbr = rowNbr;
-    	//this.oldName = getAdapter(element).getText(element);
-    	if (adapter != null)
-    	  this.name = adapter.getName(element);
-    	else
-    	{
-    		if (element instanceof ISystemTypedObject)
-    		  this.name = ((ISystemTypedObject)element).getName();
-    		else if (element instanceof IResource)
-    		  this.name = ((IResource)element).getName();
-    	}
-    	ISystemViewElementAdapter typeAdapter = adapter;
-    	Object typeElement = element;
-    	if (typeElement instanceof ISystemFilterPoolReference)
-    	{
-    	  typeElement = ((ISystemFilterPoolReference)typeElement).getReferencedFilterPool();
-    	  typeAdapter = getViewAdapter(typeElement);
-    	}
-    	if (typeAdapter != null)
-    	  this.type = typeAdapter.getType(typeElement);
-    	else
-    	{
-    		if (element instanceof ISystemTypedObject)
-    		  this.type = ((ISystemTypedObject)element).getType();
-    		else if (element instanceof IResource)
-    		{
-    			if ((element instanceof IFolder) || (element instanceof IProject))
-    			  this.type = SystemViewResources.RESID_PROPERTY_FILE_TYPE_FOLDER_VALUE;
-    			else
-    			  this.type = SystemViewResources.RESID_PROPERTY_FILE_TYPE_FILE_VALUE;
-    		}
-    		else
-    	      this.type = element.getClass().getName();
-    	}
-    	if (adapter != null)
-    	  this.imageDescriptor = adapter.getImageDescriptor(element);
-    	else if (element instanceof ISystemTypedObject)
-    	  this.imageDescriptor = ((ISystemTypedObject)element).getImageDescriptor();
-    	else if (element instanceof IFolder)
-		  this.imageDescriptor = //PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_OBJ_FOLDER); 
-		  	RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_FOLDER_ID);
-    	else if (element instanceof IFile)
-    	  this.imageDescriptor = RSEUIPlugin.getDefault().getWorkbench().getEditorRegistry().getImageDescriptor(name);
-    }
-    
-    /**
-     * Return the name of the item to be deleted
-     * @return display name of the item.
-     */
-    public String getName()
-    {
-    	return name;
-    }
-    /**
-     * Return the resource type of the item to be deleted
-     * @return resource type of the item
-     */
-    public String getType()
-    {
-    	return type;
-    }
-    /**
-     * Return the 0-based row number of this item
-     * @return 0-based row number
-     */
-    public int getRowNumber()
-    {
-    	return rowNbr;
-    }
-
-	/**
-	 * Returns an image descriptor for the image. More efficient than getting the image.
-	 */
-	public ImageDescriptor getImageDescriptor()
-	{
-    	return imageDescriptor;
-    }
-    
-    /**
-     * Get the input object this row represents
-     */
-    public Object getElement()
-    {
-    	return element;
-    }
-    /**
-     * Get the input object adapter for the input object this row represents
-     */
-    public ISystemViewElementAdapter getViewAdapter()
-    {
-    	return adapter;
-    }
-    /**
-     * Get the input object remote adapter for the input object this row represents
-     */
-    public ISystemRemoteElementAdapter getRemoteAdapter()
-    {
-    	return remoteAdapter;
-    }
-    /**
-     * Return true if this is a remote object
-     */
-    public boolean isRemote()
-    {
-    	return (remoteAdapter != null);
-    }
-        
-    /**
-     * Returns the implementation of ISystemViewElement for the given
-     * object.  Returns null if the adapter is not defined or the
-     * object is not adaptable.
-     */
-    protected ISystemViewElementAdapter getViewAdapter(Object o) 
-    {
-    	return SystemAdapterHelpers.getViewAdapter(o);
-    }
-    
-    /**
-     * Returns the implementation of ISystemRemoteElement for the given
-     * object.  Returns null if this object does not adaptable to this.
-     */
-    protected ISystemRemoteElementAdapter getRemoteAdapter(Object o) 
-    {
-    	return SystemAdapterHelpers.getRemoteAdapter(o);
-    }
-    
-    public String toString()
-    {
-    	return name;
-    }    
-
-
-    /* THESE CAUSE GRIEF IF TWO OBJECTS WITH SAME NAME ARE SHOWN
-    public boolean equals(Object o)
-    {
-        if (o instanceof SystemRenameTableRow)
-          return ((SystemRenameTableRow)o).getOldName().equalsIgnoreCase(getOldName());
-        else if (o instanceof SystemDeleteTableRow)
-          return ((SystemDeleteTableRow)o).getOldName().equalsIgnoreCase(getOldName());
-        else if (o instanceof String)
-          return ((String)o).equalsIgnoreCase(getOldName());
-        else
-          return super.equals(o);
-    }
-    public int hashCode()
-    {
-        return getOldName().hashCode();
-    }
-    */      
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemRenameDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemRenameDialog.java
deleted file mode 100644
index d5af9af26..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemRenameDialog.java
+++ /dev/null
@@ -1,696 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2008 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * Martin Oberhuber (Wind River) - [168870] refactor org.eclipse.rse.core package of the UI plugin
- * David McKnight   (IBM)        - [226143] [api][breaking] Make RSE rename/delete dialogs internal
- * David McKnight   (IBM)        - [242714] Esc on Multiple Rename Dialog doesn't close the dialog
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.dialogs;
-import java.util.Hashtable;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.ColumnLayoutData;
-import org.eclipse.jface.viewers.ColumnPixelData;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.IBasicPropertyConstants;
-import org.eclipse.jface.viewers.ICellEditorListener;
-import org.eclipse.jface.viewers.ICellModifier;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.services.clientserver.messages.SystemMessage;
-import org.eclipse.rse.ui.ISystemMessages;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.SystemBasePlugin;
-import org.eclipse.rse.ui.SystemWidgetHelpers;
-import org.eclipse.rse.ui.dialogs.SystemPromptDialog;
-import org.eclipse.rse.ui.messages.ISystemMessageLine;
-import org.eclipse.rse.ui.validators.ISystemValidator;
-import org.eclipse.rse.ui.validators.ISystemValidatorUniqueString;
-import org.eclipse.rse.ui.validators.ValidatorConnectionName;
-import org.eclipse.rse.ui.validators.ValidatorUniqueString;
-import org.eclipse.rse.ui.view.ISystemPropertyConstants;
-import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.FocusListener;
-import org.eclipse.swt.events.TraverseEvent;
-import org.eclipse.swt.events.TraverseListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-
-
-/**
- * Dialog for renaming multiple resources.
- * <p>
- * This is a re-usable dialog that you can use  directly, or via the {@link org.eclipse.rse.internal.ui.actions.SystemCommonRenameAction}
- *  action.
- * <p>
- * To use this dialog, you must call setInputObject with a StructuredSelection of the objects to be renamed.
- * If those objects adapt to {@link org.eclipse.rse.ui.view.ISystemRemoteElementAdapter} or
- * {@link org.eclipse.rse.ui.view.ISystemRemoteElementAdapter}, the dialog will offer built-in error checking.
- * <p>
- * If the input objects do not adapt to org.eclipse.rse.ui.view.ISystemRemoteElementAdapter or ISystemViewElementAdapter, then you
- * should call {@link #setNameValidator(org.eclipse.rse.ui.validators.ISystemValidator)} to
- * specify a validator that is called to verify the typed new name is valid. Further, to show the type value
- * of the input objects, they should implement {@link org.eclipse.rse.ui.dialogs.ISystemTypedObject}.
- * <p>
- * This dialog does not do the actual renames. Rather, it will return an array of the user-typed new names. These
- * are queriable via {@link #getNewNames()}, after testing that {@link #wasCancelled()} is false. The array entries
- * will match the input order.
- *
- * @see org.eclipse.rse.internal.ui.actions.SystemCommonRenameAction
- */
-public class SystemRenameDialog extends SystemPromptDialog
-                                implements
-                                           ISelectionChangedListener,
-                                           TraverseListener,
-                                           ICellEditorListener, Runnable, FocusListener
-{
-
-    private SystemMessage errorMessage;
-    private TextCellEditor cellEditor;
-    private int currRow = 0;
-    private GridData tableData = null;
-    private boolean ignoreSelection = false;
-    private Hashtable uniqueNameValidatorPerParent = new Hashtable();
-
-    private String verbiage;
-
-    private SystemRenameTableProvider srtp;
-    private Table table;
-    private TableViewer tableViewer;
-    private static final int COLUMN_NEWNAME = SystemRenameTableProvider.COLUMN_NEWNAME;
-	private String columnHeaders[] = {
-		"",SystemResources.RESID_RENAME_COLHDG_OLDNAME, //$NON-NLS-1$
-		   SystemResources.RESID_RENAME_COLHDG_NEWNAME,
-		   SystemResources.RESID_RENAME_COLHDG_TYPE
-	};
-	private ColumnLayoutData columnLayouts[] =
-	{
-		new ColumnPixelData(19, false),
-		new ColumnWeightData(125,125,true),
-		new ColumnWeightData(150,150,true),
-		new ColumnWeightData(120,120,true)
-    };
-    // give each column a property value to identify it
-	private static String[] tableColumnProperties =
-	{
-		ISystemPropertyConstants.P_ERROR,
-		IBasicPropertyConstants.P_TEXT,
-		ISystemPropertyConstants.P_NEWNAME,
-		ISystemPropertyConstants.P_TYPE,
-    };
-	// inner class to support cell editing
-	private ICellModifier cellModifier = new ICellModifier()
-	{
-		public Object getValue(Object element, String property)
-		{
-			SystemRenameTableRow row = (SystemRenameTableRow)element;
-			String value = ""; //$NON-NLS-1$
-			if (property.equals(IBasicPropertyConstants.P_TEXT))
-			  value = row.getName();
-			else
-			  value = row.getNewName();
-			//System.out.println("inside getvalue: " + row + "; " + property + " = " + value);
-			return value;
-		}
-
-		public boolean canModify(Object element, String property)
-		{
-			boolean modifiable = property.equals(ISystemPropertyConstants.P_NEWNAME);
-			if (modifiable)
-			{
-				if ((cellEditor != null) && (cellEditor.getControl() != null))
-				{
-					SystemRenameTableRow row = (SystemRenameTableRow)element;
-					int limit = row.getNameLengthLimit();
-					if (limit == -1)
-						limit = 1000;
-					((Text)cellEditor.getControl()).setTextLimit(limit);
-				}
-			}
-			return modifiable;
-		}
-		/**
-		 * Modifies a marker as a result of a successfully completed direct editing.
-		 */
-		public void modify(Object element, String property, Object value)
-		{
-			SystemRenameTableRow row = (SystemRenameTableRow)(((TableItem)element).getData());
-			//System.out.println("inside modify: " + row+"; "+property+", "+value);
-			if (property.equals(ISystemPropertyConstants.P_NEWNAME))
-			{
-			  row.setNewName((String)value);
-			  tableViewer.update(row, null);
-			}
-		}
-	};
-
-
-	/**
-	 * Constructor for SystemRenameDialog
-	 */
-	public SystemRenameDialog(Shell shell)
-	{
-		this(shell, SystemResources.RESID_RENAME_TITLE);
-	}
-	/**
-	 * Constructor when you have your own title
-	 */
-	public SystemRenameDialog(Shell shell, String title)
-	{
-		super(shell, title);
-
-		//pack();
-		setHelp(RSEUIPlugin.HELPPREFIX+"drnm0000"); //$NON-NLS-1$
-	}
-	/**
-	 * Set the verbiage to show above the table. The default is "Enter new name for each resource"
-	 */
-	public void setVerbiage(String verbiage)
-	{
-		this.verbiage = verbiage;
-	}
-    /**
-     * Set the validator for the new name,as supplied by the adaptor for name checking.
-     * Overrides the default which is to query it from the object's adapter.
-     */
-    public void setNameValidator(ISystemValidator nameValidator)
-    {
-    }
-
-	/**
-	 * Create message line. Intercept so we can set msg line of form.
-	 */
-	protected ISystemMessageLine createMessageLine(Composite c)
-	{
-		return fMessageLine;
-	}
-
-
-	/**
-	 * @see SystemPromptDialog#getInitialFocusControl()
-	 */
-	protected Control getInitialFocusControl()
-	{
-		SystemRenameTableRow[] rows = getRows();
-	   	tableViewer.setSelection(new StructuredSelection(rows[0]),true);
-		tableViewer.editElement(rows[0], COLUMN_NEWNAME);
-		return null;
-	}
-
-	/**
-	 * @see SystemPromptDialog#createInner(Composite)
-	 */
-	protected Control createInner(Composite parent)
-	{
-		// Inner composite
-		int nbrColumns = 1;
-		Composite composite = SystemWidgetHelpers.createComposite(parent, nbrColumns);
-
-		if (verbiage != null)
-			SystemWidgetHelpers.createVerbiage(composite, verbiage, nbrColumns, false, 200);
-		else
-			SystemWidgetHelpers.createVerbiage(composite, SystemResources.RESID_RENAME_VERBIAGE, nbrColumns, false, 200);
-
-        table = createTable(composite);
-        tableViewer = new TableViewer(table);
-        createColumns();
-	    tableViewer.setColumnProperties(tableColumnProperties);
-	    tableViewer.setCellModifier(cellModifier);
-	    CellEditor editors[] = new CellEditor[columnHeaders.length];
-	    cellEditor = new TextCellEditor(table);
-	    cellEditor.addListener(this);
-	    editors[COLUMN_NEWNAME] = cellEditor;
-	    tableViewer.setCellEditors(editors);
-	    cellEditor.getControl().addTraverseListener(this);
-	    //System.out.println("CELL EDITOR CONTROL: " + cellEditor.getControl());
-
-        srtp = new SystemRenameTableProvider();
-	    int width = tableData.widthHint;
-	    int nbrRows = Math.min(getRows().length,8);
-	    int rowHeight = table.getItemHeight() + table.getGridLineWidth();
-        int sbHeight = table.getHorizontalBar().getSize().y;
-	    int height = (nbrRows * rowHeight) + sbHeight;
-	    //System.out.println("#rows = "+nbrRows+", sbHeight = " + sbHeight+", totalHeight="+height);
-	    tableData.heightHint = height;
-	    table.setLayoutData(tableData);
-	    table.setSize(width, height);
-        tableViewer.setLabelProvider(srtp);
-        tableViewer.setContentProvider(srtp);
-        //System.out.println("Input Object: "+getInputObject());
-        tableViewer.setInput(getInputObject());
-
-        tableViewer.addSelectionChangedListener(this);
-        tableViewer.getTable().addFocusListener(this);
-
-		// test if we need a unique name validator
-		Shell shell = getShell();
-		Display display = shell.getDisplay();
-		if (display != null)
-		  display.asyncExec(this);
-		else
-          run();
-
-		return composite;
-	}
-
-
-    private Table createTable(Composite parent)
-    {
-	   //table = new Table(parent, SWT.H_SCROLL | SWT.V_SCROLL | SWT.SINGLE | SWT.BORDER);
-	   table = new Table(parent, SWT.H_SCROLL | SWT.V_SCROLL | SWT.SINGLE | SWT.BORDER | SWT.FULL_SELECTION | SWT.HIDE_SELECTION);
-  	   table.setLinesVisible(true);
-	   tableData = new GridData();
-	   tableData.horizontalAlignment = GridData.FILL;
-	   tableData.grabExcessHorizontalSpace = true;
-	   tableData.widthHint = 450;
-	   tableData.heightHint= 30;
-	   tableData.verticalAlignment = GridData.CENTER;
-	   tableData.grabExcessVerticalSpace = true;
-	   table.setLayoutData(tableData);
-
-	   //table.addTraverseListener(this);
-	   //getShell().addTraverseListener(this);
-
-
-	   return table;
-    }
-    private void createColumns()
-    {
-        TableLayout layout = new TableLayout();
-        table.setLayout(layout);
-        table.setHeaderVisible(true);
-	    for (int i = 0; i < columnHeaders.length; i++)
-	    {
-		   layout.addColumnData(columnLayouts[i]);
-		   TableColumn tc = new TableColumn(table, SWT.NONE,i);
-		   tc.setResizable(columnLayouts[i].resizable);
-		   tc.setText(columnHeaders[i]);
-		   //tc.addSelectionListener(headerListener);
-	    }
-    }
-    public void selectionChanged(SelectionChangedEvent event)
-    {
-		//System.out.println("Selection changed. ignoreSelection? "+ignoreSelection);
-    	if (ignoreSelection)
-    	  return;
-	    IStructuredSelection selection = (IStructuredSelection) event.getSelection();
-	    if (selection.isEmpty())
-	    {
-	      currRow = -1;
-		  return;
-	    }
-	    SystemRenameTableRow selectedRow = (SystemRenameTableRow)selection.getFirstElement();
-	    int rowIdx = srtp.getRowNumber(selectedRow);
-	    if (rowIdx == currRow)
-	      return;
-    	currRow = rowIdx;
-		tableViewer.editElement(getRows()[rowIdx], COLUMN_NEWNAME);
-    }
-	/**
-	 * Override of parent. Must pass selected object onto the form for initializing fields.
-	 * Called by SystemDialogAction's default run() method after dialog instantiated.
-	 */
-	public void setInputObject(Object inputObject)
-	{
-		//System.out.println("INSIDE SETINPUTOBJECT: " + inputObject);
-		super.setInputObject(inputObject);
-	}
-
-	/**
-	 * Called when user presses OK button.
-	 * This does not do the actual renames, but rather updates the new name array.
-	 * You need to query this via {@link #getNewNames()}, after ensuring the dialog was not
-	 *  cancelled by calling {@link #wasCancelled()}.
-	 */
-	protected boolean processOK()
-	{
-		// the following is for defect 41565 where the changed name is not used when enter pressed after typing
-		if ((currRow >=0) && (currRow <= (getRows().length - 1)))
-	    {
-	    	String newName = ((Text)cellEditor.getControl()).getText();
-	    	//System.out.println("Testing. newName = "+newName);
-	    	getRows()[currRow].setNewName(newName);
-	    }
-	    //else
-	    //  System.out.println("currRow = "+currRow);
-
-		boolean closeDialog = verify();
-		if (closeDialog)
-		{
-		}
-		return closeDialog;
-	}
-	/**
-	 * Verifies all input.
-	 * @return true if there are no errors in the user input
-	 */
-	public boolean verify()
-	{
-		SystemMessage errMsg = null;
-		SystemMessage firstErrMsg = null;
-		SystemRenameTableRow firstErrRow = null;
-		clearErrorMessage();
-		SystemRenameTableRow[] rows = getRows();
-		Vector newNames = new Vector();
-		// first, clear pending errors...
-		for (int idx=0; (idx<rows.length); idx++)
-			rows[idx].setErrorMessage(null);
-		// check 1: all entries have a new name, and the new name is unique for this list.
-		for (int idx=0; (firstErrMsg==null) && (idx<rows.length); idx++)
-		//for (int idx=0; (idx<rows.length); idx++)
-		{
-			errMsg = null;
-			String oldName = rows[idx].getName();
-			String newName = rows[idx].getNewName();
-			String canonicalNewName = rows[idx].getCanonicalNewName(); // defect 42145
-			//if (oldName.equalsIgnoreCase(newName)) // does not consider case for linux or unix or quoted names on iseries
-			if (rows[idx].newNameEqualsOldName())
-				errMsg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_RENAME_OLDEQUALSNEW).makeSubstitution(oldName);
-		     	//errMsg = SystemMessage.sub(RSEUIPlugin.getString(MSG_VALIDATE_RENAME_OLDEQUALSNEW),SystemMessage.MSG_SUB1,newName);
-			//else if (newNames.contains(newName)) defect 42145
-			else if (newNames.contains(canonicalNewName))
-				errMsg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_RENAME_NOTUNIQUE).makeSubstitution(newName);
-             	//errMsg = SystemMessage.sub(RSEUIPlugin.getString(MSG_VALIDATE_RENAME_NOTUNIQUE),SystemMessage.MSG_SUB1,newName);
-			else
-			{
-           	 	ISystemValidator nameValidator = rows[idx].getNameValidator();
-           	 	if (nameValidator != null)
-           	 		errMsg = nameValidator.validate(newName);
-           	 	if (errMsg == null)
-           	 	{
-           	 		ValidatorUniqueString vun = rows[idx].getUniqueNameValidator();
-           	 		if (vun != null)
-           	 			errMsg = vun.validate(newName);
-           	 	}
-           	 	if ((errMsg == null) && (rows[idx].getElement() instanceof IHost))
-           	 	{
-           	 		boolean ok = ValidatorConnectionName.validateNameNotInUse(newName, getShell());
-           	 		if (!ok)
-           	 			errMsg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_OPERATION_CANCELLED);
-           	 	}
-
-			}
-			if (errMsg == null)
-			{
-				//newNames.addElement(newName);
-				newNames.addElement(canonicalNewName); // defect 42145
-			}
-			if (errMsg != null)
-			{
-				firstErrMsg = errMsg;
-				firstErrRow = rows[idx];
-			}
-			rows[idx].setErrorMessage(errMsg); // todo: convert to handle SystemMessage object
-		}
-		if (firstErrMsg != null)
-		{
-			setErrorMessage(firstErrMsg);
-			tableViewer.update(rows,null);
-			tableViewer.setSelection(new StructuredSelection(firstErrRow),true);
-			tableViewer.editElement(firstErrRow,COLUMN_NEWNAME);
-		}
-		return (firstErrMsg == null);
-	}
-
-  	/**
-	 * This hook method is called whenever the text changes in the input field.
-	 * The default implementation delegates the request to an <code>ISystemValidator</code> object.
-	 * If the <code>ISystemValidator</code> reports an error the error message is displayed
-	 * in the Dialog's message line.
-	 * @see #setNameValidator(ISystemValidator)
-	 */
-	protected SystemMessage validateNameInput()
-	{
-	    errorMessage= null;
-	    if (errorMessage == null)
-	      clearErrorMessage();
-	    else
-		  setErrorMessage(errorMessage);
-		setPageComplete();
-		return errorMessage;
-	}
-
-
-	/**
-	 * This method can be called by the dialog or wizard page host, to decide whether to enable
-	 * or disable the next, final or ok buttons. It returns true if the minimal information is
-	 * available and is correct.
-	 */
-	public boolean isPageComplete()
-	{
-		boolean pageComplete = false;
-		if (errorMessage == null)
-		  pageComplete = true;
-		return pageComplete;
-	}
-
-	/**
-	 * Inform caller of page-complete status of this form
-	 */
-	public void setPageComplete()
-	{
-		setPageComplete(isPageComplete());
-	}
-
-    /**
-     * Required by TraverseListener.
-     * We want to know when the tab key is pressed so we can give edit focus to the next name
-     */
-    public void keyTraversed(TraverseEvent e)
-    {
-    	int detail = e.detail;
-    	//System.out.println("in keyTraversed: " + keycode + ", " + detail + ", " + doit);
-    	e.doit = false;
-    	ignoreSelection = true;
-
-
-    	//System.out.println("...Key pressed. currRow = "+currRow);
-
-    	// DEFECT 41807 STATED USERS SHOULD BE ALLOWED TO TAB TO THE BUTTONS
-    	if (detail == SWT.TRAVERSE_TAB_NEXT)
-    	{
-    	  if (currRow != getRows().length-1)
-    	  {
-    	    ++currRow;
-    	    //System.out.println("...D TAB pressed. currRow = "+currRow);
-	   	    //tableViewer.setSelection(new StructuredSelection(getRows()[currRow]),true);
-		    tableViewer.editElement(getRows()[currRow], COLUMN_NEWNAME);
-    	  }
-		  else
-		  {
-		    tableViewer.editElement(getRows()[0], COLUMN_NEWNAME);
-		  	currRow = 0;
-		  	e.doit = true;
-		  }
-    	}
-    	else if (detail == SWT.TRAVERSE_TAB_PREVIOUS)
-    	{
-    	  if (currRow != 0)
-    	  {
-    	  	if (currRow > 0)
-    	      --currRow;
-    	    else
-    	      currRow = 0;
-    	    //System.out.println("...D BACKTAB pressed. currRow = "+currRow);
-	   	    //tableViewer.setSelection(new StructuredSelection(getRows()[currRow]),true);
-		    tableViewer.editElement(getRows()[currRow], COLUMN_NEWNAME);
-    	  }
-    	  else
-    	  {
-		    tableViewer.editElement(getRows()[getRows().length-1], COLUMN_NEWNAME);
-    	    currRow = getRows().length-1;
-    	    e.doit = true;
-    	  }
-    	}
-    	else if (detail == SWT.TRAVERSE_ESCAPE || e.detail == SWT.TRAVERSE_RETURN) {
-			e.doit = false;
-		}
-    	else
-    	  e.doit = true;
-    	ignoreSelection = false;
-    }
-
-	/**
-	 * Returns the rows of rename items.
-	 */
-	public SystemRenameTableRow[] getRows()
-	{
-		return (SystemRenameTableRow[])srtp.getElements(getInputObject());
-	}
-
-	/**
-	 * Returns an array of the new names.
-	 */
-	public String[] getNewNames()
-	{
-		SystemRenameTableRow[] rows = getRows();
-		String[] names = new String[rows.length];
-		for (int idx=0; idx<rows.length; idx++)
-		   names[idx] = rows[idx].getNewName();
-		return names;
-	}
-
-	// CELL EDITOR METHODS
-	public void applyEditorValue()
-	{
-		//System.out.println("CELLEDITOR: INSIDE APPLYEDITORVALUE");
-	}
-	public void cancelEditor()
-	{
-		//System.out.println("CELLEDITOR: INSIDE CANCELEDITOR");
-	}
-	public void editorValueChanged(boolean oldValidState,boolean newValidState)
-	{
-		//System.out.println("CELLEDITOR: INSIDE EDITORVALUECHANGED: "+oldValidState+","+newValidState);
-	}
-
-	/**
-	 * Runnable method
-	 */
-	public void run()
-	{
-		SystemRenameTableRow[] rows = getRows();
-        ValidatorUniqueString uniqueNameValidator = null;
-        Object inputElement = null;
-        ISystemValidator nameValidator = null;
-		for (int idx=0; idx<rows.length; idx++)
-		{
-           nameValidator = rows[idx].getNameValidator();
-           inputElement = rows[idx].getElement();
-		   uniqueNameValidator = setUniqueNameValidator(inputElement, nameValidator);
-		   rows[idx].setUniqueNameValidator(uniqueNameValidator);
-		}
-	}
-
-	/**
-	 * Given an input element and externally-suppplied name validator for it, determine if we
-	 *  need to augment that validator with one that will check for uniqueness, and if so
-	 *  create and register that uniqueness validator
-	 */
-	protected ValidatorUniqueString setUniqueNameValidator(Object inputElement, ISystemValidator nameValidator)
-	{
-		ValidatorUniqueString uniqueNameValidator = null;
-		ISystemRemoteElementAdapter ra = getRemoteAdapter(inputElement);
-        boolean debug = false;
-        String parentName = null;
-		if (ra != null)
-		  parentName = ra.getAbsoluteParentName(inputElement);
-		if ((ra != null) && (parentName != null))
-		{
-			uniqueNameValidator = (ValidatorUniqueString)uniqueNameValidatorPerParent.get(parentName);
-			if (uniqueNameValidator != null)
-			{
-			  if (debug)
-		        System.out.println("Existing name list found for parent " + parentName); //$NON-NLS-1$
-		      return uniqueNameValidator;
-			}
-		    else if (debug)
-		      System.out.println("No existing name list found for parent " + parentName); //$NON-NLS-1$
-		}
-		if ((ra != null) && (parentName != null))
-		{
-           String[] names = null;
-           boolean caseSensitive = ra.getSubSystem(inputElement).getSubSystemConfiguration().isCaseSensitive();
-           boolean needUniqueNameValidator = !(nameValidator instanceof ISystemValidatorUniqueString);
-           if (!needUniqueNameValidator)
-           {
-           	 String[] existingNames = ((ISystemValidatorUniqueString)nameValidator).getExistingNamesList();
-		  	 needUniqueNameValidator = ((existingNames == null) || (existingNames.length==0));
-           }
-		   if (needUniqueNameValidator)
-		   {
-    		  // Set the busy cursor to all shells.
-    		  super.setBusyCursor(true);
-		  	  try {
-		  	         names = ra.getRemoteParentNamesInUse(inputElement, null);
-		  	  } catch (Exception exc) {SystemBasePlugin.logError("Exception getting parent's child names in rename dialog",exc);}		  			 //$NON-NLS-1$
-		  	  if ((names != null) && (names.length>0))
-		  	  {
-		  		    uniqueNameValidator = new ValidatorUniqueString(names,caseSensitive);
-		            uniqueNameValidator.setErrorMessages(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_NAME_EMPTY),
-		                                                 RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_NAME_NOTUNIQUE));
-		            uniqueNameValidatorPerParent.put(parentName, uniqueNameValidator);
-		            if (debug)
-		            {
-		  		      System.out.println("Name validator set. Names = "); //$NON-NLS-1$
-		  		      for (int idx=0; idx<names.length; idx++)
-		  		         System.out.println("..."+idx+": "+names[idx]); //$NON-NLS-1$ //$NON-NLS-2$
-		            }
-		  	  }
-    		  // Restore cursor
-    		  super.setBusyCursor(false);
-		   }
-		}
-		return uniqueNameValidator;
-	}
-
-    /**
-     * Returns the implementation of ISystemRemoteElement for the given
-     * object.  Returns null if this object does not adaptable to this.
-     */
-    protected ISystemRemoteElementAdapter getRemoteAdapter(Object o)
-    {
-    	if (!(o instanceof IAdaptable))
-          return (ISystemRemoteElementAdapter)Platform.getAdapterManager().getAdapter(o,ISystemRemoteElementAdapter.class);
-    	return (ISystemRemoteElementAdapter)((IAdaptable)o).getAdapter(ISystemRemoteElementAdapter.class);
-    }
-	/* (non-Javadoc)
-	 * @see org.eclipse.swt.events.FocusListener#focusGained(org.eclipse.swt.events.FocusEvent)
-	 */
-	public void focusGained(FocusEvent e)
-	{
-		/*
-		IStructuredSelection selection = (IStructuredSelection)tableViewer.getSelection();
-		if (selection.isEmpty())
-		{
-		  currRow = -1;
-		  return;
-		}
-		SystemRenameTableRow selectedRow = (SystemRenameTableRow)selection.getFirstElement();
-		int rowIdx = srtp.getRowNumber(selectedRow);
-		if (rowIdx == currRow)
-		  return;
-		currRow = rowIdx;
-		tableViewer.editElement(getRows()[rowIdx], COLUMN_NEWNAME);
-		*/
-		//System.out.println("Focus gained");
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.swt.events.FocusListener#focusLost(org.eclipse.swt.events.FocusEvent)
-	 */
-	public void focusLost(FocusEvent e)
-	{
-	}
-
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemRenameTableProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemRenameTableProvider.java
deleted file mode 100644
index f9a448caf..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemRenameTableProvider.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2008 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * David McKnight   (IBM)        - [226143] [api][breaking] Make RSE rename/delete dialogs internal
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.dialogs;
-import java.util.Collection;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.rse.ui.validators.ISystemValidator;
-import org.eclipse.swt.graphics.Image;
-
-/**
- *
- */
-public class SystemRenameTableProvider implements ITableLabelProvider, IStructuredContentProvider
-{
-    static final int COLUMN_ERROR   = 0;
-    static final int COLUMN_OLDNAME = 1;
-    static final int COLUMN_NEWNAME = 2;
-    static final int COLUMN_TYPE    = 3;
-    private Map imageTable = new Hashtable(20);
-    private Object[] children = null;
-	private ISystemValidator inputValidator = null;
-
-	/**
-	 * Constructor for SystemRenameTableProvider
-	 */
-	public SystemRenameTableProvider()
-	{
-		super();
-	}
-
-    /**
-     * Set the validator for the new name,as supplied by the adaptor for name checking.
-     * Overrides the default which is to query it from the object's adapter.
-     */
-    public void setNameValidator(ISystemValidator nameValidator)
-    {
-    	inputValidator = nameValidator;
-    }
-
-	private SystemRenameTableRow getTableRow(Object element)
-	{
-		return (SystemRenameTableRow)element;
-	}
-
-    private Image getImageFromDescriptor(ImageDescriptor descriptor)
-    {
-    	if (descriptor == null)
-    	  return null;
-	    //obtain the cached image corresponding to the descriptor
-	    Image image = (Image) imageTable.get(descriptor);
-	    if (image == null)
-	    {
-		  image = descriptor.createImage();
-		  imageTable.put(descriptor, image);
-	    }
-    	//System.out.println("...image = " + image);
-	    return image;
-    }
-
-	/**
-	 * @see ITableLabelProvider#getColumnImage(java.lang.Object, int)
-	 */
-	public Image getColumnImage(Object element, int column)
-	{
-		if (column == COLUMN_ERROR)
-		{
-		  SystemRenameTableRow row = getTableRow(element);
-		  if (row.getError())
-		  {
-		  	Image errorImage = JFaceResources.getImage(org.eclipse.jface.dialogs.Dialog.DLG_IMG_MESSAGE_ERROR);
-		  	   //RSEUIPlugin.getDefault().getImage(ISystemConstants.ICON_SYSTEM_ERROR_ID);
-		    return errorImage;
-		  }
-		  else
-		    return null;
-		}
-		else if (column == COLUMN_OLDNAME)
-		  return getImageFromDescriptor(getTableRow(element).getImageDescriptor());
-		else
-		  return null;
-	}
-
-	/**
-	 * @see ITableLabelProvider#getColumnText(java.lang.Object, int)
-	 */
-	public String getColumnText(Object element, int column)
-	{
-		String text = ""; //$NON-NLS-1$
-		if (column == COLUMN_OLDNAME)
-		  text = getTableRow(element).getName();
-		else if (column == COLUMN_NEWNAME)
-		  text = getTableRow(element).getNewName();
-		else if (column == COLUMN_TYPE)
-		  text = getTableRow(element).getType();
-		//System.out.println("INSIDE GETCOLUMNTEXT: " + column + ", " + text + ", " + getTableRow(element));
-		return text;
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
-	 */
-	public void addListener(ILabelProviderListener listener)
-	{
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
-	 */
-	public void dispose()
-	{
-		// The following we got from WorkbenchLabelProvider
-        if (imageTable != null)
-        {
-	      Collection imageValues = imageTable.values();
-	      if (imageValues!=null)
-	      {
-	        Iterator images = imageValues.iterator();
-	        if (images!=null)
-	          while (images.hasNext())
-    	        ((Image)images.next()).dispose();
-    	    imageTable = null;
-	      }
-        }
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)
-	 */
-	public boolean isLabelProperty(Object element, String property)
-	{
-		return true;
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
-	 */
-	public void removeListener(ILabelProviderListener listener)
-	{
-	}
-
-	/**
-	 * Return rows. Input must be an IStructuredSelection.
-	 */
-	public Object[] getElements(Object inputElement)
-	{
-        if (children == null)
-        {
-		  IStructuredSelection iss = (IStructuredSelection)inputElement;
-		  children = new SystemRenameTableRow[iss.size()];
-		  Iterator i = iss.iterator();
-		  int idx = 0;
-		  while (i.hasNext())
-		  {
-		    children[idx] = new SystemRenameTableRow(i.next(),idx);
-		    if (inputValidator != null)
-              ((SystemRenameTableRow)children[idx]).setNameValidator(inputValidator);
-		    idx++;
-		  }
-        }
-		return children;
-	}
-
-	/**
-	 *
-	 */
-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
-	{
-
-
-	}
-
-	/**
-	 * Return the 0-based row number of the given element.
-	 */
-	public int getRowNumber(SystemRenameTableRow row)
-	{
-		int matchRow = row.getRowNumber();
-		/*
-		int matchRow = -1;
-		boolean match = false;
-		for (int idx=0; !match && (matchRow<children.length); idx++)
-		{
-		   //match = children[idx].equals(row);
-		   match = (children[idx] == row);
-		   if (match)
-		      matchRow = idx;
-		}
-		*/
-		//System.out.println("getRowNumber for "+row+": "+matchRow);
-		return matchRow;
-	}
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemRenameTableRow.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemRenameTableRow.java
deleted file mode 100644
index a0e0fc9a2..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemRenameTableRow.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2008 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * David McKnight   (IBM)        - [226143] [api][breaking] Make RSE rename/delete dialogs internal
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.dialogs;
-import org.eclipse.rse.services.clientserver.messages.SystemMessage;
-import org.eclipse.rse.ui.validators.ISystemValidator;
-import org.eclipse.rse.ui.validators.ValidatorUniqueString;
-import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
-
-
-
-/**
- * Represents one row in the table in the SystemRenameDialog dialog.
- */
-public class SystemRenameTableRow extends SystemDeleteTableRow
-{
-	private String newName;
-	private SystemMessage errorMsg = null;
-	private ISystemValidator inputValidator = null;
-	private ValidatorUniqueString inputUniqueNameValidator = null;
-	private Object parent;
-	private int nameLengthLimit = -1;
-
-	/**
-	 * Constructor
-	 * @param element that is being displayed in the tree, and which the
-	 *  user selected the rename action. This represents a single item.
-	 */
-    public SystemRenameTableRow(Object element, int rowNbr)
-    {
-    	super(element,rowNbr);
-    	this.newName = getName();
-    	this.inputValidator = getViewAdapter(element).getNameValidator(element);
-		if (inputValidator != null) {
-			  nameLengthLimit = inputValidator.getMaximumNameLength();
-		}
-    }
-
-    /**
-     * Set the new name for this element. Called by the CellModifier
-     *  for the rename dialog.
-     */
-    public void setNewName(String name)
-    {
-    	//System.out.println("Inside setNewName: from " + newName + ", to " + name);
-    	if (name != null)
-    	{
-    	  if (isRemote()) // defect 43173
-    	    newName = trimTrailing(name); // defect 43041
-    	  else
-    	    newName = name.trim();
-    	}
-    	else
-    	  newName = null;
-    }
-
-    /**
-     * Trim leading blanks
-     */
-    public static String trimTrailing(String text)
-    {
-    	return ("."+text).trim().substring(1); //$NON-NLS-1$
-    }
-
-    /**
-     *  Return the new name for this element, as set by setNewName
-     */
-    public String getNewName()
-    {
-    	return newName;
-    }
-
-    /**
-     * Get the parent of this remote object that is being renamed
-     */
-    public Object getParent()
-    {
-    	return parent;
-    }
-
-    /**
-     * Set the parent of this remote object that is being renamed
-     */
-    public void setParent(Object parent)
-    {
-    	this.parent = parent;
-    }
-
-    /**
-     * Get the canonical name of this row. Sometimes, the name alone is not enough to do uniqueness
-     *  checking on. For example, two connections or filter pools can have the same name if they are
-     *  in different profiles. Two iSeries QSYS objects can have the same name if their object types
-     *  are different.
-     * <p>
-     * This method returns a name that can be used for uniqueness checking because it is qualified
-     *  sufficiently to make it unique.
-     * <p>
-     * Defers to the object's adapter
-     */
-    public String getCanonicalNewName()
-    {
-    	// this is all for defect 42145
-    	Object element = super.getElement();
-    	ISystemViewElementAdapter adapter = super.getViewAdapter();
-    	String cName = newName;
-    	if (adapter != null)
-    	  cName = adapter.getCanonicalNewName(element, newName);
-    	else
-    	  cName = newName;
-    	//System.out.println("Inside getCanonicalNewName: newName: " + newName + ", canonical: " + cName);
-    	return cName;
-    }
-    /**
-     * Compares the given new name to this row's current name, taking into consideration case if appropriate.
-     * Defers to the object's adapter
-     */
-    public boolean newNameEqualsOldName()
-    {
-    	Object element = super.getElement();
-    	ISystemViewElementAdapter adapter = super.getViewAdapter();
-    	if (adapter != null)
-    	  return adapter.namesAreEqual(element, newName);
-    	else
-    	  return getName().equals(newName);
-    }
-
-    /**
-     * Return the name length limit, if available via the name validator supplied by the adapter.
-     * Returns -1 if not available.
-     */
-    public int getNameLengthLimit()
-    {
-    	return nameLengthLimit;
-    }
-
-    /**
-     * Set the validator for the new name,as supplied by the adaptor for name checking.
-     * Overrides the default which is to query it from the object's adapter.
-     */
-    public void setNameValidator(ISystemValidator nameValidator)
-    {
-    	inputValidator = nameValidator;
-    }
-
-    /**
-     * Set the uniqueness validator for the new name,as supplied by the remote adaptor.
-     */
-    public void setUniqueNameValidator(ValidatorUniqueString uniqueNameValidator)
-    {
-    	inputUniqueNameValidator = uniqueNameValidator;
-    }
-
-    /**
-     * Return the validator for the new name,as supplied by the adaptor for
-     *  this element type.
-     * <p>
-     * By default queries it from the object's adapter, unless setNameValidator has been
-     * called.
-     */
-    public ISystemValidator getNameValidator()
-    {
-    	return inputValidator;
-    }
-
-    /**
-     * Return the uniqueness validator for the new name,as supplied by the call to setUniqueNameValidator
-     */
-    public ValidatorUniqueString getUniqueNameValidator()
-    {
-    	return inputUniqueNameValidator;
-    }
-
-    /**
-     * Return true if this row is currently in error
-     */
-    public boolean getError()
-    {
-    	return errorMsg != null;
-    }
-    /**
-     * Return text of error if this row is currently in error
-     */
-    public SystemMessage getErrorMessage()
-    {
-    	return errorMsg;
-    }
-    /**
-     * Set error message for this row.
-     * Pass null to clear it.
-     */
-    public void setErrorMessage(SystemMessage errorMsg)
-    {
-    	this.errorMsg = errorMsg;
-    }
-
-    public String toString()
-    {
-    	return getNewName();
-    }
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemResolveFilterStringDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemResolveFilterStringDialog.java
deleted file mode 100644
index f7af4d6c8..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemResolveFilterStringDialog.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2008 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.dialogs;
-import org.eclipse.rse.core.subsystems.ISubSystem;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.internal.ui.view.SystemResolveFilterStringAPIProviderImpl;
-import org.eclipse.rse.internal.ui.view.SystemViewForm;
-import org.eclipse.rse.ui.SystemWidgetHelpers;
-import org.eclipse.rse.ui.dialogs.SystemPromptDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-
-
-
-/**
- * Dialog for testing a filter string. Typically called from a create/update filter string dialog.
- * <p>
- * Caller must supply the subsystem which owns this existing or potential filter string.
- * <p>
- * This dialog contains a dropdown for selecting connections to use in the test. Only connections which
- * contain subsystems with the same parent factory as the given subsystem factory are shown.
- *
- */
-public class SystemResolveFilterStringDialog extends SystemTestFilterStringDialog
-{
-
-	/**
-	 * Constructor
-	 * @param shell The shell to hang the dialog off of
-	 * @param subsystem The contextual subsystem that owns this filter string
-	 * @param filterString The filter string that is to be tested.
-	 */
-	public SystemResolveFilterStringDialog(Shell shell, ISubSystem subsystem, String filterString)
-	{
-	  super(shell, subsystem, filterString);	
-      setShowOkButton(true);	  		
-	}
-	
-	/**
-	 * Constructor when unique title desired
-	 * @param shell The shell to hang the dialog off of
-	 * @param title The title to give the dialog
-	 * @param subsystem The contextual subsystem that owns this filter string
-	 * @param filterString The filter string that is to be tested.
-	 */
-	public SystemResolveFilterStringDialog(Shell shell, String title, ISubSystem subsystem, String filterString)
-	{
-		super(shell, title, subsystem, filterString);			
-        setShowOkButton(true);
-   	}	
-
-
-	/**
-	 * @see SystemPromptDialog#createInner(Composite)
-	 */
-	protected Control createInner(Composite parent)
-	{
-		// Inner composite
-		int gridColumns = 2;
-		Composite composite_prompts = SystemWidgetHelpers.createComposite(parent, gridColumns);	
-
-        // connection selection combo
-        connectionCombo = SystemWidgetHelpers.createConnectionCombo(composite_prompts, null, null, subsystem.getSubSystemConfiguration(),
-                                                                    null, null, subsystem.getHost(), gridColumns, false);
-
-        // Composite promptComposite = composite_prompts;
-        Composite promptComposite = connectionCombo;
-        prompt = SystemWidgetHelpers.createLabel(promptComposite, SystemResources.RESID_TESTFILTERSTRING_PROMPT_LABEL, SystemResources.RESID_TESTFILTERSTRING_PROMPT_TOOLTIP);
-        promptValue = SystemWidgetHelpers.createLabel(promptComposite, SystemResources.RESID_TESTFILTERSTRING_PROMPT_LABEL, SystemResources.RESID_TESTFILTERSTRING_PROMPT_TOOLTIP);
-
-        promptValue.setToolTipText(filterString); // Since the dialog is not resizable, this is the way to show the whole string
-
-        String label = filterString;
-
-        if ( label.length() > 30)
-           label = label.substring(0,30) + " ...";   // Use ... to show that not entire string is displayed //$NON-NLS-1$
-        promptValue.setText(label);
-
-	    GridData data = new GridData();	
-	    data.widthHint =  200;
-	    promptValue.setLayoutData(data);	
-
-		// Tree viewer
-		inputProvider = new SystemResolveFilterStringAPIProviderImpl(subsystem, filterString);		  		
-		tree = new SystemViewForm(getShell(), composite_prompts, SWT.NULL, inputProvider, true, getMessageLine(), gridColumns, 1);
-
-	    // add selection listeners
-		//tree.addSelectionChangedListener(this);				
-        connectionCombo.addSelectionListener(this);
-
-		return composite_prompts;
-	} // end createInner()
-
-
-} // end class SystemResolveFilterStringDialog
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemTestFilterStringDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemTestFilterStringDialog.java
deleted file mode 100644
index b3c481c23..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemTestFilterStringDialog.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2008 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
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
- * Martin Oberhuber (Wind River) - [175680] Deprecate obsolete ISystemRegistry methods
- * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
- ********************************************************************************/
-
-package org.eclipse.rse.internal.ui.dialogs;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.rse.core.RSECorePlugin;
-import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.core.model.ISystemRegistry;
-import org.eclipse.rse.core.subsystems.ISubSystem;
-import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.internal.ui.view.SystemTestFilterStringAPIProviderImpl;
-import org.eclipse.rse.internal.ui.view.SystemViewForm;
-import org.eclipse.rse.ui.SystemWidgetHelpers;
-import org.eclipse.rse.ui.dialogs.SystemPromptDialog;
-import org.eclipse.rse.ui.widgets.SystemHostCombo;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-
-
-
-/**
- * Dialog for testing a filter string. Typically called from a create/update filter string dialog.
- * <p>
- * Caller must supply the subsystem which owns this existing or potential filter string.
- * <p>
- * This dialog contains a dropdown for selecting connections to use in the test. Only connections which
- * contain subsystems with the same parent factory as the given subsystem factory are shown.
- *
- */
-public class SystemTestFilterStringDialog
-       extends SystemPromptDialog
-       implements ISelectionChangedListener, SelectionListener
-{
-	protected ISubSystem subsystem = null;
-	protected ISystemRegistry sr = null;
-	protected String subsystemConfigurationId = null;
-	protected String filterString = null;
-    protected SystemTestFilterStringAPIProviderImpl inputProvider = null;
-	// GUI widgets
-    protected Label prompt, promptValue;
-	protected SystemViewForm tree;
-	protected SystemHostCombo connectionCombo;
-
-	/**
-	 * Constructor
-	 * @param shell The shell to hang the dialog off of
-	 * @param subsystem The contextual subsystem that owns this filter string
-	 * @param filterString The filter string that is to be tested.
-	 */
-	public SystemTestFilterStringDialog(Shell shell, ISubSystem subsystem, String filterString)
-	{
-		this(shell, SystemResources.RESID_TESTFILTERSTRING_TITLE, subsystem, filterString);			
-	}
-	/**
-	 * Constructor when unique title desired
-	 * @param shell The shell to hang the dialog off of
-	 * @param title The title to give the dialog
-	 * @param subsystem The contextual subsystem that owns this filter string
-	 * @param filterString The filter string that is to be tested.
-	 */
-	public SystemTestFilterStringDialog(Shell shell, String title, ISubSystem subsystem, String filterString)
-	{
-		super(shell, title);	
-        setCancelButtonLabel(SystemResources.BUTTON_CLOSE);
-        setShowOkButton(false);		
-		setBlockOnOpen(true); // always modal	
-		this.subsystem = subsystem;
-		this.filterString = filterString;
-		this.subsystemConfigurationId = subsystem.getSubSystemConfiguration().getId();
-		sr = RSECorePlugin.getTheSystemRegistry();
-		setNeedsProgressMonitor(true);
-		//pack();
-	}	
-
-    // ------------------
-    // PUBLIC METHODS...
-    // ------------------
-    // ------------------
-    // PRIVATE METHODS...
-    // ------------------
-	/**
-     * Private method.
-	 * @see SystemPromptDialog#getInitialFocusControl()
-	 */
-	protected Control getInitialFocusControl()
-	{
-		//return tree.getTreeControl();
-		return connectionCombo.getCombo();
-	}
-
-	/**
-     * Private method.
-	 * @see SystemPromptDialog#createInner(Composite)
-	 */
-	protected Control createInner(Composite parent)
-	{
-		// Inner composite
-		int gridColumns = 2;
-		Composite composite_prompts = SystemWidgetHelpers.createComposite(parent, gridColumns);	
-
-        // connection selection combo
-        connectionCombo = SystemWidgetHelpers.createConnectionCombo(composite_prompts, null, null, subsystem.getSubSystemConfiguration(),
-                                                                    null, null, subsystem.getHost(), gridColumns, false);
-
-        // filter string prompt
-       // Composite promptComposite = composite_prompts;
-        Composite promptComposite = connectionCombo;
-        prompt = SystemWidgetHelpers.createLabel(promptComposite, SystemResources.RESID_TESTFILTERSTRING_PROMPT_LABEL, SystemResources.RESID_TESTFILTERSTRING_PROMPT_TOOLTIP);
-        promptValue = SystemWidgetHelpers.createLabel(promptComposite, SystemResources.RESID_TESTFILTERSTRING_PROMPT_LABEL, SystemResources.RESID_TESTFILTERSTRING_PROMPT_TOOLTIP);
-
-        promptValue.setToolTipText(filterString); // Since the dialog is not resizable, this is the way to show the whole string
-
-        // Make sure the label width is not longer than the window width
-        // Otherwise the combo box dropdown arrow above it will be pushed beyond the window and invisible
-        //promptValue.setText(filterString);
-
-        String label = filterString;
-
-        if ( label.length() > 30)
-           label = label.substring(0,30) + " ...";   // Use ... to show that not entire string is displayed //$NON-NLS-1$
-        promptValue.setText( label);
-
-        //Point point = promptValue.computeSize(SWT.DEFAULT, SWT.DEFAULT);
-        //GridData data = new GridData();	
-	    //data.widthHint = point.x < 230 ? point.x : 230;
-	    GridData data = new GridData();	
-	    data.widthHint =  200;
-	    promptValue.setLayoutData(data);	
-
-		// TREE
-		inputProvider = new SystemTestFilterStringAPIProviderImpl(subsystem, filterString);		  		
-		tree = new SystemViewForm(getShell(), composite_prompts, SWT.NULL, inputProvider, false, getMessageLine(), gridColumns, 1);
-
-	    // add selection listeners
-		//tree.addSelectionChangedListener(this);				
-        connectionCombo.addSelectionListener(this);
-
-		return composite_prompts;
-	}
-
-	/**
-	 * Override of parent. Must pass selected object onto the form for initializing fields.
-	 * Called by SystemDialogAction's default run() method after dialog instantiated.
-	 */
-	public void setInputObject(Object inputObject)
-	{
-		super.setInputObject(inputObject);
-	}
-
-    /**
-     * When re-using this dialog between runs, call this to reset its contents.
-     * Assumption: original input subsystem factory Id doesn't change between runs
-     */
-    public void reset(ISubSystem subsystem, String filterString)
-    {
-		this.subsystem = subsystem;
-		this.filterString = filterString;
-		//this.subsystemConfigurationId = subsystem.getParentSubSystemConfiguration().getId();
-    	inputProvider.setSubSystem(subsystem);
-    	inputProvider.setFilterString(filterString);
-    	tree.reset(inputProvider);    		
-    }
-
-    /**
-     * ISelectionChangedListener interface method
-     */
-    public void selectionChanged(SelectionChangedEvent event)
-    {
-    }	
-    public void widgetDefaultSelected(SelectionEvent event)
-    {
-    }
-    public void widgetSelected(SelectionEvent event)
-    {
-
-    	//if (src == connectionCombo.getCombo())
-    	{
-    		//System.out.println("connection changed");
-    		IHost newConnection = connectionCombo.getHost();
-    		ISubSystem newSubSystem = null;
-			ISubSystemConfiguration config = sr.getSubSystemConfiguration(subsystemConfigurationId);
-			if (config!=null) {
-				ISubSystem[] newSubSystems = config.getSubSystems(newConnection, true);
-				if (newSubSystems != null && newSubSystems.length > 0) {
-		    		  newSubSystem = newSubSystems[0];
-				      subsystemConfigurationId = subsystem.getSubSystemConfiguration().getId();
-				}
-			}
-    		inputProvider.setSubSystem(newSubSystem);
-    		tree.reset(inputProvider);    		
-    	}
-    }
-
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemWorkWithHistoryDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemWorkWithHistoryDialog.java
deleted file mode 100644
index 5f7ef3aff..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemWorkWithHistoryDialog.java
+++ /dev/null
@@ -1,347 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2008 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David McKnight (IBM) - [240414] NPE in SystemHistoryCombo
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.dialogs;
-
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.SystemWidgetHelpers;
-import org.eclipse.rse.ui.dialogs.SystemPromptDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ArmEvent;
-import org.eclipse.swt.events.ArmListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Widget;
-
-
-
-/**
- * A dialog that allows the user to manipulate the history associated with
- *  a widget.
- * <p>
- * The history strings are shown in a simple list, and the user can delete
- * items from the list or re-order items in the list.
- */
-public class SystemWorkWithHistoryDialog extends SystemPromptDialog implements  Listener, ArmListener
-{
-	private String[] historyInput;
-	private String[] historyOutput;
-	private String[] defaultHistory;
-	//private Label verbiage;
-	private List  historyList;
-	private Button rmvButton, clearButton, mupButton, mdnButton;
-	private Group group;
-	protected Menu        popupMenu;
-	protected MenuItem    clearMI, rmvMI, mupMI, mdnMI;
-
-	
-	/**
-	 * Constructor for SystemWorkWithHistoryDialog
-	 */
-	public SystemWorkWithHistoryDialog(Shell shell, String[] history)
-	{
-		super(shell, SystemResources.RESID_WORKWITHHISTORY_TITLE);
-		historyInput = history;
-
-		//pack();
-        setHelp(RSEUIPlugin.HELPPREFIX+"dwwh0000"); //$NON-NLS-1$
-        setInitialOKButtonEnabledState(false);     //d41471
-	}
-
-    /**
-     * Set the items to default the history to. These are sacred and can't be
-     * deleted in this dialog.
-     */
-    public void setDefaultHistory(String[] items)
-    {
-    	this.defaultHistory = items; // pc41439
-    }
-    /**
-     * Return true if the given string is among the default history items
-     */
-    private boolean inDefaultHistory(String toTest) // pc41439
-    {
-    	boolean inDefault = false;
-    	if (defaultHistory != null)
-    	  for (int idx=0; !inDefault && (idx<defaultHistory.length); idx++)
-    	     if (defaultHistory[idx].equals(toTest))
-    	       inDefault = true;
-    	return inDefault;
-    }
-    /**
-     * Return true any of the currently selected strings are among the default history items
-     */
-    private boolean selectedInDefaultHistory() /// pc41439
-    {
-    	boolean inDefault = false;
-    	if (defaultHistory != null)
-    	{
-          String[] currSelection = historyList.getSelection();
-          if (currSelection != null)
-    	  for (int idx=0; !inDefault && (idx<currSelection.length); idx++)
-             inDefault = inDefaultHistory(currSelection[idx]);      
-    	}
-    	return inDefault;
-    }
-
-	/**
-	 * @see SystemPromptDialog#getInitialFocusControl()
-	 */
-	protected Control getInitialFocusControl()
-	{
-		return historyList;
-	}
-	/**
-	 * @see SystemPromptDialog#createInner(Composite)
-	 */
-	protected Control createInner(Composite parent)
-	{
-		// Inner composite
-		int nbrColumns = 2;
-		Composite composite = SystemWidgetHelpers.createComposite(parent, nbrColumns);
-		
-		// verbiage
-		/*verbiage =*/ SystemWidgetHelpers.createLabel(composite,SystemResources.RESID_WORKWITHHISTORY_VERBIAGE, nbrColumns);
-		
-		// History list
-		init(composite, nbrColumns);
-		
-		return composite;
-	}
-	/**
-	 * Create and initialize labeled group
-	 */
-	protected Group init(Composite parent, int nbrColumns)
-	{
-		group = SystemWidgetHelpers.createGroupComposite(parent,nbrColumns,SystemResources.RESID_WORKWITHHISTORY_PROMPT);
-		//((GridData)group.getLayoutData()).horizontalSpan =horizontalSpan;
-		//((GridData)group.getLayoutData()).verticalSpan =verticalSpan;		
-	    // CREATE THE LIST BOX
-		historyList = SystemWidgetHelpers.createListBox(group,null,null,false);		
-		((GridData)historyList.getLayoutData()).widthHint = 200;
-		//((GridData)list.getLayoutData()).horizontalSpan = listboxspan;
-		//((GridData)list.getLayoutData()).heightHint = SWT.DEFAULT;          
-		//((GridData)list.getLayoutData()).heightHint = buttonHeight * maxButtonsHigh;          		
-	    ((GridData)group.getLayoutData()).grabExcessVerticalSpace = true;
-		
-		popupMenu = new Menu(historyList);
-		
-	    Composite rightHandSide = SystemWidgetHelpers.createComposite(group,1);          	
-	    clearButton = createPushButton(rightHandSide,SystemResources.ACTION_HISTORY_CLEAR_LABEL, SystemResources.ACTION_HISTORY_CLEAR_TOOLTIP);
-	    rmvButton = createPushButton(rightHandSide,SystemResources.ACTION_HISTORY_DELETE_LABEL, SystemResources.ACTION_HISTORY_DELETE_TOOLTIP);
-	    mupButton = createPushButton(rightHandSide,SystemResources.ACTION_HISTORY_MOVEUP_LABEL, SystemResources.ACTION_HISTORY_MOVEUP_TOOLTIP);
-	    mdnButton = createPushButton(rightHandSide,SystemResources.ACTION_HISTORY_MOVEDOWN_LABEL, SystemResources.ACTION_HISTORY_MOVEDOWN_LABEL);            
-		
-		clearMI = createMenuItem(SystemResources.ACTION_HISTORY_CLEAR_LABEL, SystemResources.ACTION_HISTORY_CLEAR_TOOLTIP);
-		rmvMI = createMenuItem(SystemResources.ACTION_HISTORY_DELETE_LABEL, SystemResources.ACTION_HISTORY_DELETE_TOOLTIP);
-		mupMI = createMenuItem(SystemResources.ACTION_HISTORY_MOVEUP_LABEL, SystemResources.ACTION_HISTORY_MOVEUP_TOOLTIP);
-		mdnMI = createMenuItem(SystemResources.ACTION_HISTORY_MOVEDOWN_LABEL, SystemResources.ACTION_HISTORY_MOVEDOWN_TOOLTIP);        
-				
-		historyList.setMenu(popupMenu);
-		if (historyInput != null)
-			historyList.setItems(historyInput);
-		
-		clearButton.setEnabled((historyInput!=null) && (historyInput.length>0));
-		rmvButton.setEnabled(false);		
-		mupButton.setEnabled(false);		
-		mdnButton.setEnabled(false);			
-		clearMI.setEnabled((historyInput!=null) && (historyInput.length>0));
-		rmvMI.setEnabled(false);		
-		mupMI.setEnabled(false);		
-		mdnMI.setEnabled(false);					
-				
-		// add selection listeners...
-		historyList.addSelectionListener(
-			new SelectionListener() 
-			{
-				public void widgetDefaultSelected(SelectionEvent e) 
-				{
-					//processRemoveButton(); // equate to selecting Remove...
-					okButton.setEnabled(true);		  //d41471
-				  	enableDisableAllActions();            		  
-				}
-				public void widgetSelected(SelectionEvent e) 
-				{
-					okButton.setEnabled(true);		  //d41471
-					enableDisableAllActions();
-				}
-			}
-		);        		
-		return group;   		
-	} // end init common
-	/**
-	 * Helper method for a separator menu item
-	 */
-	protected MenuItem addSeparator(Menu parent)
-	{
-		MenuItem mi = new MenuItem(parent,SWT.SEPARATOR);
-		return mi;		
-	}
-	/**
-	 * Helper method for creating cascading menu item
-	 */
-	protected MenuItem createMenuItem(String label, String description)
-	{
-		MenuItem mi = new MenuItem(popupMenu,SWT.NULL);
-		mi.setText(label);
-		mi.setData(description);
-		mi.addArmListener(this);
-		mi.addListener(SWT.Selection, this);
-		return mi;		
-	}
-	/**
-	 * Helper method for creating a pushbutton with tooltip text. 
-	 * This method takes resolved label and tooltip values
-	 */
-    protected Button createPushButton(Composite c, String label, String tooltip)
-    {
-   	      Button button = SystemWidgetHelpers.createPushButton(c, this, label, tooltip);		
-		  return button;   	
-    }                           	
-	/**
-	 * Helper method to enable/disable all actions (buttons, menuitems) 
-	 * based on current selections in list or current text contents.
-	 */
-	private void enableDisableAllActions()
-	{
-		boolean itemSelected = (historyList.getSelectionCount() > 0);
-		boolean defaultItemSelected = itemSelected && selectedInDefaultHistory();
-		// Remove action
-		rmvButton.setEnabled(itemSelected && !defaultItemSelected);
-		rmvMI.setEnabled(itemSelected && !defaultItemSelected);
-		// Move Up action
-		mupButton.setEnabled(itemSelected && !historyList.isSelected(0));    	
-		mupMI.setEnabled(mupButton.isEnabled());
-		// Move Down action
-		mdnButton.setEnabled(itemSelected && !historyList.isSelected((historyList.getItemCount())-1));
-		mupMI.setEnabled(mdnButton.isEnabled());
-			
-	    int emptyListCount = 0;
-	    if (defaultHistory != null)
-	      emptyListCount = defaultHistory.length;
-		clearButton.setEnabled(historyList.getItemCount() > emptyListCount);
-	}
-
-	protected boolean processOK() 
-	{
-		historyOutput = historyList.getItems();		 
-		return true;
-	}	
-
-	// --------------------------------- //
-	// METHODS FOR INTERFACES... 
-	// --------------------------------- //
-	/**
-	 * Handles events generated by controls on this page.
-	 */
-	public void handleEvent(Event e)
-	{
-		//get widget that generates the event
-	    clearMessage();
-	    Widget source = e.widget;
-	    if ((source == clearButton) ||
-	         (source == clearMI))	    	    
-	    {
-	    	historyList.removeAll();
-	    	if (defaultHistory != null)
-	    	  historyList.setItems(defaultHistory); // pc41439
-	    	okButton.setEnabled(true);           //d41471
-	    	enableDisableAllActions();           //d41421
-        }
-	    else if ((source == rmvButton) ||
-	             (source == rmvMI))	    	    
-	    {
-	        int seld[] = historyList.getSelectionIndices();
-	      	if (seld.length > 0)
-	      	{
-	 	       historyList.remove(seld);
-	 	       enableDisableAllActions();         //d41421
-	      	}  
-	    }
-	    else if ((source == mupButton) ||
-	             (source == mupMI))	    	    
-	    {
-	      	int oldIndex = historyList.getSelectionIndex();
-	      	if (oldIndex > 0)
-	      	{
-	      	    String seldObj = historyList.getSelection()[0];
-	      	    historyList.remove(oldIndex);
-	      	    historyList.add(seldObj,oldIndex-1);
-	      	    historyList.select(oldIndex-1);	      	   
-	      	    historyList.showSelection();	      	     
-	      	    enableDisableAllActions();        //d41421
-	      	}
-	    }
-	    else if ((source == mdnButton) ||
-	             (source == mdnMI))	    	    
-	    {
-	      	int oldIndex = historyList.getSelectionIndex();
-	      	if ((oldIndex >= 0) && (oldIndex < (historyList.getItemCount()-1)))
-	      	{	      		 
-	      	    String seldObj = historyList.getSelection()[0];
-	      	    historyList.remove(oldIndex);
-	      	    historyList.add(seldObj,oldIndex+1);
-	      	    //historyList.select(oldIndex+1);
-	      	    // historyList.showSelection();
-	      	    historyList.select(oldIndex+2);  //d41427 To get around eclipse bug which does
-	      	    historyList.showSelection();     //d41427 not show the selected one as expected.
-	      	    historyList.select(oldIndex+1);  //d41427 Need to advance one more to show it
-	      	    enableDisableAllActions();	     //d41421  	    
-	      	}	      	
-	    }
-		
-	}	
-	/**
-	 * Called by system when menu item is "armed" or in select state. 
-	 * We use this to show the menu item description.
-	 */
-	public void widgetArmed(ArmEvent e) 
-	{
-	    clearMessage();
-		Widget w = e.widget;
-		if (w instanceof MenuItem)
-		{
-		  MenuItem mi = (MenuItem)w;
-		  String desc = (String)mi.getData();
-	      setMessage(desc);
-		}
-	}    
-    
-    // -----------------------
-    // CALLER QUERY METHODS...
-    // -----------------------
-    	
-	/**
-	 * Return the updated history
-	 */
-	public String[] getHistory()
-	{
-		return historyOutput;
-	}
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/SystemFilterPoolManagerUIProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/SystemFilterPoolManagerUIProvider.java
deleted file mode 100644
index 74e0deb4a..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/SystemFilterPoolManagerUIProvider.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2007 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.filters;
-import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
-import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement;
-
-public interface SystemFilterPoolManagerUIProvider 
-{
-    public ISystemFilterPoolManager[] getFilterPoolManagers();
-	public SystemSimpleContentElement getTreeModel();    
-	public SystemSimpleContentElement getTreeModelPreSelection(SystemSimpleContentElement root);
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/SystemFilterWorkWithFilterPoolsTreeViewer.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/SystemFilterWorkWithFilterPoolsTreeViewer.java
deleted file mode 100644
index d943cd29f..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/SystemFilterWorkWithFilterPoolsTreeViewer.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2007 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.filters;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.rse.internal.ui.actions.SystemSubMenuManager;
-import org.eclipse.rse.internal.ui.filters.dialogs.SystemFilterWorkWithFilterPoolsDialog;
-import org.eclipse.rse.internal.ui.view.SystemView;
-import org.eclipse.rse.ui.ISystemContextMenuConstants;
-import org.eclipse.rse.ui.SystemMenuManager;
-import org.eclipse.rse.ui.actions.ISystemAction;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Tree;
-
-
-/**
- * This subclass of the standard JFace tree viewer is used to
- * show a tree view of filter pools within filterpool managers,
- * for a work-with experience.
- */
-public class SystemFilterWorkWithFilterPoolsTreeViewer 
-       extends TreeViewer
-       implements IMenuListener      
-{
-
-    private SystemFilterWorkWithFilterPoolsDialog caller;
-    private Shell shell;
-    private IAction[] contextMenuActions;
-    private MenuManager menuMgr;    
-
-	/**
-	 * Constructor for SystemFilterWorkWithFilterPoolsTreeViewer
-	 */
-	public SystemFilterWorkWithFilterPoolsTreeViewer(Shell shell, SystemFilterWorkWithFilterPoolsDialog caller, Composite arg0) 
-	{
-		super(arg0, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL); // DKM - putting style here to avoid SWT.BORDER (defect 168972)
-
-		init(shell, caller);
-	}
-
-	/**
-	 * Constructor for SystemFilterWorkWithFilterPoolsTreeViewer
-	 */
-	public SystemFilterWorkWithFilterPoolsTreeViewer(Shell shell, SystemFilterWorkWithFilterPoolsDialog caller, Composite arg0, int arg1) 
-	{
-		super(arg0, arg1);
-		init(shell, caller);
-	}
-
-	/**
-	 * Constructor for SystemFilterWorkWithFilterPoolsTreeViewer
-	 */
-	public SystemFilterWorkWithFilterPoolsTreeViewer(Shell shell,
-	                                                 SystemFilterWorkWithFilterPoolsDialog caller, 
-	                                                 Tree tree) 
-	{
-		super(tree);
-		init(shell, caller);
-	}
-	
-	/**
-	 * Initialize
-	 */
-	public void init(Shell shell, SystemFilterWorkWithFilterPoolsDialog caller)
-	{
-		this.caller = caller;
-		this.shell = shell;
-		// -----------------------------
-		// Enable right-click popup menu
-		// -----------------------------
-		menuMgr = new MenuManager("#PopupMenu"); //$NON-NLS-1$
-	    menuMgr.setRemoveAllWhenShown(true);
-	    menuMgr.addMenuListener(this);
-		Menu menu = menuMgr.createContextMenu(getTree());
-		getTree().setMenu(menu);		
-	}
-	
-	/**
-	 * Set the context menu actions to show in the popup
-	 */
-	public void setContextMenuActions(IAction[] actions)
-	{
-		this.contextMenuActions = actions;
-	}
-
-    /**
-     * Override of refresh from parent
-     */
-    public void refresh()
-    {
-    	if (!caller.refreshTree())
-    	  super.refresh();
-    	//super.refresh();    	
-    }
-    
-    /**
-     * Called when the context menu is about to open.
-     */
-    public void menuAboutToShow(IMenuManager menu)
-    {
-    	ISystemAction ourAction = null;
-    	if (contextMenuActions != null)
-        {
-            //SystemMenuManager ourMenu = createStandardGroups(menu);
-            SystemView.createStandardGroups(menu);
-			SystemMenuManager ourMenu = new SystemMenuManager(menu);       	
-        	for (int idx=0; idx<contextMenuActions.length; idx++)
-        	{
-        		if (contextMenuActions[idx] instanceof ISystemAction)
-        		{
-        			ourAction = (ISystemAction)contextMenuActions[idx];
-        			ourMenu.add(ISystemContextMenuConstants.GROUP_REORGANIZE, ourAction);
-
-	      	        if (ourAction instanceof SystemSubMenuManager)
-	      	        {
-	      	          SystemSubMenuManager item = (SystemSubMenuManager)ourAction;
-	      	          item.setShell(shell);
-	      	          item.setSelection(getSelection());	      	 	
-	      	        }
-        		}
-        		else
-        	      menu.appendToGroup(ISystemContextMenuConstants.GROUP_REORGANIZE, ourAction);        		  
-        	}
-        }
-    }
-
-	/*
-	 * Creates the Systems plugin standard groups in a context menu.
-	 *
-	public SystemMenuManager createStandardGroups(IMenuManager menu) 
-	{
-		if (menu.isEmpty())
-		{
-	      // simply sets partitions in the menu, into which actions can be directed.
-	      // Each partition can be delimited by a separator (new Separator) or not (new GroupMarker).
-		  menu.add(new Separator(ISystemContextMenuConstants.GROUP_NEW)); // new->
-		  //menu.add(new GroupMarker(ISystemContextMenuConstants.GROUP_GOTO)); // goto into, go->
-		  menu.add(new GroupMarker(ISystemContextMenuConstants.GROUP_EXPANDTO)); // expand TO->
-		  menu.add(new GroupMarker(ISystemContextMenuConstants.GROUP_OPENWITH)); // open with->
-		  menu.add(new GroupMarker(ISystemContextMenuConstants.GROUP_OPEN)); // open xxx
-		  menu.add(new Separator(ISystemContextMenuConstants.GROUP_SHOW)); // show->type hierarchy, in-navigator
-		  menu.add(new Separator(ISystemContextMenuConstants.GROUP_BUILD)); // build, rebuild, refresh
-		  menu.add(new Separator(ISystemContextMenuConstants.GROUP_CHANGE)); // update, change
-		  menu.add(new Separator(ISystemContextMenuConstants.GROUP_REORGANIZE)); // rename,move,copy,delete,bookmark,refactoring
-		  menu.add(new Separator(ISystemContextMenuConstants.GROUP_REORDER)); // move up, move down
-		  //menu.add(new GroupMarker(ISystemContextMenuConstants.GROUP_GENERATE)); // getters/setters, etc. Typically in editor
-		  //menu.add(new Separator(ISystemContextMenuConstants.GROUP_SEARCH)); // search
-		  menu.add(new Separator(ISystemContextMenuConstants.GROUP_CONNECTION)); // user or BP/ISV additions
-		  menu.add(new Separator(ISystemContextMenuConstants.GROUP_STARTSERVER));  // start/stop remote server actions
-		  menu.add(new Separator(ISystemContextMenuConstants.GROUP_IMPORTEXPORT)); // get or put actions
-		  menu.add(new Separator(ISystemContextMenuConstants.GROUP_ADAPTERS)); // actions queried from adapters
-		  menu.add(new Separator(ISystemContextMenuConstants.GROUP_ADDITIONS)); // user or BP/ISV additions
-		  menu.add(new Separator(ISystemContextMenuConstants.GROUP_VIEWER_SETUP)); // ? Probably View->by xxx, yyy
-		  menu.add(new Separator(ISystemContextMenuConstants.GROUP_PROPERTIES)); // Properties
-		}		
-		return new SystemMenuManager(menu);
-	}*/
-
-	/**
-	 * Private helper method to add an Action to a given menu.
-	 * To give the action the opportunity to grey out, we call selectionChanged, but
-	 * only if the action implements ISelectionChangedListener
-	 */
-	protected void menuAdd(MenuManager menu, IAction action)
-	{
-		if (action instanceof ISelectionChangedListener)
-		  ((ISelectionChangedListener)action).selectionChanged(new SelectionChangedEvent(this,getSelection()));
-	}
-    
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterNewFilterPoolWizard.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterNewFilterPoolWizard.java
deleted file mode 100644
index 104db8500..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterNewFilterPoolWizard.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.filters.dialogs;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.rse.core.filters.ISystemFilterPool;
-import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.services.clientserver.messages.SystemMessage;
-import org.eclipse.rse.ui.ISystemIconConstants;
-import org.eclipse.rse.ui.ISystemMessages;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.filters.SystemFilterPoolDialogOutputs;
-import org.eclipse.rse.ui.filters.actions.SystemFilterAbstractFilterPoolAction;
-import org.eclipse.rse.ui.filters.dialogs.SystemFilterPoolWizardInterface;
-import org.eclipse.rse.ui.messages.SystemMessageDialog;
-import org.eclipse.rse.ui.validators.ValidatorFolderName;
-import org.eclipse.rse.ui.wizards.AbstractSystemWizard;
-
-
-/**
- * Wizard for creating a new system filter pool.
- */
-public class      SystemFilterNewFilterPoolWizard
-  	   extends    AbstractSystemWizard
-	   implements SystemFilterPoolWizardInterface
-{	
-	protected SystemFilterNewFilterPoolWizardMainPageInterface mainPage;
-	protected ValidatorFolderName usv;
-    protected SystemFilterPoolDialogOutputs output;
-    protected SystemFilterAbstractFilterPoolAction caller;
-	protected ISystemFilterPoolManager[] mgrs;
-
-    /**
-     * Constructor that uses a default title and image
-     */	
-	public SystemFilterNewFilterPoolWizard()
-	{
-		this(SystemResources.RESID_NEWFILTERPOOL_TITLE,
-		     RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_NEWFILTERPOOLWIZARD_ID));
-	}
-    /**
-     * Constructor
-     * @param label The title for this wizard
-     * @param image The image for this wizard
-     */	
-	public SystemFilterNewFilterPoolWizard(String title, ImageDescriptor image)
-	{
-		super(title, image);
-	}	
-
-    /**
-     * Set the help context Id (infoPop) for this wizard. This must be fully qualified by
-     *  plugin ID.
-     */
-    public void setHelpContextId(String id)
-    {
-    	super.setHelp(id);
-    }
-	
-	/**
-	 * Creates the wizard pages.
-	 * This method is an override from the parent Wizard class.
-	 */
-	public void addPages()
-	{
-	   try {
-	      mainPage = createMainPage();
-	      addPage((WizardPage)mainPage);
-	      //super.addPages();
-	   } catch (Exception exc)
-	   {
-	   	 System.out.println("Unexpected error in addPages of NewFilterPoolWizard: "+exc.getMessage() + ", " + exc.getClass().getName()); //$NON-NLS-1$ //$NON-NLS-2$
-	   }
-	}
-
-
-	/**
-	 * Creates the wizard's main page. 
-	 */
-	protected SystemFilterNewFilterPoolWizardMainPageInterface createMainPage()
-	{
-	    mainPage = new SystemFilterNewFilterPoolWizardDefaultMainPage(this,
-	            caller.getDialogTitle(), caller.getDialogPrompt());
-	    mgrs = caller.getFilterPoolManagers();
-	    if (mgrs != null)
-	    {
-	      mainPage.setFilterPoolManagers(mgrs);
-	      mainPage.setFilterPoolManagerNameSelectionIndex(caller.getFilterPoolManagerNameSelectionIndex());	      
-	    }
-	    return mainPage;
-	}    
-	
-	/**
-	 * Completes processing of the wizard. If this
-	 * method returns true, the wizard will close;
-	 * otherwise, it will stay active.
-	 * This method is an override from the parent Wizard class.
-	 *
-	 * @return whether the wizard finished successfully
-	 */
-	public boolean performFinish()
-	{
-		if (mainPage.performFinish())
-		{
-		  	output = mainPage.getFilterPoolDialogOutputs();
-		  	String mgrName = output.filterPoolManagerName;
-		  	ISystemFilterPoolManager mgr = null;
-		    try
-		    {
-		  	  if (mgrName != null)
-		  	  {		  	   
-		  	     for (int idx=0; (mgr==null)&&(idx<mgrs.length); idx++)
-		  	       if (mgrs[idx].getName().equalsIgnoreCase(mgrName))
-		  	         mgr = mgrs[idx];
-		   	  }
-		   	  if (mgr == null)
-		   	  {
-		   	  	System.out.println("Unexpected problem in performFinish of filter pool wizard: no match for selected profile name " + mgrName); //$NON-NLS-1$
-		   	  	return false;
-		   	  }
-		  	  String poolName = mainPage.getPoolName();
-		  	  output.newPool = createFilterPool(mgr, poolName);
-		    }
-		    catch (Exception exc)
-		    {
-		    	//RSEUIPlugin.logError("Error in performFinish of filter pool wizard!", exc);
-		    	//System.out.println("Error in performFinish of filter pool wizard!");
-		    	//exc.printStackTrace();
-		    	SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXCEPTION_OCCURRED);
-		    	msg.makeSubstitution(exc);
-		    	SystemMessageDialog msgDlg = new SystemMessageDialog(getShell(), msg);
-		    	msgDlg.openWithDetails();
-		    	return false;
-		    }		  	
-		    return (output.newPool != null);
-		}
-	    return false;
-	}
-	
-	
-	/**
-	 * Process the create new filter pool request, after user presses OK on the dialog.
-	 * By default, asks the selected manager to create the new pool of the given name.
-     */
-	protected ISystemFilterPool createFilterPool(ISystemFilterPoolManager selectedManager, String poolName)
-	          throws Exception
-	{
-		ISystemFilterPool newFilterPool = null;
-        if (selectedManager != null)
-          //try {
-            newFilterPool = selectedManager.createSystemFilterPool(poolName, true);
-          //} catch (Exception exc) 
-          //{
-	   	    //System.out.println("Unexpected error in createFilterPool of NewFilterPoolWizard: "+exc.getMessage() + ", " + exc.getClass().getName());
-          //}
-        return newFilterPool;		
-	}
-	
-    /**
-     * Return an object containing user-specified information pertinent to filter pool actions
-     */
-    public SystemFilterPoolDialogOutputs getFilterPoolDialogOutputs()
-    {
-    	return output;
-    }
-
-	/**
-	 * Allow base action to pass instance of itself for callback to get info
-	 */
-    public void setFilterPoolDialogActionCaller(SystemFilterAbstractFilterPoolAction caller)
-    {
-    	this.caller = caller;
-    }
-
-	/**
-	 * Allow wizard pages to get this.
-	 */
-    public SystemFilterAbstractFilterPoolAction getFilterPoolDialogActionCaller()
-    {
-    	return caller;
-    }
-	
-} // end class
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterNewFilterPoolWizardDefaultMainPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterNewFilterPoolWizardDefaultMainPage.java
deleted file mode 100644
index bcabb50f5..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterNewFilterPoolWizardDefaultMainPage.java
+++ /dev/null
@@ -1,373 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2008 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.filters.dialogs;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.services.clientserver.messages.SystemMessage;
-import org.eclipse.rse.ui.SystemWidgetHelpers;
-import org.eclipse.rse.ui.filters.SystemFilterPoolDialogOutputs;
-import org.eclipse.rse.ui.filters.actions.SystemFilterAbstractFilterPoolAction;
-import org.eclipse.rse.ui.validators.ISystemValidator;
-import org.eclipse.rse.ui.validators.ValidatorFilterPoolName;
-import org.eclipse.rse.ui.wizards.AbstractSystemWizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-
-
-/**
- * Default main page of the "New Filter Pool" wizard.
- * This page asks for the name of the connection pool.
- * Also allows user to select from a list of filter pool managers
- * to put the filter pool into.
- */
-
-public class SystemFilterNewFilterPoolWizardDefaultMainPage 
-	   extends AbstractSystemWizardPage
-	   implements SystemFilterNewFilterPoolWizardMainPageInterface, Listener,  SelectionListener
-{
-	protected Label labelName, labelMgr;
-	protected Text  textName;
-	protected Combo mgrCombo;
-	protected int   mgrSelection = 0;
-    protected String[] mgrNames = null;
-    protected ISystemValidator[] validatorsByManager = null;
-    protected SystemFilterAbstractFilterPoolAction parentWizardAction = null;
-	    
-	/**
-	 * Constructor. 
-	 */
-	public SystemFilterNewFilterPoolWizardDefaultMainPage(Wizard wizard,
-													String title,
-													String description)
-	{
-		super(wizard, "NewFilterPool", title, description); //$NON-NLS-1$
-		this.parentWizardAction = ((SystemFilterNewFilterPoolWizard)wizard).getFilterPoolDialogActionCaller();
-	}
-    
-	/**
-	 * Call this to specify a validator for the pool name. It will be called per keystroke.
-	 * Only call this if you do not call setFilterPoolManagers! 
-	 */
-	public void setNameValidator(ISystemValidator v)
-	{
-		validatorsByManager = new ISystemValidator[1];
-		validatorsByManager[0] = v;
-	}
-	/**
-	 * Even if you call setFilterPoolManagers and you really want your own validators,
-	 * then call this. Otherwise, FolderNameValidator will be called for you.
-	 * The input must be an array of validators that is the same length as the array
-	 * of filter pool managers. Call this AFTER setFilterPoolManagers!
-	 */
-	public void setNameValidators(ISystemValidator[] v)
-	{
-		validatorsByManager = v;
-	}
-
-	/**
-	 * Call this to specify the list of filter pool managers to allow the user to select from.
-	 * Either call this or override getFilterPoolManagerNames, or leave null and this prompt will
-	 * not show.
-	 */
-	public void setFilterPoolManagers(ISystemFilterPoolManager[] mgrs) {
-		mgrNames = new String[mgrs.length];
-		validatorsByManager = new ISystemValidator[mgrNames.length];
-		for (int idx = 0; idx < mgrs.length; idx++) {
-			ISystemFilterPoolManager manager = mgrs[idx];
-			mgrNames[idx] = manager.getName();
-			ISystemValidator iiv = new ValidatorFilterPoolName(manager.getSystemFilterPoolNames());
-			validatorsByManager[idx] = iiv;
-		}
-	}
-	/**
-	 * Returns array of manager names to show in combo box.
-	 */
-	protected String[] getFilterPoolManagerNames() 
-	{
-       return mgrNames;
-	}
-	/**
-	 * Set the zero-based index of the manager name to preselect.
-	 * The default is zero.
-	 * Either call this or override getFilterPoolManagerNameSelectionIndex.
-	 */
-	public void setFilterPoolManagerNameSelectionIndex(int index)
-	{
-       this.mgrSelection = index;
-       //System.out.println("inside setFilterPoolManagerNameSelectionIndex in main page: " + index);
-	}
-	/**
-	 * Returns the zero-based index of the manager name to preselect.
-	 * Returns what was set in setFilterPoolManagerNameSelectionIndex by default.
-	 */
-	protected int getFilterPoolManagerNameSelectionIndex()
-	{
-       return mgrSelection;
-	}
-	
-	/**
-	 * Retrieve the pool name entry field prompt text. 
-	 * By default, uses what we set in setPoolNamePromptText,
-	 * or uses a supplied default if that is null.
-	 */
-	protected String getPoolNamePromptText()
-	{
-		String namePromptText = parentWizardAction.getDialogFilterPoolNamePrompt();
-		return (namePromptText==null) ? SystemResources.RESID_FILTERPOOLNAME_LABEL : namePromptText;
-	}
-	/**
-	 * Retrieve the pool name entry field tooltip text. 
-	 * By default, uses what we set in setPoolNameToolTip,
-	 * or uses a supplied default if that is null.
-	 */
-	protected String getPoolNameToolTip()
-	{
-		String nameTip = parentWizardAction.getDialogFilterPoolNameTip();
-		return (nameTip==null) ? SystemResources.RESID_FILTERPOOLNAME_TIP : nameTip;
-	}
-	/**
-	 * Retrieve the pool manager combo prompt text. 
-	 * By default, uses what we set in setPoolManagerPromptText,
-	 * or uses a supplied default if that is null.
-	 */
-	protected String getPoolManagerPromptText()
-	{
-		String mgrPromptText = parentWizardAction.getDialogFilterPoolManagerNamePrompt();
-		return (mgrPromptText == null) ? SystemResources.RESID_FILTERPOOLMANAGERNAME_LABEL : mgrPromptText;
-	}
-	/**
-	 * Retrieve the pool manager combo field tooltip text. 
-	 * By default, uses what we set in setPoolManagerToolTip,
-	 * or uses a supplied default if that is null.
-	 */
-	protected String getPoolManagerToolTip()
-	{
-		String mgrTip = parentWizardAction.getDialogFilterPoolManagerNameTip();
-		return (mgrTip == null) ? SystemResources.RESID_FILTERPOOLMANAGERNAME_TIP : mgrTip;
-	}
-
-	/**
-	 * CreateContents is the one method that must be overridden from the parent class.
-	 * In this method, we populate an SWT container with widgets and return the container
-	 *  to the caller (JFace). This is used as the contents of this page.
-	 * @param parent The parent composite
-	 */
-	public Control createContents(Composite parent)
-	{
-  	    // top level composite
-		Composite composite = new Composite(parent,SWT.NONE);        
-		composite.setLayout(new GridLayout());
-	    composite.setLayoutData(new GridData(
-		   GridData.VERTICAL_ALIGN_FILL | GridData.HORIZONTAL_ALIGN_FILL));
-
-		// Inner composite
-		Composite composite_prompts = SystemWidgetHelpers.createComposite(
-			composite, 2);	
-
-		// POOLNAME PROMPT
-		labelName = SystemWidgetHelpers.createLabel(composite_prompts, getPoolNamePromptText());
-		textName  = SystemWidgetHelpers.createTextField(
-			composite_prompts,this);
-	    String tip = getPoolNameToolTip();
-	    if (tip != null)
-	      textName.setToolTipText(tip);
-			   
-		// POOL MANAGER PROMPT
-		String[] mgrs = getFilterPoolManagerNames();
-		if (mgrs != null)
-		{
-		  labelMgr = SystemWidgetHelpers.createLabel(composite_prompts, getPoolManagerPromptText());
-		  mgrCombo  = SystemWidgetHelpers.createReadonlyCombo(composite_prompts,this);
-	      tip = getPoolManagerToolTip();
-	      if (tip != null)
-	        mgrCombo.setToolTipText(tip);
-	      mgrCombo.setItems(mgrs);
-          //System.out.println("inside createContents in main page. Selecting " + mgrSelection);	      
-	      mgrCombo.select(mgrSelection);
-	      setPoolNameTextLimit(mgrSelection);
-		}
-	            
-		textName.setFocus();
-		  		  
-		// add keystroke listeners...
-		textName.addModifyListener(
-			new ModifyListener() {
-				public void modifyText(ModifyEvent e) {
-					validateNameInput();
-				}
-			}
-		);
-		if (mgrCombo != null)
-		  mgrCombo.addSelectionListener(this);		
-		  
-		setPageComplete(false);
-		return composite;
-	}
-	
-	/**
-	 * Return control to recieve initial focus
-	 */
-	public Control getInitialFocusControl()
-	{
-		return textName;
-	}	
-	
-	// --------------------------------- //
-	// METHODS FOR LISTENER INTERFACE... 
-	// --------------------------------- //
-	/**
-	 * Combo selection listener method
-	 */
-	public void widgetDefaultSelected(SelectionEvent event)
-	{
-	}
-	/**
-	 * Combo selection listener method
-	 */
-	public void widgetSelected(SelectionEvent event)
-	{
-		Object src = event.getSource();
-		if (src == mgrCombo)
-		{
-	      setPoolNameTextLimit(mgrCombo.getSelectionIndex());
-		}
-	}
-	/**
-	 * Handles events generated by controls on this page.
-	 */
-	public void handleEvent(Event e)
-	{
-	}
-	/**
-	 * Completes processing of the wizard. If this 
-	 * method returns true, the wizard will close; 
-	 * otherwise, it will stay active.
-	 * This method is an override from the parent Wizard class. 
-	 *
-	 * @return whether the wizard finished successfully
-	 */
-	public boolean performFinish() 
-	{
-		SystemMessage errMsg = null;
-		Control controlInError = null;
-		clearErrorMessage();
-		errMsg = validateNameInput();
-		if (errMsg != null)
-		  controlInError = textName;
-		if (errMsg != null && controlInError != null)
-		  controlInError.setFocus();
-		return (errMsg == null);		
-	}
- 
- 	// ---------------------------------------------
-	// METHODS FOR VERIFYING INPUT PER KEYSTROKE ...
-	// ---------------------------------------------
-  	/**
-	 * This hook method is called whenever the text changes in the input field.
-	 * The default implementation delegates the request to an <code>ISystemValidator</code> object.
-	 * If the <code>ISystemValidator</code> reports an error the error message is displayed
-	 * in the Dialog's message line.
-	 * @see #setNameValidator(ISystemValidator)
-	 */
-	protected SystemMessage validateNameInput() 
-	{			
-		int mgrIndex = 0;
-		if (mgrCombo != null)
-		  mgrIndex = mgrCombo.getSelectionIndex();
-		if (mgrIndex < 0)
-		  mgrIndex = 0;
-		ISystemValidator iiv = validatorsByManager[mgrIndex];
-	    SystemMessage errorMessage= null;
-		if (iiv != null)
-	      errorMessage= iiv.validate(textName.getText());
-	    if (errorMessage != null)
-          setErrorMessage(errorMessage);	      
-        else
-          clearErrorMessage();
-    	setPageComplete(errorMessage == null);
-		return errorMessage;		
-	}
-	
-	/**
-	 * Set the name length for the filter pool based on the
-	 *  currently selected manager
-	 */
-	protected void setPoolNameTextLimit(int mgrIndex)
-	{
-		if (mgrIndex < 0)
-		  return;
-		ISystemValidator iiv = validatorsByManager[mgrIndex];
-		if (iiv != null)
-		{
-	      int limit = -1;
-
-	      limit = iiv.getMaximumNameLength();
-	      if (limit == -1)
-	        limit = ValidatorFilterPoolName.MAX_FILTERPOOLNAME_LENGTH; // default is 50
-	      textName.setTextLimit(limit);
-		}		
-	}
-    
-	// --------------------------------- //
-	// METHODS FOR EXTRACTING USER DATA ... 
-	// --------------------------------- //
-	/**
-	 * Return user-entered pool name.
-	 * Call this after finish ends successfully.
-	 */
-	public String getPoolName()
-	{
-		return textName.getText().trim();
-	}    
-	/**
-	 * Return user-selected pool manager name.
-	 * Call this after finish ends successfully.
-	 */
-    public String getPoolManagerName()
-    {
-    	if (mgrCombo!=null)
-    	  return mgrCombo.getText();
-    	else
-    	  return null;
-    }
-	
-    /**
-     * Return an object containing user-specified information pertinent to filter pool actions
-     */
-    public SystemFilterPoolDialogOutputs getFilterPoolDialogOutputs()
-    {
-    	SystemFilterPoolDialogOutputs output = new SystemFilterPoolDialogOutputs();
-    	output.filterPoolName = getPoolName();
-    	output.filterPoolManagerName = getPoolManagerName();
-    	return output;
-    }
-  
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterNewFilterPoolWizardMainPageInterface.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterNewFilterPoolWizardMainPageInterface.java
deleted file mode 100644
index ba5b0007c..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterNewFilterPoolWizardMainPageInterface.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2008 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.filters.dialogs;
-
-import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
-import org.eclipse.rse.ui.filters.SystemFilterPoolDialogOutputs;
-import org.eclipse.rse.ui.validators.ISystemValidator;
-import org.eclipse.rse.ui.wizards.ISystemWizardPage;
-
-
-
-/**
- * Interface for new Filter wizard main page classes
- */
-public interface SystemFilterNewFilterPoolWizardMainPageInterface extends ISystemWizardPage
-{
-	/**
-	 * Call this to specify a validator for the pool name. It will be called per keystroke.
-	 * Only call this if you do not call setFilterPoolManagers! 
-	 */
-	public void setNameValidator(ISystemValidator v);
-	/**
-	 * Even if you call setFilterPoolManagers and you really want your own validators,
-	 * then call this. Otherwise, FolderNameValidator will be called for you.
-	 * The input must be an array of validators that is the same length as the array
-	 * of filter pool managers. Call this AFTER setFilterPoolManagers!
-	 */
-	public void setNameValidators(ISystemValidator[] v);
-	/**
-	 * Call this to specify the list of filter pool managers to allow the user to select from.
-	 * Either call this or override getFilterPoolManagerNames, or leave null and this prompt will
-	 * not show.
-	 */
-	public void setFilterPoolManagers(ISystemFilterPoolManager[] mgrs);
-	/**
-	 * Set the zero-based index of the manager name to preselect.
-	 * The default is zero.
-	 * Either call this or override getFilterPoolManagerNameSelectionIndex.
-	 */
-	public void setFilterPoolManagerNameSelectionIndex(int index);
-		
-	/**
-	 * Return user-entered pool name.
-	 * Call this after finish ends successfully.
-	 */
-	public String getPoolName();
-	/**
-	 * Return user-selected pool manager name.
-	 * Call this after finish ends successfully.
-	 */
-    public String getPoolManagerName();
-    /**
-     * Return an object containing user-specified information pertinent to filter pool actions
-     */
-    public SystemFilterPoolDialogOutputs getFilterPoolDialogOutputs();
-
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterPoolWizardDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterPoolWizardDialog.java
deleted file mode 100644
index c974271c8..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterPoolWizardDialog.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2008 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.filters.dialogs;
-import org.eclipse.rse.ui.dialogs.SystemWizardDialog;
-import org.eclipse.rse.ui.filters.SystemFilterPoolDialogInterface;
-import org.eclipse.rse.ui.filters.SystemFilterPoolDialogOutputs;
-import org.eclipse.rse.ui.filters.actions.SystemFilterAbstractFilterPoolAction;
-import org.eclipse.rse.ui.filters.dialogs.SystemFilterPoolWizardInterface;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * Extends WizardDialog to support ability to pass data in from the
- * common wizard action class, and get data out.
- * This is deferred to the actual wizard, which in turn defers to the wizard's first page.
- */
-public class SystemFilterPoolWizardDialog 
-       extends SystemWizardDialog 
-       implements SystemFilterPoolDialogInterface
-{
-    // all ctors are from parent...
-	/**
-	 * Constructor
-	 */
-	public SystemFilterPoolWizardDialog(Shell shell, SystemFilterPoolWizardInterface wizard)
-	{
-		super(shell, wizard);
-	}
-	/**
-	 * Constructor two. Use when you have an input object at instantiation time.
-	 */
-	public SystemFilterPoolWizardDialog(Shell shell, SystemFilterPoolWizardInterface wizard, Object inputObject)
-	{
-		super(shell,wizard,inputObject);
-	}
-  
-    /**
-     * Return wrapped filter pool wizard
-     */
-    public SystemFilterPoolWizardInterface getFilterPoolWizard()
-    {
-    	return (SystemFilterPoolWizardInterface)getWizard();
-    }
-      
-    /**
-     * Return an object containing user-specified information pertinent to filter pool actions
-     */
-    public SystemFilterPoolDialogOutputs getFilterPoolDialogOutputs()
-    {
-    	return getFilterPoolWizard().getFilterPoolDialogOutputs();
-    }
-	
-	/**
-	 * Allow base action to pass instance of itself for callback to get info
-	 */
-    public void setFilterPoolDialogActionCaller(SystemFilterAbstractFilterPoolAction caller)
-    {
-    	getFilterPoolWizard().setFilterPoolDialogActionCaller(caller);
-    }
-    
-    /**
-     * Set the help context id for this wizard
-     */
-    public void setHelpContextId(String id)
-    {
-    	super.setHelp(id);
-    }
-    
-    
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterWizardDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterWizardDialog.java
deleted file mode 100644
index d575bda88..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterWizardDialog.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2007 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.filters.dialogs;
-import org.eclipse.rse.ui.dialogs.SystemWizardDialog;
-import org.eclipse.rse.ui.filters.actions.SystemFilterAbstractFilterAction;
-import org.eclipse.rse.ui.filters.dialogs.ISystemFilterWizard;
-import org.eclipse.rse.ui.filters.dialogs.SystemFilterDialogInterface;
-import org.eclipse.rse.ui.filters.dialogs.SystemFilterDialogOutputs;
-import org.eclipse.swt.widgets.Shell;
-
-
-
-/**
- * Extends WizardDialog to support ability to pass data in from the
- * common wizard action class, and get data out.
- * This is deferred to the actual wizard, which in turn defers to the wizard's first page.
- */
-public class SystemFilterWizardDialog 
-       extends SystemWizardDialog 
-       implements SystemFilterDialogInterface
-{
-	
-    // all ctors are from parent...
-	/**
-	 * Constructor
-	 */
-	public SystemFilterWizardDialog(Shell shell, ISystemFilterWizard wizard)
-	{
-		super(shell, wizard);
-	}
-	/**
-	 * Constructor two. Use when you have an input object at instantiation time.
-	 */
-	public SystemFilterWizardDialog(Shell shell, ISystemFilterWizard wizard, Object inputObject)
-	{
-		super(shell,wizard,inputObject);
-	}
-  
-    /**
-     * Return wrapped filter wizard
-     */
-    public ISystemFilterWizard getFilterWizard()
-    {
-    	return (ISystemFilterWizard)getWizard();
-    }
-      
-    /**
-     * Return an object containing user-specified information pertinent to filter actions
-     */
-    public SystemFilterDialogOutputs getFilterDialogOutputs()
-    {
-    	return getFilterWizard().getFilterDialogOutputs();
-    }
-	
-	/**
-	 * Allow base action to pass instance of itself for callback to get info
-	 */
-    public void setFilterDialogActionCaller(SystemFilterAbstractFilterAction caller)
-    {
-    	getFilterWizard().setFilterDialogActionCaller(caller);
-    }
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterWorkWithFilterPoolsDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterWorkWithFilterPoolsDialog.java
deleted file mode 100644
index a07205344..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterWorkWithFilterPoolsDialog.java
+++ /dev/null
@@ -1,662 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2008 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
- * David Dykstal (IBM) - [197036] fixed delete filter pool bug found during testing of this bug
- *                                see also bug 194260 regarding deleting filter pools
- * David Dykstal (IBM) - [194268] fixed initial selection and new action selection
- * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.filters.dialogs;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.ToolBarManager;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.AbstractTreeViewer;
-import org.eclipse.jface.viewers.IBasicPropertyConstants;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.rse.core.filters.ISystemFilterPool;
-import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
-import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManager;
-import org.eclipse.rse.core.subsystems.ISubSystem;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.internal.ui.actions.SystemCommonDeleteAction;
-import org.eclipse.rse.internal.ui.actions.SystemCommonRenameAction;
-import org.eclipse.rse.internal.ui.actions.SystemFilterCopyFilterPoolAction;
-import org.eclipse.rse.internal.ui.actions.SystemFilterMoveFilterPoolAction;
-import org.eclipse.rse.internal.ui.actions.SystemFilterNewFilterPoolAction;
-import org.eclipse.rse.internal.ui.actions.SystemFilterWorkWithFilterPoolsRefreshAllAction;
-import org.eclipse.rse.internal.ui.filters.SystemFilterPoolManagerUIProvider;
-import org.eclipse.rse.internal.ui.filters.SystemFilterWorkWithFilterPoolsTreeViewer;
-import org.eclipse.rse.services.clientserver.messages.SystemMessage;
-import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
-import org.eclipse.rse.ui.ISystemDeleteTarget;
-import org.eclipse.rse.ui.ISystemMessages;
-import org.eclipse.rse.ui.ISystemRenameTarget;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.SystemWidgetHelpers;
-import org.eclipse.rse.ui.actions.ISystemAction;
-import org.eclipse.rse.ui.dialogs.SystemPromptDialog;
-import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement;
-import org.eclipse.rse.ui.dialogs.SystemSimpleContentProvider;
-import org.eclipse.rse.ui.filters.SystemFilterPoolDialogInterface;
-import org.eclipse.rse.ui.filters.SystemFilterPoolDialogOutputs;
-import org.eclipse.rse.ui.filters.SystemFilterUIHelpers;
-import org.eclipse.rse.ui.filters.actions.SystemFilterAbstractFilterPoolAction;
-import org.eclipse.rse.ui.messages.ISystemMessageLine;
-import org.eclipse.rse.ui.messages.SystemMessageDialog;
-import org.eclipse.rse.ui.validators.ValidatorFilterPoolName;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.ToolBar;
-import org.eclipse.swt.widgets.Tree;
-
-/**
- * Dialog for working with filter pools.
- */
-public class SystemFilterWorkWithFilterPoolsDialog 
-       extends SystemPromptDialog 
-       implements 
-                  ISelectionChangedListener, 
-                  ISystemDeleteTarget, ISystemRenameTarget,
-                  SystemFilterPoolDialogInterface
-                  //,ISystemResourceChangeListener
-{
-	class DeleteFilterPoolAction extends SystemCommonDeleteAction {
-		public DeleteFilterPoolAction(Shell parent, ISystemDeleteTarget deleteTarget) {
-			super(parent, deleteTarget);
-		}
-		protected Object getDialogValue(Dialog dlg) {
-			doDelete(null);
-			return null;
-		}
-	}
-	
-	private String promptString;
-	//private Label prompt;
-	private SystemFilterWorkWithFilterPoolsTreeViewer tree;
-	private ToolBar  toolbar = null;
-	private ToolBarManager toolbarMgr = null;
-	private SystemSimpleContentProvider provider = new SystemSimpleContentProvider();
-    private SystemSimpleContentElement filterPoolContent;
-	private SystemSimpleContentElement preSelectedRoot = null;	
-	private ISystemFilterPoolManager[] filterPoolManagers;
-	private SystemFilterPoolManagerUIProvider caller = null;
-	private boolean initializing = false;
-	
-    //private ActionContributionItem newActionItem, deleteActionItem, renameActionItem;
-    private SystemFilterWorkWithFilterPoolsRefreshAllAction refreshAction = null;
-    private SystemFilterNewFilterPoolAction  newAction = null;
-    private DeleteFilterPoolAction dltAction = null;
-    //private SystemCommonDeleteAction         dltAction = null;    
-    //private SystemSimpleRenameAction         rnmAction = null;
-    private SystemCommonRenameAction         rnmAction = null;
-    private SystemFilterCopyFilterPoolAction cpyAction = null;
-    private SystemFilterMoveFilterPoolAction movAction = null;
-    private IAction[]                        contextMenuActions = null;
-	
-		
-	/**
-	 * Constructor
-	 */
-	public SystemFilterWorkWithFilterPoolsDialog(Shell shell, String title, String prompt,
-	                                             SystemFilterPoolManagerUIProvider caller)
-	                                             //SystemFilterPoolManager[] filterPoolManagers,
-	                                             //SystemSimpleContentElement filterPoolContent)
-	{
-		super(shell, title);				
-		this.caller = caller;
-		promptString = prompt;		
-		this.filterPoolContent = caller.getTreeModel();
-		this.filterPoolManagers = caller.getFilterPoolManagers();
-        this.preSelectedRoot = caller.getTreeModelPreSelection(filterPoolContent);		
-        setCancelButtonLabel(SystemResources.BUTTON_CLOSE);
-        setShowOkButton(false);
-		//pack();
-	}	
-
-	/**
-	 * Set the root to preselect
-	 */
-	public void setRootToPreselect(SystemSimpleContentElement preSelectedRoot)
-	{
-		this.preSelectedRoot = preSelectedRoot;
-	}
-	
-	/**
-	 * Create message line. Intercept so we can set msg line of form.
-	 */
-	protected ISystemMessageLine createMessageLine(Composite c)
-	{
-		/*ISystemMessageLine msgLine =*/ super.createMessageLine(c);
-		return fMessageLine;
-	}
-
-	/**
-	 * @see SystemPromptDialog#getInitialFocusControl()
-	 */
-	protected Control getInitialFocusControl() 
-	{
-		return tree.getControl();
-	}
-	
-	/**
-	 * Set the pool name validator for the rename action.
-	 * The work-with dialog automatically calls setExistingNamesList on it for each selection.
-	 */
-	public void setFilterPoolNameValidator(ValidatorFilterPoolName pnv)
-	{
-	}
-
-	/**
-	 * @see SystemPromptDialog#createInner(Composite)
-	 */
-	protected Control createInner(Composite parent) 
-	{
-		//System.out.println("INSIDE CREATEINNER");    			
-		/*
-  	    // top level composite
-		Composite composite = new Composite(parent,SWT.NONE);        
-		composite.setLayout(new GridLayout());
-		GridData data = new GridData();
-		data.verticalAlignment = GridData.FILL;
-		data.horizontalAlignment = GridData.FILL;
-	    data.grabExcessHorizontalSpace = true;        
-		composite.setLayoutData(data);
-		*/
-		           
-		// Inner composite
-		Composite composite_prompts = SystemWidgetHelpers.createComposite(parent, 1);
-
-        // PROMPT
-		/*prompt =*/ SystemWidgetHelpers.createLabel(composite_prompts, promptString);
-
-        // TOOLBAR
-        createToolBar(composite_prompts);
-                
-        // WORK-WITH TREE
-        initializing = true;
-		tree = new SystemFilterWorkWithFilterPoolsTreeViewer(getShell(), this, new Tree(composite_prompts, SWT.SINGLE | SWT.BORDER));        
-	    GridData treeData = new GridData();
-	    treeData.horizontalAlignment = GridData.FILL;
-	    treeData.grabExcessHorizontalSpace = true;
-	    treeData.widthHint = 300;        
-	    treeData.heightHint= 300;
-	    treeData.verticalAlignment = GridData.CENTER;
-	    treeData.grabExcessVerticalSpace = true;
-	    tree.getTree().setLayoutData(treeData);  	  	    
-	    
-	    tree.setContentProvider(provider);
-	    tree.setLabelProvider(provider);
-			
-        // populate tree        
- 		if (filterPoolContent != null)
- 		{
- 		  filterPoolContent.setData(tree); // so actions can refresh our tree
- 		  tree.setInput(filterPoolContent);
- 		}
-
-		if (preSelectedRoot != null)
-		  tree.setSelection(new StructuredSelection(preSelectedRoot), true);
-
-		// expand and pre-check
-		tree.expandAll();
-	    tree.setAutoExpandLevel(AbstractTreeViewer.ALL_LEVELS);
-
-	    // add selection listener to tree
-		tree.addSelectionChangedListener(this);
-
-		// populate toolbar
-        populateToolBar(getShell(), tree);
-        
-        initializing = false;		
-        			    			
-		return composite_prompts;
-	}
-	
-	/**
-	 * Callback from tree when refresh is done
-	 */
-	public boolean refreshTree()
-	{
-		if (initializing)
-		  return false;
-		this.filterPoolContent = caller.getTreeModel();
-		this.filterPoolManagers = caller.getFilterPoolManagers();
-        this.preSelectedRoot = caller.getTreeModelPreSelection(filterPoolContent);
- 		filterPoolContent.setData(tree); // so actions can refresh our tree        
-        tree.setInput(filterPoolContent); // hmm, hope we don't go into a loop!        
-        //System.out.println("in refreshTree");
-        return true;
-	}
-
-    /**
-     * Create the toolbar displayed at the top of the dialog
-     */
-	protected void createToolBar(Composite parent)
-	{
-	    toolbar = new ToolBar(parent, SWT.FLAT | SWT.WRAP);		
-	    toolbarMgr = new ToolBarManager(toolbar);
-	}
-	/**
-	 * Populate the toolbar displayed at the top of the dialog
-	 */
-	protected void populateToolBar(Shell shell, SystemFilterWorkWithFilterPoolsTreeViewer tree)
-	{
-		newAction = new SystemFilterNewFilterPoolAction(shell,this);
-		//dltAction = new SystemSimpleDeleteAction(shell,this);	
-		dltAction = new DeleteFilterPoolAction(shell,this);			
-		rnmAction = new SystemCommonRenameAction(shell,this);		
-		  // undo typical settings...
-		  rnmAction.allowOnMultipleSelection(false);
-          rnmAction.setProcessAllSelections(false);
-		//rnmAction = new SystemSimpleRenameAction(shell,this);		
-		  //poolNameValidator = new ValidatorFilterPoolName((Vector)null);
-		  //rnmAction.setNameValidator(poolNameValidator);		
-    	cpyAction = new SystemFilterCopyFilterPoolAction(shell);
-    	  cpyAction.setSelectionProvider(this);
-    	movAction = new SystemFilterMoveFilterPoolAction(shell);
-    	  movAction.setSelectionProvider(this);
-    	refreshAction = new SystemFilterWorkWithFilterPoolsRefreshAllAction(tree, shell);
-    	
-        contextMenuActions = new IAction[6];
-        contextMenuActions[0] = newAction;
-        contextMenuActions[1] = rnmAction;
-        contextMenuActions[2] = cpyAction;
-        contextMenuActions[3] = movAction;
-        contextMenuActions[4] = dltAction;                        
-        contextMenuActions[5] = refreshAction;        
-        
-        for (int idx=0; idx<contextMenuActions.length; idx++)
-        {
-           ((ISystemAction)contextMenuActions[idx]).setSelection(tree.getSelection());
-           ((ISystemAction)contextMenuActions[idx]).setViewer(tree);
-        }
-         
-        // populate toolbar...            	    	
-		toolbarMgr.add(refreshAction);	
-		toolbarMgr.add(newAction);	
-		toolbarMgr.add(dltAction);
-		toolbarMgr.add(rnmAction);
-		toolbarMgr.add(cpyAction);
-		toolbarMgr.add(movAction);
-		toolbarMgr.update(false);		
-		
-		// populate tree..
-        tree.setContextMenuActions(contextMenuActions);
-		
-	}
-	
-	/**
-	 * ISelectionChangedListener method. Called when user changes selection in tree
-	 */
-	public void selectionChanged(SelectionChangedEvent event) 
-	{
-		//IStructuredSelection sel = (IStructuredSelection)event.getSelection();
-		//SystemSimpleContentElement element = (SystemSimpleContentElement)sel.getFirstElement();		
-		if (rnmAction != null)
-		  rnmAction.selectionChanged(event);
-	}	
-	 
-	/**
-	 * Return current selection
-	 */
-	public SystemSimpleContentElement getSelectedElement()
-	{
-		IStructuredSelection sel = (IStructuredSelection)tree.getSelection();				
-		return (SystemSimpleContentElement)sel.getFirstElement();
-	}	 
-	/**
-	 * Return true if something selected
-	 */
-	public boolean isSelectionEmpty()
-	{
-		IStructuredSelection sel = (IStructuredSelection)tree.getSelection();				
-		return sel.isEmpty();
-	}	 
-    public void clearSelection()
-    {
-    	tree.setSelection((ISelection)null);
-    }
-	
-	    
-	/**
-	 * Called when user presses OK button. 
-	 * Return true to close dialog.
-	 * Return false to not close dialog.
-	 */
-	protected boolean processOK() 
-	{
-		boolean closeDialog = verify();
-		if (closeDialog)
-		{
-		  setOutputObject(getInputObject());
-		}
-		return closeDialog;
-	}	
-	
-	public boolean close()
-	{
-		//RSECorePlugin.getTheSystemRegistry().removeSystemResourceChangeListener(this);		
-		return super.close();
-	}
-	/**
-	 * Verifies all input.
-	 * @return true if there are no errors in the user input
-	 */
-	public boolean verify() 
-	{
-
-		clearErrorMessage();				
-/*
-		if (errMsg != null)
-		  controlInError.setFocus();
-		return (errMsg == null);
-		*/
-		return true;
-	}
-	
-	/**
-	 * This method can be called by the dialog or wizard page host, to decide whether to enable
-	 * or disable the next, final or ok buttons. It returns true if the minimal information is
-	 * available and is correct.
-	 */
-	public boolean isPageComplete()
-	{
-		boolean pageComplete = true;
-		return pageComplete;
-	}
-	
-	/**
-	 * Inform caller of page-complete status of this form
-	 */
-	public void setPageComplete()
-	{
-		setPageComplete(isPageComplete());
-	}
-	
-    // ------------------------------
-    // ISYSTEMDELETETARGET METHODS...
-    // ------------------------------
-    
-    /**
-     * Return true if delete should even be shown in the popup menu
-     */
-    public boolean showDelete()
-    {
-    	return true;
-    }
-    /**
-     * Return true if delete should be enabled based on your current selection.
-     */
-    public boolean canDelete()
-    {
-    	SystemSimpleContentElement element = getSelectedElement();
-    	if (element != null) {
-          	Object elementData = element.getData();
-          	//System.out.println("In SFWWFPsDlg.canDelete: element data class = " + elementData.getClass().getName());
-          	if (elementData instanceof ISystemFilterPool) {
-              	ISystemFilterPool pool = (ISystemFilterPool)elementData;
-              	return (pool.isDeletable() && element.isDeletable());    	     	
-          	}
-    	}
-    	return false;
-    }
-    
-    /**
-     * Actually do the delete of currently selected items.
-     */
-    public boolean doDelete(IProgressMonitor monitor)
-    {
-    	boolean ok = false;
-    	SystemSimpleContentElement element = getSelectedElement();
-    	Object elementData = element.getData();
-    	if ((elementData == null) || !(elementData instanceof ISystemFilterPool))
-    	  return ok;
-    	ISystemFilterPool pool = (ISystemFilterPool)elementData;
-    	ISystemFilterPoolManager mgr = pool.getSystemFilterPoolManager();
-        try
-        {          
-          mgr.deleteSystemFilterPool(pool);
-          ok = true;
-          SystemSimpleContentElement parent = element.getParent();
-   	      clearSelection();
-    	  tree.setSelection(new StructuredSelection(parent),true);          
-          parent.deleteChild(element);   	  
-   	      tree.refresh(parent);             
-        } catch (Exception exc) 
-        {
-    	    SystemMessageDialog msgDlg = new SystemMessageDialog(getShell(), 
-    	            RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXCEPTION_DELETING).makeSubstitution(pool.getName(),exc));
-    	    msgDlg.open(); 
-    	    //RSEUIPlugin.logError("Error deleting filter pool in workwith dialog",exc);
-        }
-        return ok;
-    }
-
-    // ------------------------------
-    // ISYSTEMRENAMETARGET METHODS...
-    // ------------------------------
-    
-    /**
-     * Return true if rename should even be shown in the popup menu
-     */
-    public boolean showRename()
-    {
-    	return true;
-    }
-    /**
-     * Return true if rename should be enabled based on your current selection.
-     */
-    public boolean canRename()
-    {
-    	boolean canRename = false;
-    	SystemSimpleContentElement element = getSelectedElement();
-    	if (element != null) {
-        	Object elementData = element.getData();
-        	//System.out.println("In SFWWFPsDlg.canRename: element data class = " + elementData.getClass().getName());
-        	if (elementData instanceof ISystemFilterPool) {
-            	ISystemFilterPool pool = (ISystemFilterPool)elementData;
-            	canRename = (!pool.isNonRenamable() && element.isRenamable());
-            	//if (canRename) {
-                //    poolNameValidator.setExistingNamesList(pool.getSystemFilterPoolManager().getSystemFilterPoolNamesVector());    	  	
-            	//}
-        	}
-    	}
-    	return canRename;
-    }
-    
-    /**
-     * Actually do the rename of currently selected items.
-     * The array of new names matches the currently selected items.
-     */
-    public boolean doRename(String[] newNames)
-    {
-    	boolean ok = false;
-    	SystemSimpleContentElement element = getSelectedElement();
-    	Object elementData = element.getData();
-    	if ((elementData == null) || !(elementData instanceof ISystemFilterPool))
-    	  return ok;    	
-    	ISystemFilterPool pool = (ISystemFilterPool)elementData;
-    	ISystemFilterPoolManager mgr = pool.getSystemFilterPoolManager();
-        try
-        {          
-          mgr.renameSystemFilterPool(pool, newNames[0]);
-          ok = true;
-          element.setName(newNames[0]);
-	      String properties[] = {IBasicPropertyConstants.P_TEXT};
-	      tree.update(element, properties); // for refreshing non-structural properties in viewer when model changes   	      
-        } 
-        catch (SystemMessageException exc)
-        {
-        	SystemMessageDialog.displayMessage(getShell(), exc);
-        }
-        catch (Exception exc) 
-        {
-    	    SystemMessageDialog msgDlg = new SystemMessageDialog(getShell(), 
-    	            RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXCEPTION_RENAMING).makeSubstitution(pool.getName(),exc));
-    	    msgDlg.open(); 
-    	    //RSEUIPlugin.logError("Error renaming filter pool in workwith dialog",exc);
-        }
-    	return ok;
-    }
-
-    // -----------------------------
-    // ISELECTIONPROVIDER METHODS...
-    // -----------------------------
-    /**
-     * 
-     */
-    public void addSelectionChangedListener(ISelectionChangedListener listener) 
-    {
-    	tree.addSelectionChangedListener(listener);    	
-    }
-    
-    public void removeSelectionChangedListener(ISelectionChangedListener listener) 
-    {
-    	tree.removeSelectionChangedListener(listener);
-    }
-    
-    public void setSelection(ISelection selection) 
-    {
-    	tree.setSelection(selection);
-    }
-    
-    public ISelection getSelection()
-    {
-    	return tree.getSelection();
-    }
-    
-    
-    /**
-     * Callback from new action when new pool created
-     */
-    public void addNewFilterPool(Shell shell, ISystemFilterPool pool)
-    {
-    	String newPoolMgrName = pool.getSystemFilterPoolManager().getName();
-    	SystemSimpleContentElement rootElement = filterPoolContent;
-		SystemSimpleContentElement[] mgrElements = rootElement.getChildren();
-		SystemSimpleContentElement mgrElement = null;
-		for (int idx=0; (mgrElement==null) && (idx<mgrElements.length); idx++)
-		{
-			 String mgrName = mgrElements[idx].getName();
-			 if (mgrName.equals(newPoolMgrName))
-			   mgrElement = mgrElements[idx];
-		}
-        SystemSimpleContentElement cElement = 
-             new SystemSimpleContentElement(pool.getName(), pool, mgrElement, (Vector)null);
-        cElement.setImageDescriptor(SystemFilterUIHelpers.getFilterPoolImage(pool.getProvider(),pool));
-        if (mgrElement != null)
-        	mgrElement.addChild(cElement, 0);    	    	
-    	tree.refresh(mgrElement); // rebuild whole thing    	
-   	    tree.setSelection(new StructuredSelection(cElement),true);              	    	
-   	    // defect 42503
-   	    Object inputObj = getInputObject();
-   	    if (inputObj instanceof ISubSystem)
-   	    {
-   	    	ISubSystem ss = (ISubSystem)inputObj;
-   	        SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_FILTERPOOL_CREATED);
-   	        msg.makeSubstitution("'"+pool.getName()+"'", "'"+ss.getName()+"'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-   	        if (shell.isDisposed() || !shell.isVisible())
-   	          shell = getShell();
-   	        SystemMessageDialog msgdlg = new SystemMessageDialog(shell, msg);
-   	        boolean yes = msgdlg.openQuestionNoException();
-   	        if (yes)
-   	        {
-          	   ISystemFilterPoolReferenceManager sfprm = ss.getSystemFilterPoolReferenceManager();
-          	   sfprm.addReferenceToSystemFilterPool(pool);   	        	
-   	        }
-   	    }
-    }
-    
-    
-    /**
-     * Callback from new action to get array of managers
-     */
-    public ISystemFilterPoolManager[] getFilterPoolManagers()
-    {
-        ISystemFilterPoolManager[] mgrs = filterPoolManagers;        
-        return mgrs;    	
-    }
-
-    /**
-	 * Callback from new action to get index of initial manager to select
-	 */
-	public int getFilterPoolManagerSelection() {
-		int selection = 0;
-		SystemSimpleContentElement element = getSelectedElement();
-		if (element != null) {
-			Object elementData = element.getData();
-			if (elementData != null) {
-				if (elementData instanceof ISystemFilterPoolManager) {
-					selection = getManagerIndex((ISystemFilterPoolManager) elementData);
-				} else if (elementData instanceof ISystemFilterPool) {
-					selection = getManagerIndex(((ISystemFilterPool) elementData).getSystemFilterPoolManager());
-				}
-			}
-		}
-		return selection;
-	}
-    
-    private int getManagerIndex(ISystemFilterPoolManager mgr)
-    {
-    	int pos = -1;
-    	ISystemFilterPoolManager[] mgrs = filterPoolManagers;
-    	for (int idx=0; (pos==-1)&&(idx<mgrs.length); idx++)
-    	{
-    	   if (mgr == mgrs[idx])
-    	     pos = idx;
-    	}
-    	if (pos == -1)
-    	  pos = 0;
-    	return pos;
-    }
-
-    // SystemFilterPoolDialogInterface methods...
-	/**
-	 * Allow base action to pass instance of itself for callback to get info
-	 */
-    public void setFilterPoolDialogActionCaller(SystemFilterAbstractFilterPoolAction caller)
-    {
-    }
-    /**
-     * Return an object containing user-specified information pertinent to filter pool actions
-     */
-    public SystemFilterPoolDialogOutputs getFilterPoolDialogOutputs()
-    {
-    	SystemFilterPoolDialogOutputs output = new SystemFilterPoolDialogOutputs();
-    	output.filterPoolTreeRoot = filterPoolContent;
-    	return output;
-    }
-    
-    /**
-     * Set the help context id for this wizard
-     */
-    public void setHelpContextId(String id)
-    {
-    	super.setHelp(id);
-    }
-    
-    
-}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemUnNamedFilterDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemUnNamedFilterDialog.java
deleted file mode 100644
index 07424635c..000000000
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemUnNamedFilterDialog.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2007 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
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.rse.internal.ui.filters.dialogs;
-
-import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManagerProvider;
-import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.services.clientserver.messages.SystemMessage;
-import org.eclipse.rse.ui.dialogs.SystemPromptDialog;
-import org.eclipse.rse.ui.filters.ISystemFilterStringEditPaneListener;
-import org.eclipse.rse.ui.filters.SystemFilterStringEditPane;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-
-
-
-/**
- * A dialog that prompts the user for a single filter string, but not for the
- *  purpose of creating a named filter. The output is that single filter string,
- *  and the caller can do what they want with it.
- */
-
-public class SystemUnNamedFilterDialog extends SystemPromptDialog
-                implements 
-                            ISystemFilterStringEditPaneListener
-{
-
-    protected SystemFilterStringEditPane  editpane;
-    protected String outputFilterString;
-	// inputs
-    protected ISystemFilterPoolReferenceManagerProvider provider;    
-	/**
-	 * Constructor
-	 */
-	public SystemUnNamedFilterDialog(Shell shell) 
-	{
-		this(shell, SystemResources.RESID_CRTFILTER_TITLE);
-	}
-	/**
-	 * Constructor, when unique title desired
-	 */
-	public SystemUnNamedFilterDialog(Shell shell, String title)
-	{
-		super(shell, title);
-		//this.parentPool = parentPool;
-		//setMinimumSize(450, 350); // x, y
-		//pack();
-		setOutputObject(null);
-        setHelp();		        
-	}		
-
-	/**
-	 * Overridable extension point for setting dialog help. By default, there is no help
-	 */
-	protected void setHelp()
-	{
-	}
-	// -------------------
-	// INPUT/CONFIGURATION
-	// -------------------
-    /**
-     * Set the contextual system filter pool reference manager provider. Eg, in the RSE, this
-     *  will be the selected subsystem if the New Filter action is launched from there, or if
-     *  launched from a filter pool reference under there.
-     * <p>
-     * Will be non-null if the current selection is a reference to a filter pool or filter, 
-     *  or a reference manager provider. 
-     * <p>
-     * This is passed into the filter and filter string wizards and dialogs in case it is needed
-     *  for context. 
-     */
-    public void setSystemFilterPoolReferenceManagerProvider(ISystemFilterPoolReferenceManagerProvider provider)
-    {
-    	this.provider = provider;
-    	//RSEUIPlugin.logDebugMessage(this.getClass().getName(),"Inside setSystemFilterPoolReferenceManagerProvider. null? " + (provider==null));
-    }
-	/**
-	 * Specify an edit pane that prompts the user for the contents of a filter string.
-	 */
-	public void setFilterStringEditPane(SystemFilterStringEditPane editPane)
-	{
-		this.editpane = editPane;
-	}
-
-	// -------------------
-	// OUTPUT
-	// -------------------
-	/**
-	 * Return the string the user configured in this dialog.
-	 * Will return null if the user cancelled the dialog, so test with wasCancelled().
-	 */
-	public String getFilterString()
-	{
-		return outputFilterString;
-	}
-
-
-	// LIFECYCLE
-			
-	/**
-	 * @see SystemPromptDialog#getInitialFocusControl()
-	 */
-	protected Control getInitialFocusControl()
-	{
-		return editpane.getInitialFocusControl();
-	}
-	/**
-	 * @see SystemPromptDialog#createInner(Composite)
-	 */
-	protected Control createInner(Composite parent)
-	{
-		editpane = getFilterStringEditPane(getShell());
-	    editpane.setSystemFilterPoolReferenceManagerProvider(provider);
-
-		// Edit pane is our whole content area
-		Control composite = editpane.createContents(parent);
- 	    
-	 	// add listeners
-		editpane.addChangeListener(this);
-				
-		return composite;
-	}
-	/**
-	 * Return our edit pane. Overriding this is an alternative to calling setEditPane.
-	 * This is called in createContents
-	 */
-	protected SystemFilterStringEditPane getFilterStringEditPane(Shell shell)
-	{
-	    if (editpane == null)
-	      editpane = new SystemFilterStringEditPane(shell);
-	    return editpane;		
-	}
-
-	/**
-	 * Parent override.
-	 * Called when user presses OK button. 
-	 * This is when we save all the changes the user made.
-	 */
-	protected boolean processOK() 
-	{
-		SystemMessage errorMessage = editpane.verify(); // should fire events back to us if there is an error
-		if (errorMessage != null)
-		  return false;
-		outputFilterString = editpane.getFilterString();
-		return super.processOK();		
-	}	
-
-	/**
-	 * Parent override.
-	 * Called when user presses CLOSE button. We simply blow away all their changes!
-	 */
-	protected boolean processCancel() 
-	{
-		return super.processCancel();		
-	}	
-	
-	/**
-	 * Override of parent method so we can direct it to the Apply button versus the OK button
-	 */
-	public void setPageComplete(boolean complete)
-	{
-	}
-			
-    // ---------------
-    // HELPER METHODS
-    // ---------------  
-