Upgrade to qooxdoo 0.8.1.argeo.1

[gpl/argeo-slc.git] / maven / maven-argeo-qooxdoo-plugin / src / main / java / org / argeo / slc / maven / plugins / qooxdoo / GenerateMojo.java

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 1529b808e7e9c093024f6632a034cff68412dedb..3138fbc4eea11a40582d2efb631b09e472cf98d6 100644 (file)
--- 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
@@ -31,7 +31,7 @@ public class GenerateMojo extends AbstractMojo {
         * @parameter expression="${qooxdooSdk}"
         */
        private String qooxdooSdk = "src" + File.separator + "main"
-                       + File.separator + "webapp" + File.separator + "qooxdoo-0.8-sdk";
+                       + File.separator + "webapp" + File.separator + "qooxdoo-sdk";
 
        /**
         * The build directory.
@@ -51,30 +51,14 @@ public class GenerateMojo extends AbstractMojo {
 
        public void execute() throws MojoExecutionException, MojoFailureException {
                try {
-                       // File jythonBase = new File(buildDirectory, "jython");
-                       // jythonBase.mkdirs();
-                       // System.setProperty("python.home", jythonBase.getCanonicalPath());
-
                        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 };
                        getLog().info("Running Qooxdoo job: " + job + " ...");
-                       // jython.main(args);
 
                        Commandline cl = new Commandline();
 
-                       if (File.separatorChar == '\\') {// win
-                               File pythonBase = new File(buildDirectory, "python-win32")
-                                               .getCanonicalFile();
-                               cl.setExecutable(pythonBase.getPath() + File.separator
-                                               + "python");
-                       } else
-                               cl.setExecutable("python");
+                       cl.setExecutable("python");// python needs to be installed
                        cl.setWorkingDirectory(baseDir.getCanonicalPath());
                        cl.createArgument().setValue(generateScript.getCanonicalPath());
                        cl.createArgument().setValue(job);