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

[veithen]

Author: veithen
Date: Sun Feb 12 19:04:35 2012
New Revision: 1243299

URL: http://svn.apache.org/viewvc?rev=1243299&view=rev
Log:
StopAllMojo doesn't need a port property.

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/StartServerMojo.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=1243299&r1=1243298&r2=1243299&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 12 19:04:35 2012
@@ -31,22 +31,10 @@ public abstract class AbstractServerMojo
     PlexusLoggerInjector loggerInjector;
     
     /**
-     * The port of the Axis server.
-     * 
-     * @parameter default-value="8080"
-     * @required
-     */
-    private int port;
-    
-    /**
      * @component
      */
     private ServerManager serverManager;
 
-    public int getPort() {
-        return port;
-    }
-
     public ServerManager getServerManager() {
         return serverManager;
     }

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=1243299&r1=1243298&r2=1243299&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 12 19:04:35 2012
@@ -81,6 +81,14 @@ public class StartServerMojo extends Abs
     private File workDirBase;
     
     /**
+     * The port of the Axis server.
+     * 
+     * @parameter default-value="8080"
+     * @required
+     */
+    private int port;
+    
+    /**
      * A set of WSDD files for services to deploy. The WSDD files may be 
deployment or undeployment
      * requests. Undeployment requests will be processed when the server is 
stopped. The primary use
      * case for this is to test undeployment.
@@ -232,7 +240,7 @@ public class StartServerMojo extends Abs
         }
         
         // Prepare a work directory where the server can create a 
server-config.wsdd file
-        File workDir = new File(workDirBase, String.valueOf(getPort()));
+        File workDir = new File(workDirBase, String.valueOf(port));
         if (workDir.exists()) {
             try {
                 FileUtils.deleteDirectory(workDir);
@@ -266,7 +274,7 @@ public class StartServerMojo extends Abs
         try {
             getServerManager().startServer(executable,
                     (String[])classPathElements.toArray(new 
String[classPathElements.size()]),
-                    getPort(),
+                    port,
                     (String[])vmArgs.toArray(new String[vmArgs.size()]),
                     workDir,
                     (File[])deployments.toArray(new File[deployments.size()]),