svn commit: r1333831 - in /axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server: SimpleHttpServerMojo.java util/RepoHelper.java

[sagara]

Author: sagara
Date: Fri May  4 09:49:48 2012
New Revision: 1333831

URL: http://svn.apache.org/viewvc?rev=1333831&view=rev
Log:
Added few checks to detect axis2.xml  for simple server Maven plug- in .

Modified:
    
axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/SimpleHttpServerMojo.java
    
axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/util/RepoHelper.java

Modified: 
axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/SimpleHttpServerMojo.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/SimpleHttpServerMojo.java?rev=1333831&r1=1333830&r2=1333831&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/SimpleHttpServerMojo.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/SimpleHttpServerMojo.java
 Fri May  4 09:49:48 2012
@@ -237,8 +237,13 @@ public class SimpleHttpServerMojo extend
             return inPath;
         } else {
             String path = repoPath != null ? repoPath : DEFAULT_REPO_LOCATION;
-            return path + File.separator + DEFAULT_CONF_DIR + File.separator
+            path = path + File.separator + DEFAULT_CONF_DIR + File.separator
                     + DEFAULT_CONF_FILE_NAME;
+            File confFile = new File(path);
+            if(confFile.exists()){
+                return path;
+            }
+            return null;
         }
     }
 

Modified: 
axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/util/RepoHelper.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/util/RepoHelper.java?rev=1333831&r1=1333830&r2=1333831&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/util/RepoHelper.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/util/RepoHelper.java
 Fri May  4 09:49:48 2012
@@ -377,7 +377,9 @@ public class RepoHelper {
         // find axis2.file any where on resource directory. 
         File srcFile = new File(DEFAULT_CONF_SRC_DIR + File.separator + 
DEFAULT_CONF_FILE_NAME);
         File desFile = new File(repoLocation + File.separator + 
DEFAULT_CONF_DIR + File.separator + DEFAULT_CONF_FILE_NAME);
-        copyDirectory(srcFile, desFile, getDataBufferSize());
+        if(srcFile.exists()){
+            copyDirectory(srcFile, desFile, getDataBufferSize());            
+        }
         
     }