Add Eclipse Version 4.4

2 files changed, 29 insertions, 11 deletions

diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/internal/setup/ui/ProgressLogDialog.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/internal/setup/ui/ProgressLogDialog.java
index a157fba1e6..67fbc42b85 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/internal/setup/ui/ProgressLogDialog.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/internal/setup/ui/ProgressLogDialog.java
@@ -56,6 +56,17 @@ public class ProgressLogDialog extends TitleAreaDialog implements ProgressLog
 
   private static final SimpleDateFormat DATE_TIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
+  private static final String[] IGNORED_PREFIXES = { "Scanning Git", "Re-indexing", "Calculating Decorations",
+  "Decorating", "http://", "The user operation is waiting", "Git repository changed", "Refreshing ", "Opening ",
+  "Connecting project ", "Searching for associated repositories.", "Preparing type ",
+  "Loading project description", "Generating cspec from PDE artifacts", "Reporting encoding changes", "Saving",
+  "Downloading software", "Java indexing...", "Computing Git status for ", "Configuring Plug-in Dependencies",
+  "Configuring JRE System Library", "Invoking builder on ", "Invoking '", "Verifying ", "Updating ...",
+  "Reading saved build state for project ", "Reading resource change information for ",
+  "Cleaning output folder for ", "Copying resources to the output folder", " adding component ",
+  "Preparing to build", "Compiling ", "Analyzing ", "Comparing ", "Checking ", "Build done",
+  "Processing API deltas..." };
+
   private PrintStream logStream;
 
   private Text text;
@@ -180,14 +191,7 @@ public class ProgressLogDialog extends TitleAreaDialog implements ProgressLog
     }
 
     if (line == null || line.length() == 0 || Character.isLowerCase(line.charAt(0)) || line.equals("Updating")
-        || line.startsWith("Scanning Git") || line.startsWith("Re-indexing") || line.endsWith(" remaining.")
-        || line.startsWith("Calculating Decorations") || line.startsWith("Decorating") || line.startsWith("http://")
-        || line.startsWith("The user operation is waiting") || line.startsWith("Git repository changed")
-        || line.startsWith("Refreshing ") || line.startsWith("Opening ") || line.startsWith("Connecting project ")
-        || line.startsWith("Searching for associated repositories.") || line.startsWith("Preparing type ")
-        || line.startsWith("Loading project description") || line.startsWith("Generating cspec from PDE artifacts")
-        || line.startsWith("Reporting encoding changes") || line.startsWith("Saving")
-        || line.startsWith("Downloading software") || line.startsWith("Java indexing..."))
+        || line.endsWith(" remaining.") || startsWithIgnoredPrefix(line))
     {
       return;
     }
@@ -282,6 +286,20 @@ public class ProgressLogDialog extends TitleAreaDialog implements ProgressLog
     }
   }
 
+  private static boolean startsWithIgnoredPrefix(String line)
+  {
+    for (int i = 0; i < IGNORED_PREFIXES.length; i++)
+    {
+      String prefix = IGNORED_PREFIXES[i];
+      if (line.startsWith(prefix))
+      {
+        return true;
+      }
+    }
+  
+    return false;
+  }
+
   public static void run(Shell shell, File logFile, final String jobName, final ProgressLogRunnable runnable)
   {
     try
diff --git a/plugins/org.eclipse.emf.cdo.releng/local.setup b/plugins/org.eclipse.emf.cdo.releng/local.setup
index 2c52ae5550..c7eab56f99 100644
--- a/plugins/org.eclipse.emf.cdo.releng/local.setup
+++ b/plugins/org.eclipse.emf.cdo.releng/local.setup
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ASCII"?>
 <setup:Project xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:predicates="http://www.eclipse.org/CDO/releng/predicates/1.0" xmlns:setup="http://www.eclipse.org/CDO/releng/setup/1.0" name="CDO">
   <setupTasks xsi:type="setup:P2Task">
-    <p2Repositories url="http://download.eclipse.org/releases/luna"/>
+    <p2Repositories url="http://download.eclipse.org/releases/kepler"/>
     <p2Repositories url="http://download.eclipse.org/modeling/emf/cdo/updates/integration"/>
     <p2Repositories url="http://download.eclipse.org/mylyn/snapshots/weekly"/>
     <p2Repositories url="http://download.eclipse.org/tools/buckminster/updates-4.3"/>
@@ -72,7 +72,7 @@
   </setupTasks>
   <branches name="master">
     <setupTasks xsi:type="setup:P2Task">
-      <p2Repositories url="http://download.eclipse.org/releases/luna"/>
+      <p2Repositories url="http://download.eclipse.org/releases/kepler"/>
       <installableUnits id="org.eclipse.emf.sdk.feature.group"/>
       <installableUnits id="org.eclipse.emf.ecoretools.sdk.feature.group"/>
       <installableUnits id="org.eclipse.gmf.runtime.notation.sdk.feature.group"/>
@@ -86,7 +86,7 @@
   </branches>
   <branches name="4.2">
     <setupTasks xsi:type="setup:P2Task">
-      <p2Repositories url="http://download.eclipse.org/releases/luna"/>
+      <p2Repositories url="http://download.eclipse.org/releases/kepler"/>
       <installableUnits id="org.eclipse.emf.sdk.feature.group"/>
       <installableUnits id="org.eclipse.gmf.runtime.notation.sdk.feature.group"/>
       <installableUnits id="org.eclipse.gmf.runtime.sdk.feature.group"/>