Call python natively

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

diff --git a/maven-argeo-qooxdoo-plugin/src/main/java/org/argeo/slc/maven/plugins/qooxdoo/GenerateMojo.java b/maven-argeo-qooxdoo-plugin/src/main/java/org/argeo/slc/maven/plugins/qooxdoo/GenerateMojo.java
index e0c331472a114aa5bb198d70213df53552dc33b1..ec695a56b21301ccf08b877f71f98882a0d33fe6 100644 (file)
--- a/maven-argeo-qooxdoo-plugin/src/main/java/org/argeo/slc/maven/plugins/qooxdoo/GenerateMojo.java
+++ b/maven-argeo-qooxdoo-plugin/src/main/java/org/argeo/slc/maven/plugins/qooxdoo/GenerateMojo.java
@@ -5,19 +5,23 @@ import java.io.File;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
-import org.python.util.jython;
+import org.apache.maven.plugin.logging.Log;
+import org.codehaus.plexus.util.cli.CommandLineException;
+import org.codehaus.plexus.util.cli.CommandLineUtils;
+import org.codehaus.plexus.util.cli.Commandline;
+import org.codehaus.plexus.util.cli.StreamConsumer;
 
 /**
  * Calls Qooxdoo python tool chain
  * 
  * @goal generate
- * @execute lifecycle="env" phase="initialize"
+ * @execute goal="env"
  */
 public class GenerateMojo extends AbstractMojo {
        /**
         * The Qooxdoo build target.
         * 
-        * @parameter expression="${jobs}"
+        * @parameter expression="${job}"
         * @required
         */
        private String job;
@@ -40,19 +44,39 @@ 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 jythonBase = new File(buildDirectory, "jython");
+                       // jythonBase.mkdirs();
+                       // System.setProperty("python.home", jythonBase.getCanonicalPath());
 
                        File generateScript = new File(baseDir, "generate.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 = { generateScript.getCanonicalPath(), job };
+                       String[] args = { "generate.py", job };
                        getLog().info("Running Qooxdoo job: " + job + " ...");
-                       jython.main(args);
+                       // jython.main(args);
+
+                       Commandline cl = new Commandline();
+                       cl.setExecutable("python");
+                       cl.setWorkingDirectory(baseDir.getCanonicalPath());
+                       cl.createArgument().setValue(generateScript.getCanonicalPath());
+                       cl.createArgument().setValue(job);
+
+                       StreamConsumer stdout = new StdoutConsumer(getLog());
+                       StreamConsumer stderr = new StderrConsumer(getLog());
+                       try {
+                               int result = CommandLineUtils.executeCommandLine(cl, stdout,
+                                               stderr);
+                               if (result != 0) {
+                                       throw new MojoExecutionException("Qooxdoo job returned: \'"
+                                                       + result + "\'.");
+                               }
+                       } catch (CommandLineException e) {
+                               throw new MojoExecutionException("Unable to run Qooxdoo job", e);
+                       }
                        getLog().info("Finished Qooxdoo job: " + job);
+
                } catch (Exception e) {
                        throw new MojoExecutionException(
                                        "Unexpected exception when running Jython", e);
@@ -60,4 +84,61 @@ public class GenerateMojo extends AbstractMojo {
 
        }
 
+       /**
+        * Consumer to receive lines sent to stdout. The lines are logged as info.
+        */
+       private class StdoutConsumer implements StreamConsumer {
+               /** Logger to receive the lines. */
+               private Log logger;
+
+               /**
+                * Constructor.
+                * 
+                * @param log
+                *            The logger to receive the lines
+                */
+               public StdoutConsumer(Log log) {
+                       logger = log;
+               }
+
+               /**
+                * Consume a line.
+                * 
+                * @param string
+                *            The line to consume
+                */
+               public void consumeLine(String string) {
+                       logger.info(string);
+               }
+       }
+
+       /**
+        * Consumer to receive lines sent to stderr. The lines are logged as
+        * warnings.
+        */
+       private class StderrConsumer implements StreamConsumer {
+               /** Logger to receive the lines. */
+               private Log logger;
+
+               /**
+                * Constructor.
+                * 
+                * @param log
+                *            The logger to receive the lines
+                */
+               public StderrConsumer(Log log) {
+                       logger = log;
+               }
+
+               /**
+                * Consume a line.
+                * 
+                * @param string
+                *            The line to consume
+                */
+               public void consumeLine(String string) {
+                       logger.warn(string);
+               }
+       }
+
 }