Merged all GWT modules into one because you can't cast the same jsint…

…erop class across module boundaries in JS, merged manager:shared sub-project into model, moved manager:client to top-level client sub-project

.gitignore

@@ -25,8 +25,8 @@ bower_components/
 console/iOS/DerivedData
 console/iOS/Pods
 
-manager/client/src/main/webapp/gwt/
-manager/client/.externalToolBuilders/
+client/src/main/webapp/gwt/
+client/.externalToolBuilders/
 manager/.factorypath
 
 # Ignore build/runtime only data

manager/client/build.gradle → client/build.gradle

@@ -1,4 +1,4 @@
-evaluationDependsOn(resolveProject(":manager:shared").path)
+evaluationDependsOn(resolveProject(":model").path)
 
 apply plugin: "java"
 apply plugin: "distribution"
@@ -9,7 +9,7 @@ configurations {
 
 dependencies {
 
-    compile resolveProject(":manager:shared")
+    compile resolveProject(":model")
 
     // TODO Deprecate this and remove all usages
     compile "com.google.gwt:gwt-elemental:$gwtVersion"
@@ -39,7 +39,6 @@ task compileGwt(dependsOn: classes, type: JavaExec) {
     inputs.files(sourceSets.main.java.srcDirs).skipWhenEmpty()
     inputs.dir sourceSets.main.output.resourcesDir
     inputs.dir(resolveProject(":model").sourceSets.main.java.srcDirs[0]).skipWhenEmpty()
-    inputs.dir(resolveProject(":manager:shared").sourceSets.main.java.srcDirs[0]).skipWhenEmpty()
     outputs.dir gwtOutputDir
 
     doFirst {
@@ -89,13 +88,13 @@ task compileGwt(dependsOn: classes, type: JavaExec) {
      */
 
     args = [
-            "org.openremote.components.Components", "org.openremote.manager.Manager", "org.openremote.app.App", // The production GWT modules
+            "org.openremote.app.App", // The production GWT modules
             "-war", gwtOutputDir,
             "-logLevel", "ERROR",
             "-localWorkers", "2",
             "-extra", gwtExtraDir,
             "-generateJsInteropExports",
-            "-style", "PRETTY"
+            "-style", "OBFUSCATED"
     ]
 }
 
@@ -136,15 +135,15 @@ task gwtSuperDev(dependsOn: classes, type: JavaExec) {
       -X[no]closureFormattedOutput   EXPERIMENTAL: Enables Javascript output suitable for post-compilation by Closure Compiler (defaults to OFF)
      */
     args = [
-            "org.openremote.components.Components", "org.openremote.manager.ManagerDev", "org.openremote.app.App", // Note: Different module for dev mode!
+            "org.openremote.app.AppDev", // Note: Different module for dev mode!
             "-workDir", gwtWorkDir,
             "-launcherDir", gwtLauncherDir,
             "-src", resolveProject(":model").sourceSets.main.java.srcDirs[0], // Help code server detect source changes
-            "-src", resolveProject(":manager:shared").sourceSets.main.java.srcDirs[0], // Help code server detect source changes
             "-logLevel", "INFO",
             "-noincremental",
             "-noprecompile",
             "-generateJsInteropExports",
+            "-style", "PRETTY",
             "-bindAddress", "0.0.0.0" // Careful! The code server listens on all interfaces!,
 
     ]
@@ -153,7 +152,7 @@ task gwtSuperDev(dependsOn: classes, type: JavaExec) {
 }
 
 installDist {
-    dependsOn resolveTask(":manager:client:src:main:webapp:installDist")
+    dependsOn resolveTask(":client:src:main:webapp:installDist")
 }
 
 distributions {

manager/client/src/main/java/org/openremote/manager/client/ManagerEntryPoint.java → client/src/main/java/org/openremote/app/client/AppEntryPoint.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016, OpenRemote Inc.
+ * Copyright 2017, OpenRemote Inc.
  *
  * See the CONTRIBUTORS.txt file in the distribution for a
  * full listing of individual contributors.
@@ -17,22 +17,34 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.openremote.manager.client;
+package org.openremote.app.client;
 
 import com.google.gwt.core.client.GWT;
 
 import java.util.logging.Logger;
 
-public class ManagerEntryPoint implements com.google.gwt.core.client.EntryPoint {
+public class AppEntryPoint implements com.google.gwt.core.client.EntryPoint {
 
-    private static final Logger LOG = Logger.getLogger(ManagerEntryPoint.class.getName());
+    private static final Logger LOG = Logger.getLogger(AppEntryPoint.class.getName());
 
     protected final ManagerGinjector injector = GWT.create(ManagerGinjector.class);
 
     @Override
     public void onModuleLoad() {
-        LOG.info("Manager GWT entry point");
+        LOG.info("App GWT module loaded");
+        dispatchLoadedEvent();
+    }
+
+    protected void startManager() {
         injector.getAppController().start();
     }
 
+    public native void dispatchLoadedEvent() /*-{
+        $wnd.addEventListener("StartManager", function() {
+            this.@org.openremote.app.client.AppEntryPoint::startManager()();
+        }.bind(this));
+
+        $wnd.dispatchEvent(new CustomEvent("AppLoaded"));
+    }-*/;
+
 }

manager/client/src/main/java/org/openremote/components/client/AppSecurity.java → client/src/main/java/org/openremote/app/client/AppSecurity.java

@@ -1,9 +1,11 @@
-package org.openremote.components.client;
+package org.openremote.app.client;
 
 import jsinterop.annotations.JsPackage;
 import jsinterop.annotations.JsProperty;
 import jsinterop.annotations.JsType;
 import org.openremote.model.http.RequestParams;
+import org.openremote.model.interop.Consumer;
+import org.openremote.model.interop.Runnable;
 
 /**
  * The singleton of {@code <or-app-security>}.
@@ -19,8 +21,8 @@ public interface AppSecurity {
 
     String getFullName();
 
-    @JsProperty(name = "tenant")
-    String getAuthenticatedRealm();
+    @JsProperty
+    String getRealm();
 
     void logout();
 
@@ -34,8 +36,14 @@ public interface AppSecurity {
 
     boolean isUserTenantAdminEnabled();
 
-    void setCredentialsOnRequestParams(RequestParams requestParams);
+    /**
+     * Sets credentials on request params, this can happen asynchronously.
+     */
+    void authorizeRequestParams(RequestParams requestParams, Runnable onComplete);
 
-    String setCredentialsOnUrl(String serviceUrl);
+    /**
+     * Sets credentials on URL, this can happen asynchronously.
+     */
+    void authorizeUrl(String serviceUrl, Consumer<String> onComplete);
 
 }

manager/client/src/main/java/org/openremote/manager/client/Environment.java → client/src/main/java/org/openremote/app/client/Environment.java

@@ -17,25 +17,23 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.openremote.manager.client;
+package org.openremote.app.client;
 
 import com.google.gwt.place.shared.PlaceController;
 import com.google.gwt.place.shared.PlaceHistoryMapper;
-import org.openremote.components.client.AppSecurity;
-import org.openremote.components.client.style.WidgetStyle;
-import org.openremote.manager.client.i18n.ManagerMessages;
-import org.openremote.manager.client.service.EventService;
+import org.openremote.app.client.OpenRemoteApp;
+import org.openremote.app.client.style.WidgetStyle;
+import org.openremote.app.client.i18n.ManagerMessages;
+import org.openremote.app.client.service.EventService;
 import org.openremote.model.event.bus.EventBus;
-import org.openremote.components.client.rest.RequestService;
 
 /**
  * Bundle all typically needed dependencies of activities/presenters, so
  * only one thing can be injected into constructors.
  */
 public interface Environment {
 
-    static Environment create(AppSecurity appSecurity,
-                              RequestService requestService,
+    static Environment create(OpenRemoteApp app,
                               EventService eventService,
                               PlaceController placeController,
                               PlaceHistoryMapper placeHistoryMapper,
@@ -45,13 +43,8 @@ static Environment create(AppSecurity appSecurity,
         return new Environment() {
 
             @Override
-            public AppSecurity getAppSecurity() {
-                return appSecurity;
-            }
-
-            @Override
-            public RequestService getRequestService() {
-                return requestService;
+            public OpenRemoteApp getApp() {
+                return app;
             }
 
             @Override
@@ -86,9 +79,7 @@ public WidgetStyle getWidgetStyle() {
         };
     }
 
-    AppSecurity getAppSecurity();
-
-    RequestService getRequestService();
+    OpenRemoteApp getApp();
 
     PlaceController getPlaceController();