Release towards 3.2m6

14 files changed, 29 insertions, 37 deletions

diff --git a/releng/org.eclipse.rse.build/nightly.sh b/releng/org.eclipse.rse.build/nightly.sh
index 2eb2abd3f..4e384cd02 100755
--- a/releng/org.eclipse.rse.build/nightly.sh
+++ b/releng/org.eclipse.rse.build/nightly.sh
@@ -34,6 +34,9 @@ cd "$mydir/../working" ; working=`pwd`
 cd "$mydir/../publish" ; publishDirectory=`pwd`
 cd "$mydir" ; builder=`pwd`
 
+# SPECIAL 3.2m6: Build with target platform 3.5m6 rather than basebuilder
+basebuilder=${eclipse}
+
 # Find the base build scripts: genericTargets.xml and build.xml
 cd "${basebuilder}/plugins"
 pdeBuild=`ls -d org.eclipse.pde.build* | sort | tail -1`
diff --git a/releng/org.eclipse.rse.build/setup.sh b/releng/org.eclipse.rse.build/setup.sh
index b7e4b27a8..26630c611 100755
--- a/releng/org.eclipse.rse.build/setup.sh
+++ b/releng/org.eclipse.rse.build/setup.sh
@@ -48,11 +48,11 @@ esac
 
 # prepare the base Eclipse installation in folder "eclipse"
 ep_rel="S-"
-ep_ver=3.6M5
-ep_date="-201001291300"
+ep_ver=3.6M6
+ep_date="-201003121448"
 P2_disabled=false
 P2_no_dropins=false
-if [ ! -f eclipse/plugins/org.eclipse.swt_3.6.0.v3631.jar ]; then
+if [ ! -f eclipse/plugins/org.eclipse.swt_3.6.0.v3637e.jar ]; then
   curdir2=`pwd`
   if [ ! -d eclipse -o -h eclipse ]; then
     if [ -d eclipse-${ep_ver}-${ep_arch} ]; then
@@ -68,17 +68,6 @@ if [ ! -f eclipse/plugins/org.eclipse.swt_3.6.0.v3631.jar ]; then
   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 
diff --git a/rse/features/org.eclipse.rse-feature/feature.properties b/rse/features/org.eclipse.rse-feature/feature.properties
index 554011874..433bc3382 100644
--- a/rse/features/org.eclipse.rse-feature/feature.properties
+++ b/rse/features/org.eclipse.rse-feature/feature.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2006, 2009 IBM Corporation and others.
+# Copyright (c) 2006, 2010 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
@@ -28,7 +28,7 @@ tmUpdateSiteName=Target Management Updates
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
-Copyright (c) 2000, 2009 IBM Corporation and others.\n\
+Copyright (c) 2000, 2010 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\
diff --git a/rse/features/org.eclipse.rse.core-feature/feature.properties b/rse/features/org.eclipse.rse.core-feature/feature.properties
index 20b219ebb..11014e287 100644
--- a/rse/features/org.eclipse.rse.core-feature/feature.properties
+++ b/rse/features/org.eclipse.rse.core-feature/feature.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2006, 2009 IBM Corporation and others.
+# Copyright (c) 2006, 2010 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
@@ -28,7 +28,7 @@ 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\
+Copyright (c) 2000, 2010 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\
diff --git a/rse/features/org.eclipse.rse.core-feature/sourceTemplateFeature/feature.properties b/rse/features/org.eclipse.rse.core-feature/sourceTemplateFeature/feature.properties
index f76dc526c..c86fd6021 100644
--- a/rse/features/org.eclipse.rse.core-feature/sourceTemplateFeature/feature.properties
+++ b/rse/features/org.eclipse.rse.core-feature/sourceTemplateFeature/feature.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2006, 2009 IBM Corporation and others.
+# Copyright (c) 2006, 2010 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
@@ -31,7 +31,7 @@ user documentation.
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
-Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved.\n\
+Copyright (c) 2000, 2010 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\
diff --git a/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/about.properties b/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/about.properties
index bbd0b6564..b6a539dbf 100644
--- a/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/about.properties
+++ b/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/about.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2009 IBM Corporation and others.
+# Copyright (c) 2000, 2010 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
@@ -21,5 +21,5 @@ blurb=RSE Core Source\n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
 \n\
-(c) Copyright IBM Corporation and others 2000, 2009.  All rights reserved.\n\
+(c) Copyright IBM Corporation and others 2000, 2010.  All rights reserved.\n\
 Visit http://www.eclipse.org/dsdp/tm
diff --git a/rse/features/org.eclipse.rse.sdk-feature/feature.properties b/rse/features/org.eclipse.rse.sdk-feature/feature.properties
index 9271ba811..3f4d6b1d5 100644
--- a/rse/features/org.eclipse.rse.sdk-feature/feature.properties
+++ b/rse/features/org.eclipse.rse.sdk-feature/feature.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2006, 2009 IBM Corporation and others.
+# Copyright (c) 2006, 2010 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
@@ -28,7 +28,7 @@ tmUpdateSiteName=Target Management Updates
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
-Copyright (c) 2000, 2009 IBM Corporation and others.\n\
+Copyright (c) 2000, 2010 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\
diff --git a/rse/plugins/org.eclipse.rse.core/about.properties b/rse/plugins/org.eclipse.rse.core/about.properties
index bf2e2747f..a316beab6 100644
--- a/rse/plugins/org.eclipse.rse.core/about.properties
+++ b/rse/plugins/org.eclipse.rse.core/about.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2009 IBM Corporation and others.
+# Copyright (c) 2000, 2010 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
@@ -25,5 +25,5 @@ blurb=RSE Core\n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
 \n\
-(c) Copyright IBM Corporation and others 2000, 2009.  All rights reserved.\n\
+(c) Copyright IBM Corporation and others 2000, 2010.  All rights reserved.\n\
 Visit http://www.eclipse.org/dsdp/tm
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.sdk/about.properties b/rse/plugins/org.eclipse.rse.sdk/about.properties
index db820ffa4..a6d8df2fb 100644
--- a/rse/plugins/org.eclipse.rse.sdk/about.properties
+++ b/rse/plugins/org.eclipse.rse.sdk/about.properties
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2006, 2009 Wind River Systems, Inc and others.
+# Copyright (c) 2006, 2010 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 
@@ -25,7 +25,7 @@ blurb=Remote System Explorer Extender SDK\n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
 \n\
-(c) Copyright IBM Corporation and others 2000, 2009.  All rights reserved.\n\
+(c) Copyright IBM Corporation and others 2000, 2010.  All rights reserved.\n\
 Visit http://www.eclipse.org/dsdp/tm\n\
 \n\
 This product includes software developed by the\n\
diff --git a/rse/plugins/org.eclipse.rse/about.properties b/rse/plugins/org.eclipse.rse/about.properties
index 75bf5897d..d077d6a8e 100644
--- a/rse/plugins/org.eclipse.rse/about.properties
+++ b/rse/plugins/org.eclipse.rse/about.properties
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others
+# Copyright (c) 2006, 2010 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 
@@ -25,7 +25,7 @@ blurb=Remote System Explorer End-User Runtime\n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
 \n\
-(c) Copyright IBM Corporation and others 2000, 2009.  All rights reserved.\n\
+(c) Copyright IBM Corporation and others 2000, 2010.  All rights reserved.\n\
 Visit http://www.eclipse.org/dsdp/tm\n\
 \n\
 This product includes software developed by the\n\
diff --git a/rse/tests/org.eclipse.rse.tests-feature/feature.properties b/rse/tests/org.eclipse.rse.tests-feature/feature.properties
index 1bec1a7f0..506357477 100644
--- a/rse/tests/org.eclipse.rse.tests-feature/feature.properties
+++ b/rse/tests/org.eclipse.rse.tests-feature/feature.properties
@@ -28,7 +28,7 @@ description=RSE Unit Tests. Includes Source.
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
-Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.\n\
+Copyright (c) 2006, 2010 Wind River Systems, 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\
diff --git a/rse/tests/org.eclipse.rse.tests-feature/feature.xml b/rse/tests/org.eclipse.rse.tests-feature/feature.xml
index 83ce051c1..6e9b28da7 100644
--- a/rse/tests/org.eclipse.rse.tests-feature/feature.xml
+++ b/rse/tests/org.eclipse.rse.tests-feature/feature.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
<!--
-     Copyright (c) 2005, 2009 IBM Corporation and others.
+     Copyright (c) 2005, 2010 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
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.rse.tests"
       label="%featureName"
-      version="3.1.1.qualifier"
+      version="3.2.0.qualifier"
       provider-name="%providerName">
 
    <description>
diff --git a/rse/tests/org.eclipse.rse.tests/META-INF/MANIFEST.MF b/rse/tests/org.eclipse.rse.tests/META-INF/MANIFEST.MF
index ca3242151..6935dde8e 100644
--- a/rse/tests/org.eclipse.rse.tests/META-INF/MANIFEST.MF
+++ b/rse/tests/org.eclipse.rse.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.tests;singleton:=true
-Bundle-Version: 3.1.1.qualifier
+Bundle-Version: 3.2.0.qualifier
 Bundle-Activator: org.eclipse.rse.tests.RSETestsPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -14,7 +14,7 @@ Require-Bundle: org.junit,
  org.eclipse.ui,
  org.eclipse.ui.views,
  org.eclipse.rse.core;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.rse.ui;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.ui;bundle-version="[3.1.100,4.0.0)",
  org.eclipse.rse.subsystems.files.core;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.rse.subsystems.files.local;bundle-version="[2.1.0,3.0.0)",
  org.eclipse.rse.subsystems.processes.core;bundle-version="[3.0.0,4.0.0)",
diff --git a/rse/tests/org.eclipse.rse.tests/about.properties b/rse/tests/org.eclipse.rse.tests/about.properties
index 214e378b2..7dacc3f4b 100644
--- a/rse/tests/org.eclipse.rse.tests/about.properties
+++ b/rse/tests/org.eclipse.rse.tests/about.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2010 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
@@ -21,5 +21,5 @@ blurb=RSE Unit Tests\n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
 \n\
-(c) Copyright Wind River Systems, Inc. and others 2006, 2009.  All rights reserved.\n\
+(c) Copyright Wind River Systems, Inc. and others 2006, 2010.  All rights reserved.\n\
 Visit http://www.eclipse.org/dsdp/tm