Fixed startup order

openremote · Feb 16, 2017 · 1d10888 · 1d10888
1 parent 5a7ee6d
commit 1d10888
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/manager/server/src/main/java/org/openremote/manager/server/Main.java b/manager/server/src/main/java/org/openremote/manager/server/Main.java
@@ -49,6 +49,7 @@ public static void main(String[] args) throws Exception {
                     new MessageBrokerSetupService(),
                     new ManagerIdentityService(),
                     new PersistenceService(),
+                    new SetupService(),
                     new EventService(),
                     new AssetService(),
                     new AgentService()
@@ -57,7 +58,6 @@ public static void main(String[] args) throws Exception {
                 addAll(Arrays.asList(
                     new MapService(),
                     new MessageBrokerService(),
-                    new SetupService(),
                     new ManagerWebService()
                 ));
             }

diff --git a/manager/test/src/main/groovy/org/openremote/test/ManagerContainerTrait.groovy b/manager/test/src/main/groovy/org/openremote/test/ManagerContainerTrait.groovy
@@ -23,13 +23,13 @@ trait ManagerContainerTrait extends ContainerTrait {
                 new MessageBrokerSetupService(),
                 new ManagerIdentityService(),
                 new PersistenceService(),
+                new SetupService(),
                 new EventService(),
                 new AssetService(),
                 new AgentService(),
                 *Lists.newArrayList(ServiceLoader.load(Protocol.class)),
                 new MapService(),
                 new MessageBrokerService(),
-                new SetupService(),
                 new ManagerWebService(),
                 *additionalServices