From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 9 Jun 2009 16:16:43 +0000 (+0000)
Subject: Use execDir to choose config and data dir when not forked.
X-Git-Tag: svn/tags/maven-plugins-0.3.0@2542^0
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=0973ad91ada11b5d108f8ea63ab609c3d45acb05;p=gpl%2Fargeo-slc.git

Use execDir to choose config and data dir when not forked.

git-svn-id: https://svn.argeo.org/slc/trunk/maven@2520 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/maven-argeo-osgi-plugin/pom.xml b/maven-argeo-osgi-plugin/pom.xml
index 4d2f66f1b..baebae2ff 100644
--- a/maven-argeo-osgi-plugin/pom.xml
+++ b/maven-argeo-osgi-plugin/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>maven-argeo-osgi-plugin</artifactId>
-	<version>0.1.12</version>
+	<version>0.1.13</version>
 	<packaging>maven-plugin</packaging>
 	<name>Argeo OSGi Plugin</name>
 
diff --git a/maven-argeo-osgi-plugin/src/main/java/org/argeo/slc/maven/plugins/osgi/EquinoxExecMojo.java b/maven-argeo-osgi-plugin/src/main/java/org/argeo/slc/maven/plugins/osgi/EquinoxExecMojo.java
index 1289b5586..acf393e76 100644
--- a/maven-argeo-osgi-plugin/src/main/java/org/argeo/slc/maven/plugins/osgi/EquinoxExecMojo.java
+++ b/maven-argeo-osgi-plugin/src/main/java/org/argeo/slc/maven/plugins/osgi/EquinoxExecMojo.java
@@ -194,8 +194,14 @@ public class EquinoxExecMojo extends AbstractOsgiMojo {
 	protected void execNonForked(LocationsStruct locationsStruct)
 			throws Exception {
 		// Set defaults
-		if (args == null)
-			args = defaultArgs;
+		if (args == null) {
+			if (fork)
+				args = defaultArgs;
+			else
+				args = new String[] { "-console", "-configuration",
+						execDir.getPath() + File.separator + "conf", "-data",
+						execDir.getPath() + File.separator + "data" };
+		}
 
 		// if (!execDir.exists())
 		// execDir.mkdirs();