From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 7 Dec 2008 17:46:09 +0000 (+0000)
Subject: Use generator directly
X-Git-Tag: argeo-slc-2.1.7~2329
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=e926213d2f93236f865df6bdd4f5bb6b38ce0ef2;p=gpl%2Fargeo-slc.git

Use generator directly

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

diff --git a/maven/maven-argeo-qooxdoo-plugin/src/main/java/org/argeo/slc/maven/plugins/qooxdoo/GenerateMojo.java b/maven/maven-argeo-qooxdoo-plugin/src/main/java/org/argeo/slc/maven/plugins/qooxdoo/GenerateMojo.java
index 405d6c70e..66f00c2a1 100644
--- a/maven/maven-argeo-qooxdoo-plugin/src/main/java/org/argeo/slc/maven/plugins/qooxdoo/GenerateMojo.java
+++ b/maven/maven-argeo-qooxdoo-plugin/src/main/java/org/argeo/slc/maven/plugins/qooxdoo/GenerateMojo.java
@@ -26,6 +26,14 @@ public class GenerateMojo extends AbstractMojo {
 	 */
 	private String job;
 
+	/**
+	 * Location of the qooxdoo sdk.
+	 * 
+	 * @parameter expression="${qooxdooSdk}"
+	 */
+	private String qooxdooSdk = "src" + File.separator + "main"
+			+ File.separator + "webapp" + File.separator + "qooxdoo-0.8-sdk";
+
 	/**
 	 * The build directory.
 	 * 
@@ -48,12 +56,14 @@ public class GenerateMojo extends AbstractMojo {
 			// jythonBase.mkdirs();
 			// System.setProperty("python.home", jythonBase.getCanonicalPath());
 
-			File generateScript = new File(baseDir, "generate.py");
+			File generateScript = new File(baseDir.getPath() + File.separator
+					+ qooxdooSdk + File.separator + "tool" + File.separator
+					+ "bin", "generator.py");
 			// String[] jobArray = jobs.split(" ");
 			// String[] args = new String[jobArray.length + 1];
 			// args[0] = generateScript.getCanonicalPath();
 			// System.arraycopy(jobArray, 0, args, 1, jobArray.length);
-			String[] args = { "generate.py", job };
+			// String[] args = { "generate.py", job };
 			getLog().info("Running Qooxdoo job: " + job + " ...");
 			// jython.main(args);