Added jmxterm, updated GWT

openremote · Oct 21, 2017 · bdfc262 · bdfc262
1 parent 5ab52a3
commit bdfc262
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -53,6 +53,17 @@ docker-compose -p ordev \
     up --build
 ```
 
+Stop the containers with:
+
+```
+docker-compose -p ordev \
+    -f profile/postgresql_dev.yml \
+    -f profile/keycloak_dev.yml \
+    -f profile/manager_dev.yml \
+    -f profile/haproxy_dev.yml \
+    down
+```
+
 For more information and how to set up a development environment, see the [Developer Guide](https://github.com/openremote/openremote/wiki).
 
 ## Discuss OpenRemote

diff --git a/container/build.gradle b/container/build.gradle
@@ -51,6 +51,8 @@ dependencies {
         exclude group: "log4j"
     }
 
+    compile "org.cyclopsgroup:jmxterm:$jmxtermVersion"
+
     // Test environment dependencies
     compile "org.glassfish.tyrus:tyrus-client:$tyrusVersion"
     compile "org.glassfish.tyrus:tyrus-container-grizzly-client:$tyrusVersion"

diff --git a/gradle.properties b/gradle.properties
@@ -11,7 +11,7 @@ resteasyVersion = 3.0.21.Final
 resteasyVersionAsyncHttpServlet = 3.0.19.Final
 jbossLoggingAnnotationsVersion = 2.0.2.Final
 keycloakVersion = 2.5.4.Final
-gwtVersion = 2.8.1
+gwtVersion = 2.8.2
 ginVersion = 2.1.2
 gwtJacksonVersion = 0.14.2
 jacksonVersion = 2.8.6
@@ -33,4 +33,5 @@ calimeroVersion = 2.4-SNAPSHOT
 clingVersion = 2.1.1
 uuidGeneratorVersion = 3.1.3
 nrjavaserialVersion = 3.13.0
-saxonHEVersion = 9.8.0-3
+saxonHEVersion = 9.8.0-3
+jmxtermVersion = 1.0.0
diff --git a/manager/client/src/main/java/org/openremote/manager/client/assets/asset/AssetEditImpl.ui.xml b/manager/client/src/main/java/org/openremote/manager/client/assets/asset/AssetEditImpl.ui.xml
@@ -99,6 +99,7 @@
                                             <w:FormButton ui:field="showHistoryButton"
                                                           text="{managerMessages.showHistory}"
                                                           enabled="false"
+                                                          visible="false"
                                                           icon="history"/>
                                         </w:FormGroupActions>
                                     </w:actions>

diff --git a/...er/client/src/main/resources/org/jboss/resteasy/api/validation/ResteasyValidation.gwt.xml b/...er/client/src/main/resources/org/jboss/resteasy/api/validation/ResteasyValidation.gwt.xml
@@ -1,5 +1,4 @@
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.0//EN"
-        "http://google-web-toolkit.googlecode.com/svn/releases/2.0/distro-source/core/src/gwt-module.dtd">
+<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.0//EN" "http://gwtproject.org/doctype/2.8.0/gwt-module.dtd">
 
 <module rename-to="ResteasyValidation">
 

diff --git a/manager/client/src/main/resources/org/keycloak/representations/idm/KeycloakIDM.gwt.xml b/manager/client/src/main/resources/org/keycloak/representations/idm/KeycloakIDM.gwt.xml
@@ -1,5 +1,4 @@
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.0//EN"
-        "http://google-web-toolkit.googlecode.com/svn/releases/2.0/distro-source/core/src/gwt-module.dtd">
+<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.0//EN" "http://gwtproject.org/doctype/2.8.0/gwt-module.dtd">
 
 <module rename-to="KeycloakIDM">
 

diff --git a/manager/client/src/main/resources/org/openremote/manager/Manager.gwt.xml b/manager/client/src/main/resources/org/openremote/manager/Manager.gwt.xml
@@ -1,5 +1,4 @@
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.0//EN"
-        "http://google-web-toolkit.googlecode.com/svn/releases/2.0/distro-source/core/src/gwt-module.dtd">
+<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.0//EN" "http://gwtproject.org/doctype/2.8.0/gwt-module.dtd">
 
 <module rename-to="Manager">
 
@@ -36,7 +35,7 @@
                                    value="org.openremote.manager.client.interop.jackson.SerializationConfiguration"/>
 
     <replace-with class="org.openremote.manager.client.interop.jackson.JsonDeserializationContextBuilder">
-        <when-type-assignable class="com.github.nmorel.gwtjackson.client.JsonDeserializationContext.Builder" />
+        <when-type-assignable class="com.github.nmorel.gwtjackson.client.JsonDeserializationContext.Builder"/>
     </replace-with>
 
     <!-- ##################################################################### -->
@@ -46,6 +45,10 @@
 
     <!-- ##################################################################### -->
 
+    <collapse-all-properties/>
+
+    <!-- ##################################################################### -->
+
     <entry-point class="org.openremote.manager.client.ManagerEntryPoint"/>
 
 </module>
diff --git a/manager/client/src/main/resources/org/openremote/manager/ManagerDev.gwt.xml b/manager/client/src/main/resources/org/openremote/manager/ManagerDev.gwt.xml
@@ -1,5 +1,4 @@
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.0//EN"
-        "http://google-web-toolkit.googlecode.com/svn/releases/2.0/distro-source/core/src/gwt-module.dtd">
+<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.0//EN" "http://gwtproject.org/doctype/2.8.0/gwt-module.dtd">
 
 <!-- This configuration is only used in SuperDev mode! -->
 

diff --git a/manager/client/src/main/resources/org/openremote/model/Model.gwt.xml b/manager/client/src/main/resources/org/openremote/model/Model.gwt.xml
@@ -1,5 +1,4 @@
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.0//EN"
-        "http://google-web-toolkit.googlecode.com/svn/releases/2.0/distro-source/core/src/gwt-module.dtd">
+<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.0//EN" "http://gwtproject.org/doctype/2.8.0/gwt-module.dtd">
 
 <module rename-to="Model">
 

diff --git a/profile/haproxy_dev.yml b/profile/haproxy_dev.yml
@@ -15,5 +15,5 @@ services:
     ports:
       - "80:80"
       - "443:443"
-    #volumes:
-    # - ../haproxy/demo:/etc/haproxy/demo
+    volumes:
+    - ../haproxy/demo:/etc/haproxy/demo