Merge remote-tracking branch 'origin/i1454' into ide-target-platform

Author: briandealwis

plugins/com.google.cloud.tools.eclipse.appengine.newproject/plugin.xml

@@ -9,6 +9,8 @@
             name="%standard.wizard.name"
             class="com.google.cloud.tools.eclipse.util.service.ServiceContextFactory:com.google.cloud.tools.eclipse.appengine.newproject.standard.AppEngineStandardProjectWizard"
             icon="platform:/plugin/com.google.cloud.tools.eclipse.appengine.ui/icons/gae-16x16.png"
+            finalPerspective="org.eclipse.jst.j2ee.J2EEPerspective"
+            preferredPerspectives="org.eclipse.jst.j2ee.J2EEPerspective,org.eclipse.wst.web.ui.webDevPerspective"
             project="true"
             category="com.google.cloud.tools.eclipse.wizards">
          <description>%standard.wizard.description</description>

plugins/com.google.cloud.tools.eclipse.appengine.newproject/src/com/google/cloud/tools/eclipse/appengine/newproject/AppEngineProjectWizard.java

@@ -29,21 +29,32 @@
 import com.google.common.base.Preconditions;
 import java.io.File;
 import java.lang.reflect.InvocationTargetException;
+import javax.inject.Inject;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.ui.INewWizard;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.ide.undo.WorkspaceUndoUtil;
+import org.eclipse.ui.wizards.newresource.BasicNewProjectResourceWizard;
 
+/**
+ * Base class for App Engine projection creation.
+ * <p>
+ * Expected to be created via the {@link ServiceContextFactory}.
+ */
 public abstract class AppEngineProjectWizard extends Wizard implements INewWizard {
 
   private AppEngineWizardPage page = null;
   protected final AppEngineProjectConfig config = new AppEngineProjectConfig();
   private IWorkbench workbench;
 
+  @Inject
+  protected IConfigurationElement configElement;
+
   public AppEngineProjectWizard() {
     setNeedsProgressMonitor(true);
   }
@@ -107,9 +118,13 @@ public boolean performFinish() {
       boolean fork = true;
       boolean cancelable = true;
       getContainer().run(fork, cancelable, runnable);
+      
+      // prompt to switch to preferred perspective
+      BasicNewProjectResourceWizard.updatePerspective(configElement);
 
       // open most important file created by wizard in editor
       IFile file = runnable.getMostImportant();
+      BasicNewProjectResourceWizard.selectAndReveal(file, workbench.getActiveWorkbenchWindow());
       WorkbenchUtil.openInEditor(workbench, file);
       return true;
     } catch (InterruptedException ex) {

plugins/com.google.cloud.tools.eclipse.integration.appengine/src/com/google/cloud/tools/eclipse/integration/appengine/BaseProjectTest.java

@@ -25,6 +25,7 @@
 import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
 import org.eclipse.swtbot.swt.finder.widgets.TimeoutException;
 import org.junit.After;
+import org.junit.Before;
 import org.junit.BeforeClass;
 
 /**
@@ -36,7 +37,7 @@ public class BaseProjectTest {
   protected IProject project;
 
   @BeforeClass
-  public static void setUp() throws Exception {
+  public static void setUpWorkbench() throws Exception {
     // verify we can find the Google Cloud SDK
     new CloudSdk.Builder().build().validateCloudSdk();
 
@@ -48,6 +49,12 @@ public static void setUp() throws Exception {
     }
   }
 
+  @Before
+  public void setUp() {
+    // switch to J2EE to avoid new-project switch-perspective prompts
+    bot.perspectiveById("org.eclipse.jst.j2ee.J2EEPerspective").activate();
+  }
+
   @After
   public void tearDown() {
     if (project != null) {

plugins/com.google.cloud.tools.eclipse.test.util/src/com/google/cloud/tools/eclipse/test/util/project/ProjectUtils.java

@@ -30,6 +30,7 @@
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
@@ -38,12 +39,14 @@
 import java.util.concurrent.TimeUnit;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
+import org.eclipse.core.internal.jobs.InternalJob;
 import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IProjectDescription;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.IncrementalProjectBuilder;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.FileLocator;
@@ -266,14 +269,20 @@ public static void waitForProjects(Runnable delayTactic, IProject... projects) {
       Collection<Job> jobs = Collections.emptyList();
       Set<String> previousBuildErrors = Collections.emptySet();
       boolean buildErrorsChanging;
+      for (IProject project : projects) {
+        try {
+          project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null);
+        } catch (Exception ex) {
+          System.err.printf("ProjectUtils#waitForProjects[%s]: error building %s: %s\n", timer,
+              project, ex);
+        }
+      }
       do {
         // wait a little bit to give the builders a chance
         delayTactic.run();
 
-        // wait for any previously-identified build jobs
-        for (Job job : jobs) {
-          job.join();
-        }
+        // NB: don't join jobs: see #1529
+        // for details: https://github.com/GoogleCloudPlatform/google-cloud-eclipse/pull/1529
 
         // identify any pending build-related jobs
         jobs = findPendingBuildJobs(projects);
@@ -293,20 +302,55 @@ public static void waitForProjects(Runnable delayTactic, IProject... projects) {
                 timer, currentBuildErrors.size());
           }
           // Uncomment if tests are failing to identify any other build-related jobs.
-          // Job[] otherJobs = Job.getJobManager().find(null);
-          // if (otherJobs.length > 0) {
-          // System.err.printf("Ignoring %d unrelated jobs:\n", otherJobs.length);
-          // for (Job job : otherJobs) {
-          // System.err.printf(" %s: %s\n", job.getClass().getName(), job);
-          // }
-          // }
+          dumpJobsState();
         }
       } while (!jobs.isEmpty() || buildErrorsChanging);
-    } catch (CoreException | InterruptedException ex) {
+    } catch (CoreException ex) {
       throw new RuntimeException(ex);
     }
   }
 
+  private static void dumpJobsState() {
+    Job[] otherJobs = Job.getJobManager().find(null);
+    if (otherJobs.length == 0) {
+      System.err.printf("ProjectUtils#dumpJobsState: no jobs\n");
+      return;
+    }
+
+    System.err.printf("ProjectUtils#dumpJobsState: %d jobs:\n", otherJobs.length);
+    for (Job job : otherJobs) {
+      String status;
+      switch (job.getState()) {
+        case Job.RUNNING:
+          status = "RUNNING";
+          break;
+        case Job.WAITING:
+          status = "WAITING";
+          break;
+        case Job.SLEEPING:
+          status = "SLEEPING";
+          break;
+        case Job.NONE:
+          status = "NONE";
+          break;
+        default:
+          status = "UNKNOWN(" + job.getState() + ")";
+          break;
+      }
+      Object blockingJob = null;
+      try {
+        blockingJob = ReflectionUtil.invoke(Job.getJobManager(), "findBlockingJob",
+            new Class<?>[] {InternalJob.class}, InternalJob.class, job);
+      } catch (Exception ex) {
+        System.err.println("Unable to fetch blocking-job: " + ex);
+      }
+      System.err.printf(" %s[%d,%s%s%s%s]: %s%s\n", job.getClass().getName(), job.getPriority(),
+          status, (job.isUser() ? ",user" : ""), (job.isSystem() ? ",system" : ""),
+          (job.isBlocking() ? ",blocking" : ""), job,
+          (blockingJob != null ? "; blocked by: " + blockingJob : ""));
+    }
+  }
+
   /** Identify all jobs that we know of that are related to building. */
   private static Collection<Job> findPendingBuildJobs(IProject... projects) {
     Set<Job> jobs = new HashSet<>();
@@ -323,6 +367,13 @@ private static Collection<Job> findPendingBuildJobs(IProject... projects) {
       Collections.addAll(jobs, jobManager.find(
           project.getName() + ValidatorManager.VALIDATOR_JOB_FAMILY));
     }
+    // remove sleeping jobs
+    for (Iterator<Job> iter = jobs.iterator(); iter.hasNext();) {
+      Job job = iter.next();
+      if (job.getState() == Job.SLEEPING) {
+        iter.remove();
+      }
+    }
     return jobs;
   }
 

plugins/com.google.cloud.tools.eclipse.test.util/src/com/google/cloud/tools/eclipse/test/util/reflection/ReflectionUtil.java

@@ -42,6 +42,13 @@ public static <T> T invoke(Object object, String methodName, Class<T> returnType
     for (int i = 0; i < parameters.length; i++) {
       parameterTypes[i] = parameters[i] == null ? Object.class : parameters[i].getClass();
     }
+    return invoke(object, methodName, parameterTypes, returnType, parameters);
+  }
+
+  /** Invoke a method. */
+  public static <T> T invoke(Object object, String methodName, Class<?>[] parameterTypes,
+      Class<T> returnType, Object... parameters) throws NoSuchMethodException, SecurityException,
+      IllegalAccessException, IllegalArgumentException, InvocationTargetException {
     Method method = object.getClass().getDeclaredMethod(methodName, parameterTypes);
     method.setAccessible(true);
     return returnType.cast(method.invoke(object, parameters));

plugins/com.google.cloud.tools.eclipse.util/src/com/google/cloud/tools/eclipse/util/service/ServiceContextFactory.java

@@ -16,6 +16,7 @@
 
 package com.google.cloud.tools.eclipse.util.service;
 
+import com.google.cloud.tools.eclipse.util.status.StatusUtil;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExecutableExtension;
@@ -28,38 +29,42 @@
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
 
-import com.google.cloud.tools.eclipse.util.status.StatusUtil;
-
 public class ServiceContextFactory implements IExecutableExtensionFactory, IExecutableExtension {
 
   private Class<?> clazz;
+  private IConfigurationElement configElement;
 
   @Override
   public void setInitializationData(IConfigurationElement config, String propertyName, Object data)
       throws CoreException {
-      if (data == null || !(data instanceof String)) {
-        throw new CoreException(StatusUtil.error(getClass(), "Data must be a class name"));
-      }
-      String className = (String) data;
-      String bundleSymbolicName = config.getNamespaceIdentifier();
-      Bundle bundle = Platform.getBundle(bundleSymbolicName);
-      if (bundle == null) {
-        throw new CoreException(StatusUtil.error(this, "Missing bundle " + bundleSymbolicName));
-      }
-      try {
-        clazz = bundle.loadClass(className);
-      } catch (ClassNotFoundException ex) {
-        throw new CoreException(StatusUtil.error(this,
-                                                 "Could not load class " + className
-                                                 + " from bundle " + bundle.getSymbolicName(),
-                                                 ex));
-      }
+    if (data == null || !(data instanceof String)) {
+      throw new CoreException(StatusUtil.error(getClass(), "Data must be a class name"));
+    }
+    configElement = config;
+    String className = (String) data;
+    String bundleSymbolicName = config.getNamespaceIdentifier();
+    Bundle bundle = Platform.getBundle(bundleSymbolicName);
+    if (bundle == null) {
+      throw new CoreException(StatusUtil.error(this, "Missing bundle " + bundleSymbolicName));
+    }
+    try {
+      clazz = bundle.loadClass(className);
+    } catch (ClassNotFoundException ex) {
+      throw new CoreException(StatusUtil.error(this,
+          "Could not load class " + className + " from bundle " + bundle.getSymbolicName(), ex));
+    }
   }
 
   @Override
   public Object create() throws CoreException {
     BundleContext bundleContext = FrameworkUtil.getBundle(clazz).getBundleContext();
     IEclipseContext serviceContext = EclipseContextFactory.getServiceContext(bundleContext);
-    return ContextInjectionFactory.make(clazz, serviceContext);
+    IEclipseContext staticContext = EclipseContextFactory.create();
+    staticContext.set(IConfigurationElement.class, configElement);
+    try {
+      return ContextInjectionFactory.make(clazz, serviceContext, staticContext);
+    } finally {
+      staticContext.dispose();
+    }
   }
 }