diff options
author | Igor Fedorenko | 2011-02-04 14:46:23 +0000 |
---|---|---|
committer | Igor Fedorenko | 2011-02-04 15:33:10 +0000 |
commit | afb64aa7f9fb5dce8e741e08c19196690902e937 (patch) | |
tree | 0358d87573e61876321f72273dfba9db8916067f /org.eclipse.m2e.tests.common/src | |
parent | 4f90ba9fe1d69d9975ab7590c146bd7dbd8e1600 (diff) | |
download | m2e-core-afb64aa7f9fb5dce8e741e08c19196690902e937.tar.gz m2e-core-afb64aa7f9fb5dce8e741e08c19196690902e937.tar.xz m2e-core-afb64aa7f9fb5dce8e741e08c19196690902e937.zip |
Detect required configuration update after workspace restart
Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>
Diffstat (limited to 'org.eclipse.m2e.tests.common/src')
-rw-r--r-- | org.eclipse.m2e.tests.common/src/org/eclipse/m2e/tests/common/AbstractLifecycleMappingTest.java | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/org.eclipse.m2e.tests.common/src/org/eclipse/m2e/tests/common/AbstractLifecycleMappingTest.java b/org.eclipse.m2e.tests.common/src/org/eclipse/m2e/tests/common/AbstractLifecycleMappingTest.java index 6011860c..f327acb0 100644 --- a/org.eclipse.m2e.tests.common/src/org/eclipse/m2e/tests/common/AbstractLifecycleMappingTest.java +++ b/org.eclipse.m2e.tests.common/src/org/eclipse/m2e/tests/common/AbstractLifecycleMappingTest.java @@ -20,12 +20,9 @@ import java.util.Arrays; import java.util.List; import java.util.Map; -import org.eclipse.core.internal.resources.Workspace; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.Path; import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; @@ -95,15 +92,14 @@ public abstract class AbstractLifecycleMappingTest extends AbstractMavenProjectT /** * Creates new partially initialised MavenProjectFacade instance */ - protected MavenProjectFacade newMavenProjectFacade(String path) throws CoreException { - File file = new File(path); - IFile pom = (IFile) ((Workspace) workspace).newResource(Path.fromOSString(file.getAbsolutePath()), IResource.FILE); - MavenProject mavenProject = plugin.getMaven().readProject(file, monitor); + protected MavenProjectFacade newMavenProjectFacade(IFile pom) throws CoreException { + MavenProject mavenProject = plugin.getMaven().readProject(pom.getLocation().toFile(), monitor); MavenExecutionRequest request = plugin.getMaven().createExecutionRequest(monitor); MavenSession session = plugin.getMaven().createSession(request, mavenProject); MavenExecutionPlan executionPlan = plugin.getMaven().calculateExecutionPlan(session, mavenProject, Arrays.asList("deploy"), false, monitor); - MavenProjectFacade facade = new MavenProjectFacade(null, pom, mavenProject, executionPlan.getMojoExecutions(), null); + MavenProjectFacade facade = new MavenProjectFacade(plugin.getMavenProjectManagerImpl(), pom, mavenProject, + executionPlan.getMojoExecutions(), new ResolverConfiguration()); return facade; } |