svn commit: r1000456 - in /synapse/trunk/java/modules: core/src/main/java/org/apache/synapse/deployers/AbstractSynapseArtifactDeployer.java xar-maven-plugin/src/main/java/org/apache/synapse/maven/xar/AbstractXarMojo.java

[hi...@apache.org]

Author: hiranya
Date: Thu Sep 23 13:18:17 2010
New Revision: 1000456

URL: http://svn.apache.org/viewvc?rev=1000456&view=rev
Log:
Refactoring


Modified:
    synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/AbstractSynapseArtifactDeployer.java
    synapse/trunk/java/modules/xar-maven-plugin/src/main/java/org/apache/synapse/maven/xar/AbstractXarMojo.java

Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/AbstractSynapseArtifactDeployer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/AbstractSynapseArtifactDeployer.java?rev=1000456&r1=1000455&r2=1000456&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/AbstractSynapseArtifactDeployer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/AbstractSynapseArtifactDeployer.java Thu Sep 23 13:18:17 2010
@@ -30,6 +30,7 @@ import org.apache.axis2.deployment.repos
 import org.apache.axis2.description.Parameter;
 import org.apache.axis2.util.XMLPrettyPrinter;
 import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.io.FileUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.synapse.*;
@@ -261,7 +262,7 @@ public abstract class AbstractSynapseArt
      *
      * @param artifactConfig built element representing the artifact to be deployed loaded from the file
      * @param fileName file name from which this artifact is being loaded
-     * @param properties
+     * @param properties Properties associated with the artifact
      * @return String artifact name created by the deployment task
      * 
      * @see org.apache.synapse.deployers.AbstractSynapseArtifactDeployer#deploy(
@@ -290,7 +291,7 @@ public abstract class AbstractSynapseArt
      *
      * @param artifactName name of the artifact to be undeployed
      *
-     * @see org.apache.synapse.deployers.AbstractSynapseArtifactDeployer#undeploy(String)  
+     * @see org.apache.synapse.deployers.AbstractSynapseArtifactDeployer#unDeploy(String)
      */
     public abstract void undeploySynapseArtifact(String artifactName);
 
@@ -397,8 +398,12 @@ public abstract class AbstractSynapseArt
                 backupFilePath = filePath + "." + backupIndex + ".back";
             } else {
                 backupIndex = -1;
-                //noinspection ResultOfMethodCallIgnored
-                file.renameTo(new File(backupFilePath));
+                try {
+                    FileUtils.moveFile(file, new File(backupFilePath));
+                } catch (IOException e) {
+                    handleSynapseArtifactDeploymentError("Error while backing up the artifact: " +
+                            file.getName(), e);
+                }
             }
         }
         return backupFilePath;

Modified: synapse/trunk/java/modules/xar-maven-plugin/src/main/java/org/apache/synapse/maven/xar/AbstractXarMojo.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/xar-maven-plugin/src/main/java/org/apache/synapse/maven/xar/AbstractXarMojo.java?rev=1000456&r1=1000455&r2=1000456&view=diff
==============================================================================
--- synapse/trunk/java/modules/xar-maven-plugin/src/main/java/org/apache/synapse/maven/xar/AbstractXarMojo.java (original)
+++ synapse/trunk/java/modules/xar-maven-plugin/src/main/java/org/apache/synapse/maven/xar/AbstractXarMojo.java Thu Sep 23 13:18:17 2010
@@ -229,7 +229,10 @@ public abstract class AbstractXarMojo ex
         Log log = getLog();
         File tmpServicesDir = new File(new File(tmpDirectory, "META-INF"), "services");
         File buildServicesDir = new File(new File(buildOutputDirectory, "META-INF"), "services");
-        tmpServicesDir.mkdirs();
+        if (!tmpServicesDir.mkdirs()) {
+            throw new MojoExecutionException("Error while creating the directory: " +
+                    tmpServicesDir.getPath());
+        }
         
         log.debug("Initializing class scanner ...");
         ClassScanner scanner = new ClassScanner(buildOutputDirectory);