Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason van Zyl2013-05-06 16:12:48 -0400
committerJason van Zyl2013-05-06 16:12:48 -0400
commit973fc4fdf0723879c962bc7b6da2ec84bbdf2ce4 (patch)
tree032b5e992c7e55f09121160b808973b888995b3b
parent3cd30d9b9258dd287bf631c41496770260c4ad9f (diff)
downloadm2e-core-973fc4fdf0723879c962bc7b6da2ec84bbdf2ce4.tar.gz
m2e-core-973fc4fdf0723879c962bc7b6da2ec84bbdf2ce4.tar.xz
m2e-core-973fc4fdf0723879c962bc7b6da2ec84bbdf2ce4.zip
o account for tesla runtimes that keep all configuration in the conf/ directory
-rw-r--r--org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/MavenExternalRuntime.java9
1 files changed, 7 insertions, 2 deletions
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/MavenExternalRuntime.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/MavenExternalRuntime.java
index 3603d7fb..e539678f 100644
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/MavenExternalRuntime.java
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/MavenExternalRuntime.java
@@ -74,9 +74,14 @@ public class MavenExternalRuntime implements MavenRuntime {
}
private File getLauncherConfigurationFile() {
- return new File(location, "bin/m2.conf"); //$NON-NLS-1$
+ File m2Conf = new File(location, "bin/m2.conf");
+ // Look for Tesla location
+ if(m2Conf.exists() == false) {
+ m2Conf = new File(location, "conf/m2.conf");
+ }
+ return m2Conf; //$NON-NLS-1$
}
-
+
public void createLauncherConfiguration(final IMavenLauncherConfiguration collector, IProgressMonitor monitor)
throws CoreException {

Back to the top