Tobias Jeger pushed to branch feature/ESSENTIALS-1132 at cms-community / 
hippo-essentials


Commits:
38298592 by Tobias Jeger at 2017-12-13T12:06:35+01:00
ESSENTIALS-1132 Enable plugins with no rebuild requirement

- - - - -


2 changed files:

- 
dashboard/src/main/java/org/onehippo/cms7/essentials/plugin/InstallStateMachine.java
- 
plugin-sdk/api/src/main/java/org/onehippo/cms7/essentials/dashboard/model/PluginDescriptor.java


Changes:

=====================================
dashboard/src/main/java/org/onehippo/cms7/essentials/plugin/InstallStateMachine.java
=====================================
--- 
a/dashboard/src/main/java/org/onehippo/cms7/essentials/plugin/InstallStateMachine.java
+++ 
b/dashboard/src/main/java/org/onehippo/cms7/essentials/plugin/InstallStateMachine.java
@@ -76,9 +76,13 @@ class InstallStateMachine {
             throw new PluginException("Incorrect state to run setup.");
         }
 
-        // For now, all plugins require a rebuild after the setup phase.
-        log.info("Setting to Installing for plugin " + plugin);
-        state = InstallState.INSTALLING;
+        if (plugin.getDescriptor().isNoRebuildAfterSetup()) {
+            log.info("Setting to Installed for plugin " + plugin);
+            state = InstallState.INSTALLED;
+        } else {
+            log.info("Setting to Installing for plugin " + plugin);
+            state = InstallState.INSTALLING;
+        }
 
         persistState();
         return state;


=====================================
plugin-sdk/api/src/main/java/org/onehippo/cms7/essentials/dashboard/model/PluginDescriptor.java
=====================================
--- 
a/plugin-sdk/api/src/main/java/org/onehippo/cms7/essentials/dashboard/model/PluginDescriptor.java
+++ 
b/plugin-sdk/api/src/main/java/org/onehippo/cms7/essentials/dashboard/model/PluginDescriptor.java
@@ -40,7 +40,8 @@ public class PluginDescriptor implements Restful {
     private List<String> imageUrls;
     private String id;
     private String packageClass;
-    private boolean hasConfiguration = false;
+    private boolean hasConfiguration;
+    private boolean noRebuildAfterSetup;
     private String packageFile;
     private String type;
     private String installState;
@@ -122,6 +123,14 @@ public class PluginDescriptor implements Restful {
     public boolean getHasConfiguration() {
         return hasConfiguration;
     }
+
+    public boolean isNoRebuildAfterSetup() {
+        return noRebuildAfterSetup;
+    }
+
+    public void setNoRebuildAfterSetup(final boolean noRebuildAfterSetup) {
+        this.noRebuildAfterSetup = noRebuildAfterSetup;
+    }
     
     public Vendor getVendor() {
         return vendor;



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-essentials/commit/38298592c5d4d06247425dc9d35c810ff1ec66c8

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-essentials/commit/38298592c5d4d06247425dc9d35c810ff1ec66c8
You're receiving this email because of your account on code.onehippo.org.
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

Reply via email to