[servicemix-scm] Applied patch for windows from Philip Dodds

[rajdavies]

Commit in servicemix/base/src/main/java/org/servicemix/jbi/framework on MAIN
DeploymentService.java	+3	-2	1.8 -> 1.9
InstallationService.java	+2	-1	1.16 -> 1.17
	+5	-3

2 modified files

Applied patch for windows from Philip Dodds

---

servicemix/base/src/main/java/org/servicemix/jbi/framework

DeploymentService.java 1.8 -> 1.9

diff -u -r1.8 -r1.9
--- DeploymentService.java	1 Aug 2005 00:04:41 -0000	1.8
+++ DeploymentService.java	2 Aug 2005 15:37:23 -0000	1.9
@@ -54,7 +54,7 @@

 /**
  * The deployment service MBean allows administrative tools to manage service assembly deployments.
  * 

- * @version $Revision: 1.8 $

+ * @version $Revision: 1.9 $

  */
 public class DeploymentService extends BaseLifeCycle implements DeploymentServiceMBean {
     private static final Log log = LogFactory.getLog(DeploymentService.class);

@@ -118,6 +118,7 @@

         String assemblyName = sa.getIdentification().getName();
         File saDirectory = environmentContext.createSALibDirectory(assemblyName);
         log.info(assemblyName + " Moving " + tmpDir.getAbsolutePath() + " to " + saDirectory.getAbsolutePath());

+        FileUtil.deleteFile(saDirectory);

         tmpDir.renameTo(saDirectory);
         // move the assembly to a well-named holding area
         ServiceUnit[] sus = sa.getServiceUnits();

@@ -464,7 +465,7 @@

                 }
             }
             else {

-                throw new DeploymentException("artifact: " + artifact + " doesn't exist");

+                throw new DeploymentException("artifact: " + artifact + "(" + artifactFile.getAbsolutePath() + ") doesn't exist");

             }
         }
         catch (IOException e) {

---

servicemix/base/src/main/java/org/servicemix/jbi/framework

InstallationService.java 1.16 -> 1.17

diff -u -r1.16 -r1.17
--- InstallationService.java	1 Aug 2005 00:04:41 -0000	1.16
+++ InstallationService.java	2 Aug 2005 15:37:23 -0000	1.17
@@ -60,7 +60,7 @@

 /**
  * Installation Service - installs/uninstalls archives
  * 

- * @version $Revision: 1.16 $

+ * @version $Revision: 1.17 $

  */
 public class InstallationService extends BaseLifeCycle implements FrameworkInstallationService {
     private static final Log log = LogFactory.getLog(InstallationService.class);

@@ -635,6 +635,7 @@

         catch (IOException e) {
             throw new DeploymentException(e);
         }

+        FileUtil.deleteFile(installationDir);

         tmpDirectory.renameTo(installationDir);
         log.info("moved " + tmpDirectory + " to " + installationDir);
         // create the Installation context

CVSspam 0.2.8