svn commit: r1290991 - in /axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/server: AbstractServerMojo.java StartProcessMojo.java StartServerMojo.java StopAllMojo.java

[veithen]

Author: veithen
Date: Sun Feb 19 12:07:17 2012
New Revision: 1290991

URL: http://svn.apache.org/viewvc?rev=1290991&view=rev
Log:
Added support for the skipTests flag.

Modified:
    
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/server/AbstractServerMojo.java
    
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/server/StartProcessMojo.java
    
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/server/StartServerMojo.java
    
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/server/StopAllMojo.java

Modified: 
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/server/AbstractServerMojo.java
URL: 
http://svn.apache.org/viewvc/axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/server/AbstractServerMojo.java?rev=1290991&r1=1290990&r2=1290991&view=diff
==============================================================================
--- 
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/server/AbstractServerMojo.java
 (original)
+++ 
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/server/AbstractServerMojo.java
 Sun Feb 19 12:07:17 2012
@@ -19,6 +19,8 @@
 package org.apache.axis.maven.server;
 
 import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
 
 import com.github.veithen.ulog.PlexusLoggerInjector;
 
@@ -35,7 +37,25 @@ public abstract class AbstractServerMojo
      */
     private ProcessManager processManager;
 
+    /**
+     * Set this to <code>true</code> to skip running tests, but still compile 
them. This is the same
+     * flag that is also used by the Surefire and Failsafe plugins.
+     * 
+     * @parameter expression="${skipTests}" default-value="false"
+     */
+    private boolean skipTests;
+    
     public ProcessManager getProcessManager() {
         return processManager;
     }
+
+    public final void execute() throws MojoExecutionException, 
MojoFailureException {
+        if (skipTests) {
+            getLog().info("Tests are skipped.");
+        } else {
+            doExecute();
+        }
+    }
+    
+    protected abstract void doExecute() throws MojoExecutionException, 
MojoFailureException;
 }

Modified: 
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/server/StartProcessMojo.java
URL: 
http://svn.apache.org/viewvc/axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/server/StartProcessMojo.java?rev=1290991&r1=1290990&r2=1290991&view=diff
==============================================================================
--- 
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/server/StartProcessMojo.java
 (original)
+++ 
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/server/StartProcessMojo.java
 Sun Feb 19 12:07:17 2012
@@ -54,7 +54,7 @@ public class StartProcessMojo extends Ab
      */
     private File workDir;
 
-    public void execute() throws MojoExecutionException, MojoFailureException {
+    protected void doExecute() throws MojoExecutionException, 
MojoFailureException {
         workDir.mkdirs();
         startJavaProcess(mainClass, mainClass, args != null ? args : new 
String[0], workDir, ProcessStartAction.NOP, ProcessStopAction.NOP);
     }

Modified: 
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/server/StartServerMojo.java
URL: 
http://svn.apache.org/viewvc/axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/server/StartServerMojo.java?rev=1290991&r1=1290990&r2=1290991&view=diff
==============================================================================
--- 
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/server/StartServerMojo.java
 (original)
+++ 
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/server/StartServerMojo.java
 Sun Feb 19 12:07:17 2012
@@ -99,7 +99,7 @@ public class StartServerMojo extends Abs
      */
     private boolean foreground;
     
-    public void execute() throws MojoExecutionException, MojoFailureException {
+    protected void doExecute() throws MojoExecutionException, 
MojoFailureException {
         Log log = getLog();
         
         // Select WSDD files

Modified: 
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/server/StopAllMojo.java
URL: 
http://svn.apache.org/viewvc/axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/server/StopAllMojo.java?rev=1290991&r1=1290990&r2=1290991&view=diff
==============================================================================
--- 
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/server/StopAllMojo.java
 (original)
+++ 
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/maven/server/StopAllMojo.java
 Sun Feb 19 12:07:17 2012
@@ -28,7 +28,7 @@ import org.apache.maven.plugin.MojoFailu
  * @phase post-integration-test
  */
 public class StopAllMojo extends AbstractServerMojo {
-    public void execute() throws MojoExecutionException, MojoFailureException {
+    protected void doExecute() throws MojoExecutionException, 
MojoFailureException {
         try {
             getProcessManager().stopAll();
         } catch (Exception ex) {