fixed bug where addons wouldn't redeploy in some cases

Author: cvogt729

README.md

@@ -6,6 +6,6 @@ WebCTRL is a trademark of Automated Logic Corporation. Any other trademarks ment
 
 This WebCTRL add-on [(download link)](https://github.com/automatic-controls/addon-dev-refresh/releases/latest/download/AddonDevRefresher.addon) streamlines the development of other add-ons. Every 3 seconds, it checks for `*.update` files in the `./addons` folder of your WebCTRL server. If an `.update` file is found, it is renamed with extension `.addon`, replacing any existing `.addon` file. Add-ons are automatically disabled and re-enabled during updates.
 
-It is recommended to use this add-on in your local development WebCTRL server. Then have your build script copy in-development add-ons to the `./addons` folder with an `.update` extension whenever your `deploy` task runs.
+It is recommended to use this add-on in your local development WebCTRL server. Then have your build script copy in-development add-ons to the `./addons` folder with an `.update` extension whenever your `deploy` task runs. To detect if deployment is successful, your build script should wait for the `.update` file to disappear.
 
 See [./deploy.bat](./deploy.bat) for an extension you can use with <https://github.com/automatic-controls/addon-dev-script>. If your WebCTRL server requires signed add-ons, download [*ACES.cer*](https://github.com/automatic-controls/addon-dev-script/blob/main/ACES.cer?raw=true) for authentication.

root/info.xml

@@ -1,6 +1,6 @@
 <extension version="1">
   <name>AddonDevRefresher</name>
   <description>Streamlines add-on development by automatically removing and adding add-ons from a local WebCTRL server as they are developed.</description>
-  <version>1.0.0</version>
+  <version>1.0.1</version>
   <vendor>Automatic Controls Equipment Systems, Inc.</vendor>
-</extension>
+</extension>

src/aces/webctrl/dev/HelperAPI.java

@@ -4,6 +4,7 @@
   Contributors: Cameron Vogt (@cvogt729)
 */
 package aces.webctrl.dev;
+import java.io.*;
 import java.nio.file.*;
 import com.controlj.green.addonsupport.web.auth.AuthenticationManager;
 import com.controlj.green.extensionsupport.Extension;
@@ -72,6 +73,28 @@ public static boolean enableAddon(String name){
       return false;
     }
   }
+  public static File getAddonsDirectory(){
+    try{
+      TomcatServer server = TomcatServerSingleton.get();
+      return server==null?null:server.getAddOnsDir();
+    }catch(Throwable t){
+      if (logErrors){ t.printStackTrace(); }
+      return null;
+    }
+  }
+  public static boolean deployAddon(File f){
+    try{
+      TomcatServer server = TomcatServerSingleton.get();
+      if (server==null){
+        return false;
+      }
+      server.deployAddOn(f);
+      return true;
+    }catch(Throwable t){
+      if (logErrors){ t.printStackTrace(); }
+      return false;
+    }
+  }
   /**
    * Removes an add-on with the given name.
    * @param name is used to identify the add-on.

src/aces/webctrl/dev/Initializer.java

@@ -2,6 +2,7 @@
 import com.controlj.green.addonsupport.*;
 import javax.servlet.*;
 import java.nio.file.*;
+import java.io.*;
 public class Initializer implements ServletContextListener {
   public volatile AddOnInfo info;
   private volatile String name;
@@ -12,7 +13,14 @@ public class Initializer implements ServletContextListener {
     try{
       info = AddOnInfo.getAddOnInfo();
       name = info.getName();
-      addons = info.getPrivateDir().toPath().getParent().getParent().getParent().getParent().getParent().resolve("addons").normalize();
+      {
+        File f = HelperAPI.getAddonsDirectory();
+        if (f==null){
+          addons = info.getPrivateDir().toPath().getParent().getParent().getParent().getParent().getParent().resolve("addons").normalize();
+        }else{
+          addons = f.toPath().normalize();
+        }
+      }
       thread = new Thread(){
         @Override public void run(){
           String addonName;
@@ -31,13 +39,13 @@ public class Initializer implements ServletContextListener {
                         addon = addons.resolve(addonName+".addon");
                         if (!Files.exists(addon) || HelperAPI.disableAddon(addonName)){
                           try{
-                            Files.move(p,addon,StandardCopyOption.REPLACE_EXISTING);
+                            Files.copy(p,addon,StandardCopyOption.REPLACE_EXISTING);
                           }catch(Throwable t){
                             continue;
                           }
-                          if (Files.exists(addon)){
-                            HelperAPI.enableAddon(addonName);
+                          if (HelperAPI.enableAddon(addonName) || HelperAPI.deployAddon(addon.toFile())){
                             HelperAPI.activateWebOperatorProvider(addon);
+                            Files.deleteIfExists(p);
                           }
                         }
                       }