You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/09/03 01:39:21 UTC

svn commit: r439687 - /geronimo/server/trunk/maven-plugins/selenium-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/selenium/StartServerMojo.java

Author: jdillon
Date: Sat Sep  2 16:39:20 2006
New Revision: 439687

URL: http://svn.apache.org/viewvc?rev=439687&view=rev
Log:
Support -userExtensions

Modified:
    geronimo/server/trunk/maven-plugins/selenium-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/selenium/StartServerMojo.java

Modified: geronimo/server/trunk/maven-plugins/selenium-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/selenium/StartServerMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/selenium-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/selenium/StartServerMojo.java?rev=439687&r1=439686&r2=439687&view=diff
==============================================================================
--- geronimo/server/trunk/maven-plugins/selenium-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/selenium/StartServerMojo.java (original)
+++ geronimo/server/trunk/maven-plugins/selenium-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/selenium/StartServerMojo.java Sat Sep  2 16:39:20 2006
@@ -23,13 +23,11 @@
 import org.apache.maven.artifact.factory.ArtifactFactory;
 
 import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.net.ConnectException;
 
 import org.apache.geronimo.genesis.AntMojoSupport;
 import org.apache.geronimo.plugin.ArtifactItem;
 import org.apache.commons.lang.SystemUtils;
+
 import org.apache.tools.ant.taskdefs.ExecTask;
 
 /**
@@ -64,6 +62,13 @@
      */
     private boolean debug;
     
+    /**
+     * Location of the user-extentions.js to load into the server.
+     *
+     * @parameter
+     */
+    private File userExtensions;
+    
     //
     // MojoSupport Hooks
     //
@@ -151,12 +156,19 @@
                     exec.createArg().setFile(artifact.getFile());
                     exec.createArg().setValue("-port");
                     exec.createArg().setValue(String.valueOf(port));
+                    
                     if (debug) {
                         exec.createArg().setValue("-debug");
                     }
+                    
                     if (timeout > 0) {
                         exec.createArg().setValue("-timeout");
                         exec.createArg().setValue(String.valueOf(timeout));
+                    }
+                    
+                    if (userExtensions != null) {
+                        exec.createArg().setValue("-userExtensions");
+                        exec.createArg().setFile(userExtensions);
                     }
                     
                     exec.setLogError(true);