Merge branch 'master' into maven-runtime-split

Conflicts:
	org.jboss.netty/netty-3.2.4.Final.jar

11 files changed, 62 insertions, 300 deletions

diff --git a/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF b/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF
index 67165457..ad5b693b 100644
--- a/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF
@@ -14,7 +14,6 @@ Export-Package: org.eclipse.m2e.core.ui.internal;x-internal:=true,
  org.eclipse.m2e.core.ui.internal.editing;x-friends:="org.eclipse.m2e.editor.xml,org.eclipse.m2e.editor,org.eclipse.m2e.refactoring",
  org.eclipse.m2e.core.ui.internal.lifecyclemapping;x-internal:=true,
  org.eclipse.m2e.core.ui.internal.preferences;x-internal:=true,
- org.eclipse.m2e.core.ui.internal.search;x-internal:=true,
  org.eclipse.m2e.core.ui.internal.search.util;x-friends:="org.eclipse.m2e.editor",
  org.eclipse.m2e.core.ui.internal.util;x-friends:="org.eclipse.m2e.editor",
  org.eclipse.m2e.core.ui.internal.views;x-internal:=true,
diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/dialogs/UpdateDepenciesDialog.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/dialogs/UpdateDepenciesDialog.java
index a8cf410a..b4d39219 100644
--- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/dialogs/UpdateDepenciesDialog.java
+++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/dialogs/UpdateDepenciesDialog.java
@@ -196,6 +196,11 @@ public class UpdateDepenciesDialog extends TitleAreaDialog implements IMenuListe
       codebaseViewer.setSubtreeChecked(project, true);
     }
 
+    // Reveal the first element
+    if(initialSelection.length > 0) {
+      codebaseViewer.reveal(initialSelection[0]);
+    }
+
     Tree tree = codebaseViewer.getTree();
     GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true, 1, 4);
     gd.heightHint = 300;
diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/search/MavenSearchPage.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/search/MavenSearchPage.java
deleted file mode 100644
index 2e2c45b1..00000000
--- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/search/MavenSearchPage.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008-2010 Sonatype, 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:
- *      Sonatype, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.m2e.core.ui.internal.search;
-
-import org.eclipse.jface.dialogs.DialogPage;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.m2e.core.ui.internal.Messages;
-import org.eclipse.search.ui.ISearchPage;
-import org.eclipse.search.ui.ISearchPageContainer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Table;
-
-/**
- * Maven Search Page
- *
- * @author Eugene Kuleshov
- */
-public class MavenSearchPage extends DialogPage implements ISearchPage {
-
-  private Table table;
-  private Combo classNameText;
-  private Combo sha1Text;
-  private Combo versionText;
-  private Combo packagingIdText;
-  private Combo artifactIdText;
-  private Combo groupIdText;
-  
-  // private ISearchPageContainer container;
-
-  public MavenSearchPage() {
-  }
-
-  public MavenSearchPage(String title) {
-    super(title);
-  }
-
-  public MavenSearchPage(String title, ImageDescriptor image) {
-    super(title, image);
-  }
-
-  public void setContainer(ISearchPageContainer container) {
-    // this.container = container;
-  }
-  
-  public boolean performAction() {
-    // TODO Auto-generated method performAction
-    return false;
-  }
-
-  public void createControl(Composite parent) {
-    Composite composite = new Composite(parent, SWT.NONE);
-    composite.setLayout(new GridLayout(3, false));
-    composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-
-    setControl(parent);
-
-    Label groupIdLabel = new Label(composite, SWT.NONE);
-    groupIdLabel.setText(Messages.MavenSearchPage_lblGroupid);
-
-    groupIdText = new Combo(composite, SWT.NONE);
-    groupIdText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1));
-
-    Label artifactIdLabel = new Label(composite, SWT.NONE);
-    artifactIdLabel.setText(Messages.MavenSearchPage_lblArtifactid);
-
-    artifactIdText = new Combo(composite, SWT.NONE);
-    artifactIdText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1));
-
-    Label versionLabel = new Label(composite, SWT.NONE);
-    versionLabel.setText(Messages.MavenSearchPage_lblVersion);
-
-    versionText = new Combo(composite, SWT.NONE);
-    versionText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1));
-
-    Label packagingIdLabel = new Label(composite, SWT.NONE);
-    packagingIdLabel.setText(Messages.MavenSearchPage_lblPackaging);
-
-    packagingIdText = new Combo(composite, SWT.NONE);
-    GridData packagingIdTextData = new GridData(SWT.LEFT, SWT.CENTER, true, false, 2, 1);
-    packagingIdTextData.widthHint = 208;
-    packagingIdText.setLayoutData(packagingIdTextData);
-
-    Label sha1Label = new Label(composite, SWT.NONE);
-    sha1Label.setText(Messages.MavenSearchPage_lblSha);
-
-    sha1Text = new Combo(composite, SWT.NONE);
-    sha1Text.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
-
-    Button browseButton = new Button(composite, SWT.NONE);
-    browseButton.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
-    browseButton.setText(Messages.MavenSearchPage_btnBrowse);
-
-    Label classNameLabel = new Label(composite, SWT.NONE);
-    classNameLabel.setText(Messages.MavenSearchPage_lblClass);
-
-    classNameText = new Combo(composite, SWT.NONE);
-    classNameText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1));
-
-    Label separator = new Label(composite, SWT.HORIZONTAL | SWT.SEPARATOR);
-    GridData separatorData = new GridData(SWT.FILL, SWT.TOP, false, false, 3, 1);
-    separatorData.heightHint = 15;
-    separatorData.minimumHeight = 15;
-    separator.setLayoutData(separatorData);
-    separator.setText(Messages.MavenSearchPage_separator);
-
-    Label repositoriesLabel = new Label(composite, SWT.NONE);
-    repositoriesLabel.setLayoutData(new GridData(SWT.LEFT, SWT.TOP, false, false));
-    repositoriesLabel.setText(Messages.MavenSearchPage_lblRepos);
-
-    CheckboxTableViewer tableViewer = CheckboxTableViewer.newCheckList(composite, SWT.BORDER);
-    table = tableViewer.getTable();
-    table.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 2));
-
-    Button selectAllButton = new Button(composite, SWT.NONE);
-    selectAllButton.setLayoutData(new GridData(SWT.FILL, SWT.TOP, false, false));
-    selectAllButton.setText(Messages.MavenSearchPage_btnSelect);
-    new Label(composite, SWT.NONE);
-
-    Button deselectAllButton = new Button(composite, SWT.NONE);
-    deselectAllButton.setLayoutData(new GridData(SWT.FILL, SWT.TOP, false, false));
-    deselectAllButton.setText(Messages.MavenSearchPage_btnUnselect);
-  }
-
-}
diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/search/MavenSearchResult.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/search/MavenSearchResult.java
deleted file mode 100644
index a464aeea..00000000
--- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/search/MavenSearchResult.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008-2010 Sonatype, 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:
- *      Sonatype, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.m2e.core.ui.internal.search;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.search.ui.ISearchQuery;
-import org.eclipse.search.ui.text.AbstractTextSearchResult;
-import org.eclipse.search.ui.text.IEditorMatchAdapter;
-import org.eclipse.search.ui.text.IFileMatchAdapter;
-
-/**
- * Maven search result
- *
- * @author Eugene Kuleshov
- */
-public class MavenSearchResult extends AbstractTextSearchResult {
-
-  /* (non-Javadoc)
-   * @see org.eclipse.search.ui.ISearchResult#getQuery()
-   */
-  public ISearchQuery getQuery() {
-    // TODO Auto-generated method getQuery
-    return null;
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.search.ui.ISearchResult#getLabel()
-   */
-  public String getLabel() {
-    // TODO Auto-generated method getLabel
-    return null;
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.search.ui.ISearchResult#getImageDescriptor()
-   */
-  public ImageDescriptor getImageDescriptor() {
-    // TODO Auto-generated method getImageDescriptor
-    return null;
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.search.ui.ISearchResult#getTooltip()
-   */
-  public String getTooltip() {
-    // TODO Auto-generated method getTooltip
-    return null;
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.search.ui.text.AbstractTextSearchResult#getEditorMatchAdapter()
-   */
-  public IEditorMatchAdapter getEditorMatchAdapter() {
-    // TODO Auto-generated method getEditorMatchAdapter
-    return null;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.search.ui.text.AbstractTextSearchResult#getFileMatchAdapter()
-   */
-  public IFileMatchAdapter getFileMatchAdapter() {
-    // TODO Auto-generated method getFileMatchAdapter
-    return null;
-  }
-
-}
-
diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/search/MavenSearchResultPage.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/search/MavenSearchResultPage.java
deleted file mode 100644
index d0c28aae..00000000
--- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/search/MavenSearchResultPage.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008-2010 Sonatype, 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:
- *      Sonatype, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.m2e.core.ui.internal.search;
-
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.search.ui.text.AbstractTextSearchViewPage;
-import org.eclipse.ui.IMemento;
-
-/**
- * Maven search result page
- *
- * @author Eugene Kuleshov
- */
-public class MavenSearchResultPage extends AbstractTextSearchViewPage {
-
-  public MavenSearchResultPage() {
-    super(FLAG_LAYOUT_TREE | FLAG_LAYOUT_FLAT);
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.search.ui.text.AbstractTextSearchViewPage#configureTableViewer(org.eclipse.jface.viewers.TableViewer)
-   */
-  protected void configureTableViewer(TableViewer viewer) {
-    // TODO Auto-generated method configureTableViewer
-    
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.search.ui.text.AbstractTextSearchViewPage#configureTreeViewer(org.eclipse.jface.viewers.TreeViewer)
-   */
-  protected void configureTreeViewer(TreeViewer viewer) {
-    // TODO Auto-generated method configureTreeViewer
-    
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.search.ui.text.AbstractTextSearchViewPage#clear()
-   */
-  protected void clear() {
-    // TODO Auto-generated method clear
-    
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.search.ui.text.AbstractTextSearchViewPage#elementsChanged(java.lang.Object[])
-   */
-  protected void elementsChanged(Object[] objects) {
-    // TODO Auto-generated method elementsChanged
-    
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.search.ui.text.AbstractTextSearchViewPage#restoreState(org.eclipse.ui.IMemento)
-   */
-  public void restoreState(IMemento memento) {
-    super.restoreState(memento);
-
-    // TODO Auto-generated method restoreState
-    
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.search.ui.text.AbstractTextSearchViewPage#saveState(org.eclipse.ui.IMemento)
-   */
-  public void saveState(IMemento memento) {
-    super.saveState(memento);
-    // TODO Auto-generated method saveState
-  }
-  
-}
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/MavenImpl.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/MavenImpl.java
index c62d0103..cf5691c0 100644
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/MavenImpl.java
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/MavenImpl.java
@@ -23,6 +23,7 @@ import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Properties;
@@ -187,6 +188,9 @@ public class MavenImpl implements IMaven, IMavenConfigurationChangeListener {
 
   public MavenExecutionRequest createExecutionRequest(IProgressMonitor monitor) throws CoreException {
     MavenExecutionRequest request = new DefaultMavenExecutionRequest();
+
+    request.setStartTime( new Date() );
+
     if(mavenConfiguration.getGlobalSettingsFile() != null) {
       request.setGlobalSettingsFile(new File(mavenConfiguration.getGlobalSettingsFile()));
     }
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/LifecycleMappingFactory.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/LifecycleMappingFactory.java
index 9c2dd401..0964eb32 100644
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/LifecycleMappingFactory.java
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/LifecycleMappingFactory.java
@@ -532,7 +532,10 @@ public class LifecycleMappingFactory {
   }
 
   private static MavenExecutionRequest newMavenExecutionRequest(MavenExecutionRequest templateRequest) {
-    return DefaultMavenExecutionRequest.copy(templateRequest); // TODO ain't nice
+    // TODO ain't nice
+    MavenExecutionRequest copy = DefaultMavenExecutionRequest.copy(templateRequest);
+    copy.setStartTime(templateRequest.getStartTime());
+    return copy;
   }
 
   public static AbstractProjectConfigurator createProjectConfigurator(IPluginExecutionMetadata metadata) {
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/registry/ProjectRegistryManager.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/registry/ProjectRegistryManager.java
index 1aeb1fd8..6afea342 100644
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/registry/ProjectRegistryManager.java
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/registry/ProjectRegistryManager.java
@@ -615,6 +615,7 @@ public class ProjectRegistryManager {
   protected MavenExecutionRequest getConfiguredExecutionRequest(DependencyResolutionContext context,
       IProjectRegistry state, IFile pom, ResolverConfiguration resolverConfiguration) throws CoreException {
     MavenExecutionRequest mavenRequest = DefaultMavenExecutionRequest.copy(context.getExecutionRequest());
+    mavenRequest.setStartTime(context.getExecutionRequest().getStartTime());
     configureExecutionRequest(mavenRequest, state, pom, resolverConfiguration);
     getMaven().populateDefaults(mavenRequest);
     mavenRequest.setOffline(context.getRequest().isOffline());
diff --git a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/IClasspathEntryDescriptor.java b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/IClasspathEntryDescriptor.java
index 47cf3343..51097a4e 100644
--- a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/IClasspathEntryDescriptor.java
+++ b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/IClasspathEntryDescriptor.java
@@ -11,6 +11,9 @@
 
 package org.eclipse.m2e.jdt;
 
+import java.util.List;
+import java.util.Map;
+
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.jdt.core.IAccessRule;
 import org.eclipse.jdt.core.IClasspathAttribute;
@@ -59,6 +62,21 @@ public interface IClasspathEntryDescriptor {
 
   public IPath[] getExclusionPatterns();
 
+  public void setExported(boolean exported);
+
+  public boolean isExported();
+
+  public IPath getOutputLocation();
+
+  public Map<String, String> getClasspathAttributes();
+
+  public List<IAccessRule> getAccessRules();
+
+  public void setCombineAccessRules(boolean combineAccessRules);
+
+  public boolean combineAccessRules();
+
+
   // maven-specific getters and setters
 
   /**
diff --git a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/AbstractJavaProjectConfigurator.java b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/AbstractJavaProjectConfigurator.java
index dcc24f06..00147116 100644
--- a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/AbstractJavaProjectConfigurator.java
+++ b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/AbstractJavaProjectConfigurator.java
@@ -182,7 +182,7 @@ public abstract class AbstractJavaProjectConfigurator extends AbstractProjectCon
     }
   }
 
-  private void addJREClasspathContainer(IClasspathDescriptor classpath, String environmentId) {
+  protected void addJREClasspathContainer(IClasspathDescriptor classpath, String environmentId) {
     // remove existing JRE entry
     classpath.removeEntry(new ClasspathDescriptor.EntryFilter() {
       public boolean accept(IClasspathEntryDescriptor descriptor) {
@@ -212,7 +212,7 @@ public abstract class AbstractJavaProjectConfigurator extends AbstractProjectCon
     return null;
   }
 
-  private void addMavenClasspathContainer(IClasspathDescriptor classpath) {
+  protected void addMavenClasspathContainer(IClasspathDescriptor classpath) {
     // remove any old maven classpath container entries
     classpath.removeEntry(new ClasspathDescriptor.EntryFilter() {
       public boolean accept(IClasspathEntryDescriptor entry) {
diff --git a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/ClasspathEntryDescriptor.java b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/ClasspathEntryDescriptor.java
index 45c58d47..6a6ced34 100644
--- a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/ClasspathEntryDescriptor.java
+++ b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/ClasspathEntryDescriptor.java
@@ -165,6 +165,10 @@ public class ClasspathEntryDescriptor implements IClasspathEntryDescriptor {
     }
   }
 
+  public Map<String, String> getClasspathAttributes() {
+    return attributes;
+  }
+
   public String getGroupId() {
     return artifactKey != null ? artifactKey.getGroupId() : null;
   }
@@ -246,10 +250,18 @@ public class ClasspathEntryDescriptor implements IClasspathEntryDescriptor {
     this.accessRules.add(rule);
   }
 
+  public List<IAccessRule> getAccessRules() {
+    return accessRules;
+  }
+
   public void setOutputLocation(IPath outputLocation) {
     this.outputLocation = outputLocation;
   }
 
+  public IPath getOutputLocation() {
+    return outputLocation;
+  }
+
   public void setInclusionPatterns(IPath[] inclusionPatterns) {
     if (inclusionPatterns!=null) {
       this.inclusionPatterns = new LinkedHashSet<IPath>(Arrays.asList(inclusionPatterns));
@@ -287,4 +299,20 @@ public class ClasspathEntryDescriptor implements IClasspathEntryDescriptor {
   public IPath[] getExclusionPatterns() {
     return exclusionPatterns != null? exclusionPatterns.toArray(new IPath[exclusionPatterns.size()]) : null;
   }
+
+  public void setExported(boolean exported) {
+    this.exported = exported;
+  }
+
+  public boolean isExported() {
+    return exported;
+  }
+
+  public void setCombineAccessRules(boolean combineAccessRules) {
+    this.combineAccessRules = combineAccessRules;
+  }
+
+  public boolean combineAccessRules() {
+    return combineAccessRules;
+  }
 }