[456710] Don't use project name in the UI

https://bugs.eclipse.org/bugs/show_bug.cgi?id=456710

9 files changed, 18 insertions, 14 deletions

diff --git a/plugins/org.eclipse.oomph.extractor.lib.tests/src/org/eclipse/oomph/extractor/lib/tests/BINExtractorTest.java b/plugins/org.eclipse.oomph.extractor.lib.tests/src/org/eclipse/oomph/extractor/lib/tests/BINExtractorTest.java
index 2346de41a..da1a935c2 100644
--- a/plugins/org.eclipse.oomph.extractor.lib.tests/src/org/eclipse/oomph/extractor/lib/tests/BINExtractorTest.java
+++ b/plugins/org.eclipse.oomph.extractor.lib.tests/src/org/eclipse/oomph/extractor/lib/tests/BINExtractorTest.java
@@ -17,7 +17,7 @@ import org.eclipse.oomph.extractor.lib.BINExtractor;
  */
 public class BINExtractorTest
 {
-  private static final String[] ARGS = { "../org.eclipse.oomph.extractor/Win64-Debug/oomph-extractor-64.exe", "extracted", System.getProperty("java.home") };
+  private static final String[] ARGS = { "../org.eclipse.oomph.extractor/Win64-Debug/eclipse-installer-64.exe", "extracted", System.getProperty("java.home") };
 
   public static void main(String[] args) throws Exception
   {
diff --git a/plugins/org.eclipse.oomph.extractor/Concat/concat.bat b/plugins/org.eclipse.oomph.extractor/Concat/concat.bat
index 2c9ddebad..4df0d4cae 100644
--- a/plugins/org.eclipse.oomph.extractor/Concat/concat.bat
+++ b/plugins/org.eclipse.oomph.extractor/Concat/concat.bat
@@ -11,4 +11,4 @@ COPY /B extractor-%1.exe + ^
   ..\marker.txt +  ^
   ..\Concat\product\product-%1.zip + ^
   ..\marker.txt  ^
-  oomph-extractor-%1.exe
+  eclipse-installer-%1.exe
diff --git a/plugins/org.eclipse.oomph.extractor/Concat/descriptor-32.txt b/plugins/org.eclipse.oomph.extractor/Concat/descriptor-32.txt
index e04caf047..c589f3579 100644
--- a/plugins/org.eclipse.oomph.extractor/Concat/descriptor-32.txt
+++ b/plugins/org.eclipse.oomph.extractor/Concat/descriptor-32.txt
@@ -6,6 +6,6 @@
 0
 oomph.exe
 oomph.ini
-Oomph Installer
+Eclipse Installer
 http://wiki.eclipse.org/Eclipse_Oomph_Installer
 http://download.eclipse.org/oomph/jre/128x128.png
diff --git a/plugins/org.eclipse.oomph.extractor/Concat/descriptor-64.txt b/plugins/org.eclipse.oomph.extractor/Concat/descriptor-64.txt
index f1f7b2745..974511db5 100644
--- a/plugins/org.eclipse.oomph.extractor/Concat/descriptor-64.txt
+++ b/plugins/org.eclipse.oomph.extractor/Concat/descriptor-64.txt
@@ -6,6 +6,6 @@
 0
 oomph.exe
 oomph.ini
-Oomph Installer
+Eclipse Installer
 http://wiki.eclipse.org/Eclipse_Oomph_Installer
 http://download.eclipse.org/oomph/jre/128x128.png
diff --git a/plugins/org.eclipse.oomph.setup.installer/src/org/eclipse/oomph/setup/internal/installer/KeepInstallerDialog.java b/plugins/org.eclipse.oomph.setup.installer/src/org/eclipse/oomph/setup/internal/installer/KeepInstallerDialog.java
index 9f0fa8889..17b6e695d 100644
--- a/plugins/org.eclipse.oomph.setup.installer/src/org/eclipse/oomph/setup/internal/installer/KeepInstallerDialog.java
+++ b/plugins/org.eclipse.oomph.setup.installer/src/org/eclipse/oomph/setup/internal/installer/KeepInstallerDialog.java
@@ -302,7 +302,7 @@ public final class KeepInstallerDialog extends AbstractSetupDialog
             new String[] {
                 powerShell,
                 "-command",
-                "& {$linkPath = Join-Path ([Environment]::GetFolderPath('" + specialFolder + "')) 'Oomph Installer.lnk'; $targetPath = '" + target
+                "& {$linkPath = Join-Path ([Environment]::GetFolderPath('" + specialFolder + "')) 'Eclipse Installer.lnk'; $targetPath = '" + target
                     + "'; $link = (New-Object -ComObject WScript.Shell).CreateShortcut( $linkpath ); $link.TargetPath = $targetPath; $link.Save()}" });
       }
     }
diff --git a/plugins/org.eclipse.oomph.setup.ui/src/org/eclipse/oomph/setup/ui/AbstractSetupDialog.java b/plugins/org.eclipse.oomph.setup.ui/src/org/eclipse/oomph/setup/ui/AbstractSetupDialog.java
index f6ab3cd09..5c856c8fa 100644
--- a/plugins/org.eclipse.oomph.setup.ui/src/org/eclipse/oomph/setup/ui/AbstractSetupDialog.java
+++ b/plugins/org.eclipse.oomph.setup.ui/src/org/eclipse/oomph/setup/ui/AbstractSetupDialog.java
@@ -20,7 +20,7 @@ import org.eclipse.swt.widgets.Shell;
  */
 public abstract class AbstractSetupDialog extends OomphDialog
 {
-  public static final String SHELL_TEXT = "Oomph Installer";
+  public static final String SHELL_TEXT = "Eclipse Installer";
 
   public AbstractSetupDialog(Shell parentShell, String title, int width, int height, OomphUIPlugin plugin, boolean helpAvailable)
   {
diff --git a/plugins/org.eclipse.oomph.setup.ui/src/org/eclipse/oomph/setup/ui/wizards/SetupWizard.java b/plugins/org.eclipse.oomph.setup.ui/src/org/eclipse/oomph/setup/ui/wizards/SetupWizard.java
index 4d647fe2e..cf97349a8 100644
--- a/plugins/org.eclipse.oomph.setup.ui/src/org/eclipse/oomph/setup/ui/wizards/SetupWizard.java
+++ b/plugins/org.eclipse.oomph.setup.ui/src/org/eclipse/oomph/setup/ui/wizards/SetupWizard.java
@@ -635,7 +635,7 @@ public abstract class SetupWizard extends Wizard implements IPageChangedListener
     {
       setTrigger(Trigger.BOOTSTRAP);
       setSetupContext(SetupContext.createUserOnly(getResourceSet()));
-      setWindowTitle("Oomph Installer");
+      setWindowTitle("Eclipse Installer");
     }
 
     @Override
@@ -688,7 +688,7 @@ public abstract class SetupWizard extends Wizard implements IPageChangedListener
     {
       setTrigger(Trigger.MANUAL);
       setSetupContext(SetupContext.create(getResourceSet()));
-      setWindowTitle("Oomph Importer");
+      setWindowTitle("Eclipse Importer");
     }
 
     @Override
@@ -733,7 +733,7 @@ public abstract class SetupWizard extends Wizard implements IPageChangedListener
     {
       setTrigger(manual ? Trigger.MANUAL : Trigger.STARTUP);
       setSetupContext(SetupContext.create(getResourceSet()));
-      setWindowTitle("Oomph Updater");
+      setWindowTitle("Eclipse Updater");
     }
 
     public Updater(SetupTaskPerformer performer)
diff --git a/products/org.eclipse.oomph.setup.installer.product/Installer.product b/products/org.eclipse.oomph.setup.installer.product/Installer.product
index 73e32d8a4..a569e9089 100644
--- a/products/org.eclipse.oomph.setup.installer.product/Installer.product
+++ b/products/org.eclipse.oomph.setup.installer.product/Installer.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Oomph Installer" uid="org.eclipse.oomph.setup.installer.product" id="org.eclipse.oomph.setup.installer.product" application="org.eclipse.oomph.setup.installer.application" version="1.1.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Eclipse Installer" uid="org.eclipse.oomph.setup.installer.product" id="org.eclipse.oomph.setup.installer.product" application="org.eclipse.oomph.setup.installer.application" version="1.1.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <configIni use="">
    </configIni>
diff --git a/releng/org.eclipse.oomph.releng/hudson/repackage.sh b/releng/org.eclipse.oomph.releng/hudson/repackage.sh
index 88211e89c..de88c15c5 100644
--- a/releng/org.eclipse.oomph.releng/hudson/repackage.sh
+++ b/releng/org.eclipse.oomph.releng/hudson/repackage.sh
@@ -50,7 +50,7 @@ for f in *.zip; do
     inifile=oomph.app/Contents/MacOS/$inifile
   fi
 
-  sed -e 's/^Oomph.*Installer$/Oomph Installer/' $inifile > $inifile.tmp
+  sed -e 's/^Eclipse.*Installer$/Eclipse Installer/' $inifile > $inifile.tmp
   mv $inifile.tmp $inifile
 
   echo "-Doomph.installer.update.url=http://download.eclipse.org/oomph/products/repository" >> $inifile
@@ -71,7 +71,8 @@ for f in *.zip; do
     
     rm oomph
     ln -s oomph.app/Contents/MacOS/oomph oomph
-    tar -czf $PRODUCTS/oomph-installer-mac$bitness.tar.gz *
+    tar -czf $PRODUCTS/eclipse-installer-mac$bitness.tar.gz *
+    cp -a $PRODUCTS/eclipse-installer-mac$bitness.tar.gz $PRODUCTS/oomph-installer-mac$bitness.tar.gz
 
   elif [[ $f == *win32* ]]; then
     rm -f eclipsec.exe
@@ -84,7 +85,7 @@ for f in *.zip; do
     
     zip -r -9 -qq --symlinks $PRODUCTS/$f *
     
-    extractor=oomph-extractor-win$bitness.exe
+    extractor=eclipse-extractor-win$bitness.exe
     marker=$GIT/plugins/org.eclipse.oomph.extractor/marker.txt
     
     echo "  Creating $extractor"
@@ -109,10 +110,13 @@ for f in *.zip; do
         echo "$PRODUCTS/$extractor is just $actualSize bytes large!"
         exit 1
       fi
+      
+      cp -a $PRODUCTS/$extractor $PRODUCTS/oomph-extractor-win$bitness.exe
     fi
 
   elif [[ $f == *linux* ]]; then
-    zip -r -9 -qq --symlinks $PRODUCTS/oomph-installer-linux$bitness.zip *
+    zip -r -9 -qq --symlinks $PRODUCTS/eclipse-installer-linux$bitness.zip *
+    cp -a $PRODUCTS/eclipse-installer-linux$bitness.zip $PRODUCTS/oomph-installer-linux$bitness.zip 
   fi
 done